galaxy.yml

@@ -39,8 +39,7 @@ tags:
 # collection label 'namespace.name'. The value is a version range
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
 # range specifiers can be set and are separated by ','
-dependencies:
-  git@gitlab.com:s3lph/ansible-collection-pki: master
+dependencies: {}
 
 # The URL of the originating SCM repository
 repository: https://gitlab.com/s3lph/ansible-collection-prometheus

playbooks/monitoring.yml

@@ -1,31 +0,0 @@
----
-
-- hosts: cas
-  roles:
-    - s3lph.pki.pki_ca
-
-- hosts: new_nodes
-  strategy: free
-  roles:
-    - s3lph.pki.pki_entity
-    - s3lph.prometheus.prometheus_node
-
-- hosts: all_nodes
-  strategy: free
-  roles:
-    - s3lph.prometheus.prometheus_node
-
-- hosts: openbsd_node
-  strategy: free
-  roles:
-    - s3lph.prometheus.prometheus_node_openbsd
-
-- hosts: alertmanagers
-  strategy: free
-  roles:
-    - s3lph.prometheus.alertmanager
-
-- 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/defaults/main.yml

@@ -8,8 +8,3 @@ smartmon_exporter_force_off: no
 prometheus_hpsa_collector: no
 
 prometheus_textfile_collectors: {}
-
-prometheus_node_tls_cert: null
-prometheus_node_tls_key: null
-prometheus_node_tls_require_cert: no
-prometheus_node_tls_ca: null

roles/prometheus_node/tasks/config.yml

@@ -1,20 +1,5 @@
 ---
 
-- name: create /etc/prometheus/node-exporter/tls
-  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
-    owner: prometheus
-    group: prometheus
-  notify: restart prometheus-node-exporter
-
 - name: render /etc/default/prometheus-node-exporter
   template:
     src: prometheus-node-exporter.default.j2

roles/prometheus_node/tasks/debian10.yml

@@ -1,34 +1,10 @@
 ---
 
-
-- name: check if package files already exist
-  stat:
-    path: "/root/{{ item.name }}_{{ item.version }}_{{ item.arch }}.deb"
-  loop:
-    - name: prometheus-node-exporter
-      version: 1.0.1+ds-1
-      arch: amd64
-    - name: prometheus-node-exporter-collectors
-      version: 0+git20201003.8db38d1-1
-      arch: all
-  register: prometheus_node_register_ucs_deb_stat
-
-- name: download packages
-  get_url:
-    url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_{{ arch | urlencode() }}.deb"  # noqa 204
-    dest: "/root/{{ package }}_{{ version }}_{{ arch }}.deb"
-  vars:
-    pfirst: "{{ item.item.name[:1] }}"
-    package: "{{ item.item.name }}"
-    version: "{{ item.item.version }}"
-    arch: "{{ item.item.arch }}"
-  when: not item.stat.exists
-  loop: "{{ prometheus_node_register_ucs_deb_stat.results }}"
-
-- name: install packages
+- name: install prometheus-node-exporter
   apt:
-    deb: "/root/{{ item.item.name }}_{{ item.item.version }}_{{ item.item.arch }}.deb"
-  loop: "{{ prometheus_node_register_ucs_deb_stat.results }}"
+    name: prometheus-node-exporter
+    state: present
+    update_cache: yes
 
 - name: start prometheus-node-exporter.service
   systemd:

roles/prometheus_node/tasks/main.yml

@@ -13,7 +13,7 @@
   import_tasks: debian11.yml
   when:
     - "ansible_lsb.id == 'Debian' or ansible_lsb.id == 'Raspbian'"
-    - "ansible_lsb.major_release | int >= 11"
+    - "ansible_lsb.major_release | int == 11"
   tags:
     - "role::prometheus_node"
     - "role::prometheus_node:debian"

roles/prometheus_node/tasks/ucs.yml

@@ -2,34 +2,28 @@
 
 - name: check if package files already exist
   stat:
-    path: "/root/{{ item.name }}_{{ item.version }}_{{ item.arch }}.deb"
+    path: "/root/{{ item.name }}_{{ item.version }}_amd64.deb"
   loop:
     - name: prometheus-node-exporter
-      version: 1.0.1+ds-1
-      arch: amd64
-    - name: prometheus-node-exporter-collectors
-      version: 0+git20201003.8db38d1-1
-      arch: all
+      version: 0.17.0+ds-3+b11
     - name: moreutils
-      version: 0.64-1
-      arch: amd64
+      version: 0.62-1
   register: prometheus_node_register_ucs_deb_stat
 
 - name: download packages
   get_url:
-    url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_{{ arch | urlencode() }}.deb"  # noqa 204
-    dest: "/root/{{ package }}_{{ version }}_{{ arch }}.deb"
+    url: "https://{{ debian_mirror }}/debian/pool/main/{{ pfirst | urlencode() }}/{{ package | urlencode() }}/{{ package | urlencode() }}_{{ version | urlencode() }}_amd64.deb"  # noqa 204
+    dest: "/root/{{ package }}_{{ version }}_amd64.deb"
   vars:
     pfirst: "{{ item.item.name[:1] }}"
     package: "{{ item.item.name }}"
     version: "{{ item.item.version }}"
-    arch: "{{ item.item.arch }}"
   when: not item.stat.exists
   loop: "{{ prometheus_node_register_ucs_deb_stat.results }}"
 
 - name: install packages
   apt:
-    deb: "/root/{{ item.item.name }}_{{ item.item.version }}_{{ item.item.arch }}.deb"
+    deb: "/root/{{ item.item.name }}_{{ item.item.version }}_amd64.deb"
   loop: "{{ prometheus_node_register_ucs_deb_stat.results }}"
 
 - name: start prometheus-node-exporter.service

roles/prometheus_node/templates/prometheus-node-exporter-webconfig.yml.j2

@@ -1,8 +0,0 @@
----
-{{ ansible_managed | comment }}
-
-tls_server_config:
-  cert_file: "{{ prometheus_node_tls_cert }}"
-  key_file: "{{ prometheus_node_tls_key }}"
-  client_auth_type: "{{ prometheus_node_tls_require_cert | ternary('RequireAndVerifyClientCert', 'NoClientCert') }}"
-  client_ca_file: "{{ prometheus_node_tls_ca }}"

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 %}"

roles/prometheus_node_openbsd/tasks/config.yml

@@ -1,28 +0,0 @@
----
-
-- name: create /etc/prometheus/node-exporter/tls
-  file:
-    path: /etc/prometheus/node-exporter/tls
-    state: directory
-    owner: _nodeexporter
-    group: _nodeexporter
-
-- 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
-    owner: _nodeexporter
-    group: _nodeexporter
-  notify: restart node exporter
-
-- name: configure node exporter
-  lineinfile:
-    path: /etc/rc.conf.local
-    line: >-
-      node_exporter_flags=--collector.textfile.directory={{ node_exporter_textfile_dir }}
-      {{ node_exporter_flags }}
-      --web.config=/etc/prometheus/node-exporter/tls/config.yml
-    regexp: ^node_exporter_flags=.*$
-  notify:
-    - start node exporter
-    - restart node exporter

roles/prometheus_node_openbsd/tasks/install.yml

@@ -2,7 +2,7 @@
 
 - name: install prometheus node exporter
   openbsd_pkg:
-    name: node_exporter
+    name: node_exporter-0.18.0
 
 - name: create textfile collector directory
   file:
@@ -11,3 +11,12 @@
     owner: root
     group: _nodeexporter
     mode: 0750
+
+- name: enable node exporter
+  lineinfile:
+    path: /etc/rc.conf.local
+    line: "node_exporter_flags=--collector.textfile.directory={{ node_exporter_textfile_dir }} {{ node_exporter_flags }}"
+    regexp: ^node_exporter_flags=.*$
+  notify:
+    - start node exporter
+    - restart node exporter

roles/prometheus_node_openbsd/tasks/main.yml

@@ -11,9 +11,3 @@
   tags:
     - 'role::prometheus_node_openbsd'
     - 'role::prometheus_node_openbsd:syspatch'
-
-- name: configure prometheus node exporter
-  import_tasks: config.yml
-  tags:
-    - "role::prometheus_node_openbsd"
-    - "role::prometheus_node_openbsd:config"

roles/prometheus_node_openbsd/templates/prometheus-node-exporter-webconfig.yml.j2

@@ -1,8 +0,0 @@
----
-{{ ansible_managed | comment }}
-
-tls_server_config:
-  cert_file: "{{ prometheus_node_tls_cert }}"
-  key_file: "{{ prometheus_node_tls_key }}"
-  client_auth_type: "{{ prometheus_node_tls_require_cert | ternary('RequireAndVerifyClientCert', 'NoClientCert') }}"
-  client_ca_file: "{{ prometheus_node_tls_ca }}"