Merge pull request #60 from vasireddy99/update-helm

Update helm charts to use collector `v0.21.0` - Helm chart `v0.7.0` Release

Author: vasireddy99

.gitignore

@@ -0,0 +1,5 @@
+#IDE
+.idea
+
+#build folder
+build/

charts/adot-exporter-for-eks-on-ec2/Chart.yaml

@@ -2,9 +2,9 @@ apiVersion: v2
 name: adot-exporter-for-eks-on-ec2
 description: A Helm chart for collecting metrics using ADOT Collector and logs using Fluent Bit to send to AWS monitoring services.
 type: application
-version: 0.6.0
-appVersion: "0.18.0"
-kubeVersion: ">=1.16.0-0"
+version: 0.7.0
+appVersion: "0.19.0"
+kubeVersion: ">=1.19.0-0"
 maintainers:
   - name: Bryan Aguilar
     email: [email protected]

charts/adot-exporter-for-eks-on-ec2/documentation/metrics_to_cloudwatch_amp.md

@@ -13,7 +13,7 @@ The above-mentioned deployment modes are explained in-detail in the following se
 
 ### Default Mode (Offload metrics to only Amazon Managed Prometheus)
 
- By default, the helm chart is configured to offload metrics data to the Amazon Managed Prometheus(AMP) workspace only. You need update the `values.yaml` file to add the Remote Write Endpoint URL and the region for your AMP workspace. By default, the region is set to `us-west-2`. By default, only the `prometheus` receiver and `awsprometheusremotewrite` exporter is included to be able to send metrics to AMP.
+ By default, the helm chart is configured to offload metrics data to the Amazon Managed Prometheus(AMP) workspace only. You need update the `values.yaml` file to add the Remote Write Endpoint URL and the region for your AMP workspace. By default, the region is set to `us-west-2`. By default, only the `prometheus` receiver and `prometheusremotewrite` exporter is included to be able to send metrics to AMP.
 
 ```console
 helm install \  
@@ -69,7 +69,7 @@ namespaces, they are successfully deployed.
 
 ### Offload metrics to both CloudWatch and Amazon Managed Prometheus(AMP)
 
-To send metrics to CloudWatch, you need to enable the CloudWatch pipeline. You can either update the `values.yaml` to change the values of the following variable `exporters` and then run the `helm install` command as above. Include both `prometheus`, `awscontainerinsightreceiver` as receivers, `awsemf`,`awsprometheusremotewrite` exporter to send metrics to both CloudWatch and AMP.
+To send metrics to CloudWatch, you need to enable the CloudWatch pipeline. You can either update the `values.yaml` to change the values of the following variable `exporters` and then run the `helm install` command as above. Include both `prometheus`, `awscontainerinsightreceiver` as receivers, `awsemf`,`prometheusremotewrite` exporter to send metrics to both CloudWatch and AMP.
 
 ```console
 helm install \  

charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml

@@ -13,6 +13,8 @@ data:
   adot-config:  |
     extensions:
       health_check: {{ .Values.adotCollector.daemonSet.extensions.healthCheck }}
+      sigv4auth:
+        region: {{ .Values.awsRegion }}
     receivers:
       awscontainerinsightreceiver:
         collection_interval: {{ .Values.adotCollector.daemonSet.cwreceivers.collectionInterval }}
@@ -42,14 +44,13 @@ data:
         - {{.}}{{- end }}
         metric_declarations:
           {{ .Values.adotCollector.daemonSet.metricDeclarations | nindent 10 }}
-      awsprometheusremotewrite:
+      prometheusremotewrite:
         namespace: {{ .Values.adotCollector.daemonSet.ampexporters.namespace }}
         endpoint: {{ .Values.adotCollector.daemonSet.ampexporters.endpoint }}
         resource_to_telemetry_conversion: 
-          enabled: {{ .Values.adotCollector.daemonSet.ampexporters.resourcetotel }}
-        aws_auth:
-          region: {{ .Values.adotCollector.daemonSet.ampexporters.region }}
-          service: aps
+          enabled: {{ .Values.adotCollector.daemonSet.ampexporters.resourcetootel }}
+        auth:
+          authenticator: {{ .Values.adotCollector.daemonSet.ampexporters.authenticator }}
         
     service:
       pipelines:

charts/adot-exporter-for-eks-on-ec2/values.schema.json

@@ -904,6 +904,22 @@
                                         }
                                     }
                                 },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "hostPath": {
+                                            "type": "object",
+                                            "properties": {
+                                                "path": {
+                                                    "type": "string"
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "type": "object",
                                     "properties": {
@@ -995,6 +1011,20 @@
                                         }
                                     }
                                 },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "mountPath": {
+                                            "type": "string"
+                                        },
+                                        "readOnly": {
+                                            "type": "boolean"
+                                        }
+                                    }
+                                },
                                 {
                                     "type": "object",
                                     "properties": {
@@ -1013,6 +1043,9 @@
                             "properties": {
                                 "healthCheck": {
                                     "type": "string"
+                                },
+                                "region": {
+                                    "type": "string"
                                 }
                             }
                         },

charts/adot-exporter-for-eks-on-ec2/values.yaml

@@ -189,7 +189,7 @@ adotCollector:
   image:
     name: "aws-otel-collector"
     repository: "amazon/aws-otel-collector"
-    tag: "v0.17.0"
+    tag: "v0.21.1"
     daemonSetPullPolicy: "IfNotPresent"
     sidecarPullPolicy: "Always"
   daemonSet:
@@ -256,6 +256,9 @@ adotCollector:
       - name: "varlibdocker"
         hostPath:
           path: "/var/lib/docker"
+      - name: "containerdsock"
+        hostPath:
+          path: "/run/containerd/containerd.sock"
       - name: "sys"
         hostPath:
           path: "/sys"
@@ -272,6 +275,9 @@ adotCollector:
       - name: "varlibdocker"
         mountPath: "/var/lib/docker"
         readOnly: true
+      - name: "containerdsock"
+        mountPath: "/run/containerd/containerd.sock"
+        readOnly: true
       - name: "sys"
         mountPath: "/sys"
         readOnly: true
@@ -282,6 +288,8 @@ adotCollector:
         mountPath: "/conf"
     extensions:
       healthCheck: ""
+      sigv4auth:
+        region: ""
     cwreceivers:
       collectionInterval: ""
       containerOrchestrator: ""
@@ -394,14 +402,14 @@ adotCollector:
     ampexporters:
       namespaces: ""
       endpoint: ""
-      resourcetotel: false
-      region: ""
+      resourcetootel: false
+      authenticator: "sigv4auth"
     service:
       metrics:
         receivers: ["prometheus"]
         processors: ["batch/metrics"]
-        exporters: ["awsprometheusremotewrite"]
-      extensions: ["health_check"]
+        exporters: ["prometheusremotewrite"]
+      extensions: ["health_check", "sigv4auth"]
 
   sidecar:
     enabled: false