diff --git a/monitoring.yml b/monitoring.yml index 23e7844..13f439d 100755 --- a/monitoring.yml +++ b/monitoring.yml @@ -99,6 +99,9 @@ prometheus_targets: - targets: | {{ groups['aurore_pve'] + groups['aurore_vm'] | list | sort }} + prometheus_postgres_targets: + - targets: + - bdd.adm.auro.re prometheus_switch_snmp_targets: - targets: - yggdrasil.switch.auro.re @@ -128,6 +131,9 @@ prometheus_targets: - targets: | {{ groups['ovh_pve'] + groups['ovh_vm'] | list | sort }} + prometheus_postgres_targets: + - targets: + - bdd-ovh.adm.auro.re prometheus_docker_targets: - docker-ovh.adm.auro.re:8087 roles: diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 4dc518b..4db338b 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -75,6 +75,13 @@ mode: 0644 when: prometheus_docker_targets is defined +- name: Configure Prometheus postgres monitoring + copy: + content: "{{ prometheus_postgres_targets | to_nice_json }}\n" + dest: /etc/prometheus/targets_postgres.json + mode: 0644 + when: prometheus_postgres_targets is defined + - name: Activate prometheus service systemd: name: prometheus @@ -88,4 +95,3 @@ - key: 05-prometheus message: >- Prometheus est déployé sur cette machine (voir /etc/prometheus) -... diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/prometheus/templates/prometheus.yml.j2 index e97e986..8fe3424 100644 --- a/roles/prometheus/templates/prometheus.yml.j2 +++ b/roles/prometheus/templates/prometheus.yml.j2 @@ -101,4 +101,18 @@ scrape_configs: file_sd_configs: - files: - '/etc/prometheus/targets_docker.json' + + - job_name: postgresql + file_sd_configs: + - files: + - '/etc/prometheus/targets_postgres.json' + relabel_configs: + # Do not put :9187 in instance name, rather here + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - source_labels: [__param_target] + target_label: __address__ + replacement: '$1:9187' ... diff --git a/roles/prometheus_federate/templates/prometheus.yml.j2 b/roles/prometheus_federate/templates/prometheus.yml.j2 index 23e649b..71e6874 100644 --- a/roles/prometheus_federate/templates/prometheus.yml.j2 +++ b/roles/prometheus_federate/templates/prometheus.yml.j2 @@ -31,6 +31,7 @@ scrape_configs: params: match[]: - '{job="servers"}' + - '{job="postgresql"}' - '{job="prometheus"}' - '{job="unifi_snmp"}' - '{job="django"}'