From 41b2ad4b20b852612b4bfc39da6ef82c1b532114 Mon Sep 17 00:00:00 2001
From: Tunui Franken <tfranken@protonmail.com>
Date: Fri, 31 Jan 2025 23:56:09 +0100
Subject: [PATCH] [icinga2] Define "disk" Service without arguments to get
 partitions dynamically

---
 .../templates/zones.d/master/hosts.conf.j2            | 11 -----------
 .../templates/zones.d/master/services/common.conf.j2  |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2 b/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
index 4656105..a793ed5 100644
--- a/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
+++ b/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
@@ -4,21 +4,10 @@ object Host "{{ icinga2_master }}" {
     import "generic-host"
 
     address = "{{ hostvars[icinga2_master].ipv4_addr }}"
-
-    vars.disks["disk /"] = {
-        disk_partitions = "/"
-    }
 }
 
 object Host "{{ icinga2_agent }}" {
     import "generic-host"
 
     address = "{{ hostvars[icinga2_agent].ipv4_addr }}"
-
-    vars.disks["disk /"] = {
-        disk_partitions = "/"
-    }
-    vars.disks["disk /var/vmail"] = {
-        disk_partitions = "/var/vmail"
-    }
 }
diff --git a/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2 b/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
index 57b3468..d165a2a 100644
--- a/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
+++ b/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
@@ -24,11 +24,11 @@ apply Service for (http_vhost => config in host.vars.http_vhosts) {
     vars += config
 }
 
-apply Service for (disk => config in host.vars.disks) {
+apply Service "disk" {
     import "generic-service"
     check_command = "disk"
     command_endpoint = host.name
-    vars += config
+    assign where true
 }
 
 apply Service "apt" {