Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aws-cloudwatch-metrics] Allow metrics_collection_interval configurat… #996

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/aws-cloudwatch-metrics/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-cloudwatch-metrics
description: A Helm chart to deploy aws-cloudwatch-metrics project
version: 0.0.11
version: 0.0.12
appVersion: "1.300032.2b361"
home: https://github.com/aws/eks-charts
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
Expand Down
1 change: 1 addition & 0 deletions stable/aws-cloudwatch-metrics/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ helm upgrade --install aws-cloudwatch-metrics \
| `image.pullPolicy` | Pull policy for the image | `IfNotPresent` | ✔
| `clusterName` | Name of your cluster | `cluster_name` | ✔
| `enhancedContainerInsights` | EKS cluster with enhanced monitoring | `true` |
| `metricsCollectionInterval` | agent collection interval | `60`
| `serviceAccount.create` | Whether a new service account should be created | `true` |
| `serviceAccount.name` | Service account to be used | |
| `hostNetwork` | Allow to use the network namespace and network resources of the node | `false` |
Expand Down
6 changes: 5 additions & 1 deletion stable/aws-cloudwatch-metrics/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ metadata:
{{- include "aws-cloudwatch-metrics.labels" . | nindent 4 }}
data:
cwagentconfig.json: |
{{- $metricsCollectionInterval := .Values.metricsCollectionInterval | default 60 | int }}
{{- if lt $metricsCollectionInterval 15 }}
{{- fail "metricsCollectionInterval allows you to specify how often the agent collects metrics. The default is 60 seconds. The default cadvisor collection interval in kubelet is 15 seconds, so don't set this value to less than 15 seconds." }}
{{- end }}
{
"logs": {
"metrics_collected": {
"kubernetes": {
"cluster_name": "{{ .Values.clusterName }}",
"enhanced_container_insights": {{ .Values.enhancedContainerInsights.enabled }},
"metrics_collection_interval": 60
"metrics_collection_interval": {{ $metricsCollectionInterval }}
}
},
"force_flush_interval": 5
Expand Down
1 change: 1 addition & 0 deletions stable/aws-cloudwatch-metrics/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ image:
pullPolicy: IfNotPresent

clusterName: cluster_name
metricsCollectionInterval: 60

enhancedContainerInsights:
enabled: true
Expand Down