tidyup

bundles/grafana/items.py

@@ -25,10 +25,8 @@ actions['reset_grafana_admin_password'] = {
 }
 
 directories = {
-    '/etc/grafana': {
+    '/etc/grafana': {},
-    },
+    '/etc/grafana/provisioning': {},
-    '/etc/grafana/provisioning': {
-    },
     '/etc/grafana/provisioning/datasources': {
         'purge': True,
     },
@@ -160,8 +158,6 @@ for dashboard_id, monitored_node in enumerate(monitored_nodes, start=1):
 
     files[f'/var/lib/grafana/dashboards/{monitored_node.name}.json'] = {
         'content': json.dumps(dashboard, indent=4),
-        'owner': 'grafana',
-        'group': 'grafana',
         'triggers': [
             'svc_systemd:grafana-server:restart',
         ]

bundles/icinga2/files/features/journald.conf

@@ -0,0 +1,7 @@
+/**
+ * The JournaldLogger type writes log information to the systemd journal.
+ */
+
+object JournaldLogger "journald" {
+    severity = "warning"
+}

bundles/icinga2/files/features/syslog.conf

@@ -1,3 +0,0 @@
-object SyslogLogger "syslog" {
-    severity = "warning"
-}

bundles/icinga2/items.py

@@ -195,7 +195,7 @@ files = {
 # FEATURES
 
 for feature, context in {
-    'syslog': {},
+    'journald': {},
     'notification': {},
     'checker': {},
     'api': {},