From 7e16bce3145a1abd6494ff55be2850b3263bd65d Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Tue, 24 Aug 2021 11:27:25 +0200
Subject: [PATCH] chore: upgraded prometheus from cx11 to cpx11

---
 group_vars/prometheus/plain.yml               |  4 +++
 roles/prometheus/defaults/main.yml            |  4 +--
 .../config/prometheus/prometheus.yml.j2       | 28 +++++++++++++++++--
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 group_vars/prometheus/plain.yml

diff --git a/group_vars/prometheus/plain.yml b/group_vars/prometheus/plain.yml
new file mode 100644
index 0000000..788e6c4
--- /dev/null
+++ b/group_vars/prometheus/plain.yml
@@ -0,0 +1,4 @@
+---
+
+hetzner_server_type: cpx11
+hetzner_server_labels: "stage={{ stage }} service=prometheus"
diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index 7a388c7..2a7d0b2 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -1,10 +1,10 @@
 ---
 
 prometheus_image_name: "prom/prometheus"
-prometheus_image_version: "v2.28.0"
+prometheus_image_version: "v2.28.1"
 
 grafana_image_name: "grafana/grafana"
-grafana_image_version: "8.0.6"
+grafana_image_version: "8.1.2"
 
 alertmanager_image_name: "prom/alertmanager"
 alertmanager_image_version: "v0.22.2"
diff --git a/templates/prometheus/config/prometheus/prometheus.yml.j2 b/templates/prometheus/config/prometheus/prometheus.yml.j2
index fa24019..db4faba 100644
--- a/templates/prometheus/config/prometheus/prometheus.yml.j2
+++ b/templates/prometheus/config/prometheus/prometheus.yml.j2
@@ -49,7 +49,7 @@ scrape_configs:
     metrics_path: '/metrics'
     static_configs:
       - targets: [
-{% for host in server_group_all | difference(['dev-awx-02']) | default([]) %}
+{% for host in server_group_all | difference(['dev-awx-01','dev-prometheus-01','dev-maria-01']) | default([]) %}
           '{{ host }}.{{ domain }}:{{ monitor_port_service }}',
 {% endfor %}
         ]
@@ -129,6 +129,30 @@ scrape_configs:
         target_label:  instance
         replacement:   $1
 
+##############################################
+
+  - job_name: 'awx'
+    scheme: http
+    metrics_path: '/api/v2/metrics/'
+    basic_auth:
+      username: {{ awx_admin_username }}
+      password: {{ awx_admin_password }}
+    static_configs:
+      - targets: [
+{% for host in server_group_awx | default([]) %}
+          '{{ host }}.{{ domain }}',
+{% endfor %}
+        ]
+        labels:
+          env: {{ stage }}
+          project: smardigo
+          application: awx
+    relabel_configs:
+      - source_labels: [__address__]
+        regex:         (.*):.*
+        target_label:  instance
+        replacement:   $1
+
 ##############################################
 
   - job_name: 'connect'
@@ -197,7 +221,7 @@ scrape_configs:
     metrics_path: '/metrics'
     static_configs:
       - targets: [
-{% for host in server_group_all | difference(['dev-awx-02']) | default([]) %}
+{% for host in server_group_all | default([]) %}
           '{{ host }}.{{ domain }}:{{ monitor_port_system }}',
 {% endfor %}
         ]