From 406e074700cb75586e0a85d08f6e8242c42113a6 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 10 Oct 2024 18:06:21 +0200 Subject: [PATCH 1/7] add service.name and drop_origin Signed-off-by: Tetiana Kravchenko --- docs/onboarding/8_16/operator/README.md | 2 +- .../kubernetes/operator/helm/values.yaml | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/onboarding/8_16/operator/README.md b/docs/onboarding/8_16/operator/README.md index c3bb7a1b..d9d24b55 100644 --- a/docs/onboarding/8_16/operator/README.md +++ b/docs/onboarding/8_16/operator/README.md @@ -76,7 +76,7 @@ $ kubectl create namespace opentelemetry-operator-system ``` $ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts $ helm repo update -$ helm install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 +$ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 ``` ## Limitations diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index c41ed163..46edadca 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -85,6 +85,9 @@ collectors: - key: service.name from_attribute: app.label.component action: insert + - tag_name: app.label.version + key: app.kubernetes.io/version + from: pod k8sattributes: passthrough: false pod_association: @@ -110,10 +113,17 @@ collectors: - "k8s.pod.ip" - "k8s.pod.uid" - "k8s.pod.start_time" + - "k8s.container.name" labels: - tag_name: app.label.component key: app.kubernetes.io/component from: pod + - key: service.name + from_attribute: k8s.container.name + action: insert + - tag_name: app.label.version + key: app.kubernetes.io/version + from: pod receivers: k8s_cluster: auth_type: serviceAccount @@ -205,6 +215,7 @@ collectors: elasticinframetrics: add_system_metrics: true add_k8s_metrics: true + drop_original: true resourcedetection/eks: detectors: [env, eks] timeout: 15s @@ -230,6 +241,12 @@ collectors: - key: service.name from_attribute: app.label.component action: insert + - key: service.name + from_attribute: k8s.container.name + action: insert + - key: service.version + from_attribute: app.label.version + action: insert attributes/dataset: actions: - key: event.dataset @@ -310,10 +327,14 @@ collectors: - "k8s.pod.ip" - "k8s.pod.uid" - "k8s.pod.start_time" + - "k8s.container.name" labels: - tag_name: app.label.component key: app.kubernetes.io/component from: pod + - tag_name: app.label.version + key: app.kubernetes.io/version + from: pod receivers: otlp: protocols: From 3656fe01d4da003a8e2fa4dd7eff67768c2674c6 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 10 Oct 2024 18:26:17 +0200 Subject: [PATCH 2/7] fix typo Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index 46edadca..b3a9976c 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -85,6 +85,9 @@ collectors: - key: service.name from_attribute: app.label.component action: insert + - key: service.name + from_attribute: k8s.container.name + action: insert - tag_name: app.label.version key: app.kubernetes.io/version from: pod @@ -118,9 +121,6 @@ collectors: - tag_name: app.label.component key: app.kubernetes.io/component from: pod - - key: service.name - from_attribute: k8s.container.name - action: insert - tag_name: app.label.version key: app.kubernetes.io/version from: pod From de9d5efc97e6ea161ce07fca0ed305ac53f159fe Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 10 Oct 2024 18:32:44 +0200 Subject: [PATCH 3/7] fix typo Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index b3a9976c..f4cfad4a 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -88,8 +88,8 @@ collectors: - key: service.name from_attribute: k8s.container.name action: insert - - tag_name: app.label.version - key: app.kubernetes.io/version + - key: service.version + from_attribute: app.label.version from: pod k8sattributes: passthrough: false From f71bce4c83d1bd8b1883ae85c48257d0eb7a1a85 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Thu, 10 Oct 2024 18:41:15 +0200 Subject: [PATCH 4/7] remove redundant fields Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index f4cfad4a..216aa842 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -88,9 +88,13 @@ collectors: - key: service.name from_attribute: k8s.container.name action: insert + - key: app.label.component + action: delete - key: service.version from_attribute: app.label.version - from: pod + action: insert + - key: app.label.version + action: delete k8sattributes: passthrough: false pod_association: @@ -244,9 +248,13 @@ collectors: - key: service.name from_attribute: k8s.container.name action: insert + - key: app.label.component + action: delete - key: service.version from_attribute: app.label.version action: insert + - key: app.label.version + action: delete attributes/dataset: actions: - key: event.dataset From 9592941528f8ace151d1934a34c8a8633fbcbe27 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Fri, 11 Oct 2024 11:30:43 +0200 Subject: [PATCH 5/7] split installation and upgrade commands Signed-off-by: Tetiana Kravchenko --- docs/onboarding/8_16/operator/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/onboarding/8_16/operator/README.md b/docs/onboarding/8_16/operator/README.md index d9d24b55..86f4bee2 100644 --- a/docs/onboarding/8_16/operator/README.md +++ b/docs/onboarding/8_16/operator/README.md @@ -76,6 +76,11 @@ $ kubectl create namespace opentelemetry-operator-system ``` $ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts $ helm repo update +$ helm install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 +``` + +To upgrade an existing release to a new version of the chart: +``` $ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 ``` From 58860b3376667fa644fef2af8ba6e7d0a96220eb Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Fri, 11 Oct 2024 12:14:57 +0200 Subject: [PATCH 6/7] remove k8s.container.name Signed-off-by: Tetiana Kravchenko --- resources/kubernetes/operator/helm/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml index 216aa842..82fcee6d 100644 --- a/resources/kubernetes/operator/helm/values.yaml +++ b/resources/kubernetes/operator/helm/values.yaml @@ -120,7 +120,6 @@ collectors: - "k8s.pod.ip" - "k8s.pod.uid" - "k8s.pod.start_time" - - "k8s.container.name" labels: - tag_name: app.label.component key: app.kubernetes.io/component @@ -335,7 +334,6 @@ collectors: - "k8s.pod.ip" - "k8s.pod.uid" - "k8s.pod.start_time" - - "k8s.container.name" labels: - tag_name: app.label.component key: app.kubernetes.io/component From 8565bf8f1258ffd98f0ed112081d8ee03896f901 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Fri, 11 Oct 2024 12:50:23 +0200 Subject: [PATCH 7/7] use helm upgrade --install Signed-off-by: Tetiana Kravchenko --- docs/onboarding/8_16/operator/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/onboarding/8_16/operator/README.md b/docs/onboarding/8_16/operator/README.md index 86f4bee2..d9d24b55 100644 --- a/docs/onboarding/8_16/operator/README.md +++ b/docs/onboarding/8_16/operator/README.md @@ -76,11 +76,6 @@ $ kubectl create namespace opentelemetry-operator-system ``` $ helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts $ helm repo update -$ helm install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 -``` - -To upgrade an existing release to a new version of the chart: -``` $ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.2.2 ```