From bea25eaf6dcb6625c743b2ed0af1518d3062d922 Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Wed, 18 Oct 2023 11:28:18 -0700 Subject: [PATCH 1/6] Add support for the BMS monitored resource to the Prometheus receiver --- VERSION | 2 +- confgenerator/prometheus.go | 88 +++++-------------- .../resourcedetector/bms_detector.go | 15 ++++ confgenerator/resourcedetector/detector.go | 5 ++ .../resourcedetector/gce_detector.go | 51 ++++++++++- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 48 +++------- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 24 ++--- .../golden/linux-bms/otel.yaml | 24 ++--- 13 files changed, 156 insertions(+), 221 deletions(-) diff --git a/VERSION b/VERSION index b0d2cf2935..52dc84cb6c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -PKG_VERSION="2.42.0-bms" +PKG_VERSION="2.42.1-bms" diff --git a/confgenerator/prometheus.go b/confgenerator/prometheus.go index 13f412c546..e7066c0df7 100644 --- a/confgenerator/prometheus.go +++ b/confgenerator/prometheus.go @@ -26,6 +26,7 @@ import ( "github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel" "github.com/GoogleCloudPlatform/ops-agent/confgenerator/resourcedetector" + "github.com/GoogleCloudPlatform/ops-agent/internal/platform" "github.com/go-playground/validator/v10" yaml "github.com/goccy/go-yaml" commonconfig "github.com/prometheus/common/config" @@ -33,7 +34,6 @@ import ( promconfig "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" _ "github.com/prometheus/prometheus/discovery/install" // init() of this package registers service discovery impl. - strutil "github.com/prometheus/prometheus/util/strutil" ) var ( @@ -60,29 +60,29 @@ func (r PrometheusMetrics) Type() string { return "prometheus" } -func (r PrometheusMetrics) Pipelines(_ context.Context) []otel.ReceiverPipeline { +func (r PrometheusMetrics) Pipelines(ctx context.Context) []otel.ReceiverPipeline { // Get the resource metadata for the instance we're running on. - if gceMetadata, ok := MetadataResource.(resourcedetector.GCEResource); ok { - // Create a prometheus style mapping for the GCE metadata. - gceMetadataMap := createPrometheusStyleGCEMetadata(gceMetadata) - - // Add the GCE metadata to the prometheus config. - for i := range r.PromConfig.ScrapeConfigs { - // Iterate over the static configs. - for j := range r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs { - staticConfigs := r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs[j].(discovery.StaticConfig) - for k := range staticConfigs { - labels := staticConfigs[k].Labels - if labels == nil { - labels = model.LabelSet{} - } - for k, v := range gceMetadataMap { - // If there are conflicts, the GCE metadata should take precedence. - labels[model.LabelName(k)] = model.LabelValue(v) - } - - staticConfigs[k].Labels = labels + resourceMetadataMap := MetadataResource.PrometheusStyleMetadata() + if p := platform.FromContext(ctx).ResourceOverride; p != nil { + resourceMetadataMap = p.PrometheusStyleMetadata() + } + + // Add the GCE metadata to the prometheus config. + for i := range r.PromConfig.ScrapeConfigs { + // Iterate over the static configs. + for j := range r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs { + staticConfigs := r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs[j].(discovery.StaticConfig) + for k := range staticConfigs { + labels := staticConfigs[k].Labels + if labels == nil { + labels = model.LabelSet{} + } + for k, v := range resourceMetadataMap { + // If there are conflicts, the resource metadata should take precedence. + labels[model.LabelName(k)] = model.LabelValue(v) } + + staticConfigs[k].Labels = labels } } } @@ -147,50 +147,6 @@ func deepCopy(config promconfig.Config) (promconfig.Config, error) { return copyConfig, nil } -func createPrometheusStyleGCEMetadata(gceMetadata resourcedetector.GCEResource) map[string]string { - metaLabels := map[string]string{ - "__meta_gce_instance_id": gceMetadata.InstanceID, - "__meta_gce_instance_name": gceMetadata.InstanceName, - "__meta_gce_project": gceMetadata.Project, - "__meta_gce_zone": gceMetadata.Zone, - "__meta_gce_network": gceMetadata.Network, - // TODO(b/b/246995894): Add support for subnetwork label. - // "__meta_gce_subnetwork": gceMetadata.Subnetwork, - "__meta_gce_public_ip": gceMetadata.PublicIP, - "__meta_gce_private_ip": gceMetadata.PrivateIP, - "__meta_gce_tags": gceMetadata.Tags, - "__meta_gce_machine_type": gceMetadata.MachineType, - } - prefix := "__meta_gce_" - for k, v := range gceMetadata.Metadata { - sanitizedKey := "metadata_" + strutil.SanitizeLabelName(k) - metaLabels[prefix+sanitizedKey] = strings.ReplaceAll(v, "$", "$$") - } - - // Labels are not available using the GCE metadata API. - // TODO(b/246995462): Add support for labels. - // - // for k, v := range gceMetadata.Label { - // metaLabels[prefix+"label_"+k] = v - // } - - for k, v := range gceMetadata.InterfaceIPv4 { - sanitizedKey := "interface_ipv4_nic" + strutil.SanitizeLabelName(k) - metaLabels[prefix+sanitizedKey] = v - } - - // Set the location, namespace and cluster labels. - metaLabels["location"] = gceMetadata.Zone - metaLabels["namespace"] = gceMetadata.InstanceID - metaLabels["cluster"] = "__gce__" - - // Set some curated labels. - metaLabels["instance_name"] = gceMetadata.InstanceName - metaLabels["machine_type"] = gceMetadata.MachineType - - return metaLabels -} - func validatePrometheusConfig(sl validator.StructLevel) { promConfig := sl.Current().Interface().(promconfig.Config) diff --git a/confgenerator/resourcedetector/bms_detector.go b/confgenerator/resourcedetector/bms_detector.go index c5d3160d2a..bd838cbf55 100644 --- a/confgenerator/resourcedetector/bms_detector.go +++ b/confgenerator/resourcedetector/bms_detector.go @@ -62,6 +62,21 @@ func (r BMSResource) MonitoredResource() *monitoredres.MonitoredResource { } } +func (r BMSResource) PrometheusStyleMetadata() map[string]string { + metaLabels := map[string]string{ + "__meta_bms_instance_id": r.InstanceID, + "__meta_bms_project": r.Project, + "__meta_bms_location": r.Location, + } + // Set the location, namespace and cluster labels. + metaLabels["location"] = r.Location + metaLabels["namespace"] = r.InstanceID + metaLabels["cluster"] = "__bms__" + // Set some curated labels. + metaLabels["instance_name"] = r.InstanceID + return metaLabels +} + func OnBMS() bool { return os.Getenv(bmsProjectIDEnv) != "" && os.Getenv(bmsLocationEnv) != "" && os.Getenv(bmsInstanceIDEnv) != "" } diff --git a/confgenerator/resourcedetector/detector.go b/confgenerator/resourcedetector/detector.go index 29ed4835c9..5c9e0ccfcd 100644 --- a/confgenerator/resourcedetector/detector.go +++ b/confgenerator/resourcedetector/detector.go @@ -25,6 +25,7 @@ type Resource interface { MonitoredResource() *monitoredres.MonitoredResource OTelResourceAttributes() map[string]string ProjectName() string + PrometheusStyleMetadata() map[string]string } // Get a resource instance for the current environment; @@ -59,6 +60,10 @@ func (UnrecognizedPlatformResource) MonitoredResource() *monitoredres.MonitoredR return nil } +func (UnrecognizedPlatformResource) PrometheusStyleMetadata() map[string]string { + return nil +} + func GetUnrecognizedPlatformResource() (Resource, error) { return UnrecognizedPlatformResource{}, nil } diff --git a/confgenerator/resourcedetector/gce_detector.go b/confgenerator/resourcedetector/gce_detector.go index 07c8cc3082..10bfecde1f 100644 --- a/confgenerator/resourcedetector/gce_detector.go +++ b/confgenerator/resourcedetector/gce_detector.go @@ -14,7 +14,12 @@ package resourcedetector -import "google.golang.org/genproto/googleapis/api/monitoredres" +import ( + "strings" + + "github.com/prometheus/prometheus/util/strutil" + "google.golang.org/genproto/googleapis/api/monitoredres" +) type gceAttribute int @@ -128,6 +133,50 @@ func (r GCEResource) MonitoredResource() *monitoredres.MonitoredResource { } } +func (r GCEResource) PrometheusStyleMetadata() map[string]string { + metaLabels := map[string]string{ + "__meta_gce_instance_id": r.InstanceID, + "__meta_gce_instance_name": r.InstanceName, + "__meta_gce_project": r.Project, + "__meta_gce_zone": r.Zone, + "__meta_gce_network": r.Network, + // TODO(b/b/246995894): Add support for subnetwork label. + // "__meta_gce_subnetwork": r.Subnetwork, + "__meta_gce_public_ip": r.PublicIP, + "__meta_gce_private_ip": r.PrivateIP, + "__meta_gce_tags": r.Tags, + "__meta_gce_machine_type": r.MachineType, + } + prefix := "__meta_gce_" + for k, v := range r.Metadata { + sanitizedKey := "metadata_" + strutil.SanitizeLabelName(k) + metaLabels[prefix+sanitizedKey] = strings.ReplaceAll(v, "$", "$$") + } + + // Labels are not available using the GCE metadata API. + // TODO(b/246995462): Add support for labels. + // + // for k, v := range r.Label { + // metaLabels[prefix+"label_"+k] = v + // } + + for k, v := range r.InterfaceIPv4 { + sanitizedKey := "interface_ipv4_nic" + strutil.SanitizeLabelName(k) + metaLabels[prefix+sanitizedKey] = v + } + + // Set the location, namespace and cluster labels. + metaLabels["location"] = r.Zone + metaLabels["namespace"] = r.InstanceID + metaLabels["cluster"] = "__gce__" + + // Set some curated labels. + metaLabels["instance_name"] = r.InstanceName + metaLabels["machine_type"] = r.MachineType + + return metaLabels +} + type GCEResourceBuilderInterface interface { GetResource() (Resource, error) } diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml index e7373be3a5..de04e2fb7b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml @@ -501,23 +501,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-bms/otel.yaml index 3a7da8081c..971af6ae67 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-bms/otel.yaml @@ -494,23 +494,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance - job_name: drop honor_timestamps: true scrape_interval: 10s @@ -553,23 +543,13 @@ receivers: - targets: - 0.0.0.0:9100 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-bms/otel.yaml index b07862e920..20d059293f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-bms/otel.yaml @@ -501,23 +501,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-bms/otel.yaml index a2018a187c..9271166429 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-bms/otel.yaml @@ -501,23 +501,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-bms/otel.yaml index b6272cdd22..e00579e065 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-bms/otel.yaml @@ -494,23 +494,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-bms/otel.yaml index 2ff66b1470..485e5ba491 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-bms/otel.yaml @@ -555,23 +555,13 @@ receivers: - targets: - 0.0.0.0:9100 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-bms/otel.yaml index 57eb8fb2ee..24929313dc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-bms/otel.yaml @@ -501,23 +501,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-bms/otel.yaml index 4942310d66..28fbe01683 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-bms/otel.yaml @@ -499,23 +499,13 @@ receivers: - targets: - localhost:1234 labels: - __meta_gce_instance_id: test-instance-id - __meta_gce_instance_name: test-instance-name - __meta_gce_interface_ipv4_nictest_interface: test-interface-ipv4 - __meta_gce_machine_type: test-machine-type - __meta_gce_metadata_test_escape: $${foo:bar} - __meta_gce_metadata_test_key: test-value - __meta_gce_network: test-network - __meta_gce_private_ip: test-private-ip - __meta_gce_project: test-project - __meta_gce_public_ip: test-public-ip - __meta_gce_tags: test-tag - __meta_gce_zone: test-zone - cluster: __gce__ - instance_name: test-instance-name - location: test-zone - machine_type: test-machine-type - namespace: test-instance-id + __meta_bms_instance_id: test-bms-instance + __meta_bms_location: test-bms-location + __meta_bms_project: test-bms-project + cluster: __bms__ + instance_name: test-bms-instance + location: test-bms-location + namespace: test-bms-instance preserve_untyped: true service: pipelines: From 7f783b780c3b96c1396ac60f7f2dfab6e410059c Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Fri, 27 Oct 2023 15:50:00 -0700 Subject: [PATCH 2/6] Ensure that MetadataResource is not nil --- .../main.go | 2 +- confgenerator/prometheus.go | 40 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/cmd/google_cloud_ops_agent_diagnostics/main.go b/cmd/google_cloud_ops_agent_diagnostics/main.go index 41908489f0..79b7299ab7 100644 --- a/cmd/google_cloud_ops_agent_diagnostics/main.go +++ b/cmd/google_cloud_ops_agent_diagnostics/main.go @@ -44,7 +44,7 @@ func getUserAndMergedConfigs(ctx context.Context, userConfPath string) (*confgen func main() { defer func() { if r := recover(); r != nil { - log.Fatal("Recovered in run", r) + log.Fatalf("Recovering from a panic due to %v", r) } }() if err := run(context.Background()); err != nil { diff --git a/confgenerator/prometheus.go b/confgenerator/prometheus.go index e7066c0df7..d12831168b 100644 --- a/confgenerator/prometheus.go +++ b/confgenerator/prometheus.go @@ -62,27 +62,29 @@ func (r PrometheusMetrics) Type() string { func (r PrometheusMetrics) Pipelines(ctx context.Context) []otel.ReceiverPipeline { // Get the resource metadata for the instance we're running on. - resourceMetadataMap := MetadataResource.PrometheusStyleMetadata() - if p := platform.FromContext(ctx).ResourceOverride; p != nil { - resourceMetadataMap = p.PrometheusStyleMetadata() - } + if MetadataResource != nil { + resourceMetadataMap := MetadataResource.PrometheusStyleMetadata() + if p := platform.FromContext(ctx).ResourceOverride; p != nil { + resourceMetadataMap = p.PrometheusStyleMetadata() + } - // Add the GCE metadata to the prometheus config. - for i := range r.PromConfig.ScrapeConfigs { - // Iterate over the static configs. - for j := range r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs { - staticConfigs := r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs[j].(discovery.StaticConfig) - for k := range staticConfigs { - labels := staticConfigs[k].Labels - if labels == nil { - labels = model.LabelSet{} + // Add the GCE metadata to the prometheus config. + for i := range r.PromConfig.ScrapeConfigs { + // Iterate over the static configs. + for j := range r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs { + staticConfigs := r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs[j].(discovery.StaticConfig) + for k := range staticConfigs { + labels := staticConfigs[k].Labels + if labels == nil { + labels = model.LabelSet{} + } + for k, v := range resourceMetadataMap { + // If there are conflicts, the resource metadata should take precedence. + labels[model.LabelName(k)] = model.LabelValue(v) + } + + staticConfigs[k].Labels = labels } - for k, v := range resourceMetadataMap { - // If there are conflicts, the resource metadata should take precedence. - labels[model.LabelName(k)] = model.LabelValue(v) - } - - staticConfigs[k].Labels = labels } } } From 0189e6d3db346568eba5613f61b4219d64682a9d Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Wed, 8 Nov 2023 11:37:58 -0800 Subject: [PATCH 3/6] address comments --- confgenerator/prometheus.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/confgenerator/prometheus.go b/confgenerator/prometheus.go index 3260774128..cc49b5f0ad 100644 --- a/confgenerator/prometheus.go +++ b/confgenerator/prometheus.go @@ -61,14 +61,14 @@ func (r PrometheusMetrics) Type() string { } func (r PrometheusMetrics) Pipelines(ctx context.Context) []otel.ReceiverPipeline { - // Get the resource metadata for the instance we're running on. - if MetadataResource != nil { - resourceMetadataMap := MetadataResource.PrometheusStyleMetadata() - if p := platform.FromContext(ctx).ResourceOverride; p != nil { - resourceMetadataMap = p.PrometheusStyleMetadata() - } - - // Add the GCE metadata to the prometheus config. + resource := MetadataResource + if p := platform.FromContext(ctx).ResourceOverride; p != nil { + resource = p + } + if resource != nil { + // Get the resource metadata for the instance we're running on. + resourceMetadataMap := resource.PrometheusStyleMetadata() + // Add the resource metadata to the prometheus config. for i := range r.PromConfig.ScrapeConfigs { // Iterate over the static configs. for j := range r.PromConfig.ScrapeConfigs[i].ServiceDiscoveryConfigs { From 56c6cc746e408d64b356da102d8523102f83c56c Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Wed, 8 Nov 2023 11:37:58 -0800 Subject: [PATCH 4/6] address comments --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e7769fddb1..18eb6072fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -PKG_VERSION="2.44.0-bms" \ No newline at end of file +PKG_VERSION="2.44.0-bms" From a4f0b84ccb46eb8536d8381337536ef6fd541eca Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Wed, 8 Nov 2023 11:37:58 -0800 Subject: [PATCH 5/6] address comments --- confgenerator/resourcedetector/bms_detector.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/confgenerator/resourcedetector/bms_detector.go b/confgenerator/resourcedetector/bms_detector.go index bd838cbf55..bda6dfc5db 100644 --- a/confgenerator/resourcedetector/bms_detector.go +++ b/confgenerator/resourcedetector/bms_detector.go @@ -72,8 +72,6 @@ func (r BMSResource) PrometheusStyleMetadata() map[string]string { metaLabels["location"] = r.Location metaLabels["namespace"] = r.InstanceID metaLabels["cluster"] = "__bms__" - // Set some curated labels. - metaLabels["instance_name"] = r.InstanceID return metaLabels } From 142de83560684b1fa9853cbec01e693574aeed45 Mon Sep 17 00:00:00 2001 From: Alexey Basinov Date: Wed, 8 Nov 2023 12:19:45 -0800 Subject: [PATCH 6/6] fix tests --- .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../builtin/golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 4 +- .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 6 - .../golden/linux-bms/otel.yaml | 6 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 5 +- .../4d6012ff003886818fb9b9285b4af962.lua | 19 + .../5fc5f42c16c9e1ab8292e3d42f74f3be.lua | 49 ++ .../68d6a3a0e8edf37868e1bf94adc737f4.lua | 38 ++ .../b4a0dead382dce7b4fe011d3f59fdb6d.lua | 17 + .../f120d4527bd717cab023dbbe5fbdc332.lua | 42 ++ .../golden/linux-bms/features.yaml | 36 ++ .../golden/linux-bms/fluent_bit_main.conf | 182 ++++++ .../golden/linux-bms/fluent_bit_parser.conf | 13 + .../golden/linux-bms/otel.yaml | 554 ++++++++++++++++++ .../golden/linux-bms/otel.yaml | 6 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 5 +- .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 4 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 2 - .../golden/linux-bms/otel.yaml | 4 - 163 files changed, 979 insertions(+), 456 deletions(-) create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/4d6012ff003886818fb9b9285b4af962.lua create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/5fc5f42c16c9e1ab8292e3d42f74f3be.lua create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/68d6a3a0e8edf37868e1bf94adc737f4.lua create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/b4a0dead382dce7b4fe011d3f59fdb6d.lua create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/f120d4527bd717cab023dbbe5fbdc332.lua create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/features.yaml create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_main.conf create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_parser.conf create mode 100644 confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/otel.yaml diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-bms/otel.yaml index 9ca240e6d5..cf42f8156f 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-bms/otel.yaml index c63ff6e94b..deb100a6c6 100644 --- a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-bms/otel.yaml index f9fd76626c..ca651f0335 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,10 +14,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-bms/otel.yaml index 76c34dc120..bb202e767f 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-bms/otel.yaml index f9fd76626c..ca651f0335 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,10 +14,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-bms/otel.yaml index f9fd76626c..ca651f0335 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,10 +14,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-bms/otel.yaml index 909d4c11cd..f41597a538 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,10 +14,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-bms/otel.yaml index c8db9e640e..cd178e9807 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-bms/otel.yaml @@ -6,10 +6,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-bms/otel.yaml index 8197896ba9..61beb0932c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-bms/otel.yaml index 1e912076fa..84518f35cc 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-bms/otel.yaml index 578633a6c7..1e854c8f30 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-bms/otel.yaml index bf1d0a072d..a3b5cdf923 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-bms/otel.yaml index 531c0c725b..772ff4d8bb 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-bms/otel.yaml index 6d3955a8fb..35b88b1c25 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-bms/otel.yaml index 9ca240e6d5..cf42f8156f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-bms/otel.yaml index 25067925b1..38278e2862 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-bms/otel.yaml index 25067925b1..38278e2862 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-bms/otel.yaml index 666c647087..2e39d9962b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-bms/otel.yaml index b6418c1a79..3e48c20e18 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-bms/otel.yaml index 601a109181..f5a51675b9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-bms/otel.yaml index b776b3fcb8..ea8430342c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-bms/otel.yaml index 013f69030e..9edac9c785 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-bms/otel.yaml index 6965f6c83c..1310fc6bd5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-bms/otel.yaml index 1d2005e406..5701f766eb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-bms/otel.yaml index f35ac53265..d15abb822b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-bms/otel.yaml index 6654e0d272..5571afb9c4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-bms/otel.yaml index 937852450f..5397137381 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-bms/otel.yaml index 8f810e5d92..7a8d98c242 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-bms/otel.yaml index e11a6e0fe3..236b2d14c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-bms/otel.yaml index 4eaa780120..33daf1e959 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-bms/otel.yaml index fbcd9da7b9..cdbee3158b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-bms/otel.yaml index 92cdef74a6..8a1913b319 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-bms/otel.yaml index d33ccda921..d859d85947 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-bms/otel.yaml index 5dfa692a23..b79d9c846d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-bms/otel.yaml index d46d3cd530..2609ffbfe5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-bms/otel.yaml index b44700d01f..bcaf4c12e4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-bms/otel.yaml index 111c5feea7..d28ed4a0f9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-bms/otel.yaml index c4c56709d0..e584204a8e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-bms/otel.yaml index 94f397b647..220cda65e9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-bms/otel.yaml index c979578506..58443f7a60 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-bms/otel.yaml index 7749fb93a3..372b3b4a0a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-bms/otel.yaml index 9f499f66bc..d01b7a569d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-bms/otel.yaml index 4eee9d6c9f..3ac05657da 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-bms/otel.yaml index 7ab2265bb8..271fc033f3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-bms/otel.yaml index f7348e5ddb..89f36cb4a4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-bms/otel.yaml index 644433efd5..6215a413ba 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-bms/otel.yaml index 4220d7ead4..48f09b3f59 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-bms/otel.yaml index db16237dc7..b433d9b9ed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: @@ -508,8 +504,6 @@ receivers: enabled: false mysql.index.io.wait.time: enabled: false - mysql.locked_connects: - enabled: false mysql.mysqlx_connections: enabled: false mysql.opened_resources: diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-bms/otel.yaml index 0e0abf6e1d..6e7112321b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: @@ -508,8 +504,6 @@ receivers: enabled: false mysql.index.io.wait.time: enabled: false - mysql.locked_connects: - enabled: false mysql.mysqlx_connections: enabled: false mysql.opened_resources: diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-bms/otel.yaml index 8504e180fc..c3a22e6703 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-bms/otel.yaml index 6f68050dc2..7d63dffca9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-bms/otel.yaml index 21de2d4be0..fbc4e1a5cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: @@ -896,7 +892,7 @@ receivers: - GLOBAL_NAME - INSTANCE_ID data_type: sum - description: The total number of sorts. + description: The total number of sorts. metric_name: oracle.sort.count monotonic: "true" static_attributes: diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-bms/otel.yaml index 0dda6082dd..a921b23778 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: @@ -896,7 +892,7 @@ receivers: - GLOBAL_NAME - INSTANCE_ID data_type: sum - description: The total number of sorts. + description: The total number of sorts. metric_name: oracle.sort.count monotonic: "true" static_attributes: diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-bms/otel.yaml index 803d947aeb..f8277eef55 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: @@ -896,7 +892,7 @@ receivers: - GLOBAL_NAME - INSTANCE_ID data_type: sum - description: The total number of sorts. + description: The total number of sorts. metric_name: oracle.sort.count monotonic: "true" static_attributes: diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-bms/otel.yaml index bca80ff61b..2b74ba9182 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-bms/otel.yaml index 6cabcc4f7a..fdb3fcb361 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-bms/otel.yaml index 7d669ce133..1185b0a477 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-bms/otel.yaml index 5b72b874e6..76a7f41436 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-bms/otel.yaml @@ -6,8 +6,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlecloud/otel: metric: @@ -16,8 +14,6 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) processors: agentmetrics/hostmetrics_0: diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml index de04e2fb7b..092617e4ad 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-bms/otel.yaml @@ -6,10 +6,10 @@ exporters: resource_filters: [] service_resource_labels: false skip_create_descriptor: true - retry_on_failure: - enabled: false user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) googlemanagedprometheus: + metric: + add_metric_suffixes: false retry_on_failure: enabled: false untyped_double_export: true @@ -505,7 +505,6 @@ receivers: __meta_bms_location: test-bms-location __meta_bms_project: test-bms-project cluster: __bms__ - instance_name: test-bms-instance location: test-bms-location namespace: test-bms-instance preserve_untyped: true diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/4d6012ff003886818fb9b9285b4af962.lua b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/4d6012ff003886818fb9b9285b4af962.lua new file mode 100644 index 0000000000..c225be24d5 --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/4d6012ff003886818fb9b9285b4af962.lua @@ -0,0 +1,19 @@ + +function process(tag, timestamp, record) +local __field_0 = (function() +return record["severity"] +end)(); +(function(value) +record["severity"] = value +end)(nil); +local v = __field_0; +if v == "debug" then v = "DEBUG" +elseif v == "error" then v = "ERROR" +elseif v == "info" then v = "INFO" +elseif v == "warn" then v = "WARNING" +end +(function(value) +record["logging.googleapis.com/severity"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/5fc5f42c16c9e1ab8292e3d42f74f3be.lua b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/5fc5f42c16c9e1ab8292e3d42f74f3be.lua new file mode 100644 index 0000000000..c5465182b5 --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/5fc5f42c16c9e1ab8292e3d42f74f3be.lua @@ -0,0 +1,49 @@ + + function shallow_merge(record, parsedRecord) + -- If no exiting record exists + if (record == nil) then + return parsedRecord + end + + for k, v in pairs(parsedRecord) do + record[k] = v + end + + return record +end + +function merge(record, parsedRecord) + -- If no exiting record exists + if record == nil then + return parsedRecord + end + + -- Potentially overwrite or merge the original records. + for k, v in pairs(parsedRecord) do + -- If there is no conflict + if k == "logging.googleapis.com/logName" then + -- Ignore the parsed payload since the logName is controlled + -- by the OpsAgent. + elseif k == "logging.googleapis.com/labels" then + -- LogEntry.labels are basically a map[string]string and so only require a + -- shallow merge (one level deep merge). + record[k] = shallow_merge(record[k], v) + else + record[k] = v + end + end + + return record +end + +function parser_merge_record(tag, timestamp, record) + originalPayload = record["logging.googleapis.com/__tmp"] + if originalPayload == nil then + return 0, timestamp, record + end + + -- Remove original payload + record["logging.googleapis.com/__tmp"] = nil + record = merge(originalPayload, record) + return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/68d6a3a0e8edf37868e1bf94adc737f4.lua b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/68d6a3a0e8edf37868e1bf94adc737f4.lua new file mode 100644 index 0000000000..16b933cb7d --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/68d6a3a0e8edf37868e1bf94adc737f4.lua @@ -0,0 +1,38 @@ + +function process(tag, timestamp, record) +local __field_0 = (function() +return record["message"] +end)(); +local v = __field_0; +if v == "LogParseErr" then v = "Ops Agent failed to parse logs, Code: LogParseErr, Documentation: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" +elseif v == "LogPipelineErr" then v = "Ops Agent logging pipeline failed, Code: LogPipelineErr, Documentation: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" +end +(function(value) +record["message"] = value +end)(v) +local v = "ops-agent"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentKind"] = value +end)(v) +local v = "latest"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentVersion"] = value +end)(v) +local v = "v1"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/schemaVersion"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/b4a0dead382dce7b4fe011d3f59fdb6d.lua b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/b4a0dead382dce7b4fe011d3f59fdb6d.lua new file mode 100644 index 0000000000..6263563b66 --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/b4a0dead382dce7b4fe011d3f59fdb6d.lua @@ -0,0 +1,17 @@ + +function parser_nest(tag, timestamp, record) + local nestedRecord = {} + local parseKey = "message" + for k, v in pairs(record) do + if k ~= parseKey then + nestedRecord[k] = v + end + end + + local result = {} + result[parseKey] = record[parseKey] + result["logging.googleapis.com/__tmp"] = nestedRecord + + return 2, timestamp, result +end + diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/f120d4527bd717cab023dbbe5fbdc332.lua b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/f120d4527bd717cab023dbbe5fbdc332.lua new file mode 100644 index 0000000000..c09b885e11 --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/f120d4527bd717cab023dbbe5fbdc332.lua @@ -0,0 +1,42 @@ + +function process(tag, timestamp, record) +local __field_0 = (function() +return record["agent.googleapis.com/log_file_path"] +end)(); +local __field_1 = (function() +if record["logging.googleapis.com/labels"] == nil +then +return nil +end +return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] +end)(); +local __field_2 = (function() +return record["logging.googleapis.com/logName"] +end)(); +(function(value) +record["agent.googleapis.com/log_file_path"] = value +end)(nil); +local v = __field_0; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/log_file_path"] = value +end)(v) +local v = __field_1; +if v == nil then v = "" end; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value +end)(v) +local v = __field_2; +if v == nil then v = "syslog" end; +(function(value) +record["logging.googleapis.com/logName"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/features.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/features.yaml new file mode 100644 index 0000000000..e37fa20ca5 --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/features.yaml @@ -0,0 +1,36 @@ +- module: logging + feature: service:pipelines + key: default_pipeline_overridden + value: "false" +- module: metrics + feature: service:pipelines + key: default_pipeline_overridden + value: "false" +- module: metrics + feature: receivers:prometheus + key: "[0].enabled" + value: "true" +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.scheme" + value: http +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.honor_timestamps" + value: "true" +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.scrape_interval" + value: 10s +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.scrape_timeout" + value: 10s +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.relabel_configs" + value: "1" +- module: metrics + feature: receivers:prometheus + key: "[0].config.[0].scrape_configs.static_config_target_groups" + value: "1" diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_main.conf b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_main.conf new file mode 100644 index 0000000000..a556fe3bbb --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_main.conf @@ -0,0 +1,182 @@ +@SET buffers_dir=/var/lib/google-cloud-ops-agent/fluent-bit/buffers +@SET logs_dir=/var/log/google-cloud-ops-agent + +[SERVICE] + Daemon off + Flush 1 + Log_Level info + dns.resolver legacy + storage.backlog.mem_limit 50M + storage.checksum off + storage.max_chunks_up 128 + storage.metrics on + storage.sync normal + +[INPUT] + Name fluentbit_metrics + Scrape_Interval 60 + Scrape_On_Start True + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/default_pipeline_syslog + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path /var/log/messages,/var/log/syslog + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag default_pipeline.syslog + storage.type filesystem + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/ops-agent-fluent-bit + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path ${logs_dir}/subagents/logging-module.log + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag ops-agent-fluent-bit + storage.type memory + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/ops-agent-health + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path ${logs_dir}/health-checks.log + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag ops-agent-health + storage.type memory + +[FILTER] + Match default_pipeline.syslog + Name lua + call process + script f120d4527bd717cab023dbbe5fbdc332.lua + +[FILTER] + Match ops-agent-fluent-bit + Name lua + call parser_nest + script b4a0dead382dce7b4fe011d3f59fdb6d.lua + +[FILTER] + Key_Name message + Match ops-agent-fluent-bit + Name parser + Preserve_Key True + Reserve_Data True + Parser ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing + +[FILTER] + Match ops-agent-fluent-bit + Name lua + call parser_merge_record + script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua + +[FILTER] + Match ops-agent-health + Name lua + call parser_nest + script b4a0dead382dce7b4fe011d3f59fdb6d.lua + +[FILTER] + Key_Name message + Match ops-agent-health + Name parser + Reserve_Data True + Parser ops-agent-health.health-checks-json + +[FILTER] + Match ops-agent-health + Name lua + call parser_merge_record + script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua + +[FILTER] + Match ops-agent-health + Name grep + Regex severity INFO|ERROR|WARNING|DEBUG|info|error|warning|debug + +[FILTER] + Match ops-agent-fluent-bit + Name rewrite_tag + Rule message \[error\]\s\[lib\]\sbackend\sfailed ops-agent-health true + +[FILTER] + Name modify + Match ops-agent-health + Condition Key_value_matches message \[error\]\s\[lib\]\sbackend\sfailed + Set message LogPipelineErr + Set code LogPipelineErr + +[FILTER] + Match ops-agent-fluent-bit + Name rewrite_tag + Rule message \[error\]\s\[parser\]\scannot\sparse ops-agent-health true + +[FILTER] + Name modify + Match ops-agent-health + Condition Key_value_matches message \[error\]\s\[parser\]\scannot\sparse + Set message LogParseErr + Set code LogParseErr + +[FILTER] + Match ops-agent-health + Name lua + call process + script 68d6a3a0e8edf37868e1bf94adc737f4.lua + +[FILTER] + Match ops-agent-* + Name lua + call process + script 4d6012ff003886818fb9b9285b4af962.lua + +[OUTPUT] + Match_Regex ^(default_pipeline\.syslog)$ + Name stackdriver + Retry_Limit 3 + http_request_key logging.googleapis.com/httpRequest + net.connect_timeout_log_error False + resource baremetalsolution.googleapis.com/Instance + resource_labels instance_id=test-bms-instance,location=test-bms-location,resource_container=test-bms-project + stackdriver_agent Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) + storage.total_limit_size 2G + tls On + tls.verify Off + workers 8 + +[OUTPUT] + Match_Regex ^(ops-agent-fluent-bit|ops-agent-health)$ + Name stackdriver + Retry_Limit 3 + http_request_key logging.googleapis.com/httpRequest + net.connect_timeout_log_error False + resource baremetalsolution.googleapis.com/Instance + resource_labels instance_id=test-bms-instance,location=test-bms-location,resource_container=test-bms-project + stackdriver_agent Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) + tls On + tls.verify Off + workers 8 + +[OUTPUT] + Match * + Name prometheus_exporter + host 0.0.0.0 + port 20202 diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_parser.conf b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_parser.conf new file mode 100644 index 0000000000..e6c4f531ea --- /dev/null +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-bms/fluent_bit_parser.conf @@ -0,0 +1,13 @@ +[PARSER] + Format regex + Name ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing + Regex (?\[[ ]*(?