From 1bcac09ed4d75874841edf646410aef0c90df376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:33:26 +0100
Subject: [PATCH 01/27] k8s-otel: cert-manager integration information added
---
docs/kubernetes/operator/README.md | 71 +++++++++++++++++++++---------
1 file changed, 50 insertions(+), 21 deletions(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index a5e6dddb..d4769791 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -15,7 +15,7 @@ This guide describes how to:
- [Manual deployment of all components](#manual-deployment-of-all-components)
- [Installation verification](#installation-verification)
- [Instrumenting applications](#instrumenting-applications)
-- [Limitations](#limitations)
+- [Cert-manager integrated installation](#cert-manager)
## Prerequisites
@@ -23,6 +23,8 @@ This guide describes how to:
- A Kubernetes version supported by the OpenTelemetry Operator (refer to the operator's [compatibility matrix](https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/compatibility.md#compatibility-matrix) for more details).
+- If you opt for automatic certificates generation and renewal, [cert-manager](https://cert-manager.io/docs/installation/) should be installed in the Kubernetes cluster. The default installation uses a self-signed certificate and **doesn't require** cert-manager to be installed.
+
## Compatibility Matrix
The minimum supported version of the Elastic Stack for OpenTelemetry-based monitoring on Kubernetes is `8.16.0`. Different Elastic Stack releases support specific versions of the [kube-stack Helm Chart](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-kube-stack).
@@ -43,7 +45,7 @@ When [installing the release](#manual-deployment-of-all-components), ensure you
The OpenTelemetry Operator is a [Kubernetes Operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) implementation designed to manage OpenTelemetry resources in a Kubernetes environment. It defines and oversees the following Custom Resource Definitions (CRDs):
- [OpenTelemetry Collectors](https://github.com/open-telemetry/opentelemetry-collector): Agents responsible for receiving, processing and exporting telemetry data such as logs, metrics, and traces.
-- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Used for the atomatic instrumentation of workloads by leveraging OpenTelemetry instrumentation libraries.
+- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Used for the automatic instrumentation of workloads by leveraging OpenTelemetry instrumentation libraries.
All signals including logs, metrics, traces are processed by the collectors and sent directly to Elasticsearch via the ES exporter. A collector's processor pipeline replaces the traditional APM server functionality for handling application traces.
@@ -85,15 +87,19 @@ The Helm Chart is configured to enable zero-code instrumentation using the [Oper
## Deploying components using Kibana Onboarding UX
-The preferred method for deploying all components is through the Kibana Onboarding UX. Follow these steps:
+The preferred method for deploying all components is through Kibana Onboarding UX. Follow these steps:
1. Navigate in Kibana to **Observability** --> **Add data**
2. Select **Kubernetes**, then choose **Kubernetes monitoring with EDOT Collector**.
3. Follow the on-screen instructions to install the OpenTelemetry Operator using the Helm Chart and the provided `values.yaml`.
-Notes:
+Regarding the commands suggested by Kibana UI:
- If the `elastic_endpoint` showed by the UI is not valid for your environment, replace it with the correct Elasticsearch endpoint.
-- The displayed `elastic_api_key` corresponds to an API key that is automatically generated when the onboarding process is initiated.
+- The displayed `elastic_api_key` corresponds to an API key created by Kibana when the onboarding process is initiated.
+
+> [!NOTE]
+> The default installation deploys an OpenTelemetry Operator with a self-signed TLS certificate.
+> If you prefer to use publicly trusted certificates with automatic generation and renewal functionality, refer to [cert-manager integrated installation](#cert-manager) for indications about how to customize the `values.yaml` file before running the `helm install` command.
## Manual deployment of all components
@@ -175,26 +181,49 @@ For detailed instructions and examples on how to instrument applications in Kube
For troubleshooing details and verification steps, refer to [Troubleshooting auto-instrumentation](/docs/kubernetes/operator/troubleshoot-auto-instrumentation.md).
-## Limitations
+<a name="cert-manager"></a>
+
+## Cert-manager integrated installation
+
+Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If it's not the case, refer to the [installation guide](https://cert-manager.io/docs/installation/) before continuing.
+
+In Kubernetes, in order for the API server to communicate with the webhook component (created by the operator), the webhook requires a TLS certificate that the API server is configured to trust. The default provided configuration sets the Helm Chart to auto generate the required certificate as a self-signed certificate with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, it is highly recommended to use a certificate manger like [cert-manager](https://cert-manager.io/docs/installation/).
+
+In order to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager` you have to set `admissionWebhooks.certManager.enabled` to true, and `autoGenerateCert.enabled` to false. This can be achieved in two different ways:
+
+Option 1) Directly adding the options `--set admissionWebhooks.certManager.enabled=true --set autoGenerateCert=null` during the helm chart installation (or upgrade), which could look like:
+
+```bash
+helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
+--values ./resources/kubernetes/operator/helm/values.yaml --version 0.3.0 \
+--set admissionWebhooks.certManager.enabled=true --set autoGenerateCert=null
+```
+
+Option 2) If you prefer to keep an updated copy of the used `values.yaml`:
+
+- **Download (or copy) and update** the `values.yaml` file with the following changes:
-### Cert manager
+ - Enable cert-manager integration for admission webhooks:
-In Kubernetes, in order for the API server to communicate with the webhook component (created by the Operator), the webhook requires a TLS certificate that the API server is configured to trust. The previous provided configurations sets the Helm Chart to auto generate the required TLS certificates with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, it is highly recommended to use a certificate manger like [cert-manager](https://cert-manager.io/docs/installation/).
+ ```yaml
+ opentelemetry-operator:
+ admissionWebhooks:
+ certManager:
+ enabled: true # Change from `false` to `true`
+ ```
-If `cert-manager` CRDs are already present in your Kubernetes environment, you can configure the Operator to use them with the following modifications in the values file:
+ - **Remove auto-generated certificate settings** if they’re no longer needed with cert-manager enabled:
+ ```yaml
+ # Remove the following lines:
+ autoGenerateCert:
+ enabled: true
+ recreate: true
+ ```
-```diff
-opentelemetry-operator:
- manager:
- extraArgs:
- - --enable-go-instrumentation
- admissionWebhooks:
- certManager:
-- enabled: false
-+ enabled: true
+Afterwards just run the installation / upgrade command pointing to the updated file (assuming for example that the update file has been saved as `values_cert-manager.yaml`):
--autoGenerateCert:
-- enabled: true
-- recreate: true
+```bash
+helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
+--values ./resources/kubernetes/operator/helm/values_cert-manager.yaml --version 0.3.0
```
From fe94118eabdf0f7be625dafbb56f2026b431168e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:50:51 +0100
Subject: [PATCH 02/27] initial paragraphs order switched
---
docs/kubernetes/operator/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index d4769791..c32b03b8 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -185,10 +185,10 @@ For troubleshooing details and verification steps, refer to [Troubleshooting aut
## Cert-manager integrated installation
-Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If it's not the case, refer to the [installation guide](https://cert-manager.io/docs/installation/) before continuing.
-
In Kubernetes, in order for the API server to communicate with the webhook component (created by the operator), the webhook requires a TLS certificate that the API server is configured to trust. The default provided configuration sets the Helm Chart to auto generate the required certificate as a self-signed certificate with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, it is highly recommended to use a certificate manger like [cert-manager](https://cert-manager.io/docs/installation/).
+Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted TLS certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If it's not the case, refer to the [cert-manager installation guide](https://cert-manager.io/docs/installation/) before continuing.
+
In order to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager` you have to set `admissionWebhooks.certManager.enabled` to true, and `autoGenerateCert.enabled` to false. This can be achieved in two different ways:
Option 1) Directly adding the options `--set admissionWebhooks.certManager.enabled=true --set autoGenerateCert=null` during the helm chart installation (or upgrade), which could look like:
From 90d34e87e753c2cf2ccefd5aa535c3ab16fc333f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:54:15 +0100
Subject: [PATCH 03/27] code block indentation fixed
---
docs/kubernetes/operator/README.md | 34 +++++++++++++++---------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index c32b03b8..e96e11db 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -203,23 +203,23 @@ Option 2) If you prefer to keep an updated copy of the used `values.yaml`:
- **Download (or copy) and update** the `values.yaml` file with the following changes:
- - Enable cert-manager integration for admission webhooks:
-
- ```yaml
- opentelemetry-operator:
- admissionWebhooks:
- certManager:
- enabled: true # Change from `false` to `true`
- ```
-
- - **Remove auto-generated certificate settings** if they’re no longer needed with cert-manager enabled:
-
- ```yaml
- # Remove the following lines:
- autoGenerateCert:
- enabled: true
- recreate: true
- ```
+ - **Enable cert-manager integration for admission webhooks.**
+
+ ```yaml
+ opentelemetry-operator:
+ admissionWebhooks:
+ certManager:
+ enabled: true # Change from `false` to `true`
+ ```
+
+ - **Remove auto-generated certificate settings.**
+
+ ```yaml
+ # Remove the following lines:
+ autoGenerateCert:
+ enabled: true
+ recreate: true
+ ```
Afterwards just run the installation / upgrade command pointing to the updated file (assuming for example that the update file has been saved as `values_cert-manager.yaml`):
From cb3d8c1713e8ad3295b7dec3b36538444d28de1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:22:29 +0100
Subject: [PATCH 04/27] small structure changes to the cert-manager procedure
---
docs/kubernetes/operator/README.md | 55 +++++++++++++++---------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index e96e11db..12e2e361 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -23,7 +23,7 @@ This guide describes how to:
- A Kubernetes version supported by the OpenTelemetry Operator (refer to the operator's [compatibility matrix](https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/compatibility.md#compatibility-matrix) for more details).
-- If you opt for automatic certificates generation and renewal, [cert-manager](https://cert-manager.io/docs/installation/) should be installed in the Kubernetes cluster. The default installation uses a self-signed certificate and **doesn't require** cert-manager to be installed.
+- If you opt for automatic certificates generation and renewal on the OpenTelemetry Operator, [cert-manager](https://cert-manager.io/docs/installation/) should be installed in the Kubernetes cluster. The operator default installation uses a self-signed certificate and **doesn't require** cert-manager to be installed.
## Compatibility Matrix
@@ -181,49 +181,50 @@ For detailed instructions and examples on how to instrument applications in Kube
For troubleshooing details and verification steps, refer to [Troubleshooting auto-instrumentation](/docs/kubernetes/operator/troubleshoot-auto-instrumentation.md).
+<!-- Do not change this anchor name as it's used by Kibana OTel+k8s Onboarding UX -->
<a name="cert-manager"></a>
## Cert-manager integrated installation
In Kubernetes, in order for the API server to communicate with the webhook component (created by the operator), the webhook requires a TLS certificate that the API server is configured to trust. The default provided configuration sets the Helm Chart to auto generate the required certificate as a self-signed certificate with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, it is highly recommended to use a certificate manger like [cert-manager](https://cert-manager.io/docs/installation/).
-Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted TLS certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If it's not the case, refer to the [cert-manager installation guide](https://cert-manager.io/docs/installation/) before continuing.
+Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted TLS certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If that's not the case, refer to the [cert-manager installation guide](https://cert-manager.io/docs/installation/) before continuing.
-In order to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager` you have to set `admissionWebhooks.certManager.enabled` to true, and `autoGenerateCert.enabled` to false. This can be achieved in two different ways:
+Follow any of the following options to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager`:
-Option 1) Directly adding the options `--set admissionWebhooks.certManager.enabled=true --set autoGenerateCert=null` during the helm chart installation (or upgrade), which could look like:
+* Directly adding to the installation command the options `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`, like:
```bash
helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
---values ./resources/kubernetes/operator/helm/values.yaml --version 0.3.0 \
---set admissionWebhooks.certManager.enabled=true --set autoGenerateCert=null
+--values ./resources/kubernetes/operator/helm/values.yaml --version 0.3.3 \
+--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.admissionWebhooks.autoGenerateCert=null
```
-Option 2) If you prefer to keep an updated copy of the used `values.yaml`:
+* If you prefer to keep an updated copy of the `values.yaml` file:
-- **Download (or copy) and update** the `values.yaml` file with the following changes:
+ 1. **Download (or copy) and update** the `values.yaml` file with the following changes:
- - **Enable cert-manager integration for admission webhooks.**
+ - **Enable cert-manager integration for admission webhooks.**
- ```yaml
- opentelemetry-operator:
- admissionWebhooks:
- certManager:
- enabled: true # Change from `false` to `true`
- ```
+ ```yaml
+ opentelemetry-operator:
+ admissionWebhooks:
+ certManager:
+ enabled: true # Change from `false` to `true`
+ ```
- - **Remove auto-generated certificate settings.**
+ - **Remove auto-generated certificate settings.**
- ```yaml
- # Remove the following lines:
- autoGenerateCert:
- enabled: true
- recreate: true
- ```
+ ```yaml
+ # Remove the following lines:
+ autoGenerateCert:
+ enabled: true
+ recreate: true
+ ```
-Afterwards just run the installation / upgrade command pointing to the updated file (assuming for example that the update file has been saved as `values_cert-manager.yaml`):
+ 2. Run the installation (or upgrade) command pointing to the updated file. For example, assuming that the updated file has been saved as `values_cert-manager.yaml`:
-```bash
-helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
---values ./resources/kubernetes/operator/helm/values_cert-manager.yaml --version 0.3.0
-```
+ ```bash
+ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
+ --values ./resources/kubernetes/operator/helm/values_cert-manager.yaml --version 0.3.0
+ ```
From a84141d928287508ea88c0f37166755ccdf355d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:27:22 +0100
Subject: [PATCH 05/27] small structure changes to the cert-manager procedure
---
docs/kubernetes/operator/README.md | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 12e2e361..d2b158e6 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -202,25 +202,25 @@ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-k
* If you prefer to keep an updated copy of the `values.yaml` file:
- 1. **Download (or copy) and update** the `values.yaml` file with the following changes:
+ 1. **Update** the `values.yaml` file with the following changes:
- - **Enable cert-manager integration for admission webhooks.**
+ - **Enable cert-manager integration for admission webhooks.**
- ```yaml
- opentelemetry-operator:
- admissionWebhooks:
- certManager:
- enabled: true # Change from `false` to `true`
- ```
+ ```yaml
+ opentelemetry-operator:
+ admissionWebhooks:
+ certManager:
+ enabled: true # Change from `false` to `true`
+ ```
- - **Remove auto-generated certificate settings.**
+ - **Remove auto-generated certificate settings.**
- ```yaml
- # Remove the following lines:
- autoGenerateCert:
- enabled: true
- recreate: true
- ```
+ ```yaml
+ # Remove the following lines:
+ autoGenerateCert:
+ enabled: true
+ recreate: true
+ ```
2. Run the installation (or upgrade) command pointing to the updated file. For example, assuming that the updated file has been saved as `values_cert-manager.yaml`:
From 82871956fcdb997e186afdcacc82f0bc851195a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:29:32 +0100
Subject: [PATCH 06/27] small structure changes to the cert-manager procedure
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index d2b158e6..6c10d576 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -213,7 +213,7 @@ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-k
enabled: true # Change from `false` to `true`
```
- - **Remove auto-generated certificate settings.**
+ - **Remove the generation of a self-signed certificate**
```yaml
# Remove the following lines:
From 3cdf17365c6d8c7a235ffd95e48f0e532cd49ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:40:16 +0100
Subject: [PATCH 07/27] small structure changes to the cert-manager procedure
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 6c10d576..e19e84e9 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -213,7 +213,7 @@ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-k
enabled: true # Change from `false` to `true`
```
- - **Remove the generation of a self-signed certificate**
+ - **Remove the generation of a self-signed certificate.**
```yaml
# Remove the following lines:
From 236ae9e95533b37c5ab9451da5d1c9f54284a78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:12:16 +0100
Subject: [PATCH 08/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index e19e84e9..3412f06d 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -23,7 +23,7 @@ This guide describes how to:
- A Kubernetes version supported by the OpenTelemetry Operator (refer to the operator's [compatibility matrix](https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/compatibility.md#compatibility-matrix) for more details).
-- If you opt for automatic certificates generation and renewal on the OpenTelemetry Operator, [cert-manager](https://cert-manager.io/docs/installation/) should be installed in the Kubernetes cluster. The operator default installation uses a self-signed certificate and **doesn't require** cert-manager to be installed.
+- If you opt for automatic certificate generation and renewal on the OpenTelemetry Operator, you need to install [cert-manager](https://cert-manager.io/docs/installation/) in the Kubernetes cluster. By default, the operator installation uses a self-signed certificate and **doesn't require** cert-manager.
## Compatibility Matrix
From a3d84b25422cf6b89c7ac97fb02f0d131250d773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:12:28 +0100
Subject: [PATCH 09/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 3412f06d..12cf492d 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -44,7 +44,7 @@ When [installing the release](#manual-deployment-of-all-components), ensure you
The OpenTelemetry Operator is a [Kubernetes Operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) implementation designed to manage OpenTelemetry resources in a Kubernetes environment. It defines and oversees the following Custom Resource Definitions (CRDs):
-- [OpenTelemetry Collectors](https://github.com/open-telemetry/opentelemetry-collector): Agents responsible for receiving, processing and exporting telemetry data such as logs, metrics, and traces.
+- [OpenTelemetry Collectors](https://github.com/open-telemetry/opentelemetry-collector): Agents responsible for receiving, processing, and exporting telemetry data such as logs, metrics, and traces.
- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Used for the automatic instrumentation of workloads by leveraging OpenTelemetry instrumentation libraries.
All signals including logs, metrics, traces are processed by the collectors and sent directly to Elasticsearch via the ES exporter. A collector's processor pipeline replaces the traditional APM server functionality for handling application traces.
From 8ecb41bf95e15441b6970d1ccfb7ba699dc72fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:19:15 +0100
Subject: [PATCH 10/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 12cf492d..4b09c136 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -45,7 +45,7 @@ When [installing the release](#manual-deployment-of-all-components), ensure you
The OpenTelemetry Operator is a [Kubernetes Operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) implementation designed to manage OpenTelemetry resources in a Kubernetes environment. It defines and oversees the following Custom Resource Definitions (CRDs):
- [OpenTelemetry Collectors](https://github.com/open-telemetry/opentelemetry-collector): Agents responsible for receiving, processing, and exporting telemetry data such as logs, metrics, and traces.
-- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Used for the automatic instrumentation of workloads by leveraging OpenTelemetry instrumentation libraries.
+- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Leverages OpenTelemetry instrumentation libraries to automatically instrument workloads.
All signals including logs, metrics, traces are processed by the collectors and sent directly to Elasticsearch via the ES exporter. A collector's processor pipeline replaces the traditional APM server functionality for handling application traces.
From 788780ed0a662897738ea8ee1e56e4993df419d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:19:46 +0100
Subject: [PATCH 11/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 4b09c136..6bf2ed7f 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -47,7 +47,7 @@ The OpenTelemetry Operator is a [Kubernetes Operator](https://kubernetes.io/docs
- [OpenTelemetry Collectors](https://github.com/open-telemetry/opentelemetry-collector): Agents responsible for receiving, processing, and exporting telemetry data such as logs, metrics, and traces.
- [Instrumentation](https://opentelemetry.io/docs/kubernetes/operator/automatic): Leverages OpenTelemetry instrumentation libraries to automatically instrument workloads.
-All signals including logs, metrics, traces are processed by the collectors and sent directly to Elasticsearch via the ES exporter. A collector's processor pipeline replaces the traditional APM server functionality for handling application traces.
+All signals including logs, metrics, and traces are processed by the collectors and sent directly to Elasticsearch using the ES exporter. A collector's processor pipeline replaces the traditional APM server functionality for handling application traces.
### Kube-stack Helm Chart
From 32e1ba6b339f6de30788ad1554016b425376a6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:19:59 +0100
Subject: [PATCH 12/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 6bf2ed7f..bb87b3c7 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -85,7 +85,7 @@ The Helm Chart is configured to enable zero-code instrumentation using the [Oper
- Python
- .NET
-## Deploying components using Kibana Onboarding UX
+## Deploy components using the guided onboarding
The preferred method for deploying all components is through Kibana Onboarding UX. Follow these steps:
From b125471186a3c0dd2c883f16d4a62f7233ec042a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:21:59 +0100
Subject: [PATCH 13/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index bb87b3c7..635a6cb1 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -93,7 +93,7 @@ The preferred method for deploying all components is through Kibana Onboarding U
2. Select **Kubernetes**, then choose **Kubernetes monitoring with EDOT Collector**.
3. Follow the on-screen instructions to install the OpenTelemetry Operator using the Helm Chart and the provided `values.yaml`.
-Regarding the commands suggested by Kibana UI:
+Notes on installing the OpenTelemetry Operator:
- If the `elastic_endpoint` showed by the UI is not valid for your environment, replace it with the correct Elasticsearch endpoint.
- The displayed `elastic_api_key` corresponds to an API key created by Kibana when the onboarding process is initiated.
From ed1aaee4fddd95f3ba5a341749765945ad51f913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:22:07 +0100
Subject: [PATCH 14/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 635a6cb1..7dda9f41 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -94,7 +94,7 @@ The preferred method for deploying all components is through Kibana Onboarding U
3. Follow the on-screen instructions to install the OpenTelemetry Operator using the Helm Chart and the provided `values.yaml`.
Notes on installing the OpenTelemetry Operator:
-- If the `elastic_endpoint` showed by the UI is not valid for your environment, replace it with the correct Elasticsearch endpoint.
+- Make sure the `elastic_endpoint` shown in the installation command is valid for your environment. If not, replace it with the correct Elasticsearch endpoint.
- The displayed `elastic_api_key` corresponds to an API key created by Kibana when the onboarding process is initiated.
> [!NOTE]
From cfb33d57b9d095bcf0d68d08d1150d59fdf5672a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:22:18 +0100
Subject: [PATCH 15/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 7dda9f41..86ad7a64 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -95,7 +95,7 @@ The preferred method for deploying all components is through Kibana Onboarding U
Notes on installing the OpenTelemetry Operator:
- Make sure the `elastic_endpoint` shown in the installation command is valid for your environment. If not, replace it with the correct Elasticsearch endpoint.
-- The displayed `elastic_api_key` corresponds to an API key created by Kibana when the onboarding process is initiated.
+- The `elastic_api_key` shown in the installation command corresponds to an API key created by Kibana when the onboarding process is initiated.
> [!NOTE]
> The default installation deploys an OpenTelemetry Operator with a self-signed TLS certificate.
From 5f227bb78fd8ac124d883d2a5b1ed90e9d30b453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:23:30 +0100
Subject: [PATCH 16/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 86ad7a64..a71a6db3 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -99,7 +99,7 @@ Notes on installing the OpenTelemetry Operator:
> [!NOTE]
> The default installation deploys an OpenTelemetry Operator with a self-signed TLS certificate.
-> If you prefer to use publicly trusted certificates with automatic generation and renewal functionality, refer to [cert-manager integrated installation](#cert-manager) for indications about how to customize the `values.yaml` file before running the `helm install` command.
+> To automatically generate and renew publicly trusted certificates, refer to [cert-manager integrated installation](#cert-manager) for instructions on customizing the `values.yaml` file before running the `helm install` command.
## Manual deployment of all components
From a17b581c31c85ee6a6737b72ddc6afa67ff38523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:24:23 +0100
Subject: [PATCH 17/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index a71a6db3..344eaead 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -186,7 +186,7 @@ For troubleshooing details and verification steps, refer to [Troubleshooting aut
## Cert-manager integrated installation
-In Kubernetes, in order for the API server to communicate with the webhook component (created by the operator), the webhook requires a TLS certificate that the API server is configured to trust. The default provided configuration sets the Helm Chart to auto generate the required certificate as a self-signed certificate with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, it is highly recommended to use a certificate manger like [cert-manager](https://cert-manager.io/docs/installation/).
+In Kubernetes, for the API server to communicate with the webhook component (created by the operator), the webhook requires a TLS certificate that the API server is configured to trust. The default provided configuration sets the Helm Chart to auto generate the required certificate as a self-signed certificate with an expiration policy of 365 days. These certificates **won't be renewed** if the Helm Chart's release is not manually updated. For production environments, we highly recommend using a certificate manager like [cert-manager](https://cert-manager.io/docs/installation/).
Integrating the operator with [cert-manager](https://cert-manager.io/) enables automatic generation and renewal of publicly trusted TLS certificates. This section assumes that cert-manager and its CRDs are already installed in your Kubernetes environment. If that's not the case, refer to the [cert-manager installation guide](https://cert-manager.io/docs/installation/) before continuing.
From 9e517cef5733c1281a91c259b4412de5b76331bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:24:47 +0100
Subject: [PATCH 18/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 344eaead..244f5862 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -192,7 +192,7 @@ Integrating the operator with [cert-manager](https://cert-manager.io/) enables a
Follow any of the following options to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager`:
-* Directly adding to the installation command the options `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`, like:
+* Directly add these options to the installation command `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`. For example:
```bash
helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
From a77ec74a1e2cc67c60516d686e9307ce9e5dee9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:25:03 +0100
Subject: [PATCH 19/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index 244f5862..c0963294 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -200,7 +200,7 @@ helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-k
--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.admissionWebhooks.autoGenerateCert=null
```
-* If you prefer to keep an updated copy of the `values.yaml` file:
+* Keep an updated copy of the `values.yaml` file by following these steps:
1. **Update** the `values.yaml` file with the following changes:
From 9b5fed2c9cdc6219ac99debb7af2b1e21f31d86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:31:03 +0100
Subject: [PATCH 20/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index c0963294..c61892e9 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -89,7 +89,7 @@ The Helm Chart is configured to enable zero-code instrumentation using the [Oper
The preferred method for deploying all components is through Kibana Onboarding UX. Follow these steps:
-1. Navigate in Kibana to **Observability** --> **Add data**
+1. In Kibana, navigate to **Observability** → **Add data**.
2. Select **Kubernetes**, then choose **Kubernetes monitoring with EDOT Collector**.
3. Follow the on-screen instructions to install the OpenTelemetry Operator using the Helm Chart and the provided `values.yaml`.
From 6497c7bc0076fe9c44bd2e3a792f55291b98406e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:32:24 +0100
Subject: [PATCH 21/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index c61892e9..a51b5bf5 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -192,7 +192,7 @@ Integrating the operator with [cert-manager](https://cert-manager.io/) enables a
Follow any of the following options to install the OpenTelemetry Operator Helm Chart integrated with `cert-manager`:
-* Directly add these options to the installation command `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null`. For example:
+* Add `--set opentelemetry-operator.admissionWebhooks.certManager.enabled=true --set opentelemetry-operator.autoGenerateCert=null` to the installation command. For example:
```bash
helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \
From a3b2dd370cd5702414ea030e8d9600dcdbc93987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:58:55 +0100
Subject: [PATCH 22/27] Update docs/kubernetes/operator/README.md
Co-authored-by: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index a51b5bf5..b278c85d 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -179,7 +179,7 @@ where ``<LANGUAGE>`` is one of: `go` , `java`, `nodejs`, `python`, `dotnet`
For detailed instructions and examples on how to instrument applications in Kubernetes using the OpenTelemetry Operator, refer to [Instrumenting applications](/docs/kubernetes/operator/instrumenting-applications.md).
-For troubleshooing details and verification steps, refer to [Troubleshooting auto-instrumentation](/docs/kubernetes/operator/troubleshoot-auto-instrumentation.md).
+For troubleshooting details and verification steps, refer to [Troubleshooting auto-instrumentation](/docs/kubernetes/operator/troubleshoot-auto-instrumentation.md).
<!-- Do not change this anchor name as it's used by Kibana OTel+k8s Onboarding UX -->
<a name="cert-manager"></a>
From 2d4a042951c8822cce3734c00c5748ad6cc600ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:46:43 +0100
Subject: [PATCH 23/27] onboarding introduction change
---
docs/kubernetes/operator/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/kubernetes/operator/README.md b/docs/kubernetes/operator/README.md
index b278c85d..04a73930 100644
--- a/docs/kubernetes/operator/README.md
+++ b/docs/kubernetes/operator/README.md
@@ -87,7 +87,7 @@ The Helm Chart is configured to enable zero-code instrumentation using the [Oper
## Deploy components using the guided onboarding
-The preferred method for deploying all components is through Kibana Onboarding UX. Follow these steps:
+The guided onboarding simplifies deploying your Kubernetes components by setting up an [API Key](https://www.elastic.co/guide/en/kibana/current/api-keys.html) and the needed [Integrations](https://www.elastic.co/docs/current/en/integrations) in the background. Follow these steps to use the guided onboarding:
1. In Kibana, navigate to **Observability** → **Add data**.
2. Select **Kubernetes**, then choose **Kubernetes monitoring with EDOT Collector**.
From 6859bb0f1ffc1864375f06953fc5cf71c27a1760 Mon Sep 17 00:00:00 2001
From: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
Date: Wed, 6 Nov 2024 10:50:54 +0100
Subject: [PATCH 24/27] split k8sattributes/ecs processor: do not add any extra
metadata
Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
---
resources/kubernetes/operator/helm/values.yaml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml
index da9e09dd..9b3b99e0 100644
--- a/resources/kubernetes/operator/helm/values.yaml
+++ b/resources/kubernetes/operator/helm/values.yaml
@@ -682,6 +682,21 @@ collectors:
- tag_name: app.label.version
key: app.kubernetes.io/version
from: pod
+ k8sattributes/ecs:
+ filter:
+ # Only retrieve pods running on the same node as the collector
+ node_from_env_var: OTEL_K8S_NODE_NAME
+ passthrough: false
+ pod_association:
+ # Below association takes a look at the k8s.pod.ip and k8s.pod.uid resource attributes or connection's context, and tries to match it with the pod having the same attribute.
+ - sources:
+ - from: resource_attribute
+ name: k8s.pod.ip
+ - sources:
+ - from: resource_attribute
+ name: k8s.pod.uid
+ - sources:
+ - from: connection
receivers:
# [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
otlp:
@@ -852,7 +867,7 @@ collectors:
processors:
- elasticinframetrics
- batch
- - k8sattributes
+ - k8sattributes/ecs
- resourcedetection/system
- resourcedetection/eks
- resourcedetection/gcp
From bb2712877b65b26bb4a474df08a7ecd28221bf69 Mon Sep 17 00:00:00 2001
From: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
Date: Wed, 6 Nov 2024 12:00:39 +0100
Subject: [PATCH 25/27] add back name metadata
Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
---
resources/kubernetes/operator/helm/values.yaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml
index 9b3b99e0..8df60895 100644
--- a/resources/kubernetes/operator/helm/values.yaml
+++ b/resources/kubernetes/operator/helm/values.yaml
@@ -697,6 +697,13 @@ collectors:
name: k8s.pod.uid
- sources:
- from: connection
+ extract:
+ metadata:
+ - "k8s.replicaset.name"
+ - "k8s.statefulset.name"
+ - "k8s.daemonset.name"
+ - "k8s.cronjob.name"
+ - "k8s.job.name"
receivers:
# [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
otlp:
From 5206785b8d8182c07bfb84bebdf1f061d6b9a5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edu=20Gonz=C3=A1lez=20de=20la=20Herr=C3=A1n?=
<25320357+eedugon@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:50:52 +0100
Subject: [PATCH 26/27] autoGenerateCert indented within admissionWebhooks
---
resources/kubernetes/operator/helm/values.yaml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml
index 8df60895..91fe745c 100644
--- a/resources/kubernetes/operator/helm/values.yaml
+++ b/resources/kubernetes/operator/helm/values.yaml
@@ -8,10 +8,9 @@ opentelemetry-operator:
certManager:
enabled: false # For production environments, it is [recommended to use cert-manager for better security and scalability](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator#tls-certificate-requirement).
-
-autoGenerateCert:
- enabled: true # Enable/disable automatic certificate generation. Set to false if manually managing certificates.
- recreate: true # Force certificate regeneration on updates. Only applicable if autoGenerateCert.enabled is true.
+ autoGenerateCert:
+ enabled: true # Enable/disable automatic certificate generation. Set to false if manually managing certificates.
+ recreate: true # Force certificate regeneration on updates. Only applicable if autoGenerateCert.enabled is true.
crds:
create: true # Install the OpenTelemetry Operator CRDs.
From 7d262f0cba392822c704f7b8fc70cde820a7e89a Mon Sep 17 00:00:00 2001
From: Roger Coll <rogercoll@protonmail.com>
Date: Tue, 12 Nov 2024 19:22:57 +0100
Subject: [PATCH 27/27] chore: bump to elastic-agent 8.16.0
---
resources/kubernetes/operator/helm/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/kubernetes/operator/helm/values.yaml b/resources/kubernetes/operator/helm/values.yaml
index 91fe745c..c9d75cab 100644
--- a/resources/kubernetes/operator/helm/values.yaml
+++ b/resources/kubernetes/operator/helm/values.yaml
@@ -18,7 +18,7 @@ crds:
defaultCRConfig:
image:
repository: "docker.elastic.co/beats/elastic-agent"
- tag: "8.16.0-SNAPSHOT"
+ tag: "8.16.0"
targetAllocator:
enabled: false # Enable/disable the Operator's Target allocator.
# Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator