3 files changed, 11 insertions, 10 deletions
diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml
index 22a5578a..f39d57f1 100644
--- a/inventory/host_vars/ch-apps/vars.yml
+++ b/inventory/host_vars/ch-apps/vars.yml
@@ -72,15 +72,15 @@ prometheus_job_multitarget_blackbox__probe:
 
 prometheus_job_multitarget_ssl__probe:
   ch-apps:
-  - instance: "sslcert-standalone-kubelet-{{ inventory_hostname }}"
+  - module: file
     target: "/etc/ssl/standalone-kubelet/*.pem"
-    module: file
-  - instance: "sslcert-node-red-{{ inventory_hostname }}"
+    sslcert_instance: "standalone-kubelet"
+  - module: file
     target: "/etc/ssl/node-red-*/*.pem"
-    module: file
-  - instance: "sslcert-whawty-auth-{{ inventory_hostname }}"
+    sslcert_instance: "node-red"
+  - module: file
     target: "/etc/ssl/whawty-auth-*/*.pem"
-    module: file
+    sslcert_instance: "whawty-auth"
 
 
 zfs_arc_size:
diff --git a/inventory/host_vars/ch-http-proxy.yml b/inventory/host_vars/ch-http-proxy.yml
index 024c9bfc..bdbde798 100644
--- a/inventory/host_vars/ch-http-proxy.yml
+++ b/inventory/host_vars/ch-http-proxy.yml
@@ -61,9 +61,9 @@ prometheus_job_multitarget_blackbox__probe:
 
 prometheus_job_multitarget_ssl__probe:
   ch-http-proxy:
-  - instance: "sslcert-apps-publish-{{ inventory_hostname }}"
+  - module: file
     target: "/etc/ssl/apps-publish-*/*.pem"
-    module: file
+    sslcert_instance: apps-publish
 
 
 whawty_auth_store_instances:
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index e974b0af..85b2dd8c 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -184,9 +184,10 @@ prometheus_job_multitarget_blackbox__probe:
 
 prometheus_job_multitarget_ssl__probe:
   ch-mon:
-  - instance: "sslcert-prometheus-{{ inventory_hostname }}"
+  - module: file
     target: "/etc/ssl/prometheus/**/*.pem"
-    module: file
+    sslcert_instance: prometheus
+
 
 prometheus_server_rules_node_extra:
   - alert: GitFsckMetricsOutdated