playbooks/monitoring.yml

@@ -1,6 +1,6 @@
 ---
 
-- hosts: cas
+- hosts: localhost
   roles:
     - s3lph.pki.pki_ca
 
@@ -8,7 +8,6 @@
   strategy: free
   roles:
     - s3lph.pki.pki_entity
-    - s3lph.prometheus.prometheus_node
 
 - hosts: all_nodes
   strategy: free
@@ -27,5 +26,4 @@
 
 - hosts: prometheus
   roles:
-    - s3lph.pki.pki_entity
     - s3lph.prometheus.prometheus

roles/prometheus/templates/prometheus-job.yml

@@ -31,14 +31,6 @@
     password: {{ job.basic_auth_password }}
   {% endif -%}
 
-  {% if 'tls_config' in job -%}
-  tls_config:
-    ca_file: {{ job.tls_config.ca_file }}
-    cert_file: {{ job.tls_config.cert_file }}
-    key_file: {{ job.tls_config.key_file }}
-    insecure_skip_verify: {{ job.tls_config.insecure_skip_verify | default(false) }}
-  {% endif -%}
-
   static_configs:
     - targets:
         {% for host in groups['all'] -%}

roles/prometheus_node/tasks/config.yml

@@ -1,19 +1,9 @@
 ---
 
-- name: create /etc/prometheus/node-exporter/tls
+- name: render /etc/prometheus/tls/config.yml
-  file:
-    path: /etc/prometheus/node-exporter/tls
-    state: directory
-    owner: prometheus
-    group: prometheus
-
-- name: render /etc/prometheus/node-exporter/tls/config.yml
   template:
     src: prometheus-node-exporter-webconfig.yml.j2
-    dest: /etc/prometheus/node-exporter/tls/config.yml
+    dest: /etc/prometheus/tls/config.yml
-    owner: prometheus
-    group: prometheus
-  notify: restart prometheus-node-exporter
 
 - name: render /etc/default/prometheus-node-exporter
   template:

roles/prometheus_node/templates/prometheus-node-exporter.default.j2

@@ -1,3 +1,3 @@
 {{ ansible_managed | comment }}
 
-ARGS="{% for k, v in args.items() %}--{{ k }}=\"{{ v }}\" {% endfor %} --web.config=/etc/prometheus/node-exporter/tls/config.yml"
+ARGS="{% for k, v in args.items() %}--{{ k }}=\"{{ v }}\" {% endfor %} --web.config=/etc/prometheus/tls/config.yml"