From ef3634cf4e72a1cf3ceb0cad7ee7fa6f78325bd1 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Mon, 15 Nov 2021 13:04:01 +0100
Subject: [PATCH] feat: added nginx ingress monitoring

---
 roles/kubernetes/apps/defaults/main.yml             |  3 +++
 .../kubernetes/ingress-controller/defaults/main.yml | 13 +++++++++++++
 roles/kubernetes/ingress-controller/tasks/main.yml  |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes/apps/defaults/main.yml b/roles/kubernetes/apps/defaults/main.yml
index 5b53ab0..62893e6 100644
--- a/roles/kubernetes/apps/defaults/main.yml
+++ b/roles/kubernetes/apps/defaults/main.yml
@@ -60,6 +60,9 @@ k8s_prometheus_helm__release_values:
         - secretName: "{{ stage }}-kube-grafana-cert"
           hosts:
             - "{{ stage }}-kube-grafana.{{ domain }}"
+    persistence:
+      enabled: true
+      size: 10Gi
     deploymentStrategy:
       type: Recreate
   kubeControllerManager:
diff --git a/roles/kubernetes/ingress-controller/defaults/main.yml b/roles/kubernetes/ingress-controller/defaults/main.yml
index 463d65d..4b3b9da 100644
--- a/roles/kubernetes/ingress-controller/defaults/main.yml
+++ b/roles/kubernetes/ingress-controller/defaults/main.yml
@@ -1,4 +1,8 @@
 ---
+
+k8s_prometheus_helm__name: "prometheus"
+k8s_ingress_helm__release_namespace: "ingress"
+
 k8s_ingress_helm__release_values:
   controller:
     replicaCount: 3
@@ -27,5 +31,14 @@ k8s_ingress_helm__release_values:
         load-balancer.hetzner.cloud/health-check-retries: 3
         load-balancer.hetzner.cloud/health-check-protocol: "tcp"
         load-balancer.hetzner.cloud/health-check-port: *httpnodeport
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+        namespace: "{{ k8s_ingress_helm__release_namespace }}"
+        additionalLabels:
+          release: "{{ k8s_prometheus_helm__name }}"
   defaultBackend:
     enabled: true
+
+# TODO nginx ingress dashboard 9614
diff --git a/roles/kubernetes/ingress-controller/tasks/main.yml b/roles/kubernetes/ingress-controller/tasks/main.yml
index 8f5ad6b..ad9974c 100644
--- a/roles/kubernetes/ingress-controller/tasks/main.yml
+++ b/roles/kubernetes/ingress-controller/tasks/main.yml
@@ -10,7 +10,7 @@
     chart_repo_url: "{{ k8s_ingress_helm__chart_repo_url | default('https://kubernetes.github.io/ingress-nginx') }}"
     chart_ref: "{{ k8s_ingress_helm__chart_ref | default('ingress-nginx') }}"
     chart_version: "{{ k8s_ingress_helm__chart_version | default('4.0.6') }}"
-    release_namespace: "{{ k8s_ingress_helm__release_namespace | default('ingress') }}"
+    release_namespace: "{{ k8s_ingress_helm__release_namespace }}"
     create_namespace: yes
     release_values: "{{ k8s_ingress_helm__release_values }}"
   when: