From 0b1ef4f6715bd28f943c7543d9917c5d58e4963e Mon Sep 17 00:00:00 2001
From: friedrich goerz <friedrich.goerz@netgo.de>
Date: Wed, 21 Sep 2022 16:46:56 +0200
Subject: [PATCH] DEV-558: pinned helm chart version + adding some values for
 knative monitoring

---
 roles/kubernetes/prometheus/defaults/main.yml | 6 ++++++
 roles/kubernetes/prometheus/tasks/main.yml    | 1 +
 2 files changed, 7 insertions(+)

diff --git a/roles/kubernetes/prometheus/defaults/main.yml b/roles/kubernetes/prometheus/defaults/main.yml
index 3255ad3..decd06a 100644
--- a/roles/kubernetes/prometheus/defaults/main.yml
+++ b/roles/kubernetes/prometheus/defaults/main.yml
@@ -24,6 +24,8 @@ k8s_prometheus_helm__release_values:
     prometheusSpec:
       # TODO Using PersistentVolumeClaim
       storageSpec: {}
+      serviceMonitorSelectorNilUsesHelmValues: false
+      podMonitorSelectorNilUsesHelmValues: false
     deploymentStrategy:
       type: Recreate
   alertmanager:
@@ -72,3 +74,7 @@ k8s_prometheus_helm__release_values:
     serviceMonitor:
       https: true
       insecureSkipVerify: true
+  kube-state-metrics:
+    metricLabelsAllowlist:
+      - pods=[*]
+      - deployments=[app.kubernetes.io/name,app.kubernetes.io/component,app.kubernetes.io/instance]
diff --git a/roles/kubernetes/prometheus/tasks/main.yml b/roles/kubernetes/prometheus/tasks/main.yml
index c4b651a..b1b7a73 100644
--- a/roles/kubernetes/prometheus/tasks/main.yml
+++ b/roles/kubernetes/prometheus/tasks/main.yml
@@ -9,6 +9,7 @@
     name: "{{ k8s_prometheus_helm__name }}"
     chart_repo_url: "{{ k8s_prometheus_helm__chart_repo_url | default('https://prometheus-community.github.io/helm-charts') }}"
     chart_ref: "{{ k8s_prometheus_helm__chart_ref | default('kube-prometheus-stack') }}"
+    chart_version: 40.1.0
     release_namespace: "{{ k8s_prometheus_helm__release_namespace }}"
     create_namespace: yes
     release_values: "{{ k8s_prometheus_helm__release_values }}"