bundles/hdparm/items.py

@@ -0,0 +1,18 @@
+previous_action = []
+
+for device, options in node.metadata.get('hdparm').items():
+    for option, value in options.items():
+        if option == 'power_management':
+            name = f'hdparm_{option}_{device}'
+            actions[name] = {
+                'command': f'hdparm -B {value} "{device}"',
+                'unless': f'hdparm -B "{device}" | grep APM_level | cut -d= -f2 | xargs | grep -q "^{value}$"',
+                'needs': [
+                    'pkg_apt:hdparm',
+                    *previous_action,
+                ],
+            }
+        else:
+            raise ValueError(f'unsupported hdparm option: {option}')
+            
+    previous_action = [f'action:{name}']

bundles/hdparm/metadata.py

@@ -0,0 +1,8 @@
+defaults = {
+    'apt': {
+        'packages': {
+            'hdparm': {},
+        },
+    },
+    'hdparm': {},
+}

bundles/smartctl/README.md

@@ -1,15 +0,0 @@
-# state
-smartctl -n idle /dev/sda
-
-# temp
-smartctl -n idle -A /dev/sdb --json=c | jq .temperature.current
-
-# apm
-smartctl --get apm /dev/sdb --json=c | jq .ata_apm.level
-smartctl --set apm,20 /dev/sdb --json=c
-
-# power state
-smartctl -n idle /dev/sdb
-
-# devices
-smartctl --scan | cut -d' ' -f1

bundles/smartctl/files/hdd_temp

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-for device in $(smartctl --scan | cut -d' ' -f1)
-do
-  temp=$(smartctl -n idle -A --json=c $device | jq .temperature.current)
-
-  if [[ $temp == ?(-)+([0-9]) ]]
-  then
-    echo "smartctl,host=${node.name},device=$device temperature=$temp $(date --utc +%s%N)"
-  elif [[ $temp == null ]]
-  then
-    # hdd might be sleeping
-    continue
-  else
-    # hdd might be unsupported
-    continue
-  fi
-done

bundles/smartctl/items.py

@@ -1,25 +0,0 @@
-files = {
-    '/usr/local/share/icinga/plugins/hdd_temp': {
-        'content_type': 'mako',
-        'mode': '0755',
-    },
-}
-
-previous_action = []
-
-for device, conf in node.metadata.get('smartctl').items():
-    for option, value in conf.items():
-        if option == 'apm':
-            action_name = f'smartctl_apm_{device}'
-            actions[action_name] = {
-                'command': f'smartctl --set apm,{value} "{device}"',
-                'unless': f'smartctl --get apm "{device}" --json=c | jq .ata_apm.level | grep -q "^{value}$"',
-                'needs': [
-                    'pkg_apt:smartmontools',
-                    *previous_action,
-                ],
-            }
-        else:
-            raise ValueError(f'{node.name}: unkown smartctl option: {option}')
-        
-        previous_action = [f'action:{action_name}']

bundles/smartctl/metadata.py

@@ -1,27 +0,0 @@
-defaults = {
-    'apt': {
-        'packages': {
-            'smartmontools': {},
-        },
-    },
-    'grafana_rows': {
-        'smartctl',
-    },
-    'smartctl': {},
-    'telegraf': {
-        'config': {
-            'inputs': {
-                'exec': [{
-                    'commands': [
-                        f'sudo /usr/local/share/icinga/plugins/hdd_temp',
-                    ],
-                    'data_format': 'influx',
-                    'interval': '60s',
-                }],
-            },
-        },
-    },
-    'sudoers': {
-        'telegraf': ['/usr/local/share/icinga/plugins/hdd_temp'],
-    },
-}

data/grafana/rows/smartctl.py

@@ -1,18 +0,0 @@
-{
-    'temperature': {
-        'queries': {
-            'usage': {
-                'filters': {
-                    '_measurement': 'smartctl',
-                    '_field': [
-                        'temperature',
-                    ],
-                },
-                'function': 'mean',
-            },
-        },
-        'display_name': '__field.labels.device',
-        'min': 0,
-        'unit': 'degrees',
-    },
-}

nodes/home.backups.py

@@ -6,9 +6,9 @@
         'monitored',
     ],
     'bundles': [
-        'smartctl',
         'zfs',
         'zfs-mirror',
+        'hdparm',
     ],
     'metadata': {
         'id': '9cf52515-63a1-4659-a8ec-6c3c881727e5',
@@ -22,15 +22,15 @@
         'backup-server': {
             'hostname': 'backups.sublimity.de',
         },
-        'smartctl': {
+        'hdparm': {
             '/dev/disk/by-id/ata-HGST_HDN726040ALE614_K3GV6TPL': {
-                'apm': 32,
+                'power_management': 1,
             },
             '/dev/disk/by-id/ata-HGST_HDN726040ALE614_K4KAJXEB': {
-                'apm': 32,
+                'power_management': 1,
             },
             '/dev/disk/by-id/ata-TOSHIBA_HDWQ140_19VZK0EMFAYG': {
-                'apm': 32,
+                'power_management': 1,
             },
         },
         'zfs-mirror': {

nodes/home.server.py

@@ -9,15 +9,14 @@
     ],
     'bundles': [
         'gitea',
-        'gollum',
         'grafana',
         'influxdb2',
         'mirror',
         'postgresql',
         'redis',
-        'smartctl',
         'wireguard',
         'zfs',
+        'gollum',
     ],
     'metadata': {
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',

nodes/wb.offsite-backups.py

@@ -7,7 +7,6 @@
     ],
     'bundles': [
         'dm-crypt',
-        'smartctl',
         'wireguard',
         'zfs',
     ],
@@ -54,11 +53,6 @@
                 'device': '/dev/disk/by-id/ata-TOSHIBA_MG06ACA10TE_61C0A1B1FKQE',
             },
         },
-        'smartctl': {
-            '/dev/disk/by-id/ata-TOSHIBA_MG06ACA10TE_61C0A1B1FKQE': {
-                'apm': 32,
-            },
-        },
         'zfs': {
             'pools': {
                 'tank': {