Skip to content

Commit 4a41f77

Browse files
alanbtyalanbty
authored
Merge branch 'signalfx:main' into ansible_fix_loop_otelwinreg
2 parents d0c4cee + 55d6497 commit 4a41f77

29 files changed

+599
-156
lines changed

‎.gitlab-ci.yml

+21
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ include:
2626
file:
2727
- '/prodsec/.oss-scan.yml'
2828
- '/prodsec/.binary-scan.yml'
29+
- '/prodsec/.container-scan.yml'
2930
- project: 'core-ee/signing/api-integration'
3031
ref: develop
3132
file: '/templates/.sign-client.yml'
@@ -1271,6 +1272,26 @@ sign-multiarch-manifest:
12711272
before_script:
12721273
- mv tags_to_sign_${MANIFEST} tags_to_sign
12731274

1275+
xray-scan-docker:
1276+
only:
1277+
- main
1278+
except:
1279+
- schedules
1280+
extends: .container-scan
1281+
stage: xray-scan
1282+
parallel:
1283+
matrix:
1284+
# - CHILD: ["amd64", "arm64", "ppc64le", "2019", "2022"]
1285+
- CHILD: ["amd64"] # the .container-scan template currently only supports linux/amd64 images
1286+
needs:
1287+
- push-multiarch-manifest
1288+
- sign-multiarch-manifest
1289+
variables:
1290+
create_jira: "true"
1291+
before_script:
1292+
- export CONTAINER_IMAGE="$(cat tags_to_sign_multiarch)-${CHILD}"
1293+
- echo $CONTAINER_IMAGE
1294+
12741295
github-release:
12751296
extends:
12761297
- .trigger-filter

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@
88
in v0.42.0 to support a bug causing double expansion. $$ is treated as an escape sequence representing a literal
99
$ character ([#5134](https://github.com/signalfx/splunk-otel-collector/pull/5134))
1010

11+
### 🚩Deprecations 🚩
12+
13+
- (Splunk) Deprecate usage of bare environment variables and config sources in configuration files.
14+
- Use `${env:VAR}` or `${VAR}` instead of `$VAR`.
15+
- Use `${uri:selector}` instead of `$uri:selector`, e.g. `${file:/path/to/file}` instead of `$file:/path/to/file`.
16+
1117
### 💡 Enhancements 💡
1218

19+
- (Splunk) `discovery`: Enable discovery mode for SQL Server receiver ([#5109](https://github.com/signalfx/splunk-otel-collector/pull/5109))
1320
- (Splunk) Update bundled OpenJDK to [11.0.24_8](https://github.com/adoptium/temurin11-binaries/releases/tag/jdk-11.0.24%2B8) ([#5113](https://github.com/signalfx/splunk-otel-collector/pull/5113))
21+
- (Splunk) Rabbitmq receiver was added into the discovery feature([#5113](https://github.com/signalfx/splunk-otel-collector/pull/5051))
1422

1523
## v0.104.0
1624

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

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
# rabbitmq:
10+
# enabled: true
11+
# rule:
12+
# docker_observer: type == "container" and any([name, image, command], {# matches "(?i)rabbitmq.*"}) and not (command matches "splunk.discovery")
13+
# host_observer: type == "hostport" and command matches "(?i)rabbitmq.*" and not (command matches "splunk.discovery")
14+
# k8s_observer: type == "port" and pod.name matches "(?i)rabbitmq.*"
15+
# config:
16+
# default:
17+
# endpoint: '`endpoint`'
18+
# username: splunk.discovery.default
19+
# password: splunk.discovery.default
20+
# collection_interval: 10s
21+
# status:
22+
# metrics:
23+
# - status: successful
24+
# strict: rabbitmq.consumer.count
25+
# message: RabbitMQ receiver is working!
26+
# statements:
27+
# - status: failed
28+
# regexp: 'connect: network is unreachable'
29+
# message: The endpoint is refusing RabbitMQ server connections.
30+
# - status: failed
31+
# regexp: 'connect: connection refused'
32+
# message: The endpoint is refusing RabbitMQ server connections.

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

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
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+
# sqlserver:
10+
# enabled: true
11+
# rule:
12+
# docker_observer: type == "container" and any([name, image, command], {# matches "(?i)mssql"}) and not (command matches "splunk.discovery")
13+
# host_observer: type == "hostport" and command matches "(?i)mssql" and not (command matches "splunk.discovery")
14+
# k8s_observer: type == "port" and pod.name matches "(?i)mssql"
15+
# config:
16+
# default:
17+
# username: splunk.discovery.default
18+
# password: splunk.discovery.default
19+
# server: '`host`'
20+
# port: '`port`'
21+
# resource_attributes:
22+
# sqlserver.instance.name:
23+
# enabled: true
24+
# metrics:
25+
# # Enable all OOTB dashboard default metrics
26+
# sqlserver.batch.request.rate:
27+
# enabled: true
28+
# sqlserver.batch.sql_compilation.rate:
29+
# enabled: true
30+
# sqlserver.batch.sql_recompilation.rate:
31+
# enabled: true
32+
# sqlserver.database.count:
33+
# enabled: true
34+
# sqlserver.database.io:
35+
# enabled: true
36+
# sqlserver.database.latency:
37+
# enabled: true
38+
# sqlserver.database.operations:
39+
# enabled: true
40+
# sqlserver.lock.wait.rate:
41+
# enabled: true
42+
# sqlserver.page.buffer_cache.hit_ratio:
43+
# enabled: true
44+
# sqlserver.processes.blocked:
45+
# enabled: true
46+
# sqlserver.resource_pool.disk.throttled.read.rate:
47+
# enabled: true
48+
# sqlserver.resource_pool.disk.throttled.write.rate:
49+
# enabled: true
50+
# sqlserver.user.connection.count:
51+
# enabled: true
52+
# # Disable upstream default metrics that OOTB dashboards don't use
53+
# sqlserver.lock.wait_time.avg:
54+
# enabled: false
55+
# sqlserver.page.checkpoint.flush.rate:
56+
# enabled: false
57+
# sqlserver.page.lazy_write.rate:
58+
# enabled: false
59+
# sqlserver.page.life_expectancy:
60+
# enabled: false
61+
# sqlserver.page.operation.rate:
62+
# enabled: false
63+
# sqlserver.page.split.rate:
64+
# enabled: false
65+
# sqlserver.transaction.rate:
66+
# enabled: false
67+
# sqlserver.transaction.write.rate:
68+
# enabled: false
69+
# sqlserver.transaction_log.flush.data.rate:
70+
# enabled: false
71+
# sqlserver.transaction_log.flush.rate:
72+
# enabled: false
73+
# sqlserver.transaction_log.flush.wait.rate:
74+
# enabled: false
75+
# sqlserver.transaction_log.growth.count:
76+
# enabled: false
77+
# sqlserver.transaction_log.shrink.count:
78+
# enabled: false
79+
# sqlserver.transaction_log.usage:
80+
# enabled: false
81+
#
82+
# status:
83+
# metrics:
84+
# - status: successful
85+
# strict: sqlserver.database.io
86+
# message: sqlserver receiver is working!
87+
# statements:
88+
# - status: failed
89+
# regexp: "connection refused"
90+
# message: The container is not serving http connections.
91+
# - status: failed
92+
# regexp: "unable to open tcp connection"
93+
# message: Unable to resolve sql server tcp endpoint
94+
# - status: partial
95+
# regexp: "Login failed for user"
96+
# message: >-
97+
# Make sure your user credentials are correctly specified using the
98+
# `SPLUNK_DISCOVERY_RECEIVERS_sqlserver_CONFIG_username="<username>"` and
99+
# `SPLUNK_DISCOVERY_RECEIVERS_sqlserver_CONFIG_password="<password>"` environment variables.
100+
# - status: partial
101+
# regexp: "The user does not have permission"
102+
# message: >-
103+
# Specified user does not have proper permissions. User must have view `SERVER STATE` permissions.
104+
# This can be accomplished by: `GRANT VIEW SERVER STATE TO [username]`

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

-8
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,6 @@ exporters:
132132
#ingest_url: http://${SPLUNK_GATEWAY_URL}:9943
133133
sync_host_metadata: true
134134
correlation:
135-
# Logs for Splunk Cloud Platform and Log Observer Connect
136-
# See https://docs.splunk.com/Observability/gdi/opentelemetry/components/splunk-hec-exporter.html
137-
splunk_hec:
138-
token: "${SPLUNK_HEC_TOKEN}"
139-
endpoint: "${SPLUNK_HEC_URL}"
140-
source: "otel"
141-
sourcetype: "otel"
142-
profiling_data_enabled: false
143135
splunk_hec/profiling:
144136
token: "${SPLUNK_ACCESS_TOKEN}"
145137
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v1/log"

‎go.mod

+14-14
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/cenkalti/backoff/v4 v4.3.0
99
github.com/expr-lang/expr v1.16.9
1010
github.com/fsnotify/fsnotify v1.7.0
11-
github.com/go-zookeeper/zk v1.0.3
11+
github.com/go-zookeeper/zk v1.0.4
1212
github.com/gogo/protobuf v1.3.2
1313
github.com/hashicorp/vault v1.17.2
1414
github.com/hashicorp/vault-plugin-auth-gcp v0.18.0
@@ -179,12 +179,12 @@ require (
179179
github.com/apache/arrow/go/v15 v15.0.0 // indirect
180180
github.com/apache/pulsar-client-go v0.11.0 // indirect
181181
github.com/aws/aws-sdk-go-v2/config v1.27.16 // indirect
182-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
182+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect
183183
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
184184
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.10 // indirect
185-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect
186-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect
187-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect
185+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect
186+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 // indirect
187+
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect
188188
github.com/axiomhq/hyperloglog v0.0.0-20240124082744-24bca3a5b39b // indirect
189189
github.com/bits-and-blooms/bitset v1.4.0 // indirect
190190
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -383,19 +383,19 @@ require (
383383
github.com/armon/go-metrics v0.4.1 // indirect
384384
github.com/armon/go-radix v1.0.0 // indirect
385385
github.com/aws/aws-sdk-go v1.53.16 // indirect
386-
github.com/aws/aws-sdk-go-v2 v1.27.0 // indirect
386+
github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
387387
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
388-
github.com/aws/aws-sdk-go-v2/credentials v1.17.16 // indirect
388+
github.com/aws/aws-sdk-go-v2/credentials v1.17.24 // indirect
389389
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 // indirect
390-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
391-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.7 // indirect
390+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
391+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
392392
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
393-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
393+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
394394
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
395-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
395+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15 // indirect
396396
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
397397
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
398-
github.com/aws/smithy-go v1.20.2 // indirect
398+
github.com/aws/smithy-go v1.20.3 // indirect
399399
github.com/beevik/ntp v1.4.3 // indirect
400400
github.com/beorn7/perks v1.0.1 // indirect
401401
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
@@ -441,7 +441,7 @@ require (
441441
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
442442
github.com/golang/protobuf v1.5.4 // indirect
443443
github.com/golang/snappy v0.0.4
444-
github.com/google/cadvisor v0.49.1 // indirect
444+
github.com/google/cadvisor v0.50.0 // indirect
445445
github.com/google/flatbuffers v24.3.7+incompatible // indirect
446446
github.com/google/go-cmp v0.6.0 // indirect
447447
github.com/google/go-querystring v1.1.0 // indirect
@@ -578,7 +578,7 @@ require (
578578
github.com/tklauser/numcpus v0.7.0 // indirect
579579
github.com/ulule/deepcopier v0.0.0-20171107155558-ca99b135e50f // indirect
580580
github.com/vjeantet/grok v1.0.1 // indirect
581-
github.com/vmware/govmomi v0.38.0 // indirect
581+
github.com/vmware/govmomi v0.39.0 // indirect
582582
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
583583
github.com/xdg-go/scram v1.1.2 // indirect
584584
github.com/xdg-go/stringprep v1.0.4 // indirect

0 commit comments

Comments
 (0)