From a72ef99f78d1d528d089364eb2c85ad2fa9a07b2 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 27 Mar 2022 18:15:35 +0200
Subject: [PATCH] wip

---
 bundles/icinga2/items.py    | 142 ++++++++++++++++++------------------
 bundles/icinga2/metadata.py |  89 +++++++++++-----------
 2 files changed, 115 insertions(+), 116 deletions(-)

diff --git a/bundles/icinga2/items.py b/bundles/icinga2/items.py
index 2c70ca9..34e6030 100644
--- a/bundles/icinga2/items.py
+++ b/bundles/icinga2/items.py
@@ -1,72 +1,72 @@
 # Git-Hash for Icinga1: b63bb0ef52bf213715e567c81e3ed097024e61af
-
-directories = {
-    '/etc/icinga2': {
-        'purge': True,
-        'owner': 'nagios',
-    },
-    '/etc/icinga2/conf.d': {
-        'purge': True,
-        'owner': 'nagios',
-    },
-    '/etc/icinga2/hosts.d': {
-        'purge': True,
-        'owner': 'nagios',
-    },
-    '/etc/icinga2/features.d': {
-        'purge': True,
-        'owner': 'nagios',
-    },
-}
-
-files = {
-    '/etc/icinga2/icinga2.conf': {
-        'owner': 'nagios',
-    },
-    '/etc/icinga2/constants.conf': {
-        'owner': 'nagios',
-        'context': {
-            'hostname': node.metadata.get('icinga2/hostname')
-        },
-    },
-    '/etc/icinga2/conf.d/templates.conf': {
-        'source': 'conf.d/templates.conf',
-        'owner': 'nagios',
-    },
-    '/etc/icinga2/features/ido-pgsql.conf': {
-        'source': 'features/ido-pgsql.conf',
-        'content_type': 'mako',
-        'owner': 'nagios',
-        'context': {
-            'db_password': node.metadata.get('postgresql/roles/icinga2/password')
-        },
-        'needs': [
-            'pkg_apt:icinga2-ido-pgsql',
-        ],
-    },
-    '/etc/icingaweb2/setup.token': {
-        'content': node.metadata.get('icingaweb2/setup_token'),
-        'owner': 'nagios',
-    },
-}
-
-for other_node in repo.nodes:
-    files[f'/etc/icinga2/hosts.d/{other_node.name}.conf'] = {
-        'content_type': 'mako',
-        'source': 'hosts.d/host.conf',
-        'owner': 'nagios',
-        'context': {
-            'host_name': other_node.name,
-            'host_settings': {},
-            'services': other_node.metadata.get('monitoring', {}),
-        },
-    }
-
-svc_systemd = {
-    'icinga2': {
-        'needs': [
-            'pkg_apt:icinga2-ido-pgsql',
-            'svc_systemd:postgresql',
-        ],
-    },
-}
+# 
+# directories = {
+#     '/etc/icinga2': {
+#         'purge': True,
+#         'owner': 'nagios',
+#     },
+#     '/etc/icinga2/conf.d': {
+#         'purge': True,
+#         'owner': 'nagios',
+#     },
+#     '/etc/icinga2/hosts.d': {
+#         'purge': True,
+#         'owner': 'nagios',
+#     },
+#     '/etc/icinga2/features.d': {
+#         'purge': True,
+#         'owner': 'nagios',
+#     },
+# }
+# 
+# files = {
+#     '/etc/icinga2/icinga2.conf': {
+#         'owner': 'nagios',
+#     },
+#     '/etc/icinga2/constants.conf': {
+#         'owner': 'nagios',
+#         'context': {
+#             'hostname': node.metadata.get('icinga2/hostname')
+#         },
+#     },
+#     '/etc/icinga2/conf.d/templates.conf': {
+#         'source': 'conf.d/templates.conf',
+#         'owner': 'nagios',
+#     },
+#     '/etc/icinga2/features/ido-pgsql.conf': {
+#         'source': 'features/ido-pgsql.conf',
+#         'content_type': 'mako',
+#         'owner': 'nagios',
+#         'context': {
+#             'db_password': node.metadata.get('postgresql/roles/icinga2/password')
+#         },
+#         'needs': [
+#             'pkg_apt:icinga2-ido-pgsql',
+#         ],
+#     },
+#     '/etc/icingaweb2/setup.token': {
+#         'content': node.metadata.get('icingaweb2/setup_token'),
+#         'owner': 'nagios',
+#     },
+# }
+# 
+# for other_node in repo.nodes:
+#     files[f'/etc/icinga2/hosts.d/{other_node.name}.conf'] = {
+#         'content_type': 'mako',
+#         'source': 'hosts.d/host.conf',
+#         'owner': 'nagios',
+#         'context': {
+#             'host_name': other_node.name,
+#             'host_settings': {},
+#             'services': other_node.metadata.get('monitoring', {}),
+#         },
+#     }
+# 
+# svc_systemd = {
+#     'icinga2': {
+#         'needs': [
+#             'pkg_apt:icinga2-ido-pgsql',
+#             'svc_systemd:postgresql',
+#         ],
+#     },
+# }
diff --git a/bundles/icinga2/metadata.py b/bundles/icinga2/metadata.py
index b9b71ea..ceeb659 100644
--- a/bundles/icinga2/metadata.py
+++ b/bundles/icinga2/metadata.py
@@ -3,11 +3,10 @@ from hashlib import sha3_256
 defaults = {
     'apt': {
         'packages': {
-            'icinga2': {},
+            'icingadb': {},
+            'icingadb-web': {},
             'icingaweb2': {},
-            'icinga2-ido-pgsql': {},
-            'icingacli': {},
-            'monitoring-plugins': {},
+            'icingadb-redis': {},
         },
         'sources': {
             'deb https://packages.icinga.com/debian icinga-{release} main',
@@ -15,7 +14,7 @@ defaults = {
     },
     'postgresql': {
         'databases': {
-            'icinga2': {
+            'icingadb': {
                 'owner': 'icinga2',
             },
             'icingaweb2': {
@@ -23,7 +22,7 @@ defaults = {
             },
         },
         'roles': {
-            'icinga2': {
+            'icingadb': {
                 'password': repo.vault.password_for(f'psql icinga2 on {node.name}'),
             },
             'icingaweb2': {
@@ -31,44 +30,44 @@ defaults = {
             },
         },
     },
-    'zfs': {
-        'datasets': {
-            'tank/icinga2': {
-                'mountpoint': '/var/lib/icinga2',
-                'needed_by': {
-                    'pkg_apt:icinga2',
-                    'pkg_apt:icingaweb2',
-                    'pkg_apt:icinga2-ido-pgsql',
-                },
-            },
-        },
-    },
+    # 'zfs': {
+    #     'datasets': {
+    #         'tank/icinga2': {
+    #             'mountpoint': '/var/lib/icingadb',
+    #             'needed_by': {
+    #                 'pkg_apt:icingadb',
+    #                 'pkg_apt:icingadb-web',
+    #                 'pkg_apt:icingaweb2',
+    #             },
+    #         },
+    #     },
+    # },
 }
 
-
-@metadata_reactor.provides(
-    'icingaweb2/setup_token',
-)
-def setup_token(metadata):
-    return {
-        'icingaweb2': {
-            'setup_token': sha3_256(metadata.get('id').encode()).hexdigest()[:16],
-        },
-    }
-
-
-@metadata_reactor.provides(
-    'nginx/vhosts',
-)
-def nginx(metadata):
-    return {
-        'nginx': {
-            'vhosts': {
-                metadata.get('icinga2/hostname'): {
-                    'content': 'icingaweb2/vhost.conf',
-                    'context': {
-                    },
-                },
-            },
-        },
-    }
+# 
+# @metadata_reactor.provides(
+#     'icingaweb2/setup_token',
+# )
+# def setup_token(metadata):
+#     return {
+#         'icingaweb2': {
+#             'setup_token': sha3_256(metadata.get('id').encode()).hexdigest()[:16],
+#         },
+#     }
+# 
+# 
+# @metadata_reactor.provides(
+#     'nginx/vhosts',
+# )
+# def nginx(metadata):
+#     return {
+#         'nginx': {
+#             'vhosts': {
+#                 metadata.get('icinga2/hostname'): {
+#                     'content': 'icingaweb2/vhost.conf',
+#                     'context': {
+#                     },
+#                 },
+#             },
+#         },
+#     }