Merge pull request splunk#1678 from splunk/repo-sync

aurbiztondo-splunk · web-flow · commit b2c1cfd28ad5 · 2025-02-13T07:00:07.000+01:00
Pulling refs/heads/main into main
diff --git a/gdi/get-data-in/application/python/get-started.rst b/gdi/get-data-in/application/python/get-started.rst
@@ -24,14 +24,12 @@ Instrument Python applications for Splunk Observability Cloud
    Migrate to Splunk Python 2.X <migration-guide>
    Version 1.X (deprecated) <version1x/get-started-1x>
 
-The Splunk Distribution of OpenTelemetry Python provides a Python agent that automatically adds APM instrumentation to your Python application. The instrumentation captures distributed traces and metrics and sends them to Splunk Observability Cloud.
+The Splunk Distribution of OpenTelemetry Python provides a Python agent that automatically adds APM instrumentation to your Python application. The instrumentation captures distributed traces and metrics and sends them to Splunk Observability Cloud. For more information, see :ref:`splunk-python-otel-dist`.
 
 To instrument your Python application, follow these steps:
 
 #. Check compatibility and requirements. See :ref:`python-otel-requirements`.
 #. Instrument your Python application. See :ref:`instrument-python-applications`.
 #. Configure your instrumentation. See :ref:`configure-python-instrumentation`.
 
-For more information, see :ref:`splunk-python-otel-dist`.
-
-.. note:: The SignalFx Python Agent is deprecated and will reach End of Support on December 17th, 2022. See :ref:`migrate-signalfx-python-agent-to-otel` to migrate to the Splunk Distribution of OpenTelemetry Python.
+.. note:: The SignalFx Python Agent is deprecated and has reached End of Support. See :ref:`migrate-signalfx-python-agent-to-otel` to migrate to the Splunk Distribution of OpenTelemetry Python.
diff --git a/gdi/get-data-in/application/python/instrumentation/instrument-python-application.rst b/gdi/get-data-in/application/python/instrumentation/instrument-python-application.rst
@@ -214,7 +214,7 @@ The following example shows how to update a deployment to expose environment var
 Send data directly to Splunk Observability Cloud
 ==========================================================
 
-By default, the agent sends all telemetry to the local instance of the Splunk Distribution of OpenTelemetry Collector.
+By default, the agent sends all telemetry to the local instance of the Splunk Distribution of the OpenTelemetry Collector.
 
 To send data directly to Splunk Observability Cloud, set the following environment variables:
 
diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-advanced-config.rst
@@ -1,7 +1,7 @@
 .. _k8s-advanced-auto-discovery-config:
 
 ********************************************************************************
-Advanced customization for automatic discovery and instrumtenation in Kubernetes
+Advanced customization for automatic discovery and instrumentation in Kubernetes
 ********************************************************************************
 
 .. meta:: 
diff --git a/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/deploy-collector-k8s-java.rst b/gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/deploy-collector-k8s-java.rst
@@ -96,12 +96,12 @@ Deploy the Spring Petclinic Java application in your Kubernetes cluster:
                 annotations:
                   # Activates zero-code instrumentation for the Java application
                   instrumentation.opentelemetry.io/inject-java: "true"
-              spec:
-                containers:
-                - name: petclinic-app
-                  # Java application to instrument
-                  image: ghcr.io/pavolloffay/spring-petclinic:latest
-                  imagePullPolicy: Always
+          spec:
+            containers:
+              - name: petclinic-app
+                # Java application to instrument
+                image: ghcr.io/pavolloffay/spring-petclinic:latest
+                imagePullPolicy: Always
 
 #. Run the following command to start the application deployment:
 
diff --git a/gdi/opentelemetry/collector-kubernetes/collector-kubernetes-intro.rst b/gdi/opentelemetry/collector-kubernetes/collector-kubernetes-intro.rst
@@ -43,8 +43,6 @@ To install the Splunk Distribution of the OpenTelemetry Collector for Kubernetes
 * :ref:`kubernetes-helm-architecture`
 * :ref:`kubernetes-helm-releases`
 
-.. note:: By default you'll obtain these :ref:`Kubernetes metrics <ootb-metrics-k8s>`. 
-
 Optionally, you can also:
 
 * :ref:`otel-install-k8s-manifests`
@@ -66,8 +64,6 @@ To configure the Collector see:
 * :ref:`kubernetes-config-logs`
 * :ref:`otel-kubernetes-config-advanced`
 
-
-
 .. raw:: html
 
    <div class="include-start" id="gdi/collector-common-options.rst"></div>
@@ -78,8 +74,18 @@ To configure the Collector see:
 
    <div class="include-stop" id="gdi/collector-common-options.rst"></div>
 
+.. raw:: html
+
+  <embed>
+    <h2>Metrics and other telemetry<a name="k8s-metrics" class="headerlink" href="#k8s-metrics" title="Permalink to this headline">¶</a></h2>
+  </embed>
+
+If you use the default configuration for the Splunk Distribution of the Collector you'll obtain these :ref:`Kubernetes metrics <ootb-metrics-k8s>`. 
 
+To obtain additional telemetry from other sources see:
 
+* :ref:`kubernetes-config-add`
+* :ref:`receiver-creator-receiver` to create new receivers at runtime  
 
 .. raw:: html
 
diff --git a/gdi/opentelemetry/collector-kubernetes/kubernetes-config-add.rst b/gdi/opentelemetry/collector-kubernetes/kubernetes-config-add.rst
@@ -7,15 +7,15 @@ Configure the Collector for Kubernetes with Helm: Add components and data source
 .. meta::
       :description: Optional configurations for the Splunk Distribution of OpenTelemetry Collector for Kubernetes: Add components or new data sources.
 
-Read on to learn how to add additional components or data sources to your Collector for Kubernetes config.
+Read on to learn how to add additional components or data sources to your Collector for Kubernetes config. To create new receivers at runtime see :ref:`receiver-creator-receiver`.   
 
 For other config options, see:
 
 * :ref:`otel-kubernetes-config`
 * :ref:`discovery-mode-k8s`
 * :ref:`kubernetes-config-logs`
 * :ref:`otel-kubernetes-config-advanced`
-
+  
 For a practical example of how to configure the Collector for Kubernetes see :ref:`about-collector-configuration-tutorial-k8s`.
 
 .. _otel-kubernetes-config-add-components:
diff --git a/gdi/opentelemetry/data-processing.rst b/gdi/opentelemetry/data-processing.rst
@@ -45,7 +45,7 @@ Connect pipelines with connectors
 
 You can use connectors to connect two pipelines. Connectors consume data as an exporter at the end of one pipeline and emit data as a receiver at the start of another pipeline. They can consume and emit data of the same data type, or of different data types. Use connectors to generate and emit data which summarizes the data you've already consumed, or to simply replicate or route data. 
 
-Learn more at:ref:`otel-components-connectors`.
+Learn more at :ref:`otel-components-connectors`.
 
 Example of a pipeline configuration
 --------------------------------------------------------------------
diff --git a/gdi/opentelemetry/deployments/otel-deployments.rst b/gdi/opentelemetry/deployments/otel-deployments.rst
@@ -35,3 +35,5 @@ See also the install options available for each platform:
 * :ref:`collector-kubernetes-intro` and :ref:`otel-install-k8s`
 * :ref:`collector-linux-intro` and :ref:`otel-install-linux`, including instructions on how to deploy using Ansible, Chef, Puppet and Salt
 * :ref:`collector-windows-intro` and :ref:`otel-install-windows`, including instructions on how to deploy using Ansible, Chef and Puppet
+
+.. note:: To install the Collector in a Mac environment refer to the :new-page:`binary available in the Splunk Distribution of the OpenTelemetry Collector GitHub repo <https://github.com/signalfx/splunk-otel-collector/releases>`.
diff --git a/gdi/opentelemetry/install-the-collector.rst b/gdi/opentelemetry/install-the-collector.rst
@@ -38,7 +38,7 @@ Get started with the available options to install, deploy, and configure the Spl
     <h2>Install the Collector using packages and deployment tools<a name="collector-package-install" class="headerlink" href="#collector-package-install" title="Permalink to this headline">¶</a></h2>
   </embed>
 
-The Splunk Distribution of the OpenTelemetry Collector is supported on Kubernetes, Linux, Windows, and Mac. Use one of the following packages to gather data for Splunk Observability Cloud:
+The Splunk Distribution of the OpenTelemetry Collector is supported on Kubernetes, Linux, and Windows. Use one of the following packages to gather data for Splunk Observability Cloud:
 
 * :ref:`collector-kubernetes-intro`
 * :ref:`collector-linux-intro`
diff --git a/gdi/opentelemetry/opentelemetry.rst b/gdi/opentelemetry/opentelemetry.rst
@@ -71,7 +71,7 @@ The Splunk Distribution of the OpenTelemetry Collector is a distribution of the
   Splunk officially supports the Splunk Distribution of the OpenTelemetry Collector. 
   Splunk only provides best-effort support for the upstream OpenTelemetry Collector. See :ref:`using-upstream-otel` for more information.
 
-While Splunk Observability Cloud would work with any of the Collector versions as it's native OTel, Splunk can provide better support response for the Splunk distribution. Any changes to the Contrib or Base OpenTelemetry Collector are required to go through the open-source vetting process, which can take some time. If you use the Splunk version, updates and hot fixes are under Splunk control. Note that all major additions to the Splunk version of the Collector do eventually make their way into the Contrib version.
+Splunk Observability Cloud is OTel native and works with any of the Collector versions. However, Splunk can provide better support response for the Splunk distribution. Any changes to the Contrib or Base OpenTelemetry Collector are required to go through the open-source vetting process, which can take some time. If you use the Splunk version, updates and hot fixes are under Splunk control. Note that all major additions to the Splunk version of the Collector do eventually make their way into the Contrib version.
 
 Also, the customizations in the Splunk distribution include these additional features:
 
@@ -80,6 +80,8 @@ Also, the customizations in the Splunk distribution include these additional fea
 * Automatic discovery and configuration
 * Fluentd for log capture, deactivated by default
 
+.. note:: Check out the :new-page:`Splunk Distribution of the OpenTelemetry Collector repo in GitHub <https://github.com/signalfx/splunk-otel-collector>` for more details.
+
 .. raw:: html
 
   <embed>
diff --git a/get-started/o11y-ai-promptlibrary.rst b/get-started/o11y-ai-promptlibrary.rst
diff --git a/get-started/o11y-ai.rst b/get-started/o11y-ai.rst
diff --git a/index.rst b/index.rst
