From 77538ad03a72998f31797ada620324d47f98d8f1 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Tue, 21 Jan 2025 10:17:52 -0700 Subject: [PATCH 1/3] Add new k8s automatic-discovery helm chart configuration `operatorcrds.install` --- .../automatic-discovery/k8s/k8s-advanced-config.rst | 12 ++++++++++++ .../automatic-discovery/k8s/k8s-backend.rst | 8 ++++++++ .../k8s-java-traces-tutorial/config-k8s-for-java.rst | 7 ++++++- .../collector-kubernetes/kubernetes-config.rst | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst index 596425e8b..710e02799 100644 --- a/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst +++ b/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst @@ -37,6 +37,8 @@ By default, the Splunk Distribution of OpenTelemetry Collector uses the latest v environment: prd certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true instrumentation: @@ -78,6 +80,8 @@ Follow these steps to activate Profiling for a language: .. code-block:: yaml + operatorcrds: + install: true operator: enabled: true instrumentation: @@ -112,6 +116,8 @@ Follow these steps to activate runtime metrics collection: .. code-block:: yaml + operatorcrds: + install: true operator: enabled: true instrumentation: @@ -126,6 +132,8 @@ Follow these steps to activate runtime metrics collection: .. code-block:: yaml + operatorcrds: + install: true operator: enabled: true instrumentation: @@ -169,6 +177,8 @@ Follow these steps to send data to a gateway endpoint: environment: prd certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true instrumentation: @@ -194,6 +204,8 @@ You can also automatically send data to a deployed gateway endpoint by setting ` environment: prd certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst index 25c993482..e5cdbf9ba 100644 --- a/gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst +++ b/gdi/opentelemetry/automatic-discovery/k8s/k8s-backend.rst @@ -79,6 +79,8 @@ Populate values.yaml with the following fields and values: accessToken: # Activates the OpenTelemetry Kubernetes Operator + operatorcrds: + install: true operator: enabled: true @@ -109,6 +111,8 @@ If a certification manager isn't available in the cluster, then you'll need to a certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true @@ -159,6 +163,8 @@ The following examples show how to set the attribute using each method: certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true @@ -168,6 +174,8 @@ The following examples show how to set the attribute using each method: .. code-block:: yaml + operatorcrds: + install: true operator: enabled: true instrumentation: diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst index bd7614eac..82599bb52 100644 --- a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst +++ b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst @@ -55,7 +55,10 @@ Now, you need to configure Helm to correctly install the Splunk Distribution of - Tags data that the application sends to Splunk Observability Cloud, allowing you to see the data in Splunk APM * - ``certmanager.enabled`` - ``true`` - - Activates the certification manager for Helm + - Install the CRDs used by the OpenTelemetry Kubernetes Operator + * - ``operatorcrds.install`` + - ``true`` + - Activates the OpenTelemetry Kubernetes Operator * - ``operator.enabled`` - ``true`` - Activates the OpenTelemetry Kubernetes Operator @@ -75,6 +78,8 @@ Now, you need to configure Helm to correctly install the Splunk Distribution of environment: prd certmanager: enabled: true + operatorcrds: + install: true operator: enabled: true diff --git a/gdi/opentelemetry/collector-kubernetes/kubernetes-config.rst b/gdi/opentelemetry/collector-kubernetes/kubernetes-config.rst index b5542a92e..627e871df 100644 --- a/gdi/opentelemetry/collector-kubernetes/kubernetes-config.rst +++ b/gdi/opentelemetry/collector-kubernetes/kubernetes-config.rst @@ -250,6 +250,8 @@ For the Operator: .. code-block:: yaml + operatorcrds: + install: true operator: enabled: true From 719028edb4618a249718e4d5569e081237d0d4cc Mon Sep 17 00:00:00 2001 From: jvoravong Date: Tue, 21 Jan 2025 11:39:39 -0700 Subject: [PATCH 2/3] patch --- .../k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst index 82599bb52..bab888013 100644 --- a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst +++ b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst @@ -55,10 +55,10 @@ Now, you need to configure Helm to correctly install the Splunk Distribution of - Tags data that the application sends to Splunk Observability Cloud, allowing you to see the data in Splunk APM * - ``certmanager.enabled`` - ``true`` - - Install the CRDs used by the OpenTelemetry Kubernetes Operator + - Activates the certification manager for Helm * - ``operatorcrds.install`` - ``true`` - - Activates the OpenTelemetry Kubernetes Operator + - Install the CRDs used by the OpenTelemetry Kubernetes Operator * - ``operator.enabled`` - ``true`` - Activates the OpenTelemetry Kubernetes Operator From b7cc35481f5661fe1e046cc31b1fc131408f9c5e Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:34:02 -0700 Subject: [PATCH 3/3] Update gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst Co-authored-by: mbechtold-splunk <107698185+mbechtold-splunk@users.noreply.github.com> --- .../k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst index bab888013..6bf202970 100644 --- a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst +++ b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/config-k8s-for-java.rst @@ -58,7 +58,7 @@ Now, you need to configure Helm to correctly install the Splunk Distribution of - Activates the certification manager for Helm * - ``operatorcrds.install`` - ``true`` - - Install the CRDs used by the OpenTelemetry Kubernetes Operator + - Installs the CRDs used by the OpenTelemetry Kubernetes Operator * - ``operator.enabled`` - ``true`` - Activates the OpenTelemetry Kubernetes Operator