Merge pull request #1224 from splunk/repo-sync

theletterf · web-flow · commit 5a8b188e7014 · 2024-03-05T11:14:07.000+01:00
Pulling refs/heads/main into main
diff --git a/gdi/get-data-in/application/java/splunk-java-otel-distribution.rst b/gdi/get-data-in/application/java/splunk-java-otel-distribution.rst
@@ -23,7 +23,7 @@ In addition to the features of the OpenTelemetry Instrumentation for Java, like
 - Collection of data about application servers, stored as server span attributes. See :ref:`webengine-attributes-java-otel`.
 - Automatic injection of trace metadata into application logs. See :ref:`correlate-traces-with-logs-java`.
 
-The agent of the Splunk Distribution of OpenTelemetry Java is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories.
+The agent of the Splunk Distribution of OpenTelemetry Java is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`.
 
 .. caution:: Use the Splunk Distribution of OpenTelemetry Java instead of the upstream OpenTelemetry instrumentation and OpenTelemetry SDK. Splunk supports only upstream OTel components as part of the Splunk Distribution of OpenTelemetry Java.
 
diff --git a/gdi/get-data-in/application/nodejs/splunk-nodejs-otel-distribution.rst b/gdi/get-data-in/application/nodejs/splunk-nodejs-otel-distribution.rst
@@ -21,7 +21,7 @@ In addition to the features of the OpenTelemetry Instrumentation for Node.js, li
 - Instrumentation for HTTP server frameworks that returns server trace information in HTTP responses. See :ref:`server-trace-information-nodejs`.
 - Automatic injection of trace metadata into application logs. See :ref:`correlate-traces-with-logs-nodejs`.
 
-The Splunk Distribution of OpenTelemetry JS is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories.
+The Splunk Distribution of OpenTelemetry JS is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`.
 
 .. caution:: Use the Splunk Distribution of OpenTelemetry JS instead of the upstream OpenTelemetry JavaScript Client. Splunk supports only upstream OTel components as part of the Splunk Distribution of OpenTelemetry JS.
 
diff --git a/gdi/get-data-in/application/php/sfx/instrumentation/instrument-php-application.rst b/gdi/get-data-in/application/php/sfx/instrumentation/instrument-php-application.rst
@@ -193,7 +193,7 @@ The following example shows how to update a deployment to expose environment var
              - name: SIGNALFX_SERVICE_NAME
                value: "<service-name>"
              - name: SIGNALFX_ENDPOINT_URL
-               value: "http://$(host_ip):9411/api/v2/spans"
+               value: "http://$(HOST_IP):9411/api/v2/spans"
              - name: SIGNALFX_TRACE_GLOBAL_TAGS
                value: "deployment.environment:<my_environment>"
 
diff --git a/gdi/get-data-in/application/python/splunk-python-otel-distribution.rst b/gdi/get-data-in/application/python/splunk-python-otel-distribution.rst
@@ -20,7 +20,7 @@ In addition to the features of the OpenTelemetry Instrumentation for Python, lik
 - Instrumentation for HTTP server frameworks that returns server trace information in HTTP responses. See :ref:`server-trace-information-python`.
 - Automatic injection of trace metadata into application logs. See :ref:`correlate-traces-with-logs-python`.
 
-The agent of the Splunk Distribution of OpenTelemetry Python is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories.
+The agent of the Splunk Distribution of OpenTelemetry Python is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`.
 
 .. caution:: Use the Splunk Distribution of OpenTelemetry Python instead of the upstream OpenTelemetry instrumentation and SDK. Splunk supports upstream OTel components as part of the Splunk Distribution of OpenTelemetry Python.
 
diff --git a/gdi/get-data-in/application/ruby/splunk-ruby-otel-distribution.rst b/gdi/get-data-in/application/ruby/splunk-ruby-otel-distribution.rst
@@ -20,7 +20,7 @@ In addition to all the features of the OpenTelemetry Instrumentation for Ruby, l
 - Instrumentation for HTTP server frameworks that returns server trace information in HTTP responses. See :ref:`server-trace-information-ruby`.
 - Automatic injection of trace metadata into application logs. See :ref:`correlate-traces-with-logs-ruby`.
 
-The agent of the Splunk Distribution of OpenTelemetry Ruby is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories.
+The agent of the Splunk Distribution of OpenTelemetry Ruby is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`.
 
 .. caution:: Use the Splunk Distribution of OpenTelemetry Ruby instead of the upstream OpenTelemetry instrumentation and SDK. Splunk supports only upstream OTel components as part of the Splunk Distribution of OpenTelemetry Ruby.
 
diff --git a/gdi/other-ingestion-methods/upstream-collector.rst b/gdi/other-ingestion-methods/upstream-collector.rst
@@ -11,7 +11,7 @@ Send telemetry using the OpenTelemetry Collector Contrib project
 .. meta::
       :description: If you need to use the upstream Collector due to technical or practical reasons, you can still send traces and metrics to Splunk Observability Cloud. On the other hand, the Splunk Distribution of OpenTelemetry Collector enhances the upstream OpenTelemetry Collector and is fully compatible with Splunk instrumentation.
 
-The OpenTelemetry Collector Contrib project, referred to officially as the upstream Collector, is the upstream source of all OpenTelemetry Collector distributions, including the Splunk Distribution of OpenTelemetry Collector. The upstream Collector contains vendor-specific components, such as receivers and exporters for several observability back ends, including Splunk Observability Cloud.
+The OpenTelemetry Collector Contrib project, referred to officially as the :new-page:`upstream <https://docs.splunk.com/Splexicon:Upstream>` Collector, is the upstream source of all OpenTelemetry Collector distributions, including the Splunk Distribution of OpenTelemetry Collector. The upstream Collector contains vendor-specific components, such as receivers and exporters for several observability back ends, including Splunk Observability Cloud.
 
 The Splunk Distribution of OpenTelemetry Collector, on the other hand, is configured for Splunk Observability Cloud and can be deployed automatically by a variety of configuration management tools or using the installer scripts. The distribution adds additional functionality to the Collector while preserving all the features from the OpenTelemetry Collector Contrib project. See :ref:`otel-intro`.
 
diff --git a/locales/ja_JA/LC_MESSAGES/gdi.po b/locales/ja_JA/LC_MESSAGES/gdi.po
@@ -6944,7 +6944,7 @@ msgid "Automatic injection of trace metadata into application logs. See :ref:`co
 msgstr "アプリケーションログへのトレースメタデータの自動注入。:ref:`correlate-traces-with-logs-java` を参照してください。"
 
 #: ../../gdi/get-data-in/application/java/splunk-java-otel-distribution.rst:26
-msgid "The agent of the Splunk Distribution of OpenTelemetry Java is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories."
+msgid "The agent of the Splunk Distribution of OpenTelemetry Java is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`."
 msgstr "Splunk Distribution of OpenTelemetry Java のエージェントは Splunk によってサポートされ、頻繁に更新されるため、バグフィックスや新機能がアップストリームの OTel リポジトリに統合される前にお客様にお届けします。"
 
 #: ../../gdi/get-data-in/application/java/splunk-java-otel-distribution.rst:28
@@ -8938,7 +8938,7 @@ msgid "Automatic injection of trace metadata into application logs. See :ref:`co
 msgstr "アプリケーションログへのトレースメタデータの自動注入。:ref:`correlate-traces-with-logs-nodejs` を参照してください。"
 
 #: ../../gdi/get-data-in/application/nodejs/splunk-nodejs-otel-distribution.rst:24
-msgid "The Splunk Distribution of OpenTelemetry JS is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories."
+msgid "The Splunk Distribution of OpenTelemetry JS is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`."
 msgstr "Splunk Distribution of OpenTelemetry JS はSplunkによってサポートされ、頻繁に更新され、バグフィックスや新機能がアップストリームのOTelリポジトリに統合される前に提供されます。"
 
 #: ../../gdi/get-data-in/application/nodejs/splunk-nodejs-otel-distribution.rst:26
@@ -12411,7 +12411,7 @@ msgid "Automatic injection of trace metadata into application logs. See :ref:`co
 msgstr "アプリケーションログへのトレースメタデータの自動注入。:ref:`correlate-traces-with-logs-python` を参照してください。"
 
 #: ../../gdi/get-data-in/application/python/splunk-python-otel-distribution.rst:23
-msgid "The agent of the Splunk Distribution of OpenTelemetry Python is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories."
+msgid "The agent of the Splunk Distribution of OpenTelemetry Python is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`."
 msgstr "OpenTelemetry Python の Splunk ディストリビューションのエージェントは Splunk によってサポートされ、頻繁に更新され、バグフィックスや新機能がアップストリームの OTel リポジトリに統合される前に提供されます。"
 
 #: ../../gdi/get-data-in/application/python/splunk-python-otel-distribution.rst:25
@@ -13100,7 +13100,7 @@ msgid "Automatic injection of trace metadata into application logs. See :ref:`co
 msgstr "アプリケーションログへのトレースメタデータの自動注入。:ref:`correlate-traces-with-logs-ruby` を参照してください。"
 
 #: ../../gdi/get-data-in/application/ruby/splunk-ruby-otel-distribution.rst:23
-msgid "The agent of the Splunk Distribution of OpenTelemetry Ruby is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories."
+msgid "The agent of the Splunk Distribution of OpenTelemetry Ruby is supported by Splunk and is updated frequently, bringing bug fixes and new features to you before they are integrated in the upstream OTel repositories. See :new-page:`Upstream in the Splexicon <https://docs.splunk.com/Splexicon:Upstream>`."
 msgstr "Splunk Distribution of OpenTelemetry Ruby のエージェントは Splunk によってサポートされ、頻繁に更新され、バグフィックスや新機能がアップストリームの OTel リポジトリに統合される前に提供されます。"
 
 #: ../../gdi/get-data-in/application/ruby/splunk-ruby-otel-distribution.rst:25
