Merge branch 'main' into deprecate_collectd_mysql

CHANGELOG.md

@@ -19,7 +19,12 @@
 - (Splunk) Deprecate statsd monitor. Use the [statsd receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/statsdreceiver) instead. ([#5513](https://github.com/signalfx/splunk-otel-collector/pull/5513))
 - (Splunk) Deprecate the collectd/consul monitor. Please use the statsd or prometheus receiver instead. See https://developer.hashicorp.com/consul/docs/agent/monitor/telemetry for more information. ([#5521](https://github.com/signalfx/splunk-otel-collector/pull/5521))
 - (Splunk) Deprecate collectd/mysql monitor. Use the [mysql receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/mysqlreceiver) instead. ([#5538](https://github.com/signalfx/splunk-otel-collector/pull/5538))
+- (Splunk) Deprecate the collectd/nginx monitor. Please use the [nginx receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/receiver/nginxreceiver/) instead. ([#5537](https://github.com/signalfx/splunk-otel-collector/pull/5537))
+- (Splunk) Deprecate the collectd/chrony monitor. Please use the [chronyreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/chronyreceiver) instead. ([#5536](https://github.com/signalfx/splunk-otel-collector/pull/5536))
 
+### 🚀 New components 🚀
+
+- (Splunk) Add [chrony receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/chronyreceiver) ([#5535](https://github.com/signalfx/splunk-otel-collector/pull/5535))
 
 ## v0.111.0
 

docs/components.md

@@ -22,6 +22,7 @@ The distribution offers support for the following components.
 | [azureeventhub](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/azureeventhubreceiver)                                        | [alpha]          |
 | [azuremonitor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/azuremonitorreceiver)                                          | [in development] |
 | [carbon](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/carbonreceiver)                                                      | [alpha]          |
+| [chrony](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/chronyreceiver)                                                      | [beta]           |
 | [cloudfoundry](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/cloudfoundryreceiver)                                          | [beta]           |
 | [collectd](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/collectdreceiver)                                                  | [beta]           |
 | [discovery](../internal/receiver/discoveryreceiver)                                                                                                                | [in development] |

go.mod

@@ -67,6 +67,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.111.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver v0.111.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.111.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.111.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.111.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.111.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.111.0
@@ -231,6 +232,7 @@ require (
 	github.com/envoyproxy/go-control-plane v0.13.0 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
+	github.com/facebook/time v0.0.0-20240510113249-fa89cc575891 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
 	github.com/go-resty/resty/v2 v2.13.1 // indirect

go.sum

@@ -475,6 +475,8 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
 github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
 github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
+github.com/facebook/time v0.0.0-20240510113249-fa89cc575891 h1:x6T9k2Jw0IPzSdM2i4tVWmnJ3KJ1fEKwWJ++IzDvPDU=
+github.com/facebook/time v0.0.0-20240510113249-fa89cc575891/go.mod h1:2UFAomOuD2vAK1x68czUtCVjAqmyWCEnAXOlmGqf+G0=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
 github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 h1:fP04zlkPjAGpsduG7xN3rRkxjAqkJaIQnnkNYYw/pAk=
@@ -1416,6 +1418,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorr
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver v0.111.0/go.mod h1:KWyCZTBTbgwRbqS1bPyClYvEi1eBZ35qjN9MLymGgIQ=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.111.0 h1:oEj98u1JVEcrzNxBR6G+hNGRO7GIVRdIMFz22UN49n4=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.111.0/go.mod h1:HGvlEjJCzCtpSvZ3ftPa/PSNxO1VzK+WFXrRnQwCw04=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.111.0 h1:oe4sRhoxBn7WE8L+KBaZp3+ti1Erl0+rkR+/+5UR+TA=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver v0.111.0/go.mod h1:cummsjZaobQ7sMzIVY9nYU0QDmqJwMMzL/KzTQhvpQY=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.111.0 h1:tn5NMoRyVMU1HNRhScgMKdEiOqxmJ6MgRY1YbHFUluA=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver v0.111.0/go.mod h1:riUWcSErtrVdWuN7f5SZZRIwJo7Ldcp9fa46TSp3R9U=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.111.0 h1:omclLJbVMB2KdqsGpPJp2HjZ2qWgX8iGhvzDDoNHIMg=

internal/components/components.go

@@ -64,6 +64,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"
@@ -171,6 +172,7 @@ func Get() (otelcol.Factories, error) {
 		azureeventhubreceiver.NewFactory(),
 		azuremonitorreceiver.NewFactory(),
 		carbonreceiver.NewFactory(),
+		chronyreceiver.NewFactory(),
 		cloudfoundryreceiver.NewFactory(),
 		collectdreceiver.NewFactory(),
 		discoveryreceiver.NewFactory(),

internal/components/components_test.go

@@ -52,6 +52,7 @@ func TestDefaultComponents(t *testing.T) {
 		"azureeventhub",
 		"azuremonitor",
 		"carbon",
+		"chrony",
 		"cloudfoundry",
 		"collectd",
 		"discovery",

internal/signalfx-agent/pkg/monitors/collectd/chrony/chrony.go

@@ -42,5 +42,5 @@ type Monitor struct {
 
 // Configure configures and runs the plugin in collectd
 func (m *Monitor) Configure(conf *Config) error {
-	return m.SetConfigurationAndRun(conf)
+	return m.SetConfigurationAndRun(conf, collectd.WithDeprecationWarningLog("chronyreceiver"))
 }

internal/signalfx-agent/pkg/monitors/collectd/chrony/metadata.yaml

@@ -1,6 +1,7 @@
 monitors:
 - dimensions:
   doc: |
+    **The collectd/chrony monitor is deprecated. Use the chronyreceiver instead.**
     Collectd NTP data from a chronyd instance
 
     See https://collectd.org/documentation/manpages/collectd.conf.5.shtml#plugin_chrony

internal/signalfx-agent/pkg/monitors/collectd/nginx/metadata.yaml

@@ -1,6 +1,7 @@
 monitors:
 - dimensions:
   doc: |
+    **The collectd/nginx monitor is deprecated. Please use nginx receiver instead.**
     Monitors an NGINX instance using our fork of the
     collectd nginx plugin based on the [collectd nginx
     plugin](https://collectd.org/wiki/index.php/Plugin:nginx).

internal/signalfx-agent/pkg/monitors/collectd/nginx/nginx.go

@@ -40,5 +40,5 @@ type Monitor struct {
 
 // Configure configures and runs the plugin in collectd
 func (m *Monitor) Configure(conf *Config) error {
-	return m.SetConfigurationAndRun(conf)
+	return m.SetConfigurationAndRun(conf, collectd.WithDeprecationWarningLog("nginxreceiver"))
 }