Update fluent-bit submodule to v1.8.11 and switch dns resolver to leg…

…acy.
GoogleCloudPlatform · Dec 16, 2021 · b1bb57b · b1bb57b
1 parent 3150c9a
commit b1bb57b
Show file tree

Hide file tree

Showing 57 changed files with 58 additions and 1 deletion.
diff --git a/confgenerator/fluentbit/service.go b/confgenerator/fluentbit/service.go
@@ -37,6 +37,8 @@ func (s Service) Component() Component {
 			"HTTP_Listen": "0.0.0.0",
 			"HTTP_PORT":   "2020",
 
+			// Use the legacy DNS resolver mechanism to work around b/206549605 temporarily.
+			"dns.resolver": "legacy",
 			// https://docs.fluentbit.io/manual/administration/buffering-and-storage#service-section-configuration
 			// storage.path is set by Fluent Bit systemd unit (e.g. /var/lib/google-cloud-ops-agent/fluent-bit/buffers).
 			"storage.sync": "normal",

diff --git a/...a/valid/linux/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf b/...a/valid/linux/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/all-built_in_config/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/all-built_in_config/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 warn
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...or/testdata/valid/linux/logging-default_overrides_disable_all/golden_fluent_bit_main.conf b/...or/testdata/valid/linux/logging-default_overrides_disable_all/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...ator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_fluent_bit_main.conf b/...ator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-processor_order/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-processor_order/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...alid/linux/logging-processor_parse_json_and_parse_regex_types/golden_fluent_bit_main.conf b/...alid/linux/logging-processor_parse_json_and_parse_regex_types/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/.../linux/logging-processor_parse_regex_type_on_default_pipeline/golden_fluent_bit_main.conf b/.../linux/logging-processor_parse_regex_type_on_default_pipeline/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...ta/valid/linux/logging-receiver_files_type_multiple_receivers/golden_fluent_bit_main.conf b/...ta/valid/linux/logging-receiver_files_type_multiple_receivers/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...a/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_fluent_bit_main.conf b/...a/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_fluent_bit_main.conf b/...valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...or/testdata/valid/linux/metrics-default_overrides_disable_all/golden_fluent_bit_main.conf b/...or/testdata/valid/linux/metrics-default_overrides_disable_all/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...nux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_fluent_bit_main.conf b/...nux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...inux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_fluent_bit_main.conf b/...inux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...rics-processor_exclude_metrics_type_filter_with_special_chars/golden_fluent_bit_main.conf b/...rics-processor_exclude_metrics_type_filter_with_special_chars/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...stdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_fluent_bit_main.conf b/...stdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...erator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_fluent_bit_main.conf b/...erator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...tdata/valid/linux/metrics-receiver_custom_collection_interval/golden_fluent_bit_main.conf b/...tdata/valid/linux/metrics-receiver_custom_collection_interval/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...or/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_fluent_bit_main.conf b/...or/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...generator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_fluent_bit_main.conf b/...generator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...estdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_fluent_bit_main.conf b/...estdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...r/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_fluent_bit_main.conf b/...r/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...valid/windows/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf b/...valid/windows/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/confgenerator/testdata/valid/windows/all-built_in_config/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/windows/all-built_in_config/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...generator/testdata/valid/windows/all-user_config_file_deleted/golden_fluent_bit_main.conf b/...generator/testdata/valid/windows/all-user_config_file_deleted/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/.../testdata/valid/windows/logging-default_overrides_disable_all/golden_fluent_bit_main.conf b/.../testdata/valid/windows/logging-default_overrides_disable_all/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/.../valid/windows/logging-receiver_files_type_multiple_receivers/golden_fluent_bit_main.conf b/.../valid/windows/logging-receiver_files_type_multiple_receivers/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/.../testdata/valid/windows/metrics-default_overrides_disable_all/golden_fluent_bit_main.conf b/.../testdata/valid/windows/metrics-default_overrides_disable_all/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/.../testdata/valid/windows/metrics-default_overrides_disable_iis/golden_fluent_bit_main.conf b/.../testdata/valid/windows/metrics-default_overrides_disable_iis/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...estdata/valid/windows/metrics-default_overrides_disable_mssql/golden_fluent_bit_main.conf b/...estdata/valid/windows/metrics-default_overrides_disable_mssql/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...or/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_fluent_bit_main.conf b/...or/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...ows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_fluent_bit_main.conf b/...ows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...dows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_fluent_bit_main.conf b/...dows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128

diff --git a/...rics-processor_exclude_metrics_type_filter_with_special_chars/golden_fluent_bit_main.conf b/...rics-processor_exclude_metrics_type_filter_with_special_chars/golden_fluent_bit_main.conf
@@ -8,6 +8,7 @@
     HTTP_PORT                 2020
     HTTP_Server               On
     Log_Level                 info
+    dns.resolver              legacy
     storage.backlog.mem_limit 50M
     storage.checksum          on
     storage.max_chunks_up     128