Merge pull request slok#416 from slok/slok/helm-scrape-interval

vinted · Oct 26, 2022 · ac0182a · ac0182a
2 parents 4027a0a + 390c1af
commit ac0182a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml
@@ -4,4 +4,4 @@ description: Base chart for Sloth.
 type: application
 home: https://github.com/slok/sloth
 kubeVersion: ">= 1.19.0-0"
-version: 0.6.3
+version: 0.6.4
diff --git a/deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml b/deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml
@@ -16,4 +16,7 @@ spec:
       {{- include "sloth.selectorLabels" . | nindent 6 }}
   podMetricsEndpoints:
     - port: metrics
+    {{- with .Values.metrics.scrapeInterval }}
+      interval: {{.}}
+    {{- end }}
 {{- end }}
diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/pod_monitor_custom.yaml
@@ -22,3 +22,4 @@ spec:
       app.kubernetes.io/instance: test
   podMetricsEndpoints:
     - port: metrics
+      interval: 45s
diff --git a/deploy/kubernetes/helm/sloth/tests/values_test.go b/deploy/kubernetes/helm/sloth/tests/values_test.go
@@ -38,7 +38,8 @@ func customValues() msi {
 		},
 
 		"metrics": msi{
-			"enabled": true,
+			"enabled":        true,
+			"scrapeInterval": "45s",
 			"prometheusLabels": msi{
 				"kp1": "vp1",
 				"kp2": "vp2",

diff --git a/deploy/kubernetes/helm/sloth/values.yaml b/deploy/kubernetes/helm/sloth/values.yaml
@@ -46,6 +46,7 @@ commonPlugins:
 
 metrics:
   enabled: true
+  #scrapeInterval: 30s
   prometheusLabels: {}
 
 customSloConfig:

diff --git a/deploy/kubernetes/raw/sloth-with-common-plugins.yaml b/deploy/kubernetes/raw/sloth-with-common-plugins.yaml
@@ -6,7 +6,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -18,7 +18,7 @@ kind: ClusterRole
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -38,7 +38,7 @@ kind: ClusterRoleBinding
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -59,7 +59,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -74,7 +74,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: sloth-0.6.3
+        helm.sh/chart: sloth-0.6.4
         app.kubernetes.io/managed-by: Helm
         app: sloth
         app.kubernetes.io/name: sloth
@@ -132,7 +132,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth

diff --git a/deploy/kubernetes/raw/sloth.yaml b/deploy/kubernetes/raw/sloth.yaml
@@ -6,7 +6,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -18,7 +18,7 @@ kind: ClusterRole
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -38,7 +38,7 @@ kind: ClusterRoleBinding
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -59,7 +59,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -74,7 +74,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: sloth-0.6.3
+        helm.sh/chart: sloth-0.6.4
         app.kubernetes.io/managed-by: Helm
         app: sloth
         app.kubernetes.io/name: sloth
@@ -107,7 +107,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.6.3
+    helm.sh/chart: sloth-0.6.4
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth