Merge branch 'main' into fedora-38

Signed-off-by: gardar <gardar@users.noreply.github.com>
prometheus-community · Aug 22, 2023 · 07d39f8 · 07d39f8
2 parents d6f370b + 7ae8738
commit 07d39f8
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 38 deletions.
diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
@@ -46,12 +46,6 @@ platforms:
     privileged: true
     cgroup_parent: docker.slice
     command: /lib/systemd/systemd
-  - name: fedora-36
-    image: dokken/fedora-36
-    pre_build_image: true
-    privileged: true
-    cgroup_parent: docker.slice
-    command: /lib/systemd/systemd
   - name: fedora-37
     image: dokken/fedora-37
     pre_build_image: true
@@ -64,12 +58,6 @@ platforms:
     privileged: true
     cgroup_parent: docker.slice
     command: /lib/systemd/systemd
-  - name: ubuntu-18.04
-    image: dokken/ubuntu-18.04
-    pre_build_image: true
-    privileged: true
-    cgroup_parent: docker.slice
-    command: /lib/systemd/systemd
   - name: ubuntu-20.04
     image: dokken/ubuntu-20.04
     pre_build_image: true

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,10 +17,17 @@ Minor Changes
 - feature: Make config installation dir configurable (https://github.com/prometheus-community/ansible/pull/173)
 - feature: blackbox exporter user/group configurable (https://github.com/prometheus-community/ansible/pull/172)
 
+Removed Features (previously deprecated)
+----------------------------------------
+
+- removed: Drop fedora 36 support as it is EOL (https://github.com/prometheus-community/ansible/pull/200)
+- removed: Drop ubuntu 18.04 support as it is EOL (https://github.com/prometheus-community/ansible/pull/199)
+
 Bugfixes
 --------
 
 - fix(alertmanager): add routes before match_re (https://github.com/prometheus-community/ansible/pull/194)
+- fix(node_exporter): Fix ProtectHome for textfiles (https://github.com/prometheus-community/ansible/pull/184)
 - fix: Add test for argument_specs matching (https://github.com/prometheus-community/ansible/pull/177)
 - fix: mysqld_exporter should actually respect the mysqld_exporter_host variable (https://github.com/prometheus-community/ansible/pull/88)
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -159,27 +159,31 @@ releases:
   0.6.0:
     changes:
       minor_changes:
-        - 'feat: Add role smokeping_prober (https://github.com/prometheus-community/ansible/pull/128)'
         - 'feature: blackbox exporter user/group configurable (https://github.com/prometheus-community/ansible/pull/172)'
-        - 'feat: Add chrony_exporter role (https://github.com/prometheus-community/ansible/pull/159)'
         - 'feature: Make config installation dir configurable (https://github.com/prometheus-community/ansible/pull/173)'
+        - 'feat: Add chrony_exporter role (https://github.com/prometheus-community/ansible/pull/159)'
         - 'feat: Add pushgateway role (https://github.com/prometheus-community/ansible/pull/127)'
+        - 'feat: Add role smokeping_prober (https://github.com/prometheus-community/ansible/pull/128)'
       bugfixes:
-        - 'fix: Add test for argument_specs matching (https://github.com/prometheus-community/ansible/pull/177)'
         - 'fix: mysqld_exporter should actually respect the mysqld_exporter_host variable
           (https://github.com/prometheus-community/ansible/pull/88)'
+        - 'fix: Add test for argument_specs matching (https://github.com/prometheus-community/ansible/pull/177)'
         - 'fix(alertmanager): add routes before match_re (https://github.com/prometheus-community/ansible/pull/194)'
+        - 'fix(node_exporter): Fix ProtectHome for textfiles (https://github.com/prometheus-community/ansible/pull/184)'
+      removed_features:
+        - 'removed: Drop ubuntu 18.04 support as it is EOL (https://github.com/prometheus-community/ansible/pull/199)'
+        - 'removed: Drop fedora 36 support as it is EOL (https://github.com/prometheus-community/ansible/pull/200)'
       trivial:
-        - 'patch: New prometheus/prometheus upstream release! (https://github.com/prometheus-community/ansible/pull/152)'
         - 'patch: New prometheus/snmp_exporter upstream release! (https://github.com/prometheus-community/ansible/pull/146)'
         - 'patch: New prometheus/mysqld_exporter upstream release! (https://github.com/prometheus-community/ansible/pull/153)'
+        - 'patch: New prometheus/prometheus upstream release! (https://github.com/prometheus-community/ansible/pull/152)'
         - 'patch: New prometheus/node_exporter upstream release! (https://github.com/prometheus-community/ansible/pull/162)'
         - 'patch: New prometheus/prometheus upstream release! (https://github.com/prometheus-community/ansible/pull/168)'
         - 'Fix: rename collector flags (https://github.com/prometheus-community/ansible/pull/167)'
-        - 'docs(smokeping_prober): Update arguments specs (https://github.com/prometheus-community/ansible/pull/190)'
         - Fix mysqld_exporter world-readable secrets (https://github.com/prometheus-community/ansible/pull/169)
         - 'fix ansible-lint: risky-octal & no-same-owner (https://github.com/prometheus-community/ansible/pull/171)'
         - 'patch: New prometheus/snmp_exporter upstream release! (https://github.com/prometheus-community/ansible/pull/188)'
+        - 'docs(smokeping_prober): Update arguments specs (https://github.com/prometheus-community/ansible/pull/190)'
         - 'patch: New superq/smokeping_prober upstream release! (https://github.com/prometheus-community/ansible/pull/196)'
         - 'docs: Fix node_exporter 404 TLS auth links (https://github.com/prometheus-community/ansible/pull/154)'
     release_date: '2023-07-29'
diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/blackbox_exporter/meta/main.yml b/roles/blackbox_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/chrony_exporter/meta/main.yml b/roles/chrony_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/mysqld_exporter/meta/main.yml b/roles/mysqld_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/node_exporter/meta/main.yml b/roles/node_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/node_exporter/molecule/latest/molecule.yml b/roles/node_exporter/molecule/latest/molecule.yml
@@ -4,3 +4,4 @@ provisioner:
     group_vars:
       all:
         node_exporter_version: latest
+        node_exporter_textfile_dir: /home/node_exporter
diff --git a/...molecule/latest/tests/test_alternative.py → ...rter/molecule/latest/tests/test_latest.py b/...molecule/latest/tests/test_alternative.py → ...rter/molecule/latest/tests/test_latest.py
@@ -19,6 +19,16 @@ def test_files(host, files):
     assert f.is_file
 
 
+def test_directories(host):
+    dirs = [
+        "/home/node_exporter"
+    ]
+    for dir in dirs:
+        d = host.file(dir)
+        assert d.is_directory
+        assert d.exists
+
+
 def test_service(host):
     s = host.service("node_exporter")
     try:
@@ -35,7 +45,7 @@ def test_service(host):
 def test_protecthome_property(host):
     s = host.service("node_exporter")
     p = s.systemd_properties
-    assert p.get("ProtectHome") == "yes"
+    assert p.get("ProtectHome") == "read-only"
 
 
 def test_socket(host):

diff --git a/roles/node_exporter/templates/node_exporter.service.j2 b/roles/node_exporter/templates/node_exporter.service.j2
@@ -42,6 +42,9 @@ StartLimitInterval=0
 {% for m in ansible_mounts if m.mount.startswith('/home') %}
 {%   set ns.protect_home = 'read-only' %}
 {% endfor %}
+{% if node_exporter_textfile_dir.startswith('/home') %}
+{%   set ns.protect_home = 'read-only' %}
+{% endif %}
 ProtectHome={{ ns.protect_home }}
 NoNewPrivileges=yes
 

diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/pushgateway/meta/main.yml b/roles/pushgateway/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/smokeping_prober/meta/main.yml b/roles/smokeping_prober/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/snmp_exporter/meta/main.yml b/roles/snmp_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
     - name: "Debian"
@@ -21,7 +20,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags:

diff --git a/roles/systemd_exporter/meta/main.yml b/roles/systemd_exporter/meta/main.yml
@@ -7,7 +7,6 @@ galaxy_info:
   platforms:
     - name: "Ubuntu"
       versions:
-        - "bionic"
         - "focal"
         - "jammy"
         - "xenial"
@@ -22,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
         - '38'
   galaxy_tags: