[collectd/redis] remove plugin

Author: atoulme

.chloggen/remove_redis.yaml

@@ -0,0 +1,17 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. crosslink)
+component: collectd/redis
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: This plugin is removed at the end of its deprecation period.
+
+# One or more tracking issues related to the change
+issues: [7079]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  The collectd/redis smart agent monitor is removed. Please follow [this documentation](https://help.splunk.com/en/splunk-observability-cloud/manage-data/available-data-sources/supported-integrations-in-splunk-observability-cloud/opentelemetry-receivers/redis-receiver) to set up the Redis receiver.

internal/confmapprovider/discovery/config_test.go

@@ -262,14 +262,13 @@ var expectedConfig = Config{
 				},
 			},
 		},
-		component.MustNewIDWithName("smartagent", "collectd/redis"): {
+		component.MustNewID("redis"): {
 			Rule: map[component.ID]string{
 				component.MustNewID("docker_observer"): `type == "container" and port == 6379`,
 			},
 
 			Config: map[component.ID]map[string]any{
 				defaultType: {
-					"type": "collectd/redis",
 					"auth": "password",
 				},
 				component.MustNewID("docker_observer"): {
@@ -282,7 +281,7 @@ var expectedConfig = Config{
 						"successful": []any{
 							map[any]any{
 								"regexp":  ".*",
-								"message": "smartagent/collectd-redis receiver successful metric status",
+								"message": "redis receiver successful metric status",
 							},
 						},
 					},
@@ -301,8 +300,8 @@ var expectedConfig = Config{
 							map[any]any{
 								"regexp": "^redis_info plugin: Error .* - RedisError\\('-(WRONGPASS|NOAUTH|ERR AUTH).*$",
 								"message": "Please ensure that your redis password is correctly specified in " +
-									"`splunk.discovery.receivers.smartagent/collectd/redis.config.auth` or via the " +
-									"`SPLUNK_DISCOVERY_RECEIVERS_SMARTAGENT_COLLECTD_REDIS_CONFIG_AUTH` environment variable.",
+									"`splunk.discovery.receivers.redis/redis.config.auth` or via the " +
+									"`SPLUNK_DISCOVERY_RECEIVERS_REDIS_CONFIG_AUTH` environment variable.",
 							},
 						},
 					},

…smartagent-collectd-redis.discovery.yaml …/config.d/receivers/redis.discovery.yamlinternal/confmapprovider/discovery/testdata/config.d/receivers/smartagent-collectd-redis.discovery.yaml renamed to internal/confmapprovider/discovery/testdata/config.d/receivers/redis.discovery.yaml internal/confmapprovider/discovery/testdata/config.d/receivers/smartagent-collectd-redis.discovery.yaml renamed to internal/confmapprovider/discovery/testdata/config.d/receivers/redis.discovery.yaml

@@ -1,17 +1,16 @@
-smartagent/collectd/redis:
+redis:
   rule:
     docker_observer: type == "container" and port == 6379
   config:
     default:
-      type: collectd/redis
       auth: password
     docker_observer:
       auth: '`labels["auth"]`'
   status:
     metrics:
       successful:
         - regexp: '.*'
-          message: smartagent/collectd-redis receiver successful metric status
+          message: redis receiver successful metric status
     statements:
       failed:
         - regexp: 'raise ValueError\(\"Unknown Redis response'
@@ -21,5 +20,5 @@ smartagent/collectd/redis:
       partial:
         - regexp: "^redis_info plugin: Error .* - RedisError\\('-(WRONGPASS|NOAUTH|ERR AUTH).*$"
           message: >-
-              Please ensure that your redis password is correctly specified in `splunk.discovery.receivers.smartagent/collectd/redis.config.auth`
-              or via the `SPLUNK_DISCOVERY_RECEIVERS_SMARTAGENT_COLLECTD_REDIS_CONFIG_AUTH` environment variable.
+              Please ensure that your redis password is correctly specified in `splunk.discovery.receivers.redis/redis.config.auth`
+              or via the `SPLUNK_DISCOVERY_RECEIVERS_REDIS_CONFIG_AUTH` environment variable.

internal/receiver/discoveryreceiver/config_test.go

@@ -43,12 +43,11 @@ func TestValidConfig(t *testing.T) {
 
 	require.Equal(t, &Config{
 		Receivers: map[component.ID]ReceiverEntry{
-			component.MustNewIDWithName("smartagent", "redis"): {
+			component.MustNewIDWithName("redis", ""): {
 				Config: map[string]any{
 					"auth": "password",
 					"host": "`host`",
 					"port": "`port`",
-					"type": "collectd/redis",
 				},
 				ResourceAttributes: map[string]string{
 					"receiver_attribute": "receiver_attribute_value",
@@ -119,17 +118,16 @@ func TestReceiverCreatorFactoryAndConfig(t *testing.T) {
 
 	receiverTemplate := dCfg.receiverCreatorReceiversConfig()
 	expectedTemplate := map[string]any{
-		"smartagent/redis": map[string]any{
+		"redis": map[string]any{
 			"config": map[string]any{
 				"auth": "password",
 				"host": "`host`",
 				"port": "`port`",
-				"type": "collectd/redis",
 			},
 			"resource_attributes": map[string]string{
 				"discovery.endpoint.id":   "`id`",
-				"discovery.receiver.name": "redis",
-				"discovery.receiver.type": "smartagent",
+				"discovery.receiver.name": "",
+				"discovery.receiver.type": "redis",
 				"receiver_attribute":      "receiver_attribute_value",
 			},
 			"rule": `type == "container" && name matches "(?i)redis"`,

internal/receiver/discoveryreceiver/testdata/config.yaml

@@ -5,10 +5,9 @@ discovery:
   embed_receiver_config: true
   correlation_ttl: 25s
   receivers:
-    smartagent/redis:
+    redis:
       rule: type == "container" && name matches "(?i)redis"
       config:
-        type: collectd/redis
         auth: password
         host: '`host`'
         port: '`port`'

internal/signalfx-agent/pkg/core/modules.go

@@ -15,7 +15,6 @@ import (
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/php"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/python"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/rabbitmq"
-	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/redis"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/systemd"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/zookeeper"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/conviva"

internal/signalfx-agent/pkg/core/modules_linux.go

@@ -20,7 +20,6 @@ import (
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/protocols"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/python"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/rabbitmq"
-	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/redis"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/statsd"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/uptime"
 	_ "github.com/signalfx/signalfx-agent/pkg/monitors/process"