diff --git a/apps/apache.go b/apps/apache.go index 75a07280a0..81d461547a 100644 --- a/apps/apache.go +++ b/apps/apache.go @@ -143,12 +143,11 @@ func (LoggingProcessorApacheAccess) Type() string { return "apache_access" } -type LoggingReceiverApacheAccess struct { - LoggingProcessorApacheAccess `yaml:",inline"` +type LoggingReceiverApacheAccessMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverApacheAccess) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverApacheAccessMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file path on Debian / Ubuntu @@ -159,17 +158,14 @@ func (r LoggingReceiverApacheAccess) Components(ctx context.Context, tag string) "/var/log/httpd/access_log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorApacheAccess.Components(ctx, tag, "apache_access")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverApacheError struct { - LoggingProcessorApacheError `yaml:",inline"` +type LoggingReceiverApacheErrorMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverApacheError) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverApacheErrorMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file path on Debian / Ubuntu @@ -180,14 +176,16 @@ func (r LoggingReceiverApacheError) Components(ctx context.Context, tag string) "/var/log/httpd/error_log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorApacheError.Components(ctx, tag, "apache_error")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorApacheAccess{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorApacheError{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverApacheAccess{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverApacheError{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverApacheAccessMixin, LoggingProcessorApacheAccess]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverApacheErrorMixin, LoggingProcessorApacheError]{} + }) } diff --git a/apps/cassandra.go b/apps/cassandra.go index c70a994cd2..5c8fe6e1fe 100644 --- a/apps/cassandra.go +++ b/apps/cassandra.go @@ -234,12 +234,11 @@ func (p LoggingProcessorCassandraGC) Components(ctx context.Context, tag string, return c } -type LoggingReceiverCassandraSystem struct { - LoggingProcessorCassandraSystem `yaml:",inline"` +type LoggingReceiverCassandraSystemMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverCassandraSystem) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverCassandraSystemMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file path on Debian / Ubuntu / RHEL / CentOS @@ -247,17 +246,14 @@ func (r LoggingReceiverCassandraSystem) Components(ctx context.Context, tag stri // No default install position / log path for SLES } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorCassandraSystem.Components(ctx, tag, "cassandra_system")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverCassandraDebug struct { - LoggingProcessorCassandraDebug `yaml:",inline"` +type LoggingReceiverCassandraDebugMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverCassandraDebug) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverCassandraDebugMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file path on Debian / Ubuntu / RHEL / CentOS @@ -265,17 +261,14 @@ func (r LoggingReceiverCassandraDebug) Components(ctx context.Context, tag strin // No default install position / log path for SLES } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorCassandraDebug.Components(ctx, tag, "cassandra_debug")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverCassandraGC struct { - LoggingProcessorCassandraGC `yaml:",inline"` +type LoggingReceiverCassandraGCMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverCassandraGC) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverCassandraGCMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file path on Debian / Ubuntu / RHEL / CentOS for JDK 8 @@ -285,16 +278,20 @@ func (r LoggingReceiverCassandraGC) Components(ctx context.Context, tag string) // No default install position / log path for SLES } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorCassandraGC.Components(ctx, tag, "cassandra_gc")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorCassandraSystem{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorCassandraDebug{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorCassandraGC{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverCassandraSystem{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverCassandraDebug{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverCassandraGC{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverCassandraSystemMixin, LoggingProcessorCassandraSystem]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverCassandraDebugMixin, LoggingProcessorCassandraDebug]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverCassandraGCMixin, LoggingProcessorCassandraGC]{} + }) } diff --git a/apps/couchdb.go b/apps/couchdb.go index f30274f908..852f10e36f 100644 --- a/apps/couchdb.go +++ b/apps/couchdb.go @@ -153,12 +153,11 @@ func (p LoggingProcessorCouchdb) Components(ctx context.Context, tag string, uid return c } -type LoggingReceiverCouchdb struct { - LoggingProcessorCouchdb `yaml:",inline"` +type LoggingReceiverCouchdbMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverCouchdb) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverCouchdbMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log file @@ -178,12 +177,12 @@ func (r LoggingReceiverCouchdb) Components(ctx context.Context, tag string) []fl }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorCouchdb.Components(ctx, tag, "couchdb")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorCouchdb{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverCouchdb{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverCouchdbMixin, LoggingProcessorCouchdb]{} + }) } diff --git a/apps/elasticsearch.go b/apps/elasticsearch.go index 0812b72f9b..f4e508186a 100644 --- a/apps/elasticsearch.go +++ b/apps/elasticsearch.go @@ -268,12 +268,11 @@ func (p LoggingProcessorElasticsearchGC) Components(ctx context.Context, tag, ui return c } -type LoggingReceiverElasticsearchJson struct { - LoggingProcessorElasticsearchJson `yaml:",inline"` +type LoggingReceiverElasticsearchJsonMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` } -func (r LoggingReceiverElasticsearchJson) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverElasticsearchJsonMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { // Default JSON logs for Elasticsearch r.IncludePaths = []string{ @@ -307,16 +306,14 @@ func (r LoggingReceiverElasticsearchJson) Components(ctx context.Context, tag st }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - return append(c, r.LoggingProcessorElasticsearchJson.Components(ctx, tag, "elasticsearch_json")...) + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverElasticsearchGC struct { - LoggingProcessorElasticsearchGC `yaml:",inline"` +type LoggingReceiverElasticsearchGCMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` } -func (r LoggingReceiverElasticsearchGC) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverElasticsearchGCMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { // Default GC log for Elasticsearch r.IncludePaths = []string{ @@ -324,11 +321,14 @@ func (r LoggingReceiverElasticsearchGC) Components(ctx context.Context, tag stri } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - return append(c, r.LoggingProcessorElasticsearchGC.Components(ctx, tag, "elasticsearch_gc")...) + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverElasticsearchJson{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverElasticsearchGC{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverElasticsearchJsonMixin, LoggingProcessorElasticsearchJson]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverElasticsearchGCMixin, LoggingProcessorElasticsearchGC]{} + }) } diff --git a/apps/flink.go b/apps/flink.go index 3c0a871f89..a105bbe375 100644 --- a/apps/flink.go +++ b/apps/flink.go @@ -141,12 +141,11 @@ func (p LoggingProcessorFlink) Components(ctx context.Context, tag string, uid s return c } -type LoggingReceiverFlink struct { - LoggingProcessorFlink `yaml:",inline"` +type LoggingReceiverFlinkMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverFlink) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverFlinkMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/opt/flink/log/flink-*-standalonesession-*.log", @@ -154,12 +153,12 @@ func (r LoggingReceiverFlink) Components(ctx context.Context, tag string) []flue "/opt/flink/log/flink-*-client-*.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorFlink.Components(ctx, tag, "flink")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverFlinkMixin, LoggingProcessorFlink]{} + }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorFlink{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverFlink{} }) } diff --git a/apps/hadoop.go b/apps/hadoop.go index b8f9fd6d6c..c6a7ce1de6 100644 --- a/apps/hadoop.go +++ b/apps/hadoop.go @@ -105,12 +105,11 @@ func (p LoggingProcessorHadoop) Components(ctx context.Context, tag, uid string) return c } -type LoggingReceiverHadoop struct { - LoggingProcessorHadoop `yaml:",inline"` +type LoggingReceiverHadoopMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` } -func (r LoggingReceiverHadoop) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverHadoopMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { // Default logs for hadoop r.IncludePaths = []string{ @@ -132,11 +131,11 @@ func (r LoggingReceiverHadoop) Components(ctx context.Context, tag string) []flu }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - - return append(c, r.LoggingProcessorHadoop.Components(ctx, tag, "hadoop")...) + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverHadoop{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverHadoopMixin, LoggingProcessorHadoop]{} + }) } diff --git a/apps/hbase.go b/apps/hbase.go index b2bb0851cc..95d697f203 100644 --- a/apps/hbase.go +++ b/apps/hbase.go @@ -125,24 +125,24 @@ func (p LoggingProcessorHbaseSystem) Components(ctx context.Context, tag string, return c } -type SystemLoggingReceiverHbase struct { +type SystemLoggingReceiverHbaseMixin struct { LoggingProcessorHbaseSystem `yaml:",inline"` confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r SystemLoggingReceiverHbase) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r SystemLoggingReceiverHbaseMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/opt/hbase/logs/hbase-*-regionserver-*.log", "/opt/hbase/logs/hbase-*-master-*.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorHbaseSystem.Components(ctx, tag, "hbase_system")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorHbaseSystem{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &SystemLoggingReceiverHbase{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[SystemLoggingReceiverHbaseMixin, LoggingProcessorHbaseSystem]{} + }) } diff --git a/apps/iis.go b/apps/iis.go index 4c002ea5d3..a360e1dd98 100644 --- a/apps/iis.go +++ b/apps/iis.go @@ -150,7 +150,7 @@ type LoggingProcessorIisAccess struct { confgenerator.ConfigComponent `yaml:",inline"` } -func (*LoggingProcessorIisAccess) Type() string { +func (LoggingProcessorIisAccess) Type() string { return "iis_access" } @@ -184,7 +184,7 @@ const ( ` ) -func (p *LoggingProcessorIisAccess) Components(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorIisAccess) Components(ctx context.Context, tag, uid string) []fluentbit.Component { c := confgenerator.LoggingProcessorParseRegex{ // Documentation: // https://docs.microsoft.com/en-us/windows/win32/http/w3c-logging @@ -248,23 +248,22 @@ func (p *LoggingProcessorIisAccess) Components(ctx context.Context, tag, uid str return c } -type LoggingReceiverIisAccess struct { - LoggingProcessorIisAccess `yaml:",inline"` +type LoggingReceiverIisAccessMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverIisAccess) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverIisAccessMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ `C:\inetpub\logs\LogFiles\W3SVC1\u_ex*`, } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorIisAccess.Components(ctx, tag, "iis_access")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverIisAccess{} }, platform.Windows) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverIisAccessMixin, LoggingProcessorIisAccess]{} + }, platform.Windows) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorIisAccess{} }, platform.Windows) } diff --git a/apps/jetty.go b/apps/jetty.go index 6e41b2b68a..2534fd8689 100644 --- a/apps/jetty.go +++ b/apps/jetty.go @@ -71,23 +71,22 @@ func (LoggingProcessorJettyAccess) Type() string { return "jetty_access" } -type LoggingReceiverJettyAccess struct { - LoggingProcessorJettyAccess `yaml:",inline"` +type LoggingReceiverJettyAccessMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverJettyAccess) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverJettyAccessMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/opt/logs/*.request.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorJettyAccess.Components(ctx, tag, "jetty_access")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorJettyAccess{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverJettyAccess{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverJettyAccessMixin, LoggingProcessorJettyAccess]{} + }) } diff --git a/apps/kafka.go b/apps/kafka.go index 0a8ac8aea5..bf6aa7b029 100644 --- a/apps/kafka.go +++ b/apps/kafka.go @@ -143,12 +143,11 @@ func (p LoggingProcessorKafka) Components(ctx context.Context, tag string, uid s return c } -type LoggingReceiverKafka struct { - LoggingProcessorKafka `yaml:",inline"` +type LoggingReceiverKafkaMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverKafka) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverKafkaMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // No default package installers, these are common log paths from installs online @@ -157,12 +156,12 @@ func (r LoggingReceiverKafka) Components(ctx context.Context, tag string) []flue "/opt/kafka/logs/controller.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorKafka.Components(ctx, tag, "kafka")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorKafka{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverKafka{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverKafkaMixin, LoggingProcessorKafka]{} + }) } diff --git a/apps/mongodb.go b/apps/mongodb.go index c4b9724c45..19199e18c0 100644 --- a/apps/mongodb.go +++ b/apps/mongodb.go @@ -95,11 +95,11 @@ type LoggingProcessorMongodb struct { confgenerator.ConfigComponent `yaml:",inline"` } -func (*LoggingProcessorMongodb) Type() string { +func (LoggingProcessorMongodb) Type() string { return "mongodb" } -func (p *LoggingProcessorMongodb) Components(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) Components(ctx context.Context, tag, uid string) []fluentbit.Component { c := []fluentbit.Component{} c = append(c, p.JsonLogComponents(ctx, tag, uid)...) @@ -112,7 +112,7 @@ func (p *LoggingProcessorMongodb) Components(ctx context.Context, tag, uid strin // JsonLogComponents are the fluentbit components for parsing log messages that are json formatted. // these are generally messages from mongo with versions greater than or equal to 4.4 // documentation: https://docs.mongodb.com/v4.4/reference/log-messages/#log-message-format -func (p *LoggingProcessorMongodb) JsonLogComponents(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) JsonLogComponents(ctx context.Context, tag, uid string) []fluentbit.Component { c := p.jsonParserWithTimeKey(ctx, tag, uid) c = append(c, p.promoteWiredTiger(tag, uid)...) @@ -123,7 +123,7 @@ func (p *LoggingProcessorMongodb) JsonLogComponents(ctx context.Context, tag, ui // jsonParserWithTimeKey requires promotion of the nested timekey for the json parser so we must // first promote the $date field from the "t" field before declaring the parser -func (p *LoggingProcessorMongodb) jsonParserWithTimeKey(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) jsonParserWithTimeKey(ctx context.Context, tag, uid string) []fluentbit.Component { c := []fluentbit.Component{} jsonParser := &confgenerator.LoggingProcessorParseJson{ @@ -200,7 +200,7 @@ func (p *LoggingProcessorMongodb) jsonParserWithTimeKey(ctx context.Context, tag // severityParser is used by both regex and json parser to ensure an "s" field on the entry gets translated // to a valid logging.googleapis.com/seveirty field -func (p *LoggingProcessorMongodb) severityParser(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) severityParser(ctx context.Context, tag, uid string) []fluentbit.Component { severityComponents := []fluentbit.Component{} severityComponents = append(severityComponents, @@ -233,7 +233,7 @@ func (p *LoggingProcessorMongodb) severityParser(ctx context.Context, tag, uid s return severityComponents } -func (p *LoggingProcessorMongodb) renames(tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) renames(tag, uid string) []fluentbit.Component { r := []fluentbit.Component{} renames := []struct { src string @@ -252,7 +252,7 @@ func (p *LoggingProcessorMongodb) renames(tag, uid string) []fluentbit.Component return r } -func (p *LoggingProcessorMongodb) promoteWiredTiger(tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) promoteWiredTiger(tag, uid string) []fluentbit.Component { // promote messages that are WiredTiger messages and are nested in attr.message addPrefix := "temp_attributes_" upNest := fluentbit.Component{ @@ -284,7 +284,7 @@ func (p *LoggingProcessorMongodb) promoteWiredTiger(tag, uid string) []fluentbit return []fluentbit.Component{upNest, wiredTigerRename, renameRemainingAttributes} } -func (p *LoggingProcessorMongodb) RegexLogComponents(tag, uid string) []fluentbit.Component { +func (p LoggingProcessorMongodb) RegexLogComponents(tag, uid string) []fluentbit.Component { c := []fluentbit.Component{} parseKey := "message" parser, parserName := fluentbit.ParserComponentBase("%Y-%m-%dT%H:%M:%S.%L%z", "timestamp", map[string]string{ @@ -319,23 +319,22 @@ func (p *LoggingProcessorMongodb) RegexLogComponents(tag, uid string) []fluentbi return c } -type LoggingReceiverMongodb struct { - LoggingProcessorMongodb `yaml:",inline"` +type LoggingReceiverMongodbMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r *LoggingReceiverMongodb) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverMongodbMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // default logging location "/var/log/mongodb/mongod.log*", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorMongodb.Components(ctx, tag, "mongodb")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverMongodb{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverMongodbMixin, LoggingProcessorMongodb]{} + }) } diff --git a/apps/mysql.go b/apps/mysql.go index f0bbf044b4..fdb4d90572 100644 --- a/apps/mysql.go +++ b/apps/mysql.go @@ -567,46 +567,39 @@ func (p LoggingProcessorMysqlSlow) Components(ctx context.Context, tag string, u return c } -type LoggingReceiverMysqlGeneral struct { - LoggingProcessorMysqlGeneral `yaml:",inline"` +type LoggingReceiverMysqlGeneralMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverMysqlGeneral) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverMysqlGeneralMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log path for CentOS / RHEL / SLES / Debain / Ubuntu "/var/lib/mysql/${HOSTNAME}.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorMysqlGeneral.Components(ctx, tag, "mysql_general")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverMysqlSlow struct { - LoggingProcessorMysqlSlow `yaml:",inline"` +type LoggingReceiverMysqlSlowMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverMysqlSlow) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverMysqlSlowMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log path for CentOS / RHEL / SLES / Debain / Ubuntu "/var/lib/mysql/${HOSTNAME}-slow.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorMysqlSlow.Components(ctx, tag, "mysql_slow")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverMysqlError struct { - LoggingProcessorMysqlError `yaml:",inline"` +type LoggingReceiverMysqlErrorMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverMysqlError) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverMysqlErrorMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log path for CentOS / RHEL @@ -622,16 +615,20 @@ func (r LoggingReceiverMysqlError) Components(ctx context.Context, tag string) [ "/var/lib/mysql/${HOSTNAME}.err", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorMysqlError.Components(ctx, tag, "mysql_error")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorMysqlError{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorMysqlGeneral{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorMysqlSlow{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverMysqlError{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverMysqlGeneral{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverMysqlSlow{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverMysqlErrorMixin, LoggingProcessorMysqlError]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverMysqlGeneralMixin, LoggingProcessorMysqlGeneral]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverMysqlSlowMixin, LoggingProcessorMysqlSlow]{} + }) } diff --git a/apps/nginx.go b/apps/nginx.go index 8a3532f116..116919fb33 100644 --- a/apps/nginx.go +++ b/apps/nginx.go @@ -125,37 +125,35 @@ func (p LoggingProcessorNginxError) Components(ctx context.Context, tag string, return c } -type LoggingReceiverNginxAccess struct { - LoggingProcessorNginxAccess `yaml:",inline"` +type LoggingReceiverNginxAccessMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverNginxAccess) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverNginxAccessMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{"/var/log/nginx/access.log"} } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorNginxAccess.Components(ctx, tag, "nginx_access")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } -type LoggingReceiverNginxError struct { - LoggingProcessorNginxError `yaml:",inline"` +type LoggingReceiverNginxErrorMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverNginxError) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverNginxErrorMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{"/var/log/nginx/error.log"} } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorNginxError.Components(ctx, tag, "nginx_error")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorNginxAccess{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorNginxError{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverNginxAccess{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverNginxError{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverNginxAccessMixin, LoggingProcessorNginxAccess]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverNginxErrorMixin, LoggingProcessorNginxError]{} + }) } diff --git a/apps/oracledb.go b/apps/oracledb.go index f360b82908..35dbf0e331 100644 --- a/apps/oracledb.go +++ b/apps/oracledb.go @@ -811,14 +811,13 @@ func (lr LoggingProcessorOracleDBAlert) Components(ctx context.Context, tag stri return components } -type LoggingReceiverOracleDBAlert struct { - LoggingProcessorOracleDBAlert `yaml:",inline"` +type LoggingReceiverOracleDBAlertMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` OracleHome string `yaml:"oracle_home,omitempty" validate:"required_without=IncludePaths,excluded_with=IncludePaths"` IncludePaths []string `yaml:"include_paths,omitempty" validate:"required_without=OracleHome,excluded_with=OracleHome"` } -func (lr LoggingReceiverOracleDBAlert) Components(ctx context.Context, tag string) []fluentbit.Component { +func (lr LoggingReceiverOracleDBAlertMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(lr.OracleHome) > 0 { lr.IncludePaths = []string{ path.Join(lr.OracleHome, "/diag/rdbms/*/*/trace/alert_*.log"), @@ -827,9 +826,7 @@ func (lr LoggingReceiverOracleDBAlert) Components(ctx context.Context, tag strin lr.LoggingReceiverFilesMixin.IncludePaths = lr.IncludePaths - c := lr.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, lr.LoggingProcessorOracleDBAlert.Components(ctx, tag, lr.Type())...) - return c + return lr.LoggingReceiverFilesMixin.Components(ctx, tag) } type LoggingProcessorOracleDBAudit struct { @@ -919,14 +916,13 @@ func (lr LoggingProcessorOracleDBAudit) Components(ctx context.Context, tag stri return components } -type LoggingReceiverOracleDBAudit struct { - LoggingProcessorOracleDBAudit `yaml:",inline"` +type LoggingReceiverOracleDBAuditMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` OracleHome string `yaml:"oracle_home,omitempty" validate:"required_without=IncludePaths,excluded_with=IncludePaths"` IncludePaths []string `yaml:"include_paths,omitempty" validate:"required_without=OracleHome,excluded_with=OracleHome"` } -func (lr LoggingReceiverOracleDBAudit) Components(ctx context.Context, tag string) []fluentbit.Component { +func (lr LoggingReceiverOracleDBAuditMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(lr.OracleHome) > 0 { lr.IncludePaths = []string{ path.Join(lr.OracleHome, "/admin/*/adump/*.aud"), @@ -935,14 +931,16 @@ func (lr LoggingReceiverOracleDBAudit) Components(ctx context.Context, tag strin lr.LoggingReceiverFilesMixin.IncludePaths = lr.IncludePaths - c := lr.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, lr.LoggingProcessorOracleDBAudit.Components(ctx, tag, lr.Type())...) - return c + return lr.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverOracleDBAlert{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverOracleDBAlertMixin, LoggingProcessorOracleDBAlert]{} + }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorOracleDBAlert{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverOracleDBAudit{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverOracleDBAuditMixin, LoggingProcessorOracleDBAudit]{} + }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorOracleDBAudit{} }) } diff --git a/apps/postgresql.go b/apps/postgresql.go index 75a3417013..8b15c5ca10 100644 --- a/apps/postgresql.go +++ b/apps/postgresql.go @@ -201,12 +201,11 @@ func (p LoggingProcessorPostgresql) Components(ctx context.Context, tag string, return c } -type LoggingReceiverPostgresql struct { - LoggingProcessorPostgresql `yaml:",inline"` +type LoggingReceiverPostgresqlMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverPostgresql) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverPostgresqlMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log paths for Debian / Ubuntu @@ -217,12 +216,12 @@ func (r LoggingReceiverPostgresql) Components(ctx context.Context, tag string) [ "/var/lib/pgsql/*/data/log/postgresql*.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorPostgresql.Components(ctx, tag, "postgresql")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorPostgresql{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverPostgresql{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverPostgresqlMixin, LoggingProcessorPostgresql]{} + }) } diff --git a/apps/rabbitmq.go b/apps/rabbitmq.go index 561fe46e11..cc811a1fcb 100644 --- a/apps/rabbitmq.go +++ b/apps/rabbitmq.go @@ -27,11 +27,11 @@ type LoggingProcessorRabbitmq struct { confgenerator.ConfigComponent `yaml:",inline"` } -func (*LoggingProcessorRabbitmq) Type() string { +func (LoggingProcessorRabbitmq) Type() string { return "rabbitmq" } -func (p *LoggingProcessorRabbitmq) Components(ctx context.Context, tag, uid string) []fluentbit.Component { +func (p LoggingProcessorRabbitmq) Components(ctx context.Context, tag, uid string) []fluentbit.Component { c := confgenerator.LoggingProcessorParseRegexComplex{ Parsers: []confgenerator.RegexParser{ { @@ -78,12 +78,11 @@ func (p *LoggingProcessorRabbitmq) Components(ctx context.Context, tag, uid stri return c } -type LoggingReceiverRabbitmq struct { - LoggingProcessorRabbitmq `yaml:",inline"` +type LoggingReceiverRabbitmqMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverRabbitmq) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverRabbitmqMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/var/log/rabbitmq/rabbit*.log", @@ -108,13 +107,13 @@ func (r LoggingReceiverRabbitmq) Components(ctx context.Context, tag string) []f Regex: `^(?!\d+-\d+-\d+ \d+:\d+:\d+\.\d+\+\d+:\d+)`, }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorRabbitmq.Components(ctx, tag, "rabbitmq")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverRabbitmq{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverRabbitmqMixin, LoggingProcessorRabbitmq]{} + }) } type MetricsReceiverRabbitmq struct { diff --git a/apps/redis.go b/apps/redis.go index 08c2c657b3..1ef3276dfc 100644 --- a/apps/redis.go +++ b/apps/redis.go @@ -139,12 +139,11 @@ func (p LoggingProcessorRedis) Components(ctx context.Context, tag string, uid s return c } -type LoggingReceiverRedis struct { - LoggingProcessorRedis `yaml:",inline"` +type LoggingReceiverRedisMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverRedis) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverRedisMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // Default log path on Ubuntu / Debian @@ -159,12 +158,12 @@ func (r LoggingReceiverRedis) Components(ctx context.Context, tag string) []flue "/var/log/redis/redis_6379.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorRedis.Components(ctx, tag, "redis")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorRedis{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverRedis{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverRedisMixin, LoggingProcessorRedis]{} + }) } diff --git a/apps/saphana.go b/apps/saphana.go index 37d059d24d..6538fe341b 100644 --- a/apps/saphana.go +++ b/apps/saphana.go @@ -95,12 +95,11 @@ func (p LoggingProcessorSapHanaTrace) Components(ctx context.Context, tag string return c } -type LoggingReceiverSapHanaTrace struct { - LoggingProcessorSapHanaTrace `yaml:",inline"` +type LoggingReceiverSapHanaTraceMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverSapHanaTrace) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverSapHanaTraceMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/usr/sap/*/HDB*/${HOSTNAME}/trace/*.trc", @@ -127,14 +126,15 @@ func (r LoggingReceiverSapHanaTrace) Components(ctx context.Context, tag string) }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorSapHanaTrace.Components(ctx, tag, r.Type())...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) + } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorSapHanaTrace{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverSapHanaTrace{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverSapHanaTraceMixin, LoggingProcessorSapHanaTrace]{} + }) } type MetricsReceiverSapHana struct { diff --git a/apps/solr.go b/apps/solr.go index 708853427b..c04ed1d2fc 100644 --- a/apps/solr.go +++ b/apps/solr.go @@ -114,23 +114,22 @@ func (p LoggingProcessorSolrSystem) Components(ctx context.Context, tag string, return c } -type LoggingReceiverSolrSystem struct { - LoggingProcessorSolrSystem `yaml:",inline"` +type LoggingReceiverSolrSystemMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverSolrSystem) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverSolrSystemMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/var/solr/logs/solr.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorSolrSystem.Components(ctx, tag, "solr_system")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorSolrSystem{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverSolrSystem{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverSolrSystemMixin, LoggingProcessorSolrSystem]{} + }) } diff --git a/apps/tomcat.go b/apps/tomcat.go index 3b9b079cbd..3e451907b6 100644 --- a/apps/tomcat.go +++ b/apps/tomcat.go @@ -125,12 +125,11 @@ func (p LoggingProcessorTomcatSystem) Components(ctx context.Context, tag string return c } -type SystemLoggingReceiverTomcat struct { - LoggingProcessorTomcatSystem `yaml:",inline"` +type SystemLoggingReceiverTomcatMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r SystemLoggingReceiverTomcat) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r SystemLoggingReceiverTomcatMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/opt/tomcat/logs/catalina.out", @@ -138,9 +137,7 @@ func (r SystemLoggingReceiverTomcat) Components(ctx context.Context, tag string) "/var/log/tomcat*/catalina.*.log", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorTomcatSystem.Components(ctx, tag, "tomcat_system")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } type LoggingProcessorTomcatAccess struct { @@ -155,26 +152,27 @@ func (LoggingProcessorTomcatAccess) Type() string { return "tomcat_access" } -type AccessSystemLoggingReceiverTomcat struct { - LoggingProcessorTomcatAccess `yaml:",inline"` +type AccessSystemLoggingReceiverTomcatMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r AccessSystemLoggingReceiverTomcat) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r AccessSystemLoggingReceiverTomcatMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ "/opt/tomcat/logs/localhost_access_log*.txt", "/var/log/tomcat*/localhost_access_log*.txt", } } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorTomcatAccess.Components(ctx, tag, "tomcat_access")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorTomcatAccess{} }) confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorTomcatSystem{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &AccessSystemLoggingReceiverTomcat{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &SystemLoggingReceiverTomcat{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[AccessSystemLoggingReceiverTomcatMixin, LoggingProcessorTomcatAccess]{} + }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[SystemLoggingReceiverTomcatMixin, LoggingProcessorTomcatSystem]{} + }) } diff --git a/apps/varnish.go b/apps/varnish.go index a79121ae20..ee1c3a43f7 100644 --- a/apps/varnish.go +++ b/apps/varnish.go @@ -71,22 +71,21 @@ func (p LoggingProcessorVarnish) Components(ctx context.Context, tag string, uid return genericAccessLogParser(ctx, p.Type(), tag, uid) } -type LoggingReceiverVarnish struct { - LoggingProcessorVarnish `yaml:",inline"` +type LoggingReceiverVarnishMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverVarnish) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverVarnishMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{"/var/log/varnish/varnishncsa.log"} } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorVarnish.Components(ctx, tag, "varnish")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorVarnish{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverVarnish{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverVarnishMixin, LoggingProcessorVarnish]{} + }) } diff --git a/apps/vault.go b/apps/vault.go index bda23a3eb5..7014beb5c4 100644 --- a/apps/vault.go +++ b/apps/vault.go @@ -338,13 +338,12 @@ func (p LoggingProcessorVaultJson) Components(ctx context.Context, tag, uid stri return c } -type LoggingReceiverVaultAuditJson struct { - LoggingProcessorVaultJson `yaml:",inline"` +type LoggingReceiverVaultAuditJsonMixin struct { 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 LoggingReceiverVaultAuditJsonMixin) Components(ctx context.Context, tag string) []fluentbit.Component { r.LoggingReceiverFilesMixin.IncludePaths = r.IncludePaths r.MultilineRules = []confgenerator.MultilineRule{ @@ -360,10 +359,12 @@ func (r LoggingReceiverVaultAuditJson) Components(ctx context.Context, tag strin }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - return append(c, r.LoggingProcessorVaultJson.Components(ctx, tag, r.LoggingProcessorVaultJson.Type())...) + return r.LoggingReceiverFilesMixin.Components(ctx, tag) + } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverVaultAuditJson{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverVaultAuditJsonMixin, LoggingProcessorVaultJson]{} + }) } diff --git a/apps/wildfly.go b/apps/wildfly.go index 376bb243cc..f3a1ca1517 100644 --- a/apps/wildfly.go +++ b/apps/wildfly.go @@ -111,12 +111,11 @@ func (p LoggingProcessorWildflySystem) Components(ctx context.Context, tag strin return c } -type LoggingReceiverWildflySystem struct { - LoggingProcessorWildflySystem `yaml:",inline"` +type LoggingReceiverWildflySystemMixin struct { confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverWildflySystem) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverWildflySystemMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { r.IncludePaths = []string{ // no package installers, default installation usually provides the following @@ -142,12 +141,12 @@ func (r LoggingReceiverWildflySystem) Components(ctx context.Context, tag string }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - c = append(c, r.LoggingProcessorWildflySystem.Components(ctx, tag, "wildfly_system")...) - return c + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func init() { confgenerator.LoggingProcessorTypes.RegisterType(func() confgenerator.LoggingProcessor { return &LoggingProcessorWildflySystem{} }) - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverWildflySystem{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverWildflySystemMixin, LoggingProcessorWildflySystem]{} + }) } diff --git a/apps/zookeeper.go b/apps/zookeeper.go index 00d22fdfc2..34964e36a7 100644 --- a/apps/zookeeper.go +++ b/apps/zookeeper.go @@ -128,12 +128,11 @@ func (p LoggingProcessorZookeeperGeneral) Components(ctx context.Context, tag, u return c } -type LoggingReceiverZookeeperGeneral struct { - LoggingProcessorZookeeperGeneral `yaml:",inline"` - confgenerator.LoggingReceiverFilesMixin `yaml:",inline"` +type LoggingReceiverZookeeperGeneralMixin struct { + confgenerator.LoggingReceiverFilesMixin `yaml:",inline" validate:"structonly"` } -func (r LoggingReceiverZookeeperGeneral) Components(ctx context.Context, tag string) []fluentbit.Component { +func (r LoggingReceiverZookeeperGeneralMixin) Components(ctx context.Context, tag string) []fluentbit.Component { if len(r.IncludePaths) == 0 { // Default log for Zookeeper. r.IncludePaths = []string{ @@ -155,8 +154,7 @@ func (r LoggingReceiverZookeeperGeneral) Components(ctx context.Context, tag str }, } - c := r.LoggingReceiverFilesMixin.Components(ctx, tag) - return append(c, r.LoggingProcessorZookeeperGeneral.Components(ctx, tag, "zookeeper_general")...) + return r.LoggingReceiverFilesMixin.Components(ctx, tag) } func severityParser(ctx context.Context, processorType, tag, uid string) []fluentbit.Component { @@ -181,5 +179,7 @@ func severityParser(ctx context.Context, processorType, tag, uid string) []fluen } func init() { - confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { return &LoggingReceiverZookeeperGeneral{} }) + confgenerator.LoggingReceiverTypes.RegisterType(func() confgenerator.LoggingReceiver { + return &confgenerator.LoggingCompositeReceiver[LoggingReceiverZookeeperGeneralMixin, LoggingProcessorZookeeperGeneral]{} + }) } diff --git a/confgenerator/config.go b/confgenerator/config.go index aa817e61aa..8c23136563 100644 --- a/confgenerator/config.go +++ b/confgenerator/config.go @@ -514,6 +514,10 @@ type LoggingReceiver interface { Components(ctx context.Context, tag string) []fluentbit.Component } +type LoggingReceiverMixin interface { + Components(ctx context.Context, tag string) []fluentbit.Component +} + var LoggingReceiverTypes = &componentTypeRegistry[LoggingReceiver, loggingReceiverMap]{ Subagent: "logging", Kind: "receiver", } @@ -546,6 +550,11 @@ type LoggingProcessor interface { Components(ctx context.Context, tag string, uid string) []fluentbit.Component } +type LoggingProcessorMixin interface { + Type() string + Components(ctx context.Context, tag string, uid string) []fluentbit.Component +} + var LoggingProcessorTypes = &componentTypeRegistry[LoggingProcessor, loggingProcessorMap]{ Subagent: "logging", Kind: "processor", } diff --git a/confgenerator/logging_receivers.go b/confgenerator/logging_receivers.go index 52c74ef6a8..403637da31 100644 --- a/confgenerator/logging_receivers.go +++ b/confgenerator/logging_receivers.go @@ -16,6 +16,7 @@ package confgenerator import ( "context" + "errors" "fmt" "path" "strconv" @@ -685,3 +686,38 @@ func (r LoggingReceiverSystemd) Components(ctx context.Context, tag string) []fl func init() { LoggingReceiverTypes.RegisterType(func() LoggingReceiver { return &LoggingReceiverSystemd{} }, platform.Linux) } + +type LoggingCompositeReceiver[R LoggingReceiverMixin, P LoggingProcessorMixin] struct { + ProcessorMixin P `yaml:",inline"` + ReceiverMixin R `yaml:",inline"` +} + +func (cr *LoggingCompositeReceiver[R, P]) Type() string { + return cr.ProcessorMixin.Type() +} + +func (cr *LoggingCompositeReceiver[R, P]) Components(ctx context.Context, tag string) []fluentbit.Component { + c := cr.ReceiverMixin.Components(ctx, tag) + c = append(c, cr.ProcessorMixin.Components(ctx, tag, cr.ProcessorMixin.Type())...) + return c +} + +func (cr *LoggingCompositeReceiver[R, P]) Pipelines(ctx context.Context) ([]otel.ReceiverPipeline, error) { + if r, ok := any(cr.ReceiverMixin).(OTelReceiver); ok { + receiverPipelines, err := r.Pipelines(ctx) + if err != nil { + return nil, err + } + if p, ok := any(cr.ProcessorMixin).(OTelProcessor); ok { + processors, err := p.Processors(ctx) + if err != nil { + return nil, err + } + for _, pipeline := range receiverPipelines { + pipeline.Processors["logs"] = append(pipeline.Processors["logs"], processors...) + } + return receiverPipelines, nil + } + } + return nil, errors.New("unimplemented") +} diff --git a/confgenerator/testdata/feature/golden.csv b/confgenerator/testdata/feature/golden.csv index e85bdfe5a8..96eb3c4081 100644 --- a/confgenerator/testdata/feature/golden.csv +++ b/confgenerator/testdata/feature/golden.csv @@ -1,8 +1,137 @@ App,Field,Override, -*apps.AccessSystemLoggingReceiverTomcat,apps.LoggingProcessorTomcatAccess.confgenerator.ConfigComponent.Type, -*apps.AccessSystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.AccessSystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.AccessSystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.AccessSystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatAccess]",apps.AccessSystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.AccessSystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatAccess]",apps.AccessSystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.AccessSystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatAccess]",apps.AccessSystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.AccessSystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatAccess]",apps.LoggingProcessorTomcatAccess.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheAccess]",apps.LoggingProcessorApacheAccess.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheAccess]",apps.LoggingReceiverApacheAccessMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheAccess]",apps.LoggingReceiverApacheAccessMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheAccess]",apps.LoggingReceiverApacheAccessMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheError]",apps.LoggingProcessorApacheError.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheError]",apps.LoggingReceiverApacheErrorMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheError]",apps.LoggingReceiverApacheErrorMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverApacheErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorApacheError]",apps.LoggingReceiverApacheErrorMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraDebugMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraDebug]",apps.LoggingProcessorCassandraDebug.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraDebugMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraDebug]",apps.LoggingReceiverCassandraDebugMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraDebugMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraDebug]",apps.LoggingReceiverCassandraDebugMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraDebugMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraDebug]",apps.LoggingReceiverCassandraDebugMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraGC]",apps.LoggingProcessorCassandraGC.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraGC]",apps.LoggingReceiverCassandraGCMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraGC]",apps.LoggingReceiverCassandraGCMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraGC]",apps.LoggingReceiverCassandraGCMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraSystem]",apps.LoggingProcessorCassandraSystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraSystem]",apps.LoggingReceiverCassandraSystemMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraSystem]",apps.LoggingReceiverCassandraSystemMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCassandraSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCassandraSystem]",apps.LoggingReceiverCassandraSystemMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCouchdbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCouchdb]",apps.LoggingProcessorCouchdb.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCouchdbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCouchdb]",apps.LoggingReceiverCouchdbMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCouchdbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCouchdb]",apps.LoggingReceiverCouchdbMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverCouchdbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorCouchdb]",apps.LoggingReceiverCouchdbMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchGC]",apps.LoggingProcessorElasticsearchGC.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchGC]",apps.LoggingReceiverElasticsearchGCMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchGC]",apps.LoggingReceiverElasticsearchGCMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchGCMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchGC]",apps.LoggingReceiverElasticsearchGCMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchJson]",apps.LoggingProcessorElasticsearchJson.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchJson]",apps.LoggingReceiverElasticsearchJsonMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchJson]",apps.LoggingReceiverElasticsearchJsonMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverElasticsearchJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorElasticsearchJson]",apps.LoggingReceiverElasticsearchJsonMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverFlinkMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorFlink]",apps.LoggingProcessorFlink.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverFlinkMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorFlink]",apps.LoggingReceiverFlinkMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverFlinkMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorFlink]",apps.LoggingReceiverFlinkMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverFlinkMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorFlink]",apps.LoggingReceiverFlinkMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverHadoopMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHadoop]",apps.LoggingProcessorHadoop.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverHadoopMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHadoop]",apps.LoggingReceiverHadoopMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverHadoopMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHadoop]",apps.LoggingReceiverHadoopMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverHadoopMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHadoop]",apps.LoggingReceiverHadoopMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverIisAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorIisAccess]",apps.LoggingProcessorIisAccess.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverIisAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorIisAccess]",apps.LoggingReceiverIisAccessMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverIisAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorIisAccess]",apps.LoggingReceiverIisAccessMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverIisAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorIisAccess]",apps.LoggingReceiverIisAccessMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverJettyAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorJettyAccess]",apps.LoggingProcessorJettyAccess.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverJettyAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorJettyAccess]",apps.LoggingReceiverJettyAccessMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverJettyAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorJettyAccess]",apps.LoggingReceiverJettyAccessMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverJettyAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorJettyAccess]",apps.LoggingReceiverJettyAccessMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverKafkaMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorKafka]",apps.LoggingProcessorKafka.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverKafkaMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorKafka]",apps.LoggingReceiverKafkaMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverKafkaMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorKafka]",apps.LoggingReceiverKafkaMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverKafkaMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorKafka]",apps.LoggingReceiverKafkaMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMongodbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMongodb]",apps.LoggingProcessorMongodb.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMongodbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMongodb]",apps.LoggingReceiverMongodbMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMongodbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMongodb]",apps.LoggingReceiverMongodbMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMongodbMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMongodb]",apps.LoggingReceiverMongodbMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlError]",apps.LoggingProcessorMysqlError.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlError]",apps.LoggingReceiverMysqlErrorMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlError]",apps.LoggingReceiverMysqlErrorMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlError]",apps.LoggingReceiverMysqlErrorMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlGeneral]",apps.LoggingProcessorMysqlGeneral.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlGeneral]",apps.LoggingReceiverMysqlGeneralMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlGeneral]",apps.LoggingReceiverMysqlGeneralMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlGeneral]",apps.LoggingReceiverMysqlGeneralMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlSlowMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlSlow]",apps.LoggingProcessorMysqlSlow.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlSlowMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlSlow]",apps.LoggingReceiverMysqlSlowMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlSlowMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlSlow]",apps.LoggingReceiverMysqlSlowMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverMysqlSlowMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMysqlSlow]",apps.LoggingReceiverMysqlSlowMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxAccess]",apps.LoggingProcessorNginxAccess.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxAccess]",apps.LoggingReceiverNginxAccessMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxAccess]",apps.LoggingReceiverNginxAccessMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxAccessMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxAccess]",apps.LoggingReceiverNginxAccessMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxError]",apps.LoggingProcessorNginxError.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxError]",apps.LoggingReceiverNginxErrorMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxError]",apps.LoggingReceiverNginxErrorMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverNginxErrorMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorNginxError]",apps.LoggingReceiverNginxErrorMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAlertMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAlert]",apps.LoggingProcessorOracleDBAlert.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAlertMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAlert]",apps.LoggingReceiverOracleDBAlertMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAlertMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAlert]",apps.LoggingReceiverOracleDBAlertMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAlertMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAlert]",apps.LoggingReceiverOracleDBAlertMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAuditMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAudit]",apps.LoggingProcessorOracleDBAudit.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAuditMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAudit]",apps.LoggingReceiverOracleDBAuditMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAuditMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAudit]",apps.LoggingReceiverOracleDBAuditMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverOracleDBAuditMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorOracleDBAudit]",apps.LoggingReceiverOracleDBAuditMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverPostgresqlMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorPostgresql]",apps.LoggingProcessorPostgresql.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverPostgresqlMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorPostgresql]",apps.LoggingReceiverPostgresqlMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverPostgresqlMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorPostgresql]",apps.LoggingReceiverPostgresqlMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverPostgresqlMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorPostgresql]",apps.LoggingReceiverPostgresqlMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRabbitmqMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRabbitmq]",apps.LoggingProcessorRabbitmq.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRabbitmqMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRabbitmq]",apps.LoggingReceiverRabbitmqMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRabbitmqMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRabbitmq]",apps.LoggingReceiverRabbitmqMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRabbitmqMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRabbitmq]",apps.LoggingReceiverRabbitmqMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRedisMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRedis]",apps.LoggingProcessorRedis.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRedisMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRedis]",apps.LoggingReceiverRedisMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRedisMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRedis]",apps.LoggingReceiverRedisMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverRedisMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorRedis]",apps.LoggingReceiverRedisMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSapHanaTraceMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSapHanaTrace]",apps.LoggingProcessorSapHanaTrace.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSapHanaTraceMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSapHanaTrace]",apps.LoggingReceiverSapHanaTraceMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSapHanaTraceMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSapHanaTrace]",apps.LoggingReceiverSapHanaTraceMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSapHanaTraceMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSapHanaTrace]",apps.LoggingReceiverSapHanaTraceMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSolrSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSolrSystem]",apps.LoggingProcessorSolrSystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSolrSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSolrSystem]",apps.LoggingReceiverSolrSystemMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSolrSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSolrSystem]",apps.LoggingReceiverSolrSystemMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverSolrSystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorSolrSystem]",apps.LoggingReceiverSolrSystemMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVarnishMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVarnish]",apps.LoggingProcessorVarnish.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVarnishMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVarnish]",apps.LoggingReceiverVarnishMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVarnishMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVarnish]",apps.LoggingReceiverVarnishMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVarnishMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVarnish]",apps.LoggingReceiverVarnishMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVaultAuditJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVaultJson]",apps.LoggingProcessorVaultJson.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVaultAuditJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVaultJson]",apps.LoggingReceiverVaultAuditJsonMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVaultAuditJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVaultJson]",apps.LoggingReceiverVaultAuditJsonMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverVaultAuditJsonMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorVaultJson]",apps.LoggingReceiverVaultAuditJsonMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverWildflySystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorWildflySystem]",apps.LoggingProcessorWildflySystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverWildflySystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorWildflySystem]",apps.LoggingReceiverWildflySystemMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverWildflySystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorWildflySystem]",apps.LoggingReceiverWildflySystemMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverWildflySystemMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorWildflySystem]",apps.LoggingReceiverWildflySystemMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverZookeeperGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorZookeeperGeneral]",apps.LoggingProcessorZookeeperGeneral.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverZookeeperGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorZookeeperGeneral]",apps.LoggingReceiverZookeeperGeneralMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverZookeeperGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorZookeeperGeneral]",apps.LoggingReceiverZookeeperGeneralMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingReceiverZookeeperGeneralMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorZookeeperGeneral]",apps.LoggingReceiverZookeeperGeneralMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverHbaseMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHbaseSystem]",apps.LoggingProcessorHbaseSystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverHbaseMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHbaseSystem]",apps.SystemLoggingReceiverHbaseMixin.apps.LoggingProcessorHbaseSystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverHbaseMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHbaseSystem]",apps.SystemLoggingReceiverHbaseMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverHbaseMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHbaseSystem]",apps.SystemLoggingReceiverHbaseMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverHbaseMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorHbaseSystem]",apps.SystemLoggingReceiverHbaseMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatSystem]",apps.LoggingProcessorTomcatSystem.confgenerator.ConfigComponent.Type, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatSystem]",apps.SystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.BufferInMemory, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatSystem]",apps.SystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, +"*confgenerator.LoggingCompositeReceiver[github.com/GoogleCloudPlatform/ops-agent/apps.SystemLoggingReceiverTomcatMixin,github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorTomcatSystem]",apps.SystemLoggingReceiverTomcatMixin.confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, *apps.LoggingProcessorApacheAccess,confgenerator.ConfigComponent.Type, *apps.LoggingProcessorApacheError,confgenerator.ConfigComponent.Type, *apps.LoggingProcessorCassandraDebug,confgenerator.ConfigComponent.Type, @@ -38,130 +167,10 @@ App,Field,Override, *apps.LoggingProcessorVarnish,confgenerator.ConfigComponent.Type, *apps.LoggingProcessorWildflySystem,confgenerator.ConfigComponent.Type, *apps.LoggingReceiverActiveDirectoryDS,confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverApacheAccess,apps.LoggingProcessorApacheAccess.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverApacheAccess,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverApacheAccess,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverApacheAccess,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverApacheError,apps.LoggingProcessorApacheError.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverApacheError,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverApacheError,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverApacheError,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverCassandraDebug,apps.LoggingProcessorCassandraDebug.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverCassandraDebug,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverCassandraDebug,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverCassandraDebug,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverCassandraGC,apps.LoggingProcessorCassandraGC.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverCassandraGC,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverCassandraGC,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverCassandraGC,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverCassandraSystem,apps.LoggingProcessorCassandraSystem.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverCassandraSystem,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverCassandraSystem,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverCassandraSystem,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, *apps.LoggingReceiverCouchbase,confgenerator.ConfigComponent.Type, *apps.LoggingReceiverCouchbase,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, *apps.LoggingReceiverCouchbase,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, *apps.LoggingReceiverCouchbase,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverCouchdb,apps.LoggingProcessorCouchdb.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverCouchdb,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverElasticsearchGC,apps.LoggingProcessorElasticsearchGC.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverElasticsearchGC,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverElasticsearchJson,apps.LoggingProcessorElasticsearchJson.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverElasticsearchJson,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverElasticsearchJson,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverElasticsearchJson,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverFlink,apps.LoggingProcessorFlink.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverFlink,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverFlink,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverFlink,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverHadoop,apps.LoggingProcessorHadoop.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverHadoop,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverHadoop,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverHadoop,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverIisAccess,apps.LoggingProcessorIisAccess.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverIisAccess,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverIisAccess,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverIisAccess,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverJettyAccess,apps.LoggingProcessorJettyAccess.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverJettyAccess,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverJettyAccess,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverJettyAccess,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverKafka,apps.LoggingProcessorKafka.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverKafka,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverKafka,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverKafka,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverMongodb,apps.LoggingProcessorMongodb.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverMongodb,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverMongodb,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverMongodb,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverMysqlError,apps.LoggingProcessorMysqlError.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverMysqlError,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverMysqlError,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverMysqlError,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverMysqlGeneral,apps.LoggingProcessorMysqlGeneral.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverMysqlGeneral,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverMysqlGeneral,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverMysqlGeneral,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverMysqlSlow,apps.LoggingProcessorMysqlSlow.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverMysqlSlow,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverMysqlSlow,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverMysqlSlow,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverNginxAccess,apps.LoggingProcessorNginxAccess.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverNginxAccess,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverNginxAccess,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverNginxAccess,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverNginxError,apps.LoggingProcessorNginxError.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverNginxError,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverNginxError,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverNginxError,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverOracleDBAlert,apps.LoggingProcessorOracleDBAlert.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverOracleDBAlert,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverOracleDBAlert,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverOracleDBAlert,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverOracleDBAudit,apps.LoggingProcessorOracleDBAudit.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverOracleDBAudit,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverPostgresql,apps.LoggingProcessorPostgresql.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverPostgresql,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverPostgresql,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverPostgresql,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverRabbitmq,apps.LoggingProcessorRabbitmq.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverRabbitmq,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverRedis,apps.LoggingProcessorRedis.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverRedis,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverRedis,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverRedis,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverSapHanaTrace,apps.LoggingProcessorSapHanaTrace.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverSapHanaTrace,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverSolrSystem,apps.LoggingProcessorSolrSystem.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverSolrSystem,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverSolrSystem,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverSolrSystem,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverVarnish,apps.LoggingProcessorVarnish.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverVarnish,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverVarnish,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverVarnish,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.LoggingReceiverWildflySystem,apps.LoggingProcessorWildflySystem.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverWildflySystem,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverWildflySystem,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverWildflySystem,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.LoggingReceiverZookeeperGeneral,apps.LoggingProcessorZookeeperGeneral.confgenerator.ConfigComponent.Type, -*apps.LoggingReceiverZookeeperGeneral,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.LoggingReceiverZookeeperGeneral,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.LoggingReceiverZookeeperGeneral,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, *apps.MetricsProcessorExcludeMetrics,confgenerator.ConfigComponent.Type, *apps.MetricsReceiverActiveDirectoryDS,confgenerator.ConfigComponent.Type, *apps.MetricsReceiverActivemq,confgenerator.ConfigComponent.Type, @@ -229,14 +238,6 @@ App,Field,Override, *apps.ReceiverOTLP,GRPCEndpoint,endpoint *apps.ReceiverOTLP,MetricsMode, *apps.ReceiverOTLP,confgenerator.ConfigComponent.Type, -*apps.SystemLoggingReceiverHbase,apps.LoggingProcessorHbaseSystem.confgenerator.ConfigComponent.Type, -*apps.SystemLoggingReceiverHbase,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.SystemLoggingReceiverHbase,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.SystemLoggingReceiverHbase,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, -*apps.SystemLoggingReceiverTomcat,apps.LoggingProcessorTomcatSystem.confgenerator.ConfigComponent.Type, -*apps.SystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.BufferInMemory, -*apps.SystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.RecordLogFilePath, -*apps.SystemLoggingReceiverTomcat,confgenerator.LoggingReceiverFilesMixin.WildcardRefreshInterval, *confgenerator.LoggingProcessorExcludeLogs,confgenerator.ConfigComponent.Type, *confgenerator.LoggingProcessorModifyFields,confgenerator.ConfigComponent.Type, *confgenerator.LoggingProcessorParseJson,confgenerator.ConfigComponent.Type, diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux-gpu/error index 8898f9bba8..4c46991b01 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux-gpu/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAlert.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlert.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_alert: - ^ - 18 | type: oracledb_alert - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAlertMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlertMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux/error index 8898f9bba8..4c46991b01 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/linux/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAlert.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlert.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_alert: - ^ - 18 | type: oracledb_alert - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAlertMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlertMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows-2012/error index 8898f9bba8..4c46991b01 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows-2012/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAlert.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlert.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_alert: - ^ - 18 | type: oracledb_alert - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAlertMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlertMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows/error index 8898f9bba8..4c46991b01 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_alert_location_missing/golden/windows/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAlert.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlert.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_alert: - ^ - 18 | type: oracledb_alert - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAlertMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAlertMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux-gpu/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux-gpu/error index 7581efda55..816b13eff3 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux-gpu/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux-gpu/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAudit.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAudit.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_audit: - ^ - 18 | type: oracledb_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAuditMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAuditMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux/error index 7581efda55..816b13eff3 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/linux/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAudit.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAudit.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_audit: - ^ - 18 | type: oracledb_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAuditMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAuditMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows-2012/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows-2012/error index 7581efda55..816b13eff3 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows-2012/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows-2012/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAudit.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAudit.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_audit: - ^ - 18 | type: oracledb_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAuditMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAuditMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ No newline at end of file diff --git a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows/error b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows/error index 7581efda55..816b13eff3 100644 --- a/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows/error +++ b/confgenerator/testdata/goldens/invalid-logging-receiver_oracledb_audit_location_missing/golden/windows/error @@ -1,8 +1 @@ -[17:19] Key: 'LoggingReceiverOracleDBAudit.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAudit.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag - 15 | logging: - 16 | receivers: -> 17 | oracledb_audit: - ^ - 18 | type: oracledb_audit - 19 | service: - 20 | pipelines: \ No newline at end of file +Key: 'LoggingReceiverOracleDBAuditMixin.include_paths' Error:Field validation for 'include_paths' failed on the 'required_without' tag,Key: 'LoggingReceiverOracleDBAuditMixin.oracle_home' Error:Field validation for 'oracle_home' failed on the 'required_without' tag \ 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_apache/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/features.yaml index 1813ff8fd6..a918015078 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:apache_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/features.yaml index 1813ff8fd6..a918015078 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:apache_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/features.yaml index 1813ff8fd6..a918015078 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:apache_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/features.yaml index 1813ff8fd6..a918015078 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:apache_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/features.yaml index 71a0977e9e..7610b68539 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:cassandra_debug key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/features.yaml index 71a0977e9e..7610b68539 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:cassandra_debug key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/features.yaml index 71a0977e9e..7610b68539 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:cassandra_debug key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/features.yaml index 71a0977e9e..7610b68539 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:cassandra_debug key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/features.yaml index 8b9e900124..f618031764 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:couchdb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/features.yaml index 8b9e900124..f618031764 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:couchdb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/features.yaml index 8b9e900124..f618031764 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:couchdb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/features.yaml index 8b9e900124..f618031764 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:couchdb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml index cbf33ea1ed..b6100396aa 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml index cbf33ea1ed..b6100396aa 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml index cbf33ea1ed..b6100396aa 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml index cbf33ea1ed..b6100396aa 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml index 0fa9f191fb..d3d7484567 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml index 0fa9f191fb..d3d7484567 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml index 0fa9f191fb..d3d7484567 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml index 0fa9f191fb..d3d7484567 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:elasticsearch_gc key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/features.yaml index 0bca0fc8f3..2cdbddee60 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:flink key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/features.yaml index 0bca0fc8f3..2cdbddee60 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:flink key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/features.yaml index 0bca0fc8f3..2cdbddee60 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:flink key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/features.yaml index 0bca0fc8f3..2cdbddee60 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:flink key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/features.yaml index 9621134874..4b805cc510 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:hadoop key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/features.yaml index e1248a9f57..cb13609a87 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/features.yaml @@ -13,6 +13,10 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config + value: "false" +- module: logging + feature: receivers:hbase_system + key: "[0].enabled" value: "true" - module: logging feature: receivers:hbase_system diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/features.yaml index e1248a9f57..cb13609a87 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/features.yaml @@ -13,6 +13,10 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config + value: "false" +- module: logging + feature: receivers:hbase_system + key: "[0].enabled" value: "true" - module: logging feature: receivers:hbase_system diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/features.yaml index e1248a9f57..cb13609a87 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/features.yaml @@ -13,6 +13,10 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config + value: "false" +- module: logging + feature: receivers:hbase_system + key: "[0].enabled" value: "true" - module: logging feature: receivers:hbase_system diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/features.yaml index e1248a9f57..cb13609a87 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/features.yaml @@ -13,6 +13,10 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config + value: "false" +- module: logging + feature: receivers:hbase_system + key: "[0].enabled" value: "true" - module: logging feature: receivers:hbase_system diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/features.yaml index c1b79c2fc6..522b0862af 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:jetty_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/features.yaml index c1b79c2fc6..522b0862af 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:jetty_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/features.yaml index c1b79c2fc6..522b0862af 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:jetty_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/features.yaml index c1b79c2fc6..522b0862af 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:jetty_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/features.yaml index 63a5521bd2..fd1c4419f6 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:kafka key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/features.yaml index 63a5521bd2..fd1c4419f6 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:kafka key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/features.yaml index 63a5521bd2..fd1c4419f6 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:kafka key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/features.yaml index 63a5521bd2..fd1c4419f6 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:kafka key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/features.yaml index e9c34ce59d..8216fe84f1 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mongodb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/features.yaml index e9c34ce59d..8216fe84f1 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mongodb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/features.yaml index e9c34ce59d..8216fe84f1 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mongodb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/features.yaml index e9c34ce59d..8216fe84f1 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mongodb key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/features.yaml index 0e7c4f0cbf..80087edacb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mysql_error key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/features.yaml index 0e7c4f0cbf..80087edacb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mysql_error key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/features.yaml index 0e7c4f0cbf..80087edacb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mysql_error key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/features.yaml index 0e7c4f0cbf..80087edacb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:mysql_error key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/features.yaml index 426214e8a1..13cc2c7718 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:nginx_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/features.yaml index 426214e8a1..13cc2c7718 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:nginx_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/features.yaml index 426214e8a1..13cc2c7718 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:nginx_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/features.yaml index 426214e8a1..13cc2c7718 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:nginx_access key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/features.yaml index a188c943c3..8ee88be0f8 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:oracledb_alert key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/features.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/features.yaml index a188c943c3..8ee88be0f8 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:oracledb_alert key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/features.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/features.yaml index a188c943c3..8ee88be0f8 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:oracledb_alert key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/features.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/features.yaml index a188c943c3..8ee88be0f8 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:oracledb_alert key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/features.yaml index b47038243c..0d628b31f9 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/features.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/features.yaml @@ -13,7 +13,7 @@ - module: logging feature: service:otel_logging key: otel_logging_supported_config - value: "true" + value: "false" - module: logging feature: receivers:postgresql_general key: "[0].enabled" diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_main.conf index ff227b06fd..437a5aedb5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_main.conf +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_main.conf @@ -93,7 +93,7 @@ [FILTER] Match postgresql.postgresql_general Multiline.Key_Content message - Multiline.Parser postgresql.postgresql_general.postgresql.multiline + Multiline.Parser postgresql.postgresql_general.postgresql_general.multiline Name multiline [FILTER] @@ -107,8 +107,8 @@ Match postgresql.postgresql_general Name parser Reserve_Data True - Parser postgresql.postgresql_general.postgresql.0 - Parser postgresql.postgresql_general.postgresql.1 + Parser postgresql.postgresql_general.postgresql_general.0 + Parser postgresql.postgresql_general.postgresql_general.1 [FILTER] Match postgresql.postgresql_general diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_parser.conf index 14fa8adb9a..56a39c09a5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_parser.conf +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/fluent_bit_parser.conf @@ -1,6 +1,6 @@ [PARSER] Format regex - Name postgresql.postgresql_general.postgresql.0 + Name postgresql.postgresql_general.postgresql_general.0 Regex ^(?