bw/bundles/mqtt-monitoring: execute daily tasks independent of normal…

… check_system tasks
voc · Apr 8, 2024 · d618f70 · d618f70
1 parent de7eaaf
commit d618f70
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/bundlewrap/bundles/mqtt-monitoring/files/check_system_daily.sh b/bundlewrap/bundles/mqtt-monitoring/files/check_system_daily.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+
+[[ -n "$DEBUG" ]] && set -x
+
+for file in /usr/local/sbin/check_system_daily.d/*.sh
+do
+    if [ -x "${file}" ]; then
+        . "${file}"
+    fi
+done
diff --git a/bundlewrap/bundles/mqtt-monitoring/items.py b/bundlewrap/bundles/mqtt-monitoring/items.py
@@ -11,15 +11,14 @@
 }
 
 files['/usr/local/sbin/alert_shutdown.sh'] = {
-    'content_type': 'mako',
     'mode': '0755',
 }
 
 files['/usr/local/sbin/check_system.sh'] = {
-    'content_type': 'jinja2',
-    'context': {
-        'event': node.metadata.get('event'),
-    },
+    'mode': '0755',
+}
+
+files['/usr/local/sbin/check_system_daily.sh'] = {
     'mode': '0755',
 }
 

diff --git a/bundlewrap/bundles/mqtt-monitoring/metadata.py b/bundlewrap/bundles/mqtt-monitoring/metadata.py
@@ -23,9 +23,16 @@
             'check_system_and_send_mqtt_message': {
                 'command': '/usr/local/sbin/check_system.sh',
                 'when': 'minutely',
-                'environment': {
-                    'DAILY_TASK_TIME': str(6+(node.magic_number%3)).rjust(2, '0') + str(node.magic_number%60).rjust(2, '0'),
+                'requires': {
+                    'network.target',
                 },
+            },
+            'check_system_daily_tasks': {
+                'command': '/usr/local/sbin/check_system_daily.sh',
+                'when': '{}:{}:00'.format(
+                    str(6+(node.magic_number%3)).rjust(2, '0'),
+                    str(node.magic_number%60).rjust(2, '0'),
+                ),
                 'requires': {
                     'network.target',
                 },