fix: update postgres_exporter_web_* variables

Author: antmelekhin

README.md

@@ -36,9 +36,9 @@ Role Variables
 - `postgres_exporter_user` and `postgres_exporter_group` Unix username and group (default: `postgres`).
 - `postgres_exporter_install_path` Path to Postgres Exporter installation directory (default: `/usr/local/bin`).
 - `postgres_exporter_data_source_name` Accepts URI form and key=value form arguments. The URI may contain the username and password to connect with. (default: `user=postgres host=/var/run/postgresql/ sslmode=disable`).
-- `postgres_exporter_listen_address` Address to listen on for web interface and telemetry (default: `0.0.0.0`).
-- `postgres_exporter_listen_port` The port to bind to (default: `9182`).
-- `postgres_exporter_metrics_path` The path at which to serve metrics (default: `metrics`).
+- `postgres_exporter_web_listen_address` Address to listen on for web interface and telemetry (default: `0.0.0.0`).
+- `postgres_exporter_web_listen_port` The port to bind to (default: `9187`).
+- `postgres_exporter_web_telemetry_path` The path at which to serve metrics (default: `metrics`).
 - `postgres_exporter_disable_default_metrics` Use only metrics supplied from queries.yaml via `postgres_exporter_extend_query_path` (default: `false`).
 - `postgres_exporter_disable_settings_metrics` Use the flag if you don't want to scrape pg_settings (default: `false`).
 - `postgres_exporter_extend_query_path` Path to a YAML file containing custom queries to run. (default: `''`).

defaults/main.yml

@@ -16,9 +16,9 @@ postgres_exporter_install_path: '{{ _postgres_exporter_install_path }}'
 postgres_exporter_data_source_name: '{{ _postgres_exporter_data_source_name }}'
 
 # See available settings flags: https://github.com/prometheus-community/postgres_exporter#flags
-postgres_exporter_listen_address: '0.0.0.0'
-postgres_exporter_listen_port: 9187
-postgres_exporter_metrics_path: '/metrics'
+postgres_exporter_web_listen_address: '0.0.0.0'
+postgres_exporter_web_listen_port: 9187
+postgres_exporter_web_telemetry_path: '/metrics'
 postgres_exporter_disable_default_metrics: false
 postgres_exporter_disable_settings_metrics: false
 postgres_exporter_extend_query_path: ''

tasks/Win32NT/configure.yml

@@ -9,8 +9,8 @@
 - name: 'Windows | Set arguments'
   ansible.builtin.set_fact:
     _postgres_exporter_arguments: >-
-      --web.listen-address {{ postgres_exporter_listen_address }}:{{ postgres_exporter_listen_port }}
-      --web.telemetry-path {{ postgres_exporter_metrics_path }}
+      --web.listen-address {{ postgres_exporter_web_listen_address }}:{{ postgres_exporter_web_listen_port }}
+      --web.telemetry-path {{ postgres_exporter_web_telemetry_path }}
       {%- if postgres_exporter_disable_default_metrics | bool %} --disable-default-metrics {%- endif %}
       {%- if postgres_exporter_disable_settings_metrics | bool %} --disable-settings-metrics {%- endif %}
       {%- if postgres_exporter_extend_query_path | length > 0 %} --extend.query-path {{ postgres_exporter_extend_query_path }} {%- endif %}
@@ -43,7 +43,7 @@
     name: 'Postgres Exporter'
     description: 'Inbound rule for Postgres Exporter'
     program: '{{ postgres_exporter_install_path }}\postgres_exporter.exe'
-    localport: '{{ postgres_exporter_listen_port }}'
+    localport: '{{ postgres_exporter_web_listen_port }}'
     action: allow
     direction: in
     protocol: tcp

templates/postgres_exporter.service.j2

@@ -11,8 +11,8 @@ User={{ postgres_exporter_user }}
 Group={{ postgres_exporter_group }}
 Environment="DATA_SOURCE_NAME={{ postgres_exporter_data_source_name }}"
 ExecStart={{ postgres_exporter_install_path }}/postgres_exporter \
-    --web.listen-address {{ postgres_exporter_listen_address }}:{{ postgres_exporter_listen_port }} \
-    --web.telemetry-path {{ postgres_exporter_metrics_path }} \
+    --web.listen-address {{ postgres_exporter_web_listen_address }}:{{ postgres_exporter_web_listen_port }} \
+    --web.telemetry-path {{ postgres_exporter_web_telemetry_path }} \
 {% if postgres_exporter_disable_default_metrics | bool %}
     --disable-default-metrics \
 {% endif %}