Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit 1e9d512

Browse files
Merge pull request #1564 from splunk/repo-sync
Pulling refs/heads/main into main
2 parents 7a0310f + a3da041 commit 1e9d512

File tree

13 files changed

+56
-39
lines changed

13 files changed

+56
-39
lines changed

gdi/get-data-in/application/span-attributes.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ Semantic conventions
2020

2121
The following semantic conventions apply for spans:
2222

23-
- :new-page:`General <https://github.com/open-telemetry/semantic-conventions/blob/main/model/general.yaml>`: General semantic attributes that might be used in describing different kinds of operations.
23+
- :new-page:`General <https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/attributes.md>`: General semantic attributes that might be used in describing different kinds of operations.
2424

25-
- :new-page:`HTTP <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/http.yaml>`: For HTTP client and server spans.
25+
- :new-page:`HTTP <https://github.com/open-telemetry/semantic-conventions/blob/main/model/http/spans.yaml>`: For HTTP client and server spans.
2626

27-
- :new-page:`Database <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/database.yaml>`: For SQL and NoSQL client call spans.
27+
- :new-page:`Database <https://github.com/open-telemetry/semantic-conventions/blob/main/model/database/spans.yaml>`: For SQL and NoSQL client call spans.
2828

29-
- :new-page:`RPC/RMI <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/rpc.yaml>`: For remote procedure call (for example, gRPC) spans.
29+
- :new-page:`RPC/RMI <https://github.com/open-telemetry/semantic-conventions/blob/main/model/rpc/spans.yaml>`: For remote procedure call (for example, gRPC) spans.
3030

31-
- :new-page:`Messaging <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/messaging.yaml>`: For messaging system spans (queues, publish/subscribe, and so on).
31+
- :new-page:`Messaging <https://github.com/open-telemetry/semantic-conventions/blob/main/model/messaging/spans.yaml>`: For messaging system spans (queues, publish/subscribe, and so on).
3232

33-
- :new-page:`FaaS <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/faas.yaml>`: For Function as a Service (for example, AWS Lambda) spans.
33+
- :new-page:`FaaS <https://github.com/open-telemetry/semantic-conventions/blob/main/model/faas/spans.yaml>`: For Function as a Service (for example, AWS Lambda) spans.
3434

35-
- :new-page:`Exceptions <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/trace-exception.yaml>`: For recording exceptions associated with a span.
35+
- :new-page:`Exceptions <https://github.com/open-telemetry/semantic-conventions/blob/main/model/exceptions/events.yaml>`: For recording exceptions associated with a span.
3636

37-
- :new-page:`Compatibility <https://github.com/open-telemetry/semantic-conventions/blob/main/model/trace/compatibility.yaml>`: For spans generated by compatibility components. For example, OpenTracing Shim layer.
37+
- :new-page:`Compatibility <https://github.com/open-telemetry/semantic-conventions/blob/main/model/opentracing/common.yaml>`: For spans generated by compatibility components. For example, OpenTracing Shim layer.
3838

3939
Learn more about OpenTelemetry in the OpenTelemetry official documentation, such as library-specific semantic conventions for AWS Lambda, AWS SDK, or GraphQL.
4040

gdi/monitors-cloud/kong.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Installation
4747
Kong installation
4848
~~~~~~~~~~~~~~~~~
4949

50-
Follow the official Kong instructions to expose the Prometheus metrics endpoint. To learn how, see the official :new-page:`Kong documentation on Prometheus <https://docs.konghq.com/hub/kong-inc/prometheus>`. Use Kong version 3.4 or higher.
50+
Follow the official Kong instructions to expose the Prometheus metrics endpoint. To learn how, see the official :new-page:`Kong documentation <https://docs.konghq.com/hub/kong-inc/prometheus>` on Prometheus. Use Kong version 3.4 or higher.
5151

5252
Configuration
5353
-------------
@@ -74,7 +74,7 @@ Next, activate the ``metrics`` pipeline:
7474
Metrics
7575
-------
7676

77-
For the complete list of metrics provided by the integration, refer to :new-page:`Kong Docs on Prometheus <https://docs.konghq.com/hub/kong-inc/prometheus>`.
77+
For the complete list of metrics provided by the integration, refer to :new-page:`Kong Docs <https://docs.konghq.com/hub/kong-inc/prometheus>` on Prometheus.
7878

7979
Notes
8080
~~~~~

gdi/monitors-databases/mongodb.rst

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@ MongoDB (deprecated)
44
=================================
55

66
.. meta::
7-
:description: Use this Splunk Observability Cloud integration for the MongoDB monitor. See benefits, install, configuration, and metrics
7+
:description: Use this Splunk Observability Cloud integration for the MongoDB monitor. See benefits, install, configuration, and metrics.
88

9-
.. note:: The MongoDB monitor is deprecated and will reach end of support on January 15, 2025. During this period, only critical security and bug fixes are provided. When the monitor reaches end of support, you won't be able to use it to send data to Splunk Observability Cloud.
9+
.. note:: The MongoDB monitor is deprecated and will reach end of support on January 15, 2025. During this period, only critical security and bug fixes are provided. When the monitor reaches end of support, you won't be able to use it to send data to Splunk Observability Cloud. To monitor your MongoDB databases, you can instead use the native OpenTelemetry MongoDB receiver. See :ref:`mongodb-receiver` to learn more.
1010

11-
To monitor your MongoDB databases, you can instead use the native OpenTelemetry MongoDB receiver. See :ref:`mongodb-receiver` to learn more.
12-
13-
The
14-
:ref:`Splunk Distribution of the OpenTelemetry Collector <otel-intro>`
15-
uses the :ref:`Smart Agent receiver <smartagent-receiver>` with the
16-
MongoDB monitor type to capture the following metrics about MongoDB:
11+
The :ref:`Splunk Distribution of the OpenTelemetry Collector <otel-intro>` uses the :ref:`Smart Agent receiver <smartagent-receiver>` with the MongoDB monitor type to capture the following metrics about MongoDB:
1712

1813
- Memory
1914
- Network input/output bytes count

gdi/monitors-hosts/apache-tomcat.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ Apache Tomcat
44
=============
55

66
.. meta::
7-
:description: Use this Splunk Observability Cloud integration for the Collectd Tomcat monitor. See benefits, install, configuration, and metrics
7+
:description: Use this Splunk Observability Cloud integration for the Collectd Tomcat monitor. See benefits, install, configuration, and metrics.
88

9-
The Splunk Distribution of OpenTelemetry Collector uses the Smart Agent receiver with the
10-
Collectd Tomcat monitor type to monitor Tomcat. You must activate JMX
11-
Remote to monitor Tomcat remotely. See
12-
:ref:`GenericJMX <genericjmx>` for more information.
9+
The :ref:`Splunk Distribution of the OpenTelemetry Collector <otel-intro>` uses the :ref:`Smart Agent receiver <smartagent-receiver>` with the Collectd Tomcat monitor type to monitor Tomcat. You must activate JMX Remote to monitor Tomcat remotely. See :ref:`GenericJMX <genericjmx>` for more information.
1310

1411
This integration is only available on Kubernetes and Linux.
1512

gdi/monitors-hosts/jenkins.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ Jenkins
66
.. meta::
77
:description: Use this Splunk Observability Cloud integration for the Jenkins monitor. See benefits, install, configuration, and metrics
88

9-
The Splunk Distribution of the OpenTelemetry Collector uses the Smart Agent receiver with the
10-
``jenkins`` monitor type to collect metrics from Jenkins instances by
11-
hitting the following endpoints:
9+
The Splunk Distribution of the OpenTelemetry Collector uses the Smart Agent receiver with the ``jenkins`` monitor type to collect metrics from Jenkins instances by hitting the following endpoints:
1210

1311
- Job metrics with the ``../api/json`` endpoint.
1412
- Codahale or Dropwizard JVM metrics with the ``metrics/<MetricsKey>/..`` endpoint.

gdi/monitors-hosts/kafka-consumer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Splunk Distribution of the OpenTelemetry Collector uses the Smart Agent rece
1010

1111
.. note:: To monitor Kafka with the OpenTelemetry Collector using native OpenTelemetry components refer to the :ref:`kafkametrics-receiver` component.
1212

13-
This integration has a set of built-in MBeans to pull metrics from the Kafka consumer's JMX endpoint. For more information, see :new-page:`Kafka consumer MBeans <https://github.com/signalfx/signalfx-agent/tree/main/pkg/monitors/collectd/kafkaconsumer/mbeans.go>` in GitHub.
13+
This integration has a set of built-in MBeans to pull metrics from the Kafka consumer's JMX endpoint. For more information, see :new-page:`Kafka consumer MBeans<https://github.com/signalfx/signalfx-agent/tree/main/pkg/monitors/collectd/kafkaconsumer/mbeans.go>` in GitHub.
1414

1515
This integration is only available on Kubernetes and Linux, and requires Kafka version 0.9.0.0 or higher.
1616

gdi/monitors-hosts/kafka-producer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Splunk Distribution of the OpenTelemetry Collector uses the Smart Agent rece
1010

1111
.. note:: To monitor Kafka with the OpenTelemetry Collector using native OpenTelemetry components refer to the :ref:`kafkametrics-receiver` component.
1212

13-
This integration has a set of built-in MBeans to pull metrics from the Kafka producer's JMX endpoint. For more information, see :new-page:`Kafka producer MBeans <https://github.com/signalfx/signalfx-agent/tree/main/pkg/monitors/collectd/kafkaproducer/mbeans.go>` in GitHub.
13+
This integration has a set of built-in MBeans to pull metrics from the Kafka producer's JMX endpoint. For more information, see :new-page:`Kafka producer MBeans<https://github.com/signalfx/signalfx-agent/tree/main/pkg/monitors/collectd/kafkaproducer/mbeans.go>` in GitHub.
1414

1515
This integration is only available on Kubernetes and Linux, and requires Kafka version 0.9.0.0 or higher.
1616

gdi/monitors-languages/expvar.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Expvar (Go)
88

99
The :ref:`Splunk Distribution of OpenTelemetry Collector <otel-intro>` uses the :ref:`Smart Agent receiver <smartagent-receiver>` with the ``expvar`` monitor type to scrape metrics exposed Expvar. See :new-page:`expvar <https://golang.org/pkg/expvar/>` to learn more.
1010

11-
The integration uses configured paths to get metric and dimension values from fetched JSON objects at an HTTP endpoint. The Metrics section in this document shows metrics derived from expvar variable :new-page:`memstats <https://golang.org/pkg/runtime/>`, which is exposed by default. These ``memstat`` metrics are referred to as standard or default metrics.
11+
The integration uses configured paths to get metric and dimension values from fetched JSON objects at an HTTP endpoint. The Metrics section in this document shows metrics derived from the :new-page:`memstats <https://golang.org/pkg/runtime/>` expvar variable. These ``memstat`` metrics are referred to as standard or default metrics and are exposed by default.
1212

1313
Benefits
1414
--------

gdi/monitors-network/statsd.rst

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,37 @@ Statsd
88

99
The Splunk Distribution of the OpenTelemetry Collector uses the Smart Agent receiver with the ``statsd`` monitor type to collect statsd metrics. It listens on a configured address and port to receive the statsd metrics.
1010

11-
This integration supports the ``Counter``, ``Timer``, ``Gauge``, and
12-
``Set`` types, which are dispatched as the Splunk Observability Cloud
13-
types ``counter``, ``gauge``, ``gauge``, and ``gauge`` respectively.
14-
Statsd extensions such as tags are not supported.
11+
This integration supports certain Stats types, which are dispatched as ``counter`` or ``gauges`` types in Splunk Observability Cloud, as displayed in the table. Statsd extensions such as tags are not supported.
12+
13+
.. list-table::
14+
:widths: 50 50
15+
:width: 100%
16+
:header-rows: 1
17+
18+
-
19+
20+
- Statsd type
21+
- Splunk Observability Cloud type
22+
23+
-
24+
25+
- ``Counter``
26+
- ``counter``
27+
28+
-
29+
30+
- ``Timer``
31+
- ``counter``
32+
33+
-
34+
35+
- ``Gauge``
36+
- ``gauge``
37+
38+
-
39+
40+
- ``Set``
41+
- ``gauge``
1542

1643
This integration is available for Kubernetes and Linux.
1744

gdi/opentelemetry/common-config/collector-common-config-auth.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can configure two types of authentication for the Collector:
2020
* :ref:`oauth2client-extension`
2121
* Sigv4 extension
2222

23-
.. note:: For more details see :new-page:`Auth Configuration Settings https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/configauth` in OTel's GitHub repo.
23+
.. note:: For more details see :new-page:`Auth Configuration Settings <https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/configauth>` in OTel's GitHub repo.
2424

2525
Example
2626
=============================================================================================

0 commit comments

Comments
 (0)