diff --git a/apps/vault.go b/apps/vault.go index 5178f368c3..5c31ed3333 100644 --- a/apps/vault.go +++ b/apps/vault.go @@ -19,7 +19,6 @@ import ( "fmt" "github.com/GoogleCloudPlatform/ops-agent/confgenerator" - "github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit" "github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel" "github.com/GoogleCloudPlatform/ops-agent/internal/secret" ) @@ -313,63 +312,56 @@ func init() { confgenerator.MetricsReceiverTypes.RegisterType(func() confgenerator.MetricsReceiver { return &MetricsReceiverVault{} }) } -type LoggingProcessorVaultJson struct { - confgenerator.ConfigComponent `yaml:",inline"` -} +type LoggingProcessorMacroVaultJson struct{} -func (LoggingProcessorVaultJson) Type() string { +func (LoggingProcessorMacroVaultJson) Type() string { return "vault_audit" } -func (p LoggingProcessorVaultJson) Components(ctx context.Context, tag, uid string) []fluentbit.Component { - c := []fluentbit.Component{} - - // sample log line: - // {"time":"2022-06-07T20:34:34.392078404Z","type":"request","auth":{"token_type":"default"},"request":{"id":"aa005196-0280-381d-ebeb-1a083bdf5675","operation":"update","namespace":{"id":"root"},"path":"sys/audit/test"}} - jsonParser := &confgenerator.LoggingProcessorParseJson{ - ParserShared: confgenerator.ParserShared{ - TimeKey: "time", - TimeFormat: "%Y-%m-%dT%H:%M:%S.%L%z", +func (p LoggingProcessorMacroVaultJson) Expand(ctx context.Context) []confgenerator.InternalLoggingProcessor { + return []confgenerator.InternalLoggingProcessor{ + confgenerator.LoggingProcessorParseMultilineRegex{ + Rules: []confgenerator.MultilineRule{ + { + StateName: "start_state", + NextState: "cont", + Regex: `^{.*`, + }, + { + StateName: "cont", + NextState: "cont", + Regex: `^(?!{.*)`, + }, + }, }, - } - - c = append(c, confgenerator.LoggingProcessorModifyFields{ Fields: map[string]*confgenerator.ModifyField{ InstrumentationSourceLabel: instrumentationSourceValue(p.Type()), }, - }.Components(ctx, tag, uid)..., - ) - c = append(c, jsonParser.Components(ctx, tag, uid)...) - return c + }, + // sample log line: + // {"time":"2022-06-07T20:34:34.392078404Z","type":"request","auth":{"token_type":"default"},"request":{"id":"aa005196-0280-381d-ebeb-1a083bdf5675","operation":"update","namespace":{"id":"root"},"path":"sys/audit/test"}} + confgenerator.LoggingProcessorParseJson{ + ParserShared: confgenerator.ParserShared{ + TimeKey: "time", + TimeFormat: "%Y-%m-%dT%H:%M:%S.%L%z", + }, + }, + } } -type LoggingReceiverVaultAuditJson struct { - LoggingProcessorVaultJson `yaml:",inline"` - ReceiverMixin confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` - IncludePaths []string `yaml:"include_paths,omitempty" validate:"required"` +type LoggingReceiverMacroVaultAuditJson struct { + LoggingProcessorMacroVaultJson `yaml:",inline"` + ReceiverMixin confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` + IncludePaths []string `yaml:"include_paths,omitempty" validate:"required"` } -func (r LoggingReceiverVaultAuditJson) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverMacroVaultAuditJson) Expand(ctx context.Context) (confgenerator.InternalLoggingReceiver, []confgenerator.InternalLoggingProcessor) { r.ReceiverMixin.IncludePaths = r.IncludePaths - - r.ReceiverMixin.MultilineRules = []confgenerator.MultilineRule{ - { - StateName: "start_state", - NextState: "cont", - Regex: `^{.*`, - }, - { - StateName: "cont", - NextState: "cont", - Regex: `^(?!{.*)`, - }, - } - - c := r.ReceiverMixin.Components(ctx, tag) - return append(c, r.LoggingProcessorVaultJson.Components(ctx, tag, r.LoggingProcessorVaultJson.Type())...) + return &r.ReceiverMixin, r.LoggingProcessorMacroVaultJson.Expand(ctx) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverVaultAuditJson{} }) + confgenerator.RegisterLoggingReceiverMacro(func() LoggingReceiverMacroVaultAuditJson { return LoggingReceiverMacroVaultAuditJson{} }) + confgenerator.RegisterLoggingProcessorMacro[LoggingProcessorMacroVaultJson]() } diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv index b0b8416221..52634ed369 100644 --- a/confgenerator/testdata/feature/golden.csv +++ b/confgenerator/testdata/feature/golden.csv @@ -31,10 +31,6 @@ App,Field,Override, *apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, *apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, *apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverVaultAuditJson,apps.LoggingProcessorVaultJson.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverVaultAuditJson,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverVaultAuditJson,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverVaultAuditJson,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, *apps.MetricsProcessorExcludeMetrics,confgenerator.ConfigComponent.Type, *apps.MetricsReceiverActiveDirectoryDS,confgenerator.ConfigComponent.Type, *apps.MetricsReceiverActivemq,confgenerator.ConfigComponent.Type, @@ -161,6 +157,7 @@ App,Field,Override, *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatAccess],confgenerator.ConfigComponent.Type, *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroTomcatSystem],confgenerator.ConfigComponent.Type, *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVarnish],confgenerator.ConfigComponent.Type, +*confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroVaultJson],confgenerator.ConfigComponent.Type, *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroWildflySystem],confgenerator.ConfigComponent.Type, *confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroZookeeperGeneral],confgenerator.ConfigComponent.Type, *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroApacheAccess]],ReceiverMacro, @@ -219,3 +216,7 @@ App,Field,Override, *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroWildflySystem]],confgenerator.ConfigComponent.Type, *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroZookeeperGeneral]],ReceiverMacro, *confgenerator.loggingReceiverMacroAdapter[*github.com/GoogleCloudPlatform/ops-agent/confgenerator.loggingFilesProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroZookeeperGeneral]],confgenerator.ConfigComponent.Type, +*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroVaultAuditJson],apps.LoggingReceiverMacroVaultAuditJson.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroVaultAuditJson],apps.LoggingReceiverMacroVaultAuditJson.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroVaultAuditJson],apps.LoggingReceiverMacroVaultAuditJson.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +*confgenerator.loggingReceiverMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMacroVaultAuditJson],confgenerator.ConfigComponent.Type, diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error index 4234c581d9..b1d3076381 100644 --- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux-gpu/error @@ -1 +1 @@ -logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error index 4234c581d9..b1d3076381 100644 --- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/linux/error @@ -1 +1 @@ -logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error index 2b0b761c84..81aa4d2801 100644 --- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows-2012/error @@ -1 +1 @@ -logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error index 2b0b761c84..81aa4d2801 100644 --- a/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-logging-otel-unsupported_processor/golden/windows/error @@ -1 +1 @@ -logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error index 41783f233b..8ed152dbea 100644 --- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux-gpu/error @@ -1 +1 @@ -logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error index 41783f233b..8ed152dbea 100644 --- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/linux/error @@ -1 +1 @@ -logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error index 7c76f2b1ee..fa19c4e4fd 100644 --- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows-2012/error @@ -1 +1 @@ -logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error index 7c76f2b1ee..fa19c4e4fd 100644 --- a/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-logging-processor_unsupported_type/golden/windows/error @@ -1 +1 @@ -logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, wildfly_system, zookeeper_general]. \ No newline at end of file +logging processor with type "unsupported_type" is not supported. Supported logging processor types: [apache_access, apache_error, cassandra_debug, cassandra_gc, cassandra_system, couchdb, elasticsearch_gc, elasticsearch_json, exclude_logs, flink, hadoop, hbase_system, iis_access, jetty_access, kafka, modify_fields, mysql_error, mysql_general, mysql_slow, nginx_access, nginx_error, oracledb_alert, oracledb_audit, parse_json, parse_multiline, parse_regex, postgresql_general, rabbitmq, redis, saphana, solr_system, tomcat_access, tomcat_system, varnish, vault_audit, wildfly_system, zookeeper_general]. \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux-gpu/error index e252b0d5d1..7107dfae58 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux-gpu/error @@ -1,8 +1 @@ -[17:16] "include_paths" is a required field - 15 | logging: - 16 | receivers: -> 17 | vault_audit: - ^ - 18 | type: vault_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +"include_paths" is a required field \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux/error index e252b0d5d1..7107dfae58 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/linux/error @@ -1,8 +1 @@ -[17:16] "include_paths" is a required field - 15 | logging: - 16 | receivers: -> 17 | vault_audit: - ^ - 18 | type: vault_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +"include_paths" is a required field \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows-2012/error index e252b0d5d1..7107dfae58 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows-2012/error @@ -1,8 +1 @@ -[17:16] "include_paths" is a required field - 15 | logging: - 16 | receivers: -> 17 | vault_audit: - ^ - 18 | type: vault_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +"include_paths" is a required field \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows/error index e252b0d5d1..7107dfae58 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_vault_missing_required_include_path/golden/windows/error @@ -1,8 +1 @@ -[17:16] "include_paths" is a required field - 15 | logging: - 16 | receivers: -> 17 | vault_audit: - ^ - 18 | type: vault_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +"include_paths" is a required field \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/feature_tracking_otlp.json index b9127ce4bd..d17301d02e 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/features.yaml index e2d1876010..adc7fba656 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "false" + value: "true" - module: logging feature: receivers:vault_audit key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_main.conf index 6db3d5eb87..26c6f9244b 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_main.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_main.conf @@ -119,7 +119,7 @@ Match vault.vault_audit Name parser Reserve_Data True - Parser vault.vault_audit.vault_audit + Parser vault.vault_audit.1 [FILTER] Match vault.vault_audit diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_parser.conf index c4a0f1816a..077fec590c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_parser.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/fluent_bit_parser.conf @@ -1,6 +1,6 @@ [PARSER] Format json - Name vault.vault_audit.vault_audit + Name vault.vault_audit.1 Time_Format %Y-%m-%dT%H:%M:%S.%L%z Time_Key time diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/feature_tracking_otlp.json index b9127ce4bd..d17301d02e 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/features.yaml index e2d1876010..adc7fba656 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "false" + value: "true" - module: logging feature: receivers:vault_audit key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_main.conf index 6db3d5eb87..26c6f9244b 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_main.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_main.conf @@ -119,7 +119,7 @@ Match vault.vault_audit Name parser Reserve_Data True - Parser vault.vault_audit.vault_audit + Parser vault.vault_audit.1 [FILTER] Match vault.vault_audit diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_parser.conf index c4a0f1816a..077fec590c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_parser.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/fluent_bit_parser.conf @@ -1,6 +1,6 @@ [PARSER] Format json - Name vault.vault_audit.vault_audit + Name vault.vault_audit.1 Time_Format %Y-%m-%dT%H:%M:%S.%L%z Time_Key time diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/feature_tracking_otlp.json index b9127ce4bd..d17301d02e 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/features.yaml index e2d1876010..adc7fba656 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "false" + value: "true" - module: logging feature: receivers:vault_audit key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_main.conf index bf14ae46c8..1f9af28ddc 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_main.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_main.conf @@ -162,7 +162,7 @@ Match vault.vault_audit Name parser Reserve_Data True - Parser vault.vault_audit.vault_audit + Parser vault.vault_audit.1 [FILTER] Match vault.vault_audit diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_parser.conf index 248e985233..f8fc654e43 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_parser.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/fluent_bit_parser.conf @@ -7,7 +7,7 @@ [PARSER] Format json - Name vault.vault_audit.vault_audit + Name vault.vault_audit.1 Time_Format %Y-%m-%dT%H:%M:%S.%L%z Time_Key time diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/feature_tracking_otlp.json b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/feature_tracking_otlp.json index b9127ce4bd..d17301d02e 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/feature_tracking_otlp.json +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/feature_tracking_otlp.json @@ -1 +1 @@ -{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"receivers:vault_audit"}},{"key":"key","value":{"stringValue":"[0].include_paths.__length"}},{"key":"value","value":{"stringValue":"1"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/features.yaml index e2d1876010..adc7fba656 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "false" + value: "true" - module: logging feature: receivers:vault_audit key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_main.conf index bf14ae46c8..1f9af28ddc 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_main.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_main.conf @@ -162,7 +162,7 @@ Match vault.vault_audit Name parser Reserve_Data True - Parser vault.vault_audit.vault_audit + Parser vault.vault_audit.1 [FILTER] Match vault.vault_audit diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_parser.conf index 248e985233..f8fc654e43 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_parser.conf +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/fluent_bit_parser.conf @@ -7,7 +7,7 @@ [PARSER] Format json - Name vault.vault_audit.vault_audit + Name vault.vault_audit.1 Time_Format %Y-%m-%dT%H:%M:%S.%L%z Time_Key time diff --git a/transformation_test/testdata/logging_processor-vault-audit/config.yaml b/transformation_test/testdata/logging_processor-vault-audit/config.yaml new file mode 100644 index 0000000000..639167f335 --- /dev/null +++ b/transformation_test/testdata/logging_processor-vault-audit/config.yaml @@ -0,0 +1 @@ +- type: vault_audit diff --git a/transformation_test/testdata/logging_processor-vault-audit/input.log b/transformation_test/testdata/logging_processor-vault-audit/input.log new file mode 100644 index 0000000000..e83886627d --- /dev/null +++ b/transformation_test/testdata/logging_processor-vault-audit/input.log @@ -0,0 +1,47 @@ +{"time":"2025-08-25T14:00:00.123456789Z","type":"request","auth":{"token_type":"default"},"request":{"id":"req-001","operation":"update","namespace":{"id":"root"},"path":"sys/audit/test"}} +{ + "time":"2025-08-25T14:01:00.987654321Z", + "type":"request", + "auth":{ + "token_type":"root" + }, + "request":{ + "id":"req-002", + "operation":"delete", + "namespace":{ + "id":"root" + }, + "path":"sys/secrets/data" + } +} +{"time":"2025-08-25T14:02:00.111213141Z","type":"response","auth":{"token_type":"default"},"response":{"id":"res-001","status":"success"}} +{ + "time":"2025-08-25T14:03:00.999888777Z", + "type":"response", + "auth":{ + "token_type":"default" + }, + "response":{ + "id":"res-002", + "status":"failure", + "error":"permission denied" + } +} +{"time":"2025-08-25T14:04:00.222333444Z","type":"request","auth":{"token_type":"default"},"request":{"id":"req-003","operation":"create","namespace":{"id":"root"},"path":"sys/audit/new"}} +{ + "time":"2025-08-25T14:05:00.555666777Z", + "type":"request", + "auth":{ + "token_type":"default" + }, + "request":{ + "id":"req-004", + "operation":"update", + "namespace":{ + "id":"root" + }, + "path":"sys/audit/multi" + } +} +{"time":"2025-08-25T15:02:00.111213141Z","type":"response","auth":{"token_type":"default"},"response":{"id":"res-001","status":"success"}} +{"time":"2025-08-25T16:04:00.222333444Z","type":"request","auth":{"token_type":"default"},"request":{"id":"req-003","operation":"create","namespace":{"id":"root"},"path":"sys/audit/new"}} diff --git a/transformation_test/testdata/logging_processor-vault-audit/output_fluentbit.yaml b/transformation_test/testdata/logging_processor-vault-audit/output_fluentbit.yaml new file mode 100644 index 0000000000..7bd96948ca --- /dev/null +++ b/transformation_test/testdata/logging_processor-vault-audit/output_fluentbit.yaml @@ -0,0 +1,102 @@ +- entries: + - jsonPayload: + auth: + token_type: default + request: + id: req-001 + namespace: + id: root + operation: update + path: sys/audit/test + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:00:00.123456789Z + - jsonPayload: + auth: + token_type: root + request: + id: req-002 + namespace: + id: root + operation: delete + path: sys/secrets/data + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:01:00.987654321Z + - jsonPayload: + auth: + token_type: default + response: + id: res-001 + status: success + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:02:00.111213141Z + - jsonPayload: + auth: + token_type: default + response: + error: permission denied + id: res-002 + status: failure + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:03:00.999888777Z + - jsonPayload: + auth: + token_type: default + request: + id: req-003 + namespace: + id: root + operation: create + path: sys/audit/new + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:04:00.222333444Z + - jsonPayload: + auth: + token_type: default + request: + id: req-004 + namespace: + id: root + operation: update + path: sys/audit/multi + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T14:05:00.555666777Z + - jsonPayload: + auth: + token_type: default + response: + id: res-001 + status: success + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/transformation_test + timestamp: 2025-08-25T15:02:00.111213141Z + partialSuccess: true + resource: + labels: {} + type: gce_instance diff --git a/transformation_test/testdata/logging_processor-vault-audit/output_otel.yaml b/transformation_test/testdata/logging_processor-vault-audit/output_otel.yaml new file mode 100644 index 0000000000..76ef562773 --- /dev/null +++ b/transformation_test/testdata/logging_processor-vault-audit/output_otel.yaml @@ -0,0 +1,156 @@ +- entries: + - jsonPayload: + auth: + token_type: default + request: + id: req-001 + namespace: + id: root + operation: update + path: sys/audit/test + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:00:00.123456789Z + - jsonPayload: + auth: + token_type: root + request: + id: req-002 + namespace: + id: root + operation: delete + path: sys/secrets/data + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:01:00.987654321Z + - jsonPayload: + auth: + token_type: default + response: + id: res-001 + status: success + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:02:00.111213141Z + - jsonPayload: + auth: + token_type: default + response: + error: permission denied + id: res-002 + status: failure + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:03:00.999888777Z + - jsonPayload: + auth: + token_type: default + request: + id: req-003 + namespace: + id: root + operation: create + path: sys/audit/new + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:04:00.222333444Z + - jsonPayload: + auth: + token_type: default + request: + id: req-004 + namespace: + id: root + operation: update + path: sys/audit/multi + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T14:05:00.555666777Z + - jsonPayload: + auth: + token_type: default + response: + id: res-001 + status: success + type: response + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T15:02:00.111213141Z + partialSuccess: true +- entries: + - jsonPayload: + auth: + token_type: default + request: + id: req-003 + namespace: + id: root + operation: create + path: sys/audit/new + type: request + labels: + compute.googleapis.com/resource_name: hostname + logging.googleapis.com/instrumentation_source: agent.googleapis.com/vault_audit + logName: projects/my-project/logs/my-log-name + resource: + labels: + instance_id: test-instance-id + zone: test-zone + type: gce_instance + timestamp: 2025-08-25T16:04:00.222333444Z + partialSuccess: true