prometheus-community · juju4 · Jan 9, 2025 · Jan 11, 2025 · Mar 22, 2024 · Apr 10, 2024
diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
@@ -61,6 +61,9 @@ provisioner:
         exclude_ansible_vers:
           - "2.17"
           - "2.18"
+      ubuntu-20.04:
+        exclude_ansible_vers:
+          - "2.18"
       ubuntu-24.04:
         exclude_ansible_vers:
           - "2.9"

diff --git a/.github/workflows/ansible-ci.yml b/.github/workflows/ansible-ci.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
 
       - name: Lint collection
-        uses: ansible/ansible-lint@6a4fcdb135dd2be6e8ee5ddb5bf59d3d78cbe7b0  # v25.2.0
+        uses: ansible/ansible-lint@c16f018b1bdfdea6717f4b5b1b141a78b86021cd  # v25.2.1
         with:
           requirements_file: requirements.yml
 
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
       - name: Run action
-        uses: hoo29/little-timmy@v2-action
+        uses: hoo29/little-timmy@c8ca5086db961499fc3d4e37637f566c3d0ec6d6  # v3-action
 
   discover-ansible-versions:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ansible-test-integration.yml b/.github/workflows/ansible-test-integration.yml
@@ -33,7 +33,7 @@ jobs:
     name: "${{ matrix.targets.name }}-${{ matrix.ansible-core-versions }}"
     steps:
       - name: "Perform ${{ matrix.targets.test }} integration test with ansible-test"
-        uses: ansible-community/ansible-test-gh-action@e083357d3acff9e6631b0ad08d8ca4421e5a75d3  # v1.16.0
+        uses: ansible-community/ansible-test-gh-action@b416b6ecf7ddb0ea3b0a51c1d198d715eba52c9d  # v1.16.0
         with:
           ansible-core-version: ${{ matrix.ansible-core-versions }}
           target-python-version: ${{ matrix.target-python-versions }}

diff --git a/.github/workflows/ansible-test-sanity.yml b/.github/workflows/ansible-test-sanity.yml
@@ -19,7 +19,7 @@ jobs:
     name: "sanity-${{ matrix.ansible-core-versions }}"
     steps:
       - name: "Perform sanity test with ansible-test"
-        uses: ansible-community/ansible-test-gh-action@e083357d3acff9e6631b0ad08d8ca4421e5a75d3  # v1.16.0
+        uses: ansible-community/ansible-test-gh-action@b416b6ecf7ddb0ea3b0a51c1d198d715eba52c9d  # v1.16.0
         with:
           ansible-core-version: ${{ matrix.ansible-core-versions }}
           testing-type: sanity

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: ansible-community/github-action-build-collection@main
 
       - name: "Upload built collection to release"
-        uses: svenstaro/upload-release-action@2b4adf59f26ea3ed6ddecb8e00f80acc6bc16bd4  # 2.9.0
+        uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd  # 2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.build-collection.outputs.artifact-filename }}

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,9 @@ Prometheus.Prometheus Release Notes
 
 .. contents:: Topics
 
+v0.26.2
+=======
+
 v0.26.1
 =======
 

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -120,4 +120,4 @@ plugins:
   strategy: {}
   test: {}
   vars: {}
-version: 0.26.1
+version: 0.26.2
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1,10 +1,13 @@
 ---
 ancestor:
 releases:
-  0.26.1:
+  0.26.2:
     changes:
       trivial:
-        - 'chore(deps): update ansible/ansible-lint action to v25.2.0 (https://github.com/prometheus-community/ansible/pull/569)'
+        - 'patch: New prometheus/prometheus upstream release 3.3.0! (https://github.com/prometheus-community/ansible/pull/580)'
+        - 'chore(deps): update hoo29/little-timmy action to v3 (https://github.com/prometheus-community/ansible/pull/578)'
+    release_date: '2025-04-18'
+  0.26.1:
     release_date: '2025-04-02'
   0.26.0:
     changes:

diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: prometheus
 name: prometheus
-version: 0.26.1
+version: 0.26.2
 readme: README.md
 authors:
   - "Ben Kochie (https://github.com/SuperQ)"

diff --git a/roles/alertmanager/defaults/main.yml b/roles/alertmanager/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-alertmanager_version: 0.28.0
+alertmanager_version: 0.28.1
 alertmanager_binary_url: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/\
                           alertmanager-{{ alertmanager_version }}.{{ ansible_facts['system'] | lower }}-{{ _alertmanager_go_ansible_arch }}.tar.gz"
 alertmanager_checksums_url: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/sha256sums.txt"

diff --git a/roles/alertmanager/meta/argument_specs.yml b/roles/alertmanager/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       alertmanager_version:
         description: "Alertmanager package version. Also accepts `latest` as parameter."
-        default: 0.28.0
+        default: 0.28.1
       alertmanager_binary_url:
         description: "URL of the alertmanager binaries .tar.gz file"
         default: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/alertmanager-{{ alertmanager_version }}.{{ ansible_facts['system'] | lower }}-{{ _alertmanager_go_ansible_arch }}.tar.gz"

diff --git a/roles/apache_exporter/defaults/main.yml b/roles/apache_exporter/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-apache_exporter_version: 1.0.9
+apache_exporter_version: 1.0.10
 apache_exporter_binary_url: "https://github.com/{{ _apache_exporter_repo }}/releases/download/v{{ apache_exporter_version }}/\
                           apache_exporter-{{ apache_exporter_version }}.{{ ansible_facts['system'] | lower }}-{{ _apache_exporter_go_ansible_arch }}.tar.gz"
 apache_exporter_checksums_url: "https://github.com/{{ _apache_exporter_repo }}/releases/download/v{{ apache_exporter_version }}/sha256sums.txt"

diff --git a/roles/apache_exporter/meta/argument_specs.yml b/roles/apache_exporter/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       apache_exporter_version:
         description: "apache_exporter package version. Also accepts latest as parameter."
-        default: "1.0.9"
+        default: "1.0.10"
       apache_exporter_binary_url:
         description: "URL of the apache_exporter binaries .tar.gz file"
         default: "https://github.com/{{ _apache_exporter_repo }}/releases/download/v{{ apache_exporter_version }}/apache_exporter_{{ apache_exporter_version }}_{{ ansible_facts['system'] | lower }}-{{ _apache_exporter_go_ansible_arch }}.tar.gz"

diff --git a/roles/cadvisor/defaults/main.yml b/roles/cadvisor/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-cadvisor_version: 0.49.2
+cadvisor_version: 0.52.1
 cadvisor_binary_url: "https://github.com/{{ _cadvisor_repo }}/releases/download/v{{ cadvisor_version }}/\
                       cadvisor-v{{ cadvisor_version }}-{{ ansible_facts['system'] | lower }}-{{ _cadvisor_go_ansible_arch }}"
 

diff --git a/roles/cadvisor/meta/argument_specs.yml b/roles/cadvisor/meta/argument_specs.yml
@@ -10,7 +10,7 @@ argument_specs:
     options:
       cadvisor_version:
         description: "cAdvisor package version. Also accepts latest as parameter."
-        default: "0.49.2"
+        default: "0.52.1"
       cadvisor_binary_url:
         description: "URL of the cadvisor binary file"
         default: "https://github.com/{{ _cadvisor_repo }}/releases/download/v{{ cadvisor_version }}/cadvisor-v{{ cadvisor_version }}-{{ ansible_facts['system'] | lower }}-{{ _cadvisor_go_ansible_arch }}"

diff --git a/roles/elasticsearch_exporter/README.md b/roles/elasticsearch_exporter/README.md
@@ -0,0 +1,45 @@
+# Ansible Role: elasticsearch exporter
+
+## Description
+
+Deploy prometheus [elasticsearch exporter](https://github.com/prometheus-community/elasticsearch_exporter) using ansible.
+
+Grafana dashboard example: https://github.com/prometheus-community/elasticsearch_exporter/blob/master/examples/grafana/dashboard.json
+
+## Requirements
+
+- Ansible >= 2.9 (It might work on previous versions, but we cannot guarantee it)
+- gnu-tar on Mac deployer host (`brew install gnu-tar`)
+- Passlib is required when using the basic authentication feature (`pip install passlib[bcrypt]`)
+
+## Role Variables
+
+All variables which can be overridden are stored in [defaults/main.yml](defaults/main.yml) file as well as in [meta/argument_specs.yml](meta/argument_specs.yml).
+Please refer to the [collection docs](https://prometheus-community.github.io/ansible/branch/main/elasticsearch_exporter_role.html) for description and default values of the variables.
+
+## Example
+
+### Playbook
+
+Use it in a playbook as follows:
+```yaml
+- hosts: all
+  roles:
+    - prometheus.prometheus.elasticsearch_exporter
+```
+
+## Local Testing
+
+The preferred way of locally testing the role is to use Docker and [molecule](https://github.com/ansible-community/molecule) (v3.x). You will have to install Docker on your system. See "Get started" for a Docker package suitable for your system. Running your tests is as simple as executing `molecule test`.
+
+## Contributing
+
+See [contributor guideline](CONTRIBUTING.md).
+
+## Troubleshooting
+
+See [troubleshooting](TROUBLESHOOTING.md).
+
+## License
+
+This project is licensed under MIT License. See [LICENSE](/LICENSE) for more details.
diff --git a/roles/elasticsearch_exporter/TROUBLESHOOTING.md b/roles/elasticsearch_exporter/TROUBLESHOOTING.md
@@ -0,0 +1 @@
+# Troubleshooting
diff --git a/roles/elasticsearch_exporter/defaults/main.yml b/roles/elasticsearch_exporter/defaults/main.yml
@@ -0,0 +1,37 @@
+---
+elasticsearch_exporter_version: 1.8.0
+elasticsearch_exporter_binary_url: "https://github.com/{{ _elasticsearch_exporter_repo }}/releases/download/v{{ elasticsearch_exporter_version }}/\
+                           elasticsearch_exporter-{{ elasticsearch_exporter_version }}.{{ ansible_facts['system'] | lower }}-{{ _elasticsearch_exporter_go_ansible_arch }}.tar.gz"
+elasticsearch_exporter_checksums_url: "https://github.com/{{ _elasticsearch_exporter_repo }}/releases/download/v{{ elasticsearch_exporter_version }}/sha256sums.txt"
+
+elasticsearch_exporter_web_disable_exporter_metrics: false
+elasticsearch_exporter_web_listen_address: "0.0.0.0:9114"
+elasticsearch_exporter_web_telemetry_path: "/metrics"
+
+elasticsearch_exporter_textfile_dir: "/var/lib/elasticsearch_exporter"
+
+elasticsearch_exporter_tls_server_config: {}
+
+elasticsearch_exporter_http_server_config: {}
+
+elasticsearch_exporter_basic_auth_users: {}
+
+elasticsearch_exporter_enabled_collectors:
+  - systemd
+  - textfile:
+      directory: "{{ elasticsearch_exporter_textfile_dir }}"
+#  - filesystem:
+#      ignored-mount-points: "^/(sys|proc|dev)($|/)"
+#      ignored-fs-types: "^(sys|proc|auto)fs$"
+
+elasticsearch_exporter_disabled_collectors: []
+
+elasticsearch_exporter_binary_install_dir: "/usr/local/bin"
+elasticsearch_exporter_system_group: "elastic-exp"
+elasticsearch_exporter_system_user: "{{ elasticsearch_exporter_system_group }}"
+# systemd cli extra arguments
+elasticsearch_exporter_extra_args: []
+
+elasticsearch_exporter_config_dir: "/etc/elasticsearch_exporter"
+# Local path to stash the archive and its extraction
+elasticsearch_exporter_local_cache_path: "/tmp/elasticsearch_exporter-{{ ansible_facts['system'] | lower }}-{{ _elasticsearch_exporter_go_ansible_arch }}/{{ elasticsearch_exporter_version }}"
diff --git a/roles/elasticsearch_exporter/handlers/main.yml b/roles/elasticsearch_exporter/handlers/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Restart elasticsearch_exporter
+  listen: "restart elasticsearch_exporter"
+  become: true
+  ansible.builtin.systemd:
+    daemon_reload: true
+    name: elasticsearch_exporter
+    state: restarted
+  when:
+    - not ansible_check_mode
diff --git a/roles/elasticsearch_exporter/meta/argument_specs.yml b/roles/elasticsearch_exporter/meta/argument_specs.yml
@@ -0,0 +1,89 @@
+---
+# yamllint disable rule:line-length
+argument_specs:
+  main:
+    short_description: "Prometheus Elasticsearch Exporter"
+    description:
+      - "Deploy prometheus L(elasticsearch exporter,https://github.com/prometheus-community/elasticsearch_exporter) using ansible"
+    author:
+      - "Prometheus Community"
+    options:
+      elasticsearch_exporter_version:
+        description: "Elasticsearch exporter package version. Also accepts latest as parameter."
+        default: "1.8.0"
+      elasticsearch_exporter_binary_url:
+        description: "URL of the elasticsearch exporter binaries .tar.gz file"
+        default: "https://github.com/{{ _elasticsearch_exporter_repo }}/releases/download/v{{ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.{{ ansible_facts['system'] | lower }}-{{ _elasticsearch_exporter_go_ansible_arch }}.tar.gz"
+      elasticsearch_exporter_checksums_url:
+        description: "URL of the elasticsearch exporter checksums file"
+        default: "https://github.com/{{ _elasticsearch_exporter_repo }}/releases/download/v{{ elasticsearch_exporter_version }}/sha256sums.txt"
+      elasticsearch_exporter_web_disable_exporter_metrics:
+        description: "Exclude metrics about the exporter itself (promhttp_*, process_*, go_*)."
+        type: bool
+        default: false
+      elasticsearch_exporter_web_listen_address:
+        description: "Address on which elasticsearch exporter will listen"
+        default: "0.0.0.0:9114"
+      elasticsearch_exporter_web_telemetry_path:
+        description: "Path under which to expose metrics"
+        default: "/metrics"
+      elasticsearch_exporter_enabled_collectors:
+        description:
+          - "List of dicts defining additionally enabled collectors and their configuration."
+          - "It adds collectors to L(those enabled by default,https://github.com/prometheus/elasticsearch_exporter#enabled-by-default)."
+        type: "list"
+        default:
+          - systemd
+          - textfile:
+              directory: "{{ elasticsearch_exporter_textfile_dir }}"
+      elasticsearch_exporter_disabled_collectors:
+        description:
+          - "List of disabled collectors."
+          - "By default elasticsearch_exporter disables collectors listed L(here,https://github.com/prometheus/elasticsearch_exporter#disabled-by-default)."
+        type: "list"
+        elements: "str"
+      elasticsearch_exporter_textfile_dir:
+        description:
+          - "Directory used by the L(Textfile Collector,https://github.com/prometheus/elasticsearch_exporter#textfile-collector)."
+          - "To get permissions to write metrics in this directory, users must be in C(elastic-exp) system group."
+          - "B(Note:) More information in TROUBLESHOOTING.md guide."
+        default: "/var/lib/elasticsearch_exporter"
+      elasticsearch_exporter_tls_server_config:
+        description:
+          - "Configuration for TLS authentication."
+          - "Keys and values are the same as in L(elasticsearch_exporter docs,https://prometheus.io/docs/prometheus/latest/configuration/https/)."
+        type: "dict"
+      elasticsearch_exporter_http_server_config:
+        description:
+          - "Config for HTTP/2 support."
+          - "Keys and values are the same as in L(elasticsearch_exporter docs,https://prometheus.io/docs/prometheus/latest/configuration/https/)."
+        type: "dict"
+      elasticsearch_exporter_basic_auth_users:
+        description: "Dictionary of users and password for basic authentication. Passwords are automatically hashed with bcrypt."
+        type: "dict"
+      elasticsearch_exporter_binary_install_dir:
+        description:
+          - "I(Advanced)"
+          - "Directory to install elasticsearch_exporter binary"
+        default: "/usr/local/bin"
+      elasticsearch_exporter_system_group:
+        description:
+          - "I(Advanced)"
+          - "System group for elasticsearch exporter"
+        default: "elastic-exp"
+      elasticsearch_exporter_system_user:
+        description:
+          - "I(Advanced)"
+          - "Elasticsearch exporter user"
+        default: "elastic-exp"
+      elasticsearch_exporter_extra_args:
+        description:
+          - "I(Advanced)"
+          - "Elasticsearch exporter cli extra arguments to be added to systemd unit"
+        default: []
+      elasticsearch_exporter_local_cache_path:
+        description: "Local path to stash the archive and its extraction"
+        default: "/tmp/elasticsearch_exporter-{{ ansible_facts['system'] | lower }}-{{ _elasticsearch_exporter_go_ansible_arch }}/{{ elasticsearch_exporter_version }}"
+      elasticsearch_exporter_config_dir:
+        description: "Path to directory with elasticsearch_exporter configuration"
+        default: "/etc/elasticsearch_exporter"
diff --git a/roles/elasticsearch_exporter/meta/main.yml b/roles/elasticsearch_exporter/meta/main.yml
@@ -0,0 +1,25 @@
+---
+galaxy_info:
+  author: "Prometheus Community"
+  description: "Prometheus Elasticsearch Exporter"
+  license: "Apache"
+  min_ansible_version: "2.9"
+  platforms:
+    - name: "Ubuntu"
+      versions:
+        - "focal"
+        - "jammy"
+        - "noble"
+    - name: "Debian"
+      versions:
+        - "bullseye"
+    - name: "EL"
+      versions:
+        - "8"
+        - "9"
+  galaxy_tags:
+    - "monitoring"
+    - "prometheus"
+    - "exporter"
+    - "metrics"
+    - "system"
diff --git a/roles/elasticsearch_exporter/molecule/alternative/molecule.yml b/roles/elasticsearch_exporter/molecule/alternative/molecule.yml
@@ -0,0 +1,26 @@
+---
+provisioner:
+  playbooks:
+    prepare: "${MOLECULE_PROJECT_DIRECTORY}/../../.config/molecule/alternative/prepare.yml"
+  inventory:
+    group_vars:
+      all:
+        elasticsearch_exporter_local_cache_path: "/tmp/elasticsearch_exporter-linux-amd64"
+        elasticsearch_exporter_web_listen_address:
+          - '127.0.0.1:8080'
+          - '127.0.1.1:8080'
+        elasticsearch_exporter_textfile_dir: ""
+        elasticsearch_exporter_enabled_collectors:
+          - entropy
+        elasticsearch_exporter_disabled_collectors:
+          - diskstats
+        elasticsearch_exporter_tls_server_config:
+          cert_file: /etc/elasticsearch_exporter/tls.cert
+          key_file: /etc/elasticsearch_exporter/tls.key
+        elasticsearch_exporter_http_server_config:
+          http2: true
+        elasticsearch_exporter_basic_auth_users:
+          randomuser: examplepassword
+        elasticsearch_exporter_version: 1.8.0
+        elasticsearch_exporter_binary_url: "https://github.com/prometheus-community/elasticsearch_exporter/releases/download/v{{\
+                                   \ elasticsearch_exporter_version }}/elasticsearch_exporter-{{ elasticsearch_exporter_version }}.linux-amd64.tar.gz"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ Prometheus.Prometheus Release Notes @@
     .. contents:: Topics
+    v0.26.2
+    =======
     v0.26.1
     =======
@@ Expand Down @@