From 11d0b46ef0a267ecb339b4fa4507a99c72a3e20a Mon Sep 17 00:00:00 2001 From: pz2891 Date: Wed, 14 Apr 2021 20:00:16 +0200 Subject: [PATCH] Remove port for docker instances. Remove 'remove old files' tasks --- roles/prometheus/tasks/main.yml | 9 --------- roles/prometheus/templates/prometheus.yml.j2 | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 0946165..d141ecc 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -28,15 +28,6 @@ group: prometheus mode: 0755 -- name: Remove old files - file: - path: "/etc/prometheus/{{ item }}" - state: absent - with_items: - - alert.rules.yml - - django.rules.yml - - - name: Configure Prometheus alerts template: src: "{{ item }}.j2" diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/prometheus/templates/prometheus.yml.j2 index 26020dc..bae1d2b 100644 --- a/roles/prometheus/templates/prometheus.yml.j2 +++ b/roles/prometheus/templates/prometheus.yml.j2 @@ -100,6 +100,15 @@ scrape_configs: file_sd_configs: - files: - '/etc/prometheus/targets_docker.json' + relabel_configs: + # Do not put :8087 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:8087' - job_name: postgresql file_sd_configs: