Skip to content

Commit f0f3e3b

Browse files
asreehari-splunkasreehari-splunk
authored
Merge branch 'main' into sapm_to_otlphttp
2 parents 6e54e6c + 0a7f444 commit f0f3e3b

File tree

57 files changed

+272
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+272
-447
lines changed

‎.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ jobs:
338338
id: get-matrix
339339
run: |
340340
includes=""
341-
for service in "apache" "mongodb" "kafkametrics" "jmx/cassandra"; do
341+
for service in "apache" "jmx/cassandra" "kafkametrics" "mongodb" "nginx"; do
342342
for arch in "amd64" "arm64"; do
343343
if [ "$service" = "mongodb" ]; then
344344
# tests for mongo "6.0" and "7.0" are flaky, skipping for now

‎.github/workflows/linux-package-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247

248248
# Required to export a multiarch manifest and images to the local image store
249249
- name: Set up containerd image store
250-
uses: crazy-max/ghaction-setup-docker@v3
250+
uses: docker/setup-docker-action@v4
251251
with:
252252
daemon-config: |
253253
{
@@ -320,7 +320,7 @@ jobs:
320320

321321
# Required to load a multiarch archive to the local image store
322322
- name: Set up containerd image store
323-
uses: crazy-max/ghaction-setup-docker@v3
323+
uses: docker/setup-docker-action@v4
324324
with:
325325
daemon-config: |
326326
{

‎CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,43 @@
22

33
## Unreleased
44

5+
56
### 🛑 Breaking changes 🛑
67

78
- (Splunk) Change default traces exporter to otlphttp exporter. ([#5588](https://github.com/signalfx/splunk-otel-collector/pull/5588)).
89

10+
### 💡 Enhancements 💡
11+
12+
- (Splunk) Automatic Discovery:
13+
- Switch bundled NGINX discovery to create [OpenTelemetry NGINX receiver](https://docs.splunk.com/observability/en/gdi/opentelemetry/components/nginx-receiver.html#nginx-receiver) instead of the Smart Agent NGINX monitor ([#5689](https://github.com/signalfx/splunk-otel-collector/pull/5689))
14+
- (Splunk) Expose internal metrics at default `localhost:8888` address instead of `${SPLUNK_LISTEN_INTERFACE}:8888` ([#5706](https://github.com/signalfx/splunk-otel-collector/pull/5706))
15+
This can be changed in `service::telemetry::metrics` section:
16+
```yaml
17+
service:
18+
telemetry:
19+
metrics:
20+
readers:
21+
- pull:
22+
exporter:
23+
prometheus:
24+
host: localhost
25+
port: 8888
26+
```
27+
This also removes a warning about deprecated `service::telemetry::metrics::address`.
28+
29+
### 🚩Deprecations 🚩
30+
31+
- (Splunk) Deprecate the collectd/genericjmx monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
32+
- (Splunk) Deprecate the collectd/activemq monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the activemq target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
33+
- (Splunk) Deprecate the collectd/cassandra monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the cassandra target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
34+
- (Splunk) Deprecate the collectd/hadoop monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the hadoop target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
35+
- (Splunk) Deprecate the collectd/kafka monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the kafka target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
36+
- (Splunk) Deprecate the collectd/kafka-consumer monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the kafka-consumer target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
37+
- (Splunk) Deprecate the collectd/kafka-producer monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the kafka-producer target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
38+
- (Splunk) Deprecate the collectd/solr monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the solr target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
39+
- (Splunk) Deprecate the collectd/tomcat monitor. Please use the [jmxreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jmxreceiver) with the tomcat target system instead. ([#5539](https://github.com/signalfx/splunk-otel-collector/pull/5539))
40+
41+
942
## v0.114.0
1043

1144
### 💡 Enhancements 💡

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ integration-test-jmx/cassandra-discovery:
103103
integration-test-apache-discovery:
104104
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_apachewebserver -v -timeout 5m -count 1 ./...
105105

106+
.PHONY: integration-test-nginx-discovery
107+
integration-test-nginx-discovery:
108+
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=discovery_integration_nginx -v -timeout 5m -count 1 ./...
109+
106110
.PHONY: smartagent-integration-test
107111
smartagent-integration-test:
108112
@set -e; cd tests && $(GOTEST_SERIAL) $(BUILD_INFO_TESTS) --tags=smartagent_integration -v -timeout 5m -count 1 ./...

‎cmd/otelcol/config/collector/agent_config.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ receivers:
7171
- job_name: 'otel-collector'
7272
scrape_interval: 10s
7373
static_configs:
74-
- targets: ["${SPLUNK_LISTEN_INTERFACE}:8888"]
74+
- targets: ["0.0.0.0:8888"]
7575
metric_relabel_configs:
7676
- source_labels: [ __name__ ]
7777
regex: 'otelcol_rpc_.*'
@@ -167,9 +167,6 @@ exporters:
167167
verbosity: detailed
168168

169169
service:
170-
telemetry:
171-
metrics:
172-
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
173170
extensions: [health_check, http_forwarder, zpages, smartagent]
174171
pipelines:
175172
traces:

‎cmd/otelcol/config/collector/config.d.linux/properties.discovery.yaml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ splunk.discovery:
1313
receivers:
1414
mysql:
1515
enabled: true
16+
nginx:
17+
enabled: true
1618
postgresql:
1719
enabled: true
1820
smartagent/collectd/mysql:
1921
enabled: false
20-
smartagent/collectd/nginx:
21-
enabled: true
2222
smartagent/postgresql:
2323
enabled: false

‎cmd/otelcol/config/collector/config.d.linux/receivers/nginx.discovery.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#####################################################################################
2+
# This file is generated by the Splunk Distribution of the OpenTelemetry Collector. #
3+
# #
4+
# It reflects the default configuration bundled in the Collector executable for use #
5+
# in discovery mode (--discovery) and is provided for reference or customization. #
6+
# Please note that any changes made to this file will need to be reconciled during #
7+
# upgrades of the Collector. #
8+
#####################################################################################
9+
# nginx:
10+
# enabled: true
11+
# rule:
12+
# docker_observer: type == "container" and any([name, image, command], {# matches "(?i)nginx"}) and not (command matches "splunk.discovery")
13+
# host_observer: type == "hostport" and command matches "(?i)nginx" and not (command matches "splunk.discovery")
14+
# k8s_observer: type == "port" and pod.name matches "(?i)nginx"
15+
# config:
16+
# default:
17+
# endpoint: '`(port in [443] ? "https://" : "http://")``endpoint`/nginx_status}}'
18+
# status:
19+
# metrics:
20+
# - status: successful
21+
# strict: nginx.connections_accepted
22+
# message: nginx receiver is working!
23+
# statements:
24+
# - status: failed
25+
# regexp: "Failed to fetch nginx stats"
26+
# message: Failed to retrieve metrics from NGINX stub_status endpoint.

‎cmd/otelcol/config/collector/config.d.linux/receivers/smartagent-collectd-mysql.discovery.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎cmd/otelcol/config/collector/config.d.linux/receivers/smartagent-postgresql.discovery.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎cmd/otelcol/config/collector/gateway_config.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ receivers:
3737
- job_name: 'otel-collector'
3838
scrape_interval: 10s
3939
static_configs:
40-
- targets: ['${SPLUNK_LISTEN_INTERFACE}:8888']
40+
- targets: ['0.0.0.0:8888']
4141
metric_relabel_configs:
4242
- source_labels: [ __name__ ]
4343
regex: 'otelcol_rpc_.*'
@@ -131,9 +131,6 @@ exporters:
131131
log_data_enabled: false
132132

133133
service:
134-
telemetry:
135-
metrics:
136-
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
137134
extensions: [health_check, http_forwarder, zpages]
138135
pipelines:
139136
traces:

‎cmd/otelcol/fips/config/agent_config.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ receivers:
6565
- job_name: 'otel-collector'
6666
scrape_interval: 10s
6767
static_configs:
68-
- targets: ["${SPLUNK_LISTEN_INTERFACE}:8888"]
68+
- targets: ["0.0.0.0:8888"]
6969
metric_relabel_configs:
7070
- source_labels: [ __name__ ]
7171
regex: 'otelcol_rpc_.*'
@@ -157,9 +157,6 @@ exporters:
157157
verbosity: detailed
158158

159159
service:
160-
telemetry:
161-
metrics:
162-
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
163160
extensions: [health_check, http_forwarder, zpages]
164161
pipelines:
165162
traces:

‎cmd/otelcol/fips/config/gateway_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ receivers:
3737
- job_name: 'otel-collector'
3838
scrape_interval: 10s
3939
static_configs:
40-
- targets: ['${SPLUNK_LISTEN_INTERFACE}:8888']
40+
- targets: ['0.0.0.0:8888']
4141
metric_relabel_configs:
4242
- source_labels: [ __name__ ]
4343
regex: 'otelcol_rpc_.*'

‎deployments/chef/test/integration/default/test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
{ name: 'SPLUNK_INGEST_URL', type: :string, data: splunk_ingest_url },
2727
{ name: 'SPLUNK_MEMORY_TOTAL_MIB', type: :string, data: splunk_memory_total },
2828
{ name: 'SPLUNK_REALM', type: :string, data: splunk_realm },
29-
{ name: 'SPLUNK_TRACE_URL', type: :string, data: "#{splunk_ingest_url}/v2/trace" },
3029
]
3130

3231
collector_env_vars_strings = []

‎docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,11 @@ services:
245245
build: ./mysql
246246
ports:
247247
- "3306:3306"
248-
# Nginx image for collectd-nginx test:
249248
nginx:
250249
image: quay.io/splunko11ytest/nginx:latest
251250
profiles:
252251
- integration
252+
- integration-test-nginx-discovery
253253
- smartagent
254254
build: ./nginx
255255
ports:

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ require (
208208
github.com/blang/semver/v4 v4.0.0 // indirect
209209
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
210210
github.com/circonus-labs/circonusllhist v0.1.5 // indirect
211-
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect
211+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
212212
github.com/containerd/containerd/api v1.7.19 // indirect
213213
github.com/containerd/errdefs v0.1.0 // indirect
214214
github.com/containerd/log v0.1.0 // indirect
@@ -623,7 +623,7 @@ require (
623623
github.com/tklauser/numcpus v0.7.0 // indirect
624624
github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f // indirect
625625
github.com/vjeantet/grok v1.0.1 // indirect
626-
github.com/vmware/govmomi v0.46.0 // indirect
626+
github.com/vmware/govmomi v0.46.2 // indirect
627627
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
628628
github.com/xdg-go/scram v1.1.2 // indirect
629629
github.com/xdg-go/stringprep v1.0.4 // indirect
@@ -656,7 +656,7 @@ require (
656656
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
657657
gonum.org/v1/gonum v0.15.1 // indirect
658658
google.golang.org/api v0.205.0 // indirect
659-
google.golang.org/grpc v1.67.1 // indirect
659+
google.golang.org/grpc v1.68.1 // indirect
660660
google.golang.org/protobuf v1.35.2 // indirect
661661
gopkg.in/fsnotify.v1 v1.4.7 // indirect
662662
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect

0 commit comments

Comments
 (0)