[discovery/receiver] Remove severity_text

Remove severity_text field from statements config and emitted logs. This is needed for moving from discovery logs to entity events. The value from the severity_text field is just added as severity text to emitted log message which is not being used by the discovery config provider. Even if the evaluated log record has it's own log level, it will be overridden by the severity_text value set in the statement. And all the discovery statements have "info" values set in the severity_text field. Later, we might want to add a `level` field in the statement that would be used to filter logs by a specific level, but it's not how the severity_text used right now.
signalfx · Apr 1, 2024 · 2904a06 · 2904a06
1 parent f03b5af
commit 2904a06
Show file tree

Hide file tree

Showing 42 changed files with 134 additions and 417 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### 🛑 Breaking changes 🛑
+
+- (Splunk) `receiver/discovery`: Remove `severity_text` field from log evaluation statements. ([#4583](https://github.com/signalfx/splunk-otel-collector/pull/4583))
+
 ## v0.97.0
 
 ### 🚀 New components 🚀

diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/mysql.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/mysql.discovery.yaml
@@ -22,21 +22,18 @@
 #         - strict: mysql.locks
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: Mysql receiver is working!
 #     statements:
 #       failed:
 #         - regexp: "Can't connect to MySQL server on .* [(]111[)]"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body:  The container cannot be reached by the Collector. The container is refusing MySQL connections.
 #       partial:
 #         - regexp: 'Access denied for user'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the

diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/oracledb.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/oracledb.discovery.yaml
@@ -23,39 +23,33 @@
 #         - strict: oracledb.cpu_time
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: oracledb receiver is working!
 #     statements:
 #       failed:
 #         - regexp: "connection refused"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is not serving http connections.
 #         - regexp: "received goaway and there are no active streams"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: Unable to connect and scrape metrics.
 #         - regexp: "dial tcp: lookup"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: Unable to resolve oracledb tcp endpoint
 #         - regexp: 'error executing select .*: EOF'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: Unable to execute select from oracledb. Verify endpoint and user permissions. 
 #       partial:
 #         - regexp: "listener does not currently know of service requested"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your oracledb service is correctly specified using the
@@ -64,7 +58,6 @@
 #         - regexp: 'invalid username/password'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the

diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/postgresql.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/postgresql.discovery.yaml
@@ -22,27 +22,23 @@
 #         - strict: postgresql.commits
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: PostgreSQL receiver is working!
 #     statements:
 #       failed:
 #         - regexp: 'connect: network is unreachable'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container cannot be reached by the Collector. Make sure they're in the same network.
 #         - regexp: 'connect: connection refused'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is refusing PostgreSQL connections.
 #       partial:
 #         - regexp: 'pq: password authentication failed for user'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Please ensure your user credentials are correctly specified with
@@ -53,7 +49,6 @@
 #         - regexp: 'pq: database .* does not exist'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure the target database is correctly specified using the
@@ -62,7 +57,6 @@
 #         - regexp: 'pq: SSL is not enabled on the server'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure the target database has SSL enabled or set insecure using the
@@ -71,7 +65,6 @@
 #         - regexp: 'pq: pg_stat_statements must be loaded via shared_preload_libraries'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your PostgreSQL database has

diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/redis.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/redis.discovery.yaml
@@ -20,33 +20,28 @@
 #         - strict: redis.uptime
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: redis receiver is working!
 #     statements:
 #       failed:
 #         - regexp: "connection refused"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is not serving http connections.
 #         - regexp: "received goaway and there are no active streams"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: Unable to connect and scrape metrics.
 #         - regexp: "dial tcp: lookup"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: Unable to resolve redis tcp endpoint
 #       partial: 
 #         - regexp: 'NOAUTH Authentication required.'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the
@@ -57,7 +52,6 @@
 #         - regexp: 'called without any password configured for the default user'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the
@@ -66,7 +60,6 @@
 #         - regexp: 'WRONGPASS invalid username-password pair or user is disabled'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the

diff --git a/...telcol/config/collector/config.d.linux/receivers/smartagent-collectd-mysql.discovery.yaml b/...telcol/config/collector/config.d.linux/receivers/smartagent-collectd-mysql.discovery.yaml
@@ -26,21 +26,18 @@
 #         - strict: mysql_octets.rx
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: smartagent/collectd/mysql receiver is working!
 #     statements:
 #       failed:
 #         - regexp: "mysql plugin: Failed to connect to database .* at server .* Can't connect to MySQL server on .* [(]111[)]"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is refusing MySQL connections.
 #       partial:
 #         - regexp: 'mysql plugin: Failed to connect to database .* at server .* Access denied for user .* [(]using password: .*[)]'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your user credentials are correctly specified using the
@@ -51,7 +48,6 @@
 #         - regexp: 'mysql plugin: Failed to connect to database .* at server .* Unknown database'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your MySQL databases are correctly specified using the
@@ -60,7 +56,6 @@
 #         - regexp: 'mysql plugin: Failed to connect to database .* at server .* Access denied for user .* to database'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your MySQL databases and auth information are correctly specified using the

diff --git a/...telcol/config/collector/config.d.linux/receivers/smartagent-collectd-nginx.discovery.yaml b/...telcol/config/collector/config.d.linux/receivers/smartagent-collectd-nginx.discovery.yaml
@@ -24,19 +24,16 @@
 #         - strict: connections.accepted
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: smartagent/collectd/nginx receiver is working!
 #     statements:
 #       failed:
 #         - regexp: "nginx plugin: curl_easy_perform failed: Operation timed out after"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is not serving http connections.
 #         - regexp: "read-function of plugin .* failed"
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The integration is unable to read metrics from this endpoint.
diff --git a/cmd/otelcol/config/collector/config.d.linux/receivers/smartagent-postgresql.discovery.yaml b/cmd/otelcol/config/collector/config.d.linux/receivers/smartagent-postgresql.discovery.yaml
@@ -26,13 +26,11 @@
 #         - strict: postgres_query_count
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: PostgreSQL receiver is working!
 #       partial:
 #         - strict: postgres_rows_inserted
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             body: >-
 #               Make sure that
 #               `CREATE EXTENSION IF NOT EXISTS pg_stat_statements;`
@@ -44,20 +42,17 @@
 #         - regexp: 'connect: network is unreachable'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container cannot be reached by the Collector. Make sure they're in the same network.
 #         - regexp: 'connect: connection refused'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: The container is refusing PostgreSQL connections.
 #       partial:
 #         - regexp: 'pq: password authentication failed for user'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Please ensure your user credentials are correctly specified with
@@ -68,7 +63,6 @@
 #         - regexp: 'pq: database .* does not exist'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure the target database is correctly specified using the
@@ -77,7 +71,6 @@
 #         - regexp: 'pq: pg_stat_statements must be loaded via shared_preload_libraries'
 #           first_only: true
 #           log_record:
-#             severity_text: info
 #             append_pattern: true
 #             body: >-
 #               Make sure your PostgreSQL database has

diff --git a/internal/confmapprovider/discovery/bundle/README.md b/internal/confmapprovider/discovery/bundle/README.md
@@ -31,7 +31,6 @@ Example `redis.discovery.yaml.tmpl`:
         - regexp: 'ERR AUTH.*'
           first_only: true
           log_record:
-            severity_text: info
             body: >-
               Please ensure your redis password is correctly specified with
               `--set {{ configProperty "password" "<password>" }}` or
@@ -57,7 +56,6 @@ redis:
         - regexp: 'ERR AUTH.*'
           first_only: true
           log_record:
-            severity_text: info
             body: >-
               Please ensure your redis password is correctly specified with
               `--set splunk.discovery.receivers.redis.config.password="<password>"` or

diff --git a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/mysql.discovery.yaml b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/mysql.discovery.yaml
@@ -18,21 +18,18 @@ mysql:
         - strict: mysql.locks
           first_only: true
           log_record:
-            severity_text: info
             body: Mysql receiver is working!
     statements:
       failed:
         - regexp: "Can't connect to MySQL server on .* [(]111[)]"
           first_only: true
           log_record:
-            severity_text: info
             append_pattern: true
             body:  The container cannot be reached by the Collector. The container is refusing MySQL connections.
       partial:
         - regexp: 'Access denied for user'
           first_only: true
           log_record:
-            severity_text: info
             append_pattern: true
             body: >-
               Make sure your user credentials are correctly specified using the

diff --git a/internal/confmapprovider/discovery/bundle/bundle.d/receivers/mysql.discovery.yaml.tmpl b/internal/confmapprovider/discovery/bundle/bundle.d/receivers/mysql.discovery.yaml.tmpl
@@ -14,21 +14,18 @@
         - strict: mysql.locks
           first_only: true
           log_record:
-            severity_text: info
             body: Mysql receiver is working!
     statements:
       failed:
         - regexp: "Can't connect to MySQL server on .* [(]111[)]"
           first_only: true
           log_record:
-            severity_text: info
             append_pattern: true
             body:  The container cannot be reached by the Collector. The container is refusing MySQL connections.
       partial:
         - regexp: 'Access denied for user'
           first_only: true
           log_record:
-            severity_text: info
             append_pattern: true
             body: >-
               Make sure your user credentials are correctly specified using the