diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml index ca3d9a4e9775767979c0f49fc665494c517b0eb1..b855c0872aa2184d3ea0a690af9d9f83cecba83e 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/helm/sloth/templates/pod-monitor.yaml b/deploy/kubernetes/helm/sloth/templates/pod-monitor.yaml index e8e6bc12115c8b835c62182a5e352b72da283c3f..722114d547399509220c629e931705bb47f6eed2 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 c4f5b44d5738ee98530b6059b4287a862754b301..d6d59f8612e3168f6296dce5d063b48c73c021bc 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 eb1062232f03475f0292344042222b036714493a..bbfcc51e5fc43a7b789717e89c34e4ae44caa78a 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 d5d987e246de64f731556cb2d344e7069e9c63b7..b9c1548a649858f7ba221edcaf92309df2106251 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: diff --git a/deploy/kubernetes/raw/sloth-with-common-plugins.yaml b/deploy/kubernetes/raw/sloth-with-common-plugins.yaml index 55561f0543f641d3337baf568efb5b18fef401d0..21de1723c258b4c84f44b7cbb62c72035e897beb 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 faf11200789e06771f39734c5d90608b0bba4378..458928f3e9c5cd748d2f653ce9c25a94a0f3ef6c 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