From bb842e304183f131b11c80b39388927f10a35d32 Mon Sep 17 00:00:00 2001 From: Daniel Mepham Date: Wed, 20 Dec 2023 15:29:41 -0500 Subject: [PATCH] release of v0.0.27 (#40) * CP-13940 updated version and appVersion (#23) updated version and appVersion * Cp 13940 Fix Typo (#25) * updated version and appVersion * fix typo * bump version and appversion for new release (#28) * CP-14789: Add CODEOWNERS (#33) Add CODEOWNERS file and mark team cirrus as global owners Co-authored-by: Brian Drennan * CP-14745: Decrease Log Frequency (#32) Increase metrics collection interval Co-authored-by: Brian Drennan * CP-14444: Bump Image Tag and App Versions for New Release (#36) * bump version and app version * bump image tag --------- Co-authored-by: Brian Drennan * CP-15508: update cloudwatch agent chart to use the latest image version (#37) * CP-15508: bump chart version * 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 --------- Co-authored-by: Robert Hocking <12814465+roberthocking@users.noreply.github.com> Co-authored-by: bdrennz <146774453+bdrennz@users.noreply.github.com> Co-authored-by: Brian Drennan Co-authored-by: Dimitar --- CODEOWNERS | 2 ++ stable/cloudzero-cloudwatch-metrics/Chart.yaml | 4 ++-- stable/cloudzero-cloudwatch-metrics/README.md | 1 + .../cloudzero-cloudwatch-metrics/templates/configmap.yaml | 8 +++++++- stable/cloudzero-cloudwatch-metrics/values.yaml | 4 +++- 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..1b43424 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,2 @@ +# Global Team Ownership +* @cloudzero/cirrus diff --git a/stable/cloudzero-cloudwatch-metrics/Chart.yaml b/stable/cloudzero-cloudwatch-metrics/Chart.yaml index 7f6bbb6..354d035 100644 --- a/stable/cloudzero-cloudwatch-metrics/Chart.yaml +++ b/stable/cloudzero-cloudwatch-metrics/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: cloudzero-cloudwatch-metrics description: A Helm chart to deploy cloudzero-cloudwatch-metrics project -version: 0.0.24 -appVersion: "0.0.16" +version: 0.0.27 +appVersion: "0.0.22" home: https://cloudzero.github.io/cloudzero-k8s-charts/ icon: https://raw.githubusercontent.com/cloudzero/cloudzero-k8s-charts/docs/logo/cloudZerologo.png diff --git a/stable/cloudzero-cloudwatch-metrics/README.md b/stable/cloudzero-cloudwatch-metrics/README.md index 023ddc4..db6cac0 100755 --- 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 index 44a78e6..c24087a 100755 --- 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": 60 + {{- $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 index 2aebedc..87730e8 100644 --- a/stable/cloudzero-cloudwatch-metrics/values.yaml +++ b/stable/cloudzero-cloudwatch-metrics/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/cloudzero/cloudzero-agent - tag: 0.0.16 + tag: 0.0.22 pullPolicy: IfNotPresent clusterName: cluster_name @@ -64,3 +64,5 @@ daemonsetLabels: {} # For AWS ROSA (OpenShift) #openshift: true + +metricsCollectionInterval: 120