Merge branch 'main' into dobbi84/influxdb_exporter

prometheus-community · Sep 25, 2024 · 86ccab1 · 86ccab1
2 parents 0edea8b + 4b1f36a
commit 86ccab1
Show file tree

Hide file tree

Showing 27 changed files with 172 additions and 75 deletions.
diff --git a/.github/workflows/ansible-test-integration.yml b/.github/workflows/ansible-test-integration.yml
@@ -42,5 +42,7 @@ jobs:
           testing-type: integration
           target: ${{ matrix.targets.test }}
           coverage: ${{ inputs.coverage }}
+          ansible-core-github-repository-slug: ${{ contains(fromJson('["stable-2.9", "stable-2.10", "stable-2.11"]'), matrix.ansible-core-versions) &&
+                                               'ansible-community/eol-ansible' || 'ansible/ansible' }}
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/ansible-test-sanity.yml b/.github/workflows/ansible-test-sanity.yml
@@ -23,3 +23,5 @@ jobs:
         with:
           ansible-core-version: ${{ matrix.ansible-core-versions }}
           testing-type: sanity
+          ansible-core-github-repository-slug: ${{ contains(fromJson('["stable-2.9", "stable-2.10", "stable-2.11"]'), matrix.ansible-core-versions) &&
+                                               'ansible-community/eol-ansible' || 'ansible/ansible' }}
diff --git a/.github/workflows/conventional-label.yml b/.github/workflows/conventional-label.yml
@@ -58,7 +58,7 @@ jobs:
 
       - name: Get changed roles
         id: changed-roles
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v45
         with:
           path: "roles"
           diff_relative: "true"

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,9 +4,38 @@ Prometheus.Prometheus Release Notes
 
 .. contents:: Topics
 
+v0.18.1
+=======
+
+v0.18.0
+=======
+
+Minor Changes
+-------------
+
+- enhancement: adding env/container labels options (https://github.com/prometheus-community/ansible/pull/407)
+
+Bugfixes
+--------
+
+- fix: ansible-community/eol-ansible for 2.9/2.10/2.11 tests (https://github.com/prometheus-community/ansible/pull/416)
+
+v0.17.2
+=======
+
+Bugfixes
+--------
+
+- fix: ansible-community/eol-ansible for 2.9/2.10/2.11 tests (https://github.com/prometheus-community/ansible/pull/416)
+
 v0.17.1
 =======
 
+Bugfixes
+--------
+
+- fix(ci): limit number of parallel tests to avoid github api limits (https://github.com/prometheus-community/ansible/pull/397)
+
 v0.17.0
 =======
 

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -13,4 +13,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 0.17.1
+version: 0.18.1
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: prometheus
 name: prometheus
-version: 0.17.1
+version: 0.18.1
 readme: README.md
 authors:
   - "Ben Kochie (https://github.com/SuperQ)"

diff --git a/roles/cadvisor/defaults/main.yml b/roles/cadvisor/defaults/main.yml
@@ -11,6 +11,9 @@ cadvisor_prometheus_endpoint: "/metrics"
 
 cadvisor_enable_metrics: []
 cadvisor_disable_metrics: []
+cadvisor_env_metadata_whitelist: []
+cadvisor_whitelisted_container_labels: []
+cadvisor_store_container_labels: true
 cadvisor_docker_only: false
 
 cadvisor_binary_install_dir: "/usr/local/bin"

diff --git a/roles/cadvisor/meta/argument_specs.yml b/roles/cadvisor/meta/argument_specs.yml
@@ -64,6 +64,18 @@ argument_specs:
         default: []
         type: "list"
         choices: *metrics_choices
+      cadvisor_store_container_labels:
+        description: "store all container labels"
+        type: "bool"
+        default: true
+      cadvisor_whitelisted_container_labels:
+        description: "comma-separated list of container labels to be used as labels on prometheus metrics"
+        default: []
+        type: "list"
+      cadvisor_env_metadata_whitelist:
+        description: "comma-separated list of env variables to be used as labels on prometheus metrics"
+        default: []
+        type: "list"
       cadvisor_docker_only:
         description: "do not report raw cgroup metrics, except the root cgroup"
         type: "bool"

diff --git a/roles/cadvisor/molecule/alternative/molecule.yml b/roles/cadvisor/molecule/alternative/molecule.yml
@@ -13,3 +13,6 @@ provisioner:
           - network
           - cpu
         cadvisor_docker_only: true
+        whitelisted_container_labels: [ "com.docker.compose.image" ]
+        env_metadata_whitelist: [ "PATH" ]
+        store_container_labels: false
diff --git a/roles/cadvisor/templates/cadvisor.service.j2 b/roles/cadvisor/templates/cadvisor.service.j2
@@ -18,6 +18,13 @@ ExecStart={{ cadvisor_binary_install_dir }}/cadvisor \
 {% if cadvisor_docker_only %}
     '--docker_only={{ cadvisor_docker_only | lower }}' \
 {% endif -%}
+{% if cadvisor_whitelisted_container_labels | length > 0 %}
+    '--whitelisted_container_labels={{ cadvisor_whitelisted_container_labels | join(',') }}' \
+{% endif -%}
+{% if cadvisor_env_metadata_whitelist | length > 0 %}
+    '--env_metadata_whitelist={{ cadvisor_env_metadata_whitelist | join(',') }}' \
+{% endif %}
+    '--store_container_labels={{ cadvisor_store_container_labels | lower }}' \
     '--listen_ip={{ cadvisor_listen_ip }}' \
     '--port={{ cadvisor_port }}' \
     '--prometheus_endpoint={{ cadvisor_prometheus_endpoint }}'

diff --git a/roles/memcached_exporter/defaults/main.yml b/roles/memcached_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-memcached_exporter_version: 0.14.3
+memcached_exporter_version: 0.14.4
 memcached_exporter_binary_local_dir: ""
 memcached_exporter_binary_url: "https://github.com/{{ _memcached_exporter_repo }}/releases/download/v{{ memcached_exporter_version }}/\
                            memcached_exporter-{{ memcached_exporter_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/memcached_exporter/meta/argument_specs.yml b/roles/memcached_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       memcached_exporter_version:
         description: "memcached_exporter package version. Also accepts latest as parameter."
-        default: "0.14.3"
+        default: "0.14.4"
       memcached_exporter_skip_install:
         description: "memcached_exporter installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/mongodb_exporter/defaults/main.yml b/roles/mongodb_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-mongodb_exporter_version: 0.40.0
+mongodb_exporter_version: 0.41.0
 mongodb_exporter_binary_local_dir: ""
 mongodb_exporter_binary_url: "https://github.com/{{ _mongodb_exporter_repo }}/releases/download/v{{ mongodb_exporter_version }}/\
                           mongodb_exporter-{{ mongodb_exporter_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/mongodb_exporter/meta/argument_specs.yml b/roles/mongodb_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       mongodb_exporter_version:
         description: "mongodb_exporter package version. Also accepts latest as parameter."
-        default: "0.40.0"
+        default: "0.41.0"
       mongodb_exporter_skip_install:
         description: "mongodb_exporter installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/nginx_exporter/defaults/main.yml b/roles/nginx_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-nginx_exporter_version: 1.2.0
+nginx_exporter_version: 1.3.0
 nginx_exporter_binary_local_dir: ""
 nginx_exporter_binary_url: "https://github.com/{{ _nginx_exporter_repo }}/releases/download/v{{ nginx_exporter_version }}/\
                           nginx-prometheus-exporter_{{ nginx_exporter_version }}_linux_{{ go_arch }}.tar.gz"

diff --git a/roles/nginx_exporter/meta/argument_specs.yml b/roles/nginx_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       nginx_exporter_version:
         description: "nginx_exporter package version. Also accepts latest as parameter."
-        default: "1.2.0"
+        default: "1.3.0"
       nginx_exporter_skip_install:
         description: "nginx_exporter installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/node_exporter/defaults/main.yml b/roles/node_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-node_exporter_version: 1.8.1
+node_exporter_version: 1.8.2
 node_exporter_binary_local_dir: ""
 node_exporter_binary_url: "https://github.com/{{ _node_exporter_repo }}/releases/download/v{{ node_exporter_version }}/\
                            node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/node_exporter/meta/argument_specs.yml b/roles/node_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       node_exporter_version:
         description: "Node exporter package version. Also accepts latest as parameter."
-        default: "1.8.1"
+        default: "1.8.2"
       node_exporter_skip_install:
         description: "Node exporter installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/process_exporter/defaults/main.yml b/roles/process_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-process_exporter_version: 0.8.2
+process_exporter_version: 0.8.3
 process_exporter_binary_local_dir: ""
 process_exporter_binary_url: "https://github.com/{{ _process_exporter_repo }}/releases/download/v{{ process_exporter_version }}/\
                               process-exporter-{{ process_exporter_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/process_exporter/meta/argument_specs.yml b/roles/process_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       process_exporter_version:
         description: "Process exporter package version. Also accepts latest as parameter."
-        default: "0.8.2"
+        default: "0.8.3"
       process_exporter_skip_install:
         description: "Process exporter installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-prometheus_version: 2.52.0
+prometheus_version: 2.54.1
 prometheus_binary_local_dir: ''
 prometheus_binary_url: "https://github.com/{{ _prometheus_repo }}/releases/download/v{{ prometheus_version }}/\
                         prometheus-{{ prometheus_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/prometheus/meta/argument_specs.yml b/roles/prometheus/meta/argument_specs.yml
@@ -12,7 +12,7 @@ argument_specs:
         description:
           - "Prometheus package version. Also accepts C(latest) as parameter."
           - "Only prometheus 2.x is supported"
-        default: "2.52.0"
+        default: "2.54.1"
       prometheus_skip_install:
         description: "Prometheus installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/pushgateway/defaults/main.yml b/roles/pushgateway/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-pushgateway_version: 1.9.0
+pushgateway_version: 1.10.0
 pushgateway_binary_local_dir: ""
 pushgateway_binary_url: "https://github.com/{{ _pushgateway_repo }}/releases/download/v{{ pushgateway_version }}/\
                            pushgateway-{{ pushgateway_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/pushgateway/meta/argument_specs.yml b/roles/pushgateway/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       pushgateway_version:
         description: "Pushgateway package version. Also accepts latest as parameter."
-        default: "1.9.0"
+        default: "1.10.0"
       pushgateway_skip_install:
         description: "Pushgateway installation tasks gets skipped when set to true."
         type: bool

diff --git a/roles/redis_exporter/defaults/main.yml b/roles/redis_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-redis_exporter_version: 1.58.0
+redis_exporter_version: 1.63.0
 redis_exporter_binary_local_dir: ""
 redis_exporter_binary_url: "https://github.com/{{ _redis_exporter_repo }}/releases/download/v{{ redis_exporter_version }}/\
                            redis_exporter-v{{ redis_exporter_version }}.linux-{{ go_arch }}.tar.gz"

diff --git a/roles/redis_exporter/meta/argument_specs.yml b/roles/redis_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       redis_exporter_version:
         description: "redis_exporter package version. Also accepts latest as parameter."
-        default: "1.58.0"
+        default: "1.63.0"
       redis_exporter_skip_install:
         description: "redis_exporter installation tasks gets skipped when set to true."
         type: bool