Store instance configs in subdirectory

Icinga · Jan 29, 2025 · b7e1413 · b7e1413
1 parent 0a33634
commit b7e1413
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/systemd/default.env b/systemd/default.env
@@ -0,0 +1 @@
+ICINGA_FOR_KUBERNETES_CLUSTER_NAME=default
diff --git a/systemd/icinga-kubernetes b/systemd/icinga-kubernetes
@@ -2,12 +2,13 @@
 # Allowed values are "all", "none" or a space separated list 
 # of names of the clusters. If empty, "all" is assumed.
 # The cluster name refers to the cluster environment file name.
-# i.e. "cluster1" would be /etc/icinga-kubernetes/cluster1.env
+# i.e. "test-cluster" would be /etc/icinga-kubernetes/instances/test-cluster.env
 #
 # Changing this variable will require running "systemctl daemon-reload" 
-# followed by a restart of the icinga-kubernetes service (if you 
-# removed entries you may have to stop those manually)
+# followed by a restart of the icinga-kubernetes service (if you removed
+# entries you may have to stop the corresponding instances manually
+# before restarting the service)
 #
 #AUTOSTART="all"
 #AUTOSTART="none"
-#AUTOSTART="cluster1 cluster2"
+#AUTOSTART="test-cluster prod-cluster"
diff --git a/systemd/icinga-kubernetes-generator b/systemd/icinga-kubernetes-generator
@@ -9,7 +9,7 @@ set -eu
 WANTDIR="$1/icinga-kubernetes.service.wants"
 SERVICEFILE="/lib/systemd/system/[email protected]"
 AUTOSTART="all"
-CONFIG_DIR=/etc/icinga-kubernetes
+CONFIG_DIR=/etc/icinga-kubernetes/instances
 
 if [[ ! -d "$WANTDIR" ]]; then
   mkdir -p "$WANTDIR"
@@ -37,4 +37,3 @@ else
 fi
 
 exit 0
-
diff --git a/systemd/icinga-kubernetes.service b/systemd/icinga-kubernetes.service
@@ -6,7 +6,7 @@ After=syslog.target network-online.target mariadb.service postgresql.service
 Type=oneshot
 RemainAfterExit=true
 ExecStart=/bin/true
-WorkingDirectory=/etc/icinga-kubernetes
+WorkingDirectory=/etc/icinga-kubernetes/instances
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/[email protected] b/systemd/[email protected]
@@ -5,9 +5,9 @@ After=syslog.target network-online.target mariadb.service postgresql.service
 
 [Service]
 Type=simple
-WorkingDirectory=/etc/icinga-kubernetes
+WorkingDirectory=/etc/icinga-kubernetes/instances
 Environment="ICINGA_FOR_KUBERNETES_CLUSTER_NAME=%i"
-EnvironmentFile=/etc/icinga-kubernetes/%i.env
+EnvironmentFile=/etc/icinga-kubernetes/instances/%i.env
 ExecStartPre=/bin/echo "$ICINGA_FOR_KUBERNETES_CLUSTER_NAME" 
 ExecStart=/usr/sbin/icinga-kubernetes --config /etc/icinga-kubernetes/config.yml --cluster-name ${ICINGA_FOR_KUBERNETES_CLUSTER_NAME}
 User=icinga-kubernetes