Merge branch 'master' into fcovalente-fix-sles15-saphana

GoogleCloudPlatform · May 22, 2024 · 4f19034 · 4f19034
2 parents a9d7330 + 7a58c41
commit 4f19034
Show file tree

Hide file tree

Showing 342 changed files with 2,101 additions and 1,749 deletions.
diff --git a/confgenerator/logging_receivers.go b/confgenerator/logging_receivers.go
@@ -430,11 +430,13 @@ func (r LoggingReceiverWindowsEventLog) Components(ctx context.Context, tag stri
 	input := []fluentbit.Component{{
 		Kind: "INPUT",
 		Config: map[string]string{
-			"Name":         inputName,
-			"Tag":          tag,
-			"Channels":     strings.Join(r.Channels, ","),
-			"Interval_Sec": "1",
-			"DB":           DBPath(tag),
+			"Name": inputName,
+			"Tag":  tag,
+			// TODO(@braydonk): Remove this upon the next Fluent Bit update. See https://github.com/fluent/fluent-bit/issues/8854
+			"String_Inserts": "true",
+			"Channels":       strings.Join(r.Channels, ","),
+			"Interval_Sec":   "1",
+			"DB":             DBPath(tag),
 		},
 	}}
 

diff --git a/...or/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/fluent_bit_main.conf b/...or/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...nerator/testdata/goldens/all-user_config_file_deleted/golden/windows/fluent_bit_main.conf b/...nerator/testdata/goldens/all-user_config_file_deleted/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/confgenerator/testdata/goldens/builtin/golden/windows-2012/fluent_bit_main.conf b/confgenerator/testdata/goldens/builtin/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/confgenerator/testdata/goldens/builtin/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/builtin/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...enerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/fluent_bit_main.conf b/...enerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/fluent_bit_main.conf b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...ens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/fluent_bit_main.conf b/...ens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/.../goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/fluent_bit_main.conf b/.../goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...s/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/fluent_bit_main.conf b/...s/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...oldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/fluent_bit_main.conf b/...oldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...data/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/fluent_bit_main.conf b/...data/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/.../testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/fluent_bit_main.conf b/.../testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...oldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/fluent_bit_main.conf b/...oldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...ata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/fluent_bit_main.conf b/...ata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...estdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/fluent_bit_main.conf b/...estdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...tor/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/fluent_bit_main.conf b/...tor/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...tdata/goldens/global-default-log-rotation_custom/golden/windows-2012/fluent_bit_main.conf b/...tdata/goldens/global-default-log-rotation_custom/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...r/testdata/goldens/global-default-log-rotation_custom/golden/windows/fluent_bit_main.conf b/...r/testdata/goldens/global-default-log-rotation_custom/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...l-service_default_self_log_file_collection_false/golden/windows-2012/fluent_bit_main.conf b/...l-service_default_self_log_file_collection_false/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...global-service_default_self_log_file_collection_false/golden/windows/fluent_bit_main.conf b/...global-service_default_self_log_file_collection_false/golden/windows/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}

diff --git a/...al-service_default_self_log_file_collection_true/golden/windows-2012/fluent_bit_main.conf b/...al-service_default_self_log_file_collection_true/golden/windows-2012/fluent_bit_main.conf
@@ -18,11 +18,12 @@
     Scrape_On_Start True
 
 [INPUT]
-    Channels     System,Application,Security
-    DB           ${buffers_dir}/default_pipeline_windows_event_log
-    Interval_Sec 1
-    Name         winlog
-    Tag          default_pipeline.windows_event_log
+    Channels       System,Application,Security
+    DB             ${buffers_dir}/default_pipeline_windows_event_log
+    Interval_Sec   1
+    Name           winlog
+    String_Inserts true
+    Tag            default_pipeline.windows_event_log
 
 [INPUT]
     Dummy         {"code": "LogPingOpsAgent", "severity": "DEBUG"}