Allow users to define the metrics collection interval (#38)

* Allow users to define the metrics collection interval * Bump chart and update docs * Update readme to include metrics * Validate metricsCollectionInterval value
Cloudzero · Dec 20, 2023 · 606524b · 606524b
1 parent 02469c5
commit 606524b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/stable/cloudzero-cloudwatch-metrics/Chart.yaml b/stable/cloudzero-cloudwatch-metrics/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: cloudzero-cloudwatch-metrics
 description: A Helm chart to deploy cloudzero-cloudwatch-metrics project
-version: 0.0.26
+version: 0.0.27
 appVersion: "0.0.22"
 
 home: https://cloudzero.github.io/cloudzero-k8s-charts/

diff --git a/stable/cloudzero-cloudwatch-metrics/README.md b/stable/cloudzero-cloudwatch-metrics/README.md
@@ -43,3 +43,4 @@ helm upgrade --install cloudzero-cloudwatch-metrics           \
 | `nodeSelector` | Node labels for pod assignment | {} |
 | `tolerations` | Optional deployment tolerations | {} |
 | `annotations` | Optional pod annotations | {} |
+| `metricsCollectionInterval` | Metrics collection interval in seconds. It can be set to 5, 10, 15, 30, 45, 60 or 120 | 120 |
diff --git a/stable/cloudzero-cloudwatch-metrics/templates/configmap.yaml b/stable/cloudzero-cloudwatch-metrics/templates/configmap.yaml
@@ -14,7 +14,13 @@ data:
         "metrics_collected": {
           "kubernetes": {
             "cluster_name": "{{ .Values.clusterName }}",
-            "metrics_collection_interval": 120
+            {{- $allowedIntervals := list 5 10 15 30 45 60 120 }}
+            {{- $failureMessage := printf "metricsCollectionInterval must be set to one of %s" (join "," $allowedIntervals) }}
+            {{- if not (has (int .Values.metricsCollectionInterval) $allowedIntervals) }}
+              {{- fail $failureMessage }}
+            {{- else }}
+            "metrics_collection_interval": {{ .Values.metricsCollectionInterval }}
+            {{- end }}
           }
         },
         "force_flush_interval": 5

diff --git a/stable/cloudzero-cloudwatch-metrics/values.yaml b/stable/cloudzero-cloudwatch-metrics/values.yaml
@@ -64,3 +64,5 @@ daemonsetLabels: {}
 
 # For AWS ROSA (OpenShift)
 #openshift: true
+
+metricsCollectionInterval: 120
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,3 +64,5 @@ daemonsetLabels: {}

		# For AWS ROSA (OpenShift)
		#openshift: true

		metricsCollectionInterval: 120