From db93942351b911cd1290dbc62e47a0ee3abce322 Mon Sep 17 00:00:00 2001 From: Xabier Larrakoetxea Date: Wed, 26 Oct 2022 20:33:39 +0200 Subject: [PATCH 1/2] Add optional prometheus scrape interval to Helm chart Signed-off-by: Xabier Larrakoetxea --- deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml | 3 +++ .../helm/sloth/tests/testdata/output/pod_monitor_custom.yaml | 1 + deploy/kubernetes/helm/sloth/tests/values_test.go | 3 ++- deploy/kubernetes/helm/sloth/values.yaml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml b/deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml index e8e6bc12..722114d5 100644 --- 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 }} \ No newline at end of file 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 index c4f5b44d..d6d59f86 100644 --- 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 index eb106223..bbfcc51e 100644 --- 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 index d5d987e2..b9c1548a 100644 --- 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: From 390c1af2ecb54d9b06629e1f9518b67e2ad85cd2 Mon Sep 17 00:00:00 2001 From: Xabier Larrakoetxea Date: Wed, 26 Oct 2022 20:43:03 +0200 Subject: [PATCH 2/2] Bump v0.6.4 Helm chart Signed-off-by: Xabier Larrakoetxea --- deploy/kubernetes/helm/sloth/Chart.yaml | 2 +- deploy/kubernetes/raw/sloth-with-common-plugins.yaml | 12 ++++++------ deploy/kubernetes/raw/sloth.yaml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml index ca3d9a4e..b855c087 100644 --- 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/raw/sloth-with-common-plugins.yaml b/deploy/kubernetes/raw/sloth-with-common-plugins.yaml index 55561f05..21de1723 100644 --- 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 index faf11200..458928f3 100644 --- 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