confgenerator: refresh goldens

GoogleCloudPlatform · Apr 8, 2022 · b8d03d1 · b8d03d1
1 parent bc9d3b1
commit b8d03d1
Show file tree

Hide file tree

Showing 40 changed files with 82 additions and 1 deletion.
diff --git a/confgenerator/testdata/valid/linux/logging-receiver_couchdb/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_couchdb/golden_fluent_bit_main.conf
@@ -184,6 +184,7 @@
     Match_Regex                   ^(couchdb\.couchdb|default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -195,6 +196,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_forward/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_forward/golden_fluent_bit_main.conf
@@ -73,6 +73,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|e8195f91348f8a6c3c046a4e5e97bc49\.fluent_forward\.fluent_forward\..*)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -84,6 +85,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...ux/logging-receiver_forward_multiple_receivers_conflicting_id/golden_fluent_bit_main.conf b/...ux/logging-receiver_forward_multiple_receivers_conflicting_id/golden_fluent_bit_main.conf
@@ -92,6 +92,7 @@
     Match_Regex                   ^(3d1e3d2de8297b94d50f1b791772d4f9\.fluent_forward\.fluent_forward_collision\..*|default_pipeline\.syslog|e8195f91348f8a6c3c046a4e5e97bc49\.fluent_forward\.fluent_forward\..*)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -103,6 +104,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...id/linux/logging-receiver_forward_multiple_receivers_with_dot/golden_fluent_bit_main.conf b/...id/linux/logging-receiver_forward_multiple_receivers_with_dot/golden_fluent_bit_main.conf
@@ -92,6 +92,7 @@
     Match_Regex                   ^(770ecc55c94dd06217c2f78e09580174\.fluent_forward\.fluent_forward\..*|default_pipeline\.syslog|e8195f91348f8a6c3c046a4e5e97bc49\.fluent_forward\.fluent_forward\..*)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -103,6 +104,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...d/linux/logging-receiver_forward_omitting_optional_parameters/golden_fluent_bit_main.conf b/...d/linux/logging-receiver_forward_omitting_optional_parameters/golden_fluent_bit_main.conf
@@ -73,6 +73,7 @@
     Match_Regex                   ^(b6547699ccacdc03ba6ae458f9ee5860\.fluent_pipeline\.fluent_logs\..*|default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -84,6 +85,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_hadoop/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_hadoop/golden_fluent_bit_main.conf
@@ -141,6 +141,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|hadoop\.hadoop)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -152,6 +153,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...testdata/valid/linux/logging-receiver_hadoop_refresh_interval/golden_fluent_bit_main.conf b/...testdata/valid/linux/logging-receiver_hadoop_refresh_interval/golden_fluent_bit_main.conf
@@ -142,6 +142,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|hadoop\.hadoop)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -153,6 +154,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_hbase/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_hbase/golden_fluent_bit_main.conf
@@ -127,6 +127,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|hbase\.hbase_system)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -138,6 +139,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_kafka/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_kafka/golden_fluent_bit_main.conf
@@ -127,6 +127,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|kafka\.kafka)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -138,6 +139,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_kafka_custom/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_kafka_custom/golden_fluent_bit_main.conf
@@ -197,6 +197,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|kafka_custom\.kafka_custom|kafka_syslog\.kafka_syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -208,6 +209,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_rabbitmq/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_rabbitmq/golden_fluent_bit_main.conf
@@ -113,6 +113,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|rabbitmq\.rabbitmq)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -124,6 +125,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_solr/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_solr/golden_fluent_bit_main.conf
@@ -127,6 +127,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|solr\.solr_system)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -138,6 +139,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_wildfly/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_wildfly/golden_fluent_bit_main.conf
@@ -115,6 +115,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|wildfly_system\.wildfly_system)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -126,6 +127,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_zookeeper/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/logging-receiver_zookeeper/golden_fluent_bit_main.conf
@@ -135,6 +135,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|zookeeper_general\.zookeeper_general)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -146,6 +147,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...erator/testdata/valid/linux/logging-receiver_zookeeper_custom/golden_fluent_bit_main.conf b/...erator/testdata/valid/linux/logging-receiver_zookeeper_custom/golden_fluent_bit_main.conf
@@ -135,6 +135,7 @@
     Match_Regex                   ^(default_pipeline\.syslog|zookeeper\.zookeeper_general)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -146,6 +147,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_activemq/golden_fluent_bit_main.conf b/confgenerator/testdata/valid/linux/metrics-receiver_activemq/golden_fluent_bit_main.conf
@@ -54,6 +54,7 @@
     Match_Regex                   ^(default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -65,6 +66,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...nerator/testdata/valid/linux/metrics-receiver_activemq_no_jvm/golden_fluent_bit_main.conf b/...nerator/testdata/valid/linux/metrics-receiver_activemq_no_jvm/golden_fluent_bit_main.conf
@@ -54,6 +54,7 @@
     Match_Regex                   ^(default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -65,6 +66,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...generator/testdata/valid/linux/metrics-receiver_elasticsearch/golden_fluent_bit_main.conf b/...generator/testdata/valid/linux/metrics-receiver_elasticsearch/golden_fluent_bit_main.conf
@@ -54,6 +54,7 @@
     Match_Regex                   ^(default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -65,6 +66,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)

diff --git a/...stdata/valid/linux/metrics-receiver_elasticsearch_credentials/golden_fluent_bit_main.conf b/...stdata/valid/linux/metrics-receiver_elasticsearch_credentials/golden_fluent_bit_main.conf
@@ -54,6 +54,7 @@
     Match_Regex                   ^(default_pipeline\.syslog)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)
@@ -65,6 +66,7 @@
     Match_Regex                   ^(ops-agent-fluent-bit)$
     Name                          stackdriver
     Retry_Limit                   3
+    http_request_key              logging.googleapis.com/httpRequest
     net.connect_timeout_log_error False
     resource                      gce_instance
     stackdriver_agent             Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version)