From 8d94da0be15a91d15d84f2ef11ee4f27bdd5f6ff Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 13 Aug 2024 13:14:46 -0700 Subject: [PATCH 01/13] Add nginx receiver --- CHANGELOG.md | 6 +- docker/docker-compose.yml | 1 + docs/components.md | 1 + go.mod | 2 + go.sum | 4 ++ internal/components/components.go | 2 + internal/components/components_test.go | 3 +- tests/receivers/nginx/nginx_test.go | 38 +++++++++++ .../nginx/testdata/all_expected_metrics.yaml | 65 +++++++++++++++++++ .../nginx/testdata/all_metrics_config.yaml | 19 ++++++ 10 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 tests/receivers/nginx/nginx_test.go create mode 100644 tests/receivers/nginx/testdata/all_expected_metrics.yaml create mode 100644 tests/receivers/nginx/testdata/all_metrics_config.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 590e0e795a..49d995fc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### πŸš€ New components πŸš€ + +- (Splunk) Add `ngnix` receiver ([TBD](https://github.com/signalfx/splunk-otel-collector/pull/TBD/)) + ## v0.106.1 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.106.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.106.1) and the [opentelemetry-collector-contrib v0.106.1](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.106.1) releases where appropriate. @@ -163,7 +167,7 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem - (Contrib) `statsdreceiver`: Allow configuring summary percentiles ([#33701](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33701)) - (Contrib) `pkg/stanza`: Switch to faster json parser lib for container operator ([#33929](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33929)) - (Contrib) `telemetrygen`: telemetrygen `--rate` flag changed from Int64 to Float64 ([#33984](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33984)) -- (Contrib) `windowsperfcountersreceiver`: `windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `
rocess(*)` counters with multiple running instances of the same executable. ([#32319](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32319)) +- (Contrib) `windowsperfcountersreceiver`: `windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `rocess(*)` counters with multiple running instances of the same executable. ([#32319](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32319)) **NOTES** - This change can expose cardinality issues where the counters were previously collapsed under the non-indexed instance name. - The change mimics Windows Performance Monitor behavior: The first instance name remains unchanged, additional instances are suffixed with `#` where `N=1` and is increased for each duplicate. diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9a863eebea..837a6ba7ea 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -231,6 +231,7 @@ services: nginx: image: quay.io/splunko11ytest/nginx:latest profiles: + - integration - smartagent build: ./nginx ports: diff --git a/docs/components.md b/docs/components.md index 8413975ad6..dd9b4a7d10 100644 --- a/docs/components.md +++ b/docs/components.md @@ -42,6 +42,7 @@ The distribution offers support for the following components. | [mongodbatlas](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbatlasreceiver) | [beta] | | [mongodb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbreceiver) | [beta] | | [mysql](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbreceiver) | [beta] | +| [ngnix](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/nginxreceiver) | [beta] | | [oracledb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/oracledbreceiver) | [alpha] | | [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) | [stable] | | [postgres](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/postgresqlreceiver) | [beta] | diff --git a/go.mod b/go.mod index 2670c229c0..e142607bf2 100644 --- a/go.mod +++ b/go.mod @@ -261,6 +261,7 @@ require ( github.com/moby/sys/user v0.1.0 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/mrunalp/fileutils v0.5.1 // indirect + github.com/nginxinc/nginx-prometheus-exporter v0.11.0 // indirect github.com/okta/okta-sdk-golang/v2 v2.20.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.106.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.106.1 // indirect @@ -278,6 +279,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.106.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.106.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.106.1 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.106.1 // indirect github.com/opencontainers/runc v1.2.0-rc.1 // indirect github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/opencontainers/selinux v1.11.0 // indirect diff --git a/go.sum b/go.sum index 5c4fc024b5..01e49813a3 100644 --- a/go.sum +++ b/go.sum @@ -1182,6 +1182,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/nginxinc/nginx-prometheus-exporter v0.11.0 h1:21xjnqNgxtni2jDgAQ90bl15uDnrTreO9sIlu1YsX/U= +github.com/nginxinc/nginx-prometheus-exporter v0.11.0/go.mod h1:GdyHnWAb8q8OW1Pssrrqbcqra0SH0Vn6UXICMmyWkw8= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1429,6 +1431,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.106.1/go.mod h1:OOaMOGpPFOnfGm4T/dW/ovvcrbkNHyEsjWjS44fChH4= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.106.1 h1:zqkcs3ko0hqPGrLO1Qte5nSf3z9bNT4DU4ApSKK/5bU= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.106.1/go.mod h1:d4da2UDkkftgatdjZh8i0rfa/w8xMRsKBXdbIGxTpeU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.106.1 h1:bRtaCkYR2eSzayN7bh3/yJBj9AwSCQjjpxROD7AEyh8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.106.1/go.mod h1:PlvHq5BrNLcDohH8k4R1lLOqDCKyAnN2sdQzIgcUiyI= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.106.1 h1:6U49QlZ5xymqFjUKEH3ouSx8pYoYkltQJor+Fu3vkHI= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.106.1/go.mod h1:zsZGxv+x2pz4gvVyZCMAdvGzT7nj1OAqkFKffWFVSRk= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.106.1 h1:4W40vu8teIVPT7nGOMl39Lo/TTyb+X7Jqe+Q5Z0nfCU= diff --git a/internal/components/components.go b/internal/components/components.go index a5b8f380eb..b62638ae15 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -81,6 +81,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" @@ -186,6 +187,7 @@ func Get() (otelcol.Factories, error) { mongodbatlasreceiver.NewFactory(), mongodbreceiver.NewFactory(), mysqlreceiver.NewFactory(), + nginxreceiver.NewFactory(), oracledbreceiver.NewFactory(), otlpreceiver.NewFactory(), postgresqlreceiver.NewFactory(), diff --git a/internal/components/components_test.go b/internal/components/components_test.go index 83fa7b0c62..4c0257a02b 100644 --- a/internal/components/components_test.go +++ b/internal/components/components_test.go @@ -68,10 +68,11 @@ func TestDefaultComponents(t *testing.T) { "kafka", "kafkametrics", "kubeletstats", + "lightprometheus", "mongodbatlas", "mongodb", "mysql", - "lightprometheus", + "nginx", "oracledb", "otlp", "postgresql", diff --git a/tests/receivers/nginx/nginx_test.go b/tests/receivers/nginx/nginx_test.go new file mode 100644 index 0000000000..ae4214a0d6 --- /dev/null +++ b/tests/receivers/nginx/nginx_test.go @@ -0,0 +1,38 @@ +// Copyright Splunk, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build integration + +package tests + +import ( + "testing" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" + + "github.com/signalfx/splunk-otel-collector/tests/testutils" +) + +func TestNginxIntegration(t *testing.T) { + testutils.CheckGoldenFile(t, "all_metrics_config.yaml", "all_expected_metrics.yaml", + pmetrictest.IgnoreScopeVersion(), + pmetrictest.IgnoreMetricDataPointsOrder(), + pmetrictest.IgnoreResourceMetricsOrder(), + pmetrictest.IgnoreScopeMetricsOrder(), + pmetrictest.IgnoreMetricsOrder(), + pmetrictest.IgnoreMetricValues(), + pmetrictest.IgnoreTimestamp(), + pmetrictest.IgnoreStartTimestamp(), + ) +} \ No newline at end of file diff --git a/tests/receivers/nginx/testdata/all_expected_metrics.yaml b/tests/receivers/nginx/testdata/all_expected_metrics.yaml new file mode 100644 index 0000000000..8b75f8cc37 --- /dev/null +++ b/tests/receivers/nginx/testdata/all_expected_metrics.yaml @@ -0,0 +1,65 @@ +resourceMetrics: + - resource: {} + scopeMetrics: + - metrics: + - description: The total number of accepted client connections + name: nginx.connections_accepted + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + timeUnixNano: "1643729289485220000" + isMonotonic: true + unit: connections + - description: The current number of nginx connections by state + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + attributes: + - key: state + value: + stringValue: active + timeUnixNano: "1643729289485220000" + - asInt: "0" + attributes: + - key: state + value: + stringValue: reading + timeUnixNano: "1643729289485220000" + - asInt: "1" + attributes: + - key: state + value: + stringValue: writing + timeUnixNano: "1643729289485220000" + - asInt: "0" + attributes: + - key: state + value: + stringValue: waiting + timeUnixNano: "1643729289485220000" + isMonotonic: false + name: nginx.connections_current + unit: connections + - description: The total number of handled connections. Generally, the parameter value is the same as nginx.connections_accepted unless some resource limits have been reached (for example, the worker_connections limit). + name: nginx.connections_handled + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + timeUnixNano: "1643729289485220000" + isMonotonic: true + unit: connections + - description: Total number of requests made to the server since it started + name: nginx.requests + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + timeUnixNano: "1643729289485220000" + isMonotonic: true + unit: requests + scope: + name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver + version: latest diff --git a/tests/receivers/nginx/testdata/all_metrics_config.yaml b/tests/receivers/nginx/testdata/all_metrics_config.yaml new file mode 100644 index 0000000000..d1887cfc78 --- /dev/null +++ b/tests/receivers/nginx/testdata/all_metrics_config.yaml @@ -0,0 +1,19 @@ +receivers: + nginx: + endpoint: "http://localhost:8123/status" + +exporters: + otlp: + endpoint: "${OTLP_ENDPOINT}" + tls: + insecure: true +service: + telemetry: + logs: + level: "info" + pipelines: + metrics: + receivers: + - nginx + exporters: + - otlp From 57a2351f32178d84dca9862cbe5da0e167b5826d Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 13 Aug 2024 13:41:42 -0700 Subject: [PATCH 02/13] Update CHANGELOG.md Co-authored-by: Curtis Robert --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d995fc31..441cb32dda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -167,7 +167,7 @@ This Splunk OpenTelemetry Collector release includes changes from the [opentelem - (Contrib) `statsdreceiver`: Allow configuring summary percentiles ([#33701](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33701)) - (Contrib) `pkg/stanza`: Switch to faster json parser lib for container operator ([#33929](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33929)) - (Contrib) `telemetrygen`: telemetrygen `--rate` flag changed from Int64 to Float64 ([#33984](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33984)) -- (Contrib) `windowsperfcountersreceiver`: `windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `rocess(*)` counters with multiple running instances of the same executable. ([#32319](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32319)) +- (Contrib) `windowsperfcountersreceiver`: `windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `process(*)` counters with multiple running instances of the same executable. ([#32319](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32319)) **NOTES** - This change can expose cardinality issues where the counters were previously collapsed under the non-indexed instance name. - The change mimics Windows Performance Monitor behavior: The first instance name remains unchanged, additional instances are suffixed with `#` where `N=1` and is increased for each duplicate. From 69b4dd5fc87872b9f077eaecf34fb7bc49ff3229 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 13 Aug 2024 13:42:03 -0700 Subject: [PATCH 03/13] Update CHANGELOG.md Co-authored-by: Curtis Robert --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 441cb32dda..29c555ec08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### πŸš€ New components πŸš€ -- (Splunk) Add `ngnix` receiver ([TBD](https://github.com/signalfx/splunk-otel-collector/pull/TBD/)) +- (Splunk) Add `ngnix` receiver ([5229](https://github.com/signalfx/splunk-otel-collector/pull/5229)) ## v0.106.1 From cb5feaa750a5e8c0524fc2f3de6f47f4a38a6464 Mon Sep 17 00:00:00 2001 From: pjanotti Date: Tue, 13 Aug 2024 14:13:54 -0700 Subject: [PATCH 04/13] make fmt --- tests/receivers/nginx/nginx_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/receivers/nginx/nginx_test.go b/tests/receivers/nginx/nginx_test.go index ae4214a0d6..eb065fc1c0 100644 --- a/tests/receivers/nginx/nginx_test.go +++ b/tests/receivers/nginx/nginx_test.go @@ -35,4 +35,4 @@ func TestNginxIntegration(t *testing.T) { pmetrictest.IgnoreTimestamp(), pmetrictest.IgnoreStartTimestamp(), ) -} \ No newline at end of file +} From 47bedee1342183d92be214e78cc925af11e61cee Mon Sep 17 00:00:00 2001 From: pjanotti Date: Tue, 13 Aug 2024 15:07:04 -0700 Subject: [PATCH 05/13] make tidy --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b9ad5c6d98..a586324ca0 100644 --- a/go.mod +++ b/go.mod @@ -84,6 +84,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.106.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.106.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.106.1 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.106.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.106.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.106.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.106.1 @@ -279,7 +280,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.106.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.106.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.106.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.106.1 // indirect github.com/opencontainers/runc v1.2.0-rc.1 // indirect github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/opencontainers/selinux v1.11.0 // indirect From 680c91a07d7fd35c0b4a7d26f723dc0360eee6fb Mon Sep 17 00:00:00 2001 From: pjanotti Date: Tue, 13 Aug 2024 15:51:40 -0700 Subject: [PATCH 06/13] Set a small collection_interval --- tests/receivers/nginx/testdata/all_metrics_config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/receivers/nginx/testdata/all_metrics_config.yaml b/tests/receivers/nginx/testdata/all_metrics_config.yaml index d1887cfc78..d342341b28 100644 --- a/tests/receivers/nginx/testdata/all_metrics_config.yaml +++ b/tests/receivers/nginx/testdata/all_metrics_config.yaml @@ -1,6 +1,7 @@ receivers: nginx: endpoint: "http://localhost:8123/status" + collection_interval: 1s exporters: otlp: From cafab6669f3b7a628bbcdddeaa4b51af043d795e Mon Sep 17 00:00:00 2001 From: pjanotti Date: Wed, 14 Aug 2024 13:14:12 -0700 Subject: [PATCH 07/13] Add credentials to test configuration --- tests/receivers/nginx/testdata/all_metrics_config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/receivers/nginx/testdata/all_metrics_config.yaml b/tests/receivers/nginx/testdata/all_metrics_config.yaml index d342341b28..61ee0ddcf1 100644 --- a/tests/receivers/nginx/testdata/all_metrics_config.yaml +++ b/tests/receivers/nginx/testdata/all_metrics_config.yaml @@ -1,6 +1,8 @@ receivers: nginx: endpoint: "http://localhost:8123/status" + username: some_user + password: some_password collection_interval: 1s exporters: From 22aea484780d217d595cc6c999ac7505a1d93fe0 Mon Sep 17 00:00:00 2001 From: pjanotti Date: Wed, 14 Aug 2024 14:57:22 -0700 Subject: [PATCH 08/13] Correct auth info --- .../receivers/nginx/testdata/all_metrics_config.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/receivers/nginx/testdata/all_metrics_config.yaml b/tests/receivers/nginx/testdata/all_metrics_config.yaml index 61ee0ddcf1..992f20bc7f 100644 --- a/tests/receivers/nginx/testdata/all_metrics_config.yaml +++ b/tests/receivers/nginx/testdata/all_metrics_config.yaml @@ -1,8 +1,8 @@ receivers: nginx: endpoint: "http://localhost:8123/status" - username: some_user - password: some_password + auth: + authenticator: basicauth collection_interval: 1s exporters: @@ -10,10 +10,18 @@ exporters: endpoint: "${OTLP_ENDPOINT}" tls: insecure: true + +extensions: + basicauth: + client_auth: + username: some_user + password: some_password + service: telemetry: logs: level: "info" + extensions: [ basicauth ] pipelines: metrics: receivers: From 29defd37ca295cad8a0f5a7f50ed3235be223aee Mon Sep 17 00:00:00 2001 From: pjanotti Date: Wed, 14 Aug 2024 15:47:29 -0700 Subject: [PATCH 09/13] Fix endpoint --- tests/receivers/nginx/testdata/all_metrics_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/receivers/nginx/testdata/all_metrics_config.yaml b/tests/receivers/nginx/testdata/all_metrics_config.yaml index 992f20bc7f..6ddc626104 100644 --- a/tests/receivers/nginx/testdata/all_metrics_config.yaml +++ b/tests/receivers/nginx/testdata/all_metrics_config.yaml @@ -1,6 +1,6 @@ receivers: nginx: - endpoint: "http://localhost:8123/status" + endpoint: "http://localhost:8123/nginx_status" auth: authenticator: basicauth collection_interval: 1s From ab77e4a1d50b674c33fe2aa224dc821d851fea2f Mon Sep 17 00:00:00 2001 From: pjanotti Date: Thu, 15 Aug 2024 11:57:08 -0700 Subject: [PATCH 10/13] make tidy --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index 736cc74a50..2a76675d5c 100644 --- a/go.sum +++ b/go.sum @@ -1443,6 +1443,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.107.0/go.mod h1:6Blm+q8DLry8ALixxN7ptDRIisrv1j5JotHpSFq7xhA= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.107.0 h1:///+XRpCXUp3InMSveu2+8h4CyIqG8p4lNlh/3B+zz8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.107.0/go.mod h1:jEcVOxr/i+s+9plCBcNYFoAMUjf1ZXKusaU3CkOjlkE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.107.0 h1:nsU2/UfiuV+EGUF/esSE2v1zr1QS/oRFg0DiAX8G3Q4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.107.0/go.mod h1:ZtK8siY3njToPOlqxOFM+CM1FEnHEgcgnHm3IMXIk0Y= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.107.0 h1:iqDqbpEoKB/TW+zHSAXWvaLtNiKVtNIb8Gw25ygB1xc= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.107.0/go.mod h1:azUHOUAEkVvpCvjxUH9z04YWMOXrb2wCYiI2SdXpx6Y= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.107.0 h1:TFQVk3mkYtXRfC3ygy1tStrDzqoqVxxMl5yaNXs2Qrc= From 31e49298bb5d349275ae5cfab5819b7529d9cfbd Mon Sep 17 00:00:00 2001 From: pjanotti Date: Wed, 21 Aug 2024 23:04:49 -0700 Subject: [PATCH 11/13] make tidy --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index 074f7495c8..d044220c06 100644 --- a/go.sum +++ b/go.sum @@ -1443,6 +1443,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiv github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c/go.mod h1:Yx8k1rSi53RM2NfbJPx7UADYGCmoqtE4ZhHdQBAjAqo= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c h1:erH9w5uHOIio3JfqyoTt5AHHjHLVhO+TZck1yCvyv9w= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c/go.mod h1:PDLr2+sk87REjOrg+Z9KCOZYysZrLeDSdTIiiY3Gr1s= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c h1:YZWPsCDwy8GfMsmM/0NPqESDT7zlQmRlPVoVxKPHtuo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c/go.mod h1:Tr38V0YBdQP3wgjt6w9sxCaP9D1t6wp1nDOqrn55oLg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c h1:bUh5o3o4AXsSXcOANwag1hTGZxt7Z0Q7AFkMMrm3/Ic= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c/go.mod h1:OtZ44vYVyVc8eX+SPPngMJUEFHJE7jiXYaZNp2bBgBE= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.107.1-0.20240816183440-44ef4d6c5a2c h1:HW3rRqUIDsnpIVVa9nWHpYkiJVspVgkoAUDLSSCV+PM= From 2d0ca4323b608b9a81e712ef4dd6b50227e45a79 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Thu, 22 Aug 2024 11:19:35 -0700 Subject: [PATCH 12/13] Correct CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 175a7b4eac..f07fab6398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### πŸš€ New components πŸš€ + +- (Splunk) Add `nginx` receiver ([5229](https://github.com/signalfx/splunk-otel-collector/pull/5229)) + ## v0.107.0 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.107.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.107.0) and the [opentelemetry-collector-contrib v0.107.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.107.0) releases where appropriate. @@ -103,7 +107,6 @@ This release fixes CVE-2024-42368 on the `bearerauthtokenextension` ([#34516](ht ### πŸš€ New components πŸš€ -- (Splunk) Add `nginx` receiver ([5229](https://github.com/signalfx/splunk-otel-collector/pull/5229)) - (Splunk) Add Azure Blob receiver ([#5200](https://github.com/signalfx/splunk-otel-collector/pull/5200)) - (Splunk) Add Google Cloud PubSub receiver ([#5200](https://github.com/signalfx/splunk-otel-collector/pull/5200)) From 91a636cc31b2a088200fcd29d9dff00cf3afd444 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Thu, 22 Aug 2024 11:42:42 -0700 Subject: [PATCH 13/13] Fix typo --- docs/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.md b/docs/components.md index 7c46e84200..37d2b796ba 100644 --- a/docs/components.md +++ b/docs/components.md @@ -44,7 +44,7 @@ The distribution offers support for the following components. | [mongodbatlas](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbatlasreceiver) | [beta] | | [mongodb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbreceiver) | [beta] | | [mysql](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mongodbreceiver) | [beta] | -| [ngnix](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/nginxreceiver) | [beta] | +| [nginx](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/nginxreceiver) | [beta] | | [oracledb](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/oracledbreceiver) | [alpha] | | [otlp](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver) | [stable] | | [postgres](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/postgresqlreceiver) | [beta] |