From accb47ee6d79374afab96a43e1a26edf1e4af061 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 17 Feb 2026 04:40:10 +0900 Subject: [PATCH] Set `prometheus_nginxlog_exporter_container_image_*` Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-prometheus-grafana.md | 4 ++-- group_vars/matrix_servers | 2 +- .../defaults/main.yml | 16 ++++++++-------- .../tasks/setup_install.yml | 6 +++--- .../tasks/validate_config.yml | 8 ++++---- ...atrix-prometheus-nginxlog-exporter.service.j2 | 2 +- .../tasks/validate_config.yml | 6 ++++++ 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/docs/configuring-playbook-prometheus-grafana.md b/docs/configuring-playbook-prometheus-grafana.md index eae0db364..c4d2e313e 100644 --- a/docs/configuring-playbook-prometheus-grafana.md +++ b/docs/configuring-playbook-prometheus-grafana.md @@ -95,8 +95,8 @@ If you enable Grafana, a dedicated `NGINX PROXY` Grafana dashboard will be creat At the moment of writing only images for `amd64` and `arm64` architectures are available. The playbook currently does not support [self-building](./self-building.md) a container image on other architectures. You can however use a custom-build image by setting: ```yaml -prometheus_nginxlog_exporter_docker_image_arch_check_enabled: false -prometheus_nginxlog_exporter_docker_image: path/to/docker/image:tag +prometheus_nginxlog_exporter_container_image_arch_check_enabled: false +prometheus_nginxlog_exporter_container_image: path/to/docker/image:tag ``` ### Extending the configuration diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index eb967f481..ab1a99ab7 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -5222,7 +5222,7 @@ prometheus_nginxlog_exporter_identifier: matrix-prometheus-nginxlog-exporter prometheus_nginxlog_exporter_hostname: "{{ matrix_server_fqn_matrix }}" -prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream_default }}" +prometheus_nginxlog_exporter_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else prometheus_nginxlog_exporter_container_image_registry_prefix_upstream_default }}" prometheus_nginxlog_exporter_container_network: "{{ matrix_monitoring_container_network }}" diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml index ed72ec0e9..9e0d1774b 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/defaults/main.yml @@ -23,14 +23,14 @@ prometheus_nginxlog_exporter_version: v1.10.0 prometheus_nginxlog_exporter_container_metrics_port: '4040' prometheus_nginxlog_exporter_container_syslog_port: '6514' -prometheus_nginxlog_exporter_docker_image_arch: ['amd64', 'arm64'] -prometheus_nginxlog_exporter_docker_image: "{{ prometheus_nginxlog_exporter_docker_image_registry_prefix }}martin-helmich/prometheus-nginxlog-exporter/exporter:{{ prometheus_nginxlog_exporter_docker_image_tag }}" -prometheus_nginxlog_exporter_docker_image_registry_prefix: "{{ prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream }}" -prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream: "{{ prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream_default }}" -prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream_default: "ghcr.io/" -prometheus_nginxlog_exporter_docker_image_tag: "{{ 'latest' if prometheus_nginxlog_exporter_version == 'master' else prometheus_nginxlog_exporter_version }}-{{ matrix_architecture }}" -prometheus_nginxlog_exporter_docker_image_force_pull: "{{ prometheus_nginxlog_exporter_docker_image.endswith(':latest') }}" -prometheus_nginxlog_exporter_docker_image_arch_check_enabled: true +prometheus_nginxlog_exporter_container_image_arch: ['amd64', 'arm64'] +prometheus_nginxlog_exporter_container_image: "{{ prometheus_nginxlog_exporter_container_image_registry_prefix }}martin-helmich/prometheus-nginxlog-exporter/exporter:{{ prometheus_nginxlog_exporter_container_image_tag }}" +prometheus_nginxlog_exporter_container_image_registry_prefix: "{{ prometheus_nginxlog_exporter_container_image_registry_prefix_upstream }}" +prometheus_nginxlog_exporter_container_image_registry_prefix_upstream: "{{ prometheus_nginxlog_exporter_container_image_registry_prefix_upstream_default }}" +prometheus_nginxlog_exporter_container_image_registry_prefix_upstream_default: "ghcr.io/" +prometheus_nginxlog_exporter_container_image_tag: "{{ 'latest' if prometheus_nginxlog_exporter_version == 'master' else prometheus_nginxlog_exporter_version }}-{{ matrix_architecture }}" +prometheus_nginxlog_exporter_container_image_force_pull: "{{ prometheus_nginxlog_exporter_container_image.endswith(':latest') }}" +prometheus_nginxlog_exporter_container_image_arch_check_enabled: true # Controls whether prometheus-nginxlog-exporter metrics should be proxied (exposed) on a public URL prometheus_nginxlog_exporter_metrics_proxying_enabled: false diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml index 898a5b153..7011d0851 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml @@ -8,10 +8,10 @@ - name: Ensure prometheus-nginxlog-exporter image is pulled community.docker.docker_image: - name: "{{ prometheus_nginxlog_exporter_docker_image }}" + name: "{{ prometheus_nginxlog_exporter_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ prometheus_nginxlog_exporter_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" - force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else prometheus_nginxlog_exporter_docker_image_force_pull }}" + force_source: "{{ prometheus_nginxlog_exporter_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" + force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else prometheus_nginxlog_exporter_container_image_force_pull }}" register: prometheus_nginxlog_exporter_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml index 2685009d4..e7e2f650c 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/validate_config.yml @@ -14,7 +14,7 @@ when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0" with_items: - {'old': 'prometheus_nginxlog_exporter_container_hostname', 'new': 'prometheus_nginxlog_exporter_identifier'} - - {'old': 'prometheus_nginxlog_exporter_docker_image_name_prefix', 'new': 'prometheus_nginxlog_exporter_docker_image_registry_prefix'} + - {'old': 'prometheus_nginxlog_exporter_container_image_name_prefix', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix'} - name: Fail if docker image not available for arch ansible.builtin.fail: @@ -24,14 +24,14 @@ We currently do not support building an image using this playbook. You can use a custom-build image by setting - 'prometheus_nginxlog_exporter_docker_image_arch_check_enabled: false' - 'prometheus_nginxlog_exporter_docker_image: path/to/docker/image:tag' + 'prometheus_nginxlog_exporter_container_image_arch_check_enabled: false' + 'prometheus_nginxlog_exporter_container_image: path/to/docker/image:tag' or disable 'prometheus-nginxlog-exporter' by setting 'prometheus_nginxlog_exporter: false' in vars.yml - when: prometheus_nginxlog_exporter_docker_image_arch_check_enabled and matrix_architecture not in prometheus_nginxlog_exporter_docker_image_arch + when: prometheus_nginxlog_exporter_container_image_arch_check_enabled and matrix_architecture not in prometheus_nginxlog_exporter_container_image_arch - name: Fail if required prometheus-nginxlog-exporter settings not defined ansible.builtin.fail: diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 b/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 index b6280c6d0..b8c07a19e 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/templates/systemd/matrix-prometheus-nginxlog-exporter.service.j2 @@ -35,7 +35,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in prometheus_nginxlog_exporter_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ prometheus_nginxlog_exporter_docker_image }} \ + {{ prometheus_nginxlog_exporter_container_image }} \ -config-file /etc/prometheus-nginxlog-exporter/prometheus-nginxlog-exporter.yaml {% for network in prometheus_nginxlog_exporter_container_additional_networks %} diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 488950cd9..31ad62010 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -95,6 +95,12 @@ - {'old': 'hydrogen_docker_image_registry_prefix_upstream', 'new': 'hydrogen_container_image_registry_prefix_upstream'} - {'old': 'hydrogen_docker_image_registry_prefix_upstream_default', 'new': 'hydrogen_container_image_registry_prefix_upstream_default'} + - {'old': 'prometheus_nginxlog_exporter_docker_image', 'new': 'prometheus_nginxlog_exporter_container_image'} + - {'old': 'prometheus_nginxlog_exporter_docker_image_registry_prefix', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix'} + - {'old': 'prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix_upstream'} + - {'old': 'prometheus_nginxlog_exporter_docker_image_registry_prefix_upstream_default', 'new': 'prometheus_nginxlog_exporter_container_image_registry_prefix_upstream_default'} + - {'old': 'prometheus_nginxlog_exporter_docker_image_arch_check_enabled', 'new': 'prometheus_nginxlog_exporter_container_image_arch_check_enabled'} + - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: msg: |-