From 15605d0cefa332e5e5bc05fbf8ee7d3cda251f71 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 14 Aug 2020 22:31:34 +0100
Subject: [PATCH] Adjust scrape internal for kiam to match others, and
 servicemonitor for agents

---
 charts/kubezero-kiam/README.md.gotmpl | 2 +-
 charts/kubezero-kiam/values.yaml      | 2 ++
 deploy/templates/values.yaml          | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/kubezero-kiam/README.md.gotmpl b/charts/kubezero-kiam/README.md.gotmpl
index 6382e4e..175c341 100644
--- a/charts/kubezero-kiam/README.md.gotmpl
+++ b/charts/kubezero-kiam/README.md.gotmpl
@@ -35,5 +35,5 @@ By default all access to the meta-data service is blocked, expect for:
 ## Resources
 - https://github.com/uswitch/kiam
 - https://www.bluematador.com/blog/iam-access-in-kubernetes-kube2iam-vs-kiam
-
+- [Grafana Dashboard](https://raw.githubusercontent.com/uswitch/kiam/master/docs/dashboard-prom.json)
 ![Kiam overview](./kiam_architecure.png)
diff --git a/charts/kubezero-kiam/values.yaml b/charts/kubezero-kiam/values.yaml
index d8d4ac6..ad05e57 100644
--- a/charts/kubezero-kiam/values.yaml
+++ b/charts/kubezero-kiam/values.yaml
@@ -26,6 +26,7 @@ kiam:
     prometheus:
       servicemonitor:
         enabled: false
+        interval: 30s
         labels:
           release: metrics
     log:
@@ -53,6 +54,7 @@ kiam:
     prometheus:
       servicemonitor:
         enabled: false
+        interval: 30s
         labels:
           release: metrics
     log:
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 86b4763..8fa5a96 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -59,6 +59,10 @@ kubezero:
           prometheus:
             servicemonitor:
               enabled: {{ .Values.metrics.enabled }}
+        agent:
+          prometheus:
+            servicemonitor:
+              enabled: {{ .Values.metrics.enabled }}
   {{- end }}
 
   {{- if not .Values.kiam.not_ready }}