From e0907120df85617fa63cd399e6ed51246e8470e4 Mon Sep 17 00:00:00 2001 From: Dennis Pattmann Date: Wed, 8 Jun 2022 22:36:12 +0200 Subject: [PATCH] Support add_full_pod_name_metric_label for awscontainerinsightreceiver reciver (#46) The "FullPodName" attribute is the pod name including suffix. If false FullPodName label is not added. The default value is false --- .../templates/adot-collector/configmap.yaml | 1 + charts/adot-exporter-for-eks-on-ec2/values.schema.json | 3 +++ charts/adot-exporter-for-eks-on-ec2/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml b/charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml index 28812ee..789ef7a 100755 --- a/charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml +++ b/charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml @@ -19,6 +19,7 @@ data: container_orchestrator: {{ .Values.adotCollector.daemonSet.cwreceivers.containerOrchestrator }} add_service_as_attribute: {{ .Values.adotCollector.daemonSet.cwreceivers.addServiceAsAttribute }} prefer_full_pod_name: {{ .Values.adotCollector.daemonSet.cwreceivers.preferFullPodName }} + add_full_pod_name_metric_label: {{ .Values.adotCollector.daemonSet.cwreceivers.addFullPodNameMetricLabel }} prometheus: config: global: diff --git a/charts/adot-exporter-for-eks-on-ec2/values.schema.json b/charts/adot-exporter-for-eks-on-ec2/values.schema.json index a7ba87e..bdb5f5e 100644 --- a/charts/adot-exporter-for-eks-on-ec2/values.schema.json +++ b/charts/adot-exporter-for-eks-on-ec2/values.schema.json @@ -1030,6 +1030,9 @@ }, "preferFullPodName": { "type": "string" + }, + "addFullPodNameMetricLabel": { + "type": "string" } } }, diff --git a/charts/adot-exporter-for-eks-on-ec2/values.yaml b/charts/adot-exporter-for-eks-on-ec2/values.yaml index 598e004..02b4a30 100644 --- a/charts/adot-exporter-for-eks-on-ec2/values.yaml +++ b/charts/adot-exporter-for-eks-on-ec2/values.yaml @@ -287,6 +287,7 @@ adotCollector: containerOrchestrator: "" addServiceAsAttribute: "" preferFullPodName: "" + addFullPodNameMetricLabel: "" processors: timeout: 60s cwexporters: