From 1f10ccd482690669deddb63ecf1e28bff7d1d9db Mon Sep 17 00:00:00 2001 From: Braydon Kains Date: Thu, 2 Dec 2021 14:47:30 +0000 Subject: [PATCH] rebase on braydonk-refresh-interval --- apps/apache.go | 2 +- apps/builtinconf.go | 14 +++++++----- apps/cassandra.go | 2 +- apps/hostmetrics.go | 2 +- apps/iis.go | 2 +- apps/jvm.go | 2 +- apps/mssql.go | 2 +- apps/nginx.go | 2 +- apps/redis.go | 2 +- confgenerator/built-in-config-linux.yaml | 2 +- confgenerator/built-in-config-windows.yaml | 6 ++--- confgenerator/config.go | 22 +------------------ .../golden_error | 2 +- .../golden_error | 10 +-------- .../golden_error | 2 +- .../golden_error | 10 +-------- .../golden_otel.conf | 2 +- .../all-built_in_config/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-custom_log_level/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-processor_order/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-receiver_apache/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-receiver_mysql/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-receiver_nginx/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-receiver_redis/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../logging-receiver_systemd/golden_otel.conf | 2 +- .../logging-receiver_tcp/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../metrics-custom_log_level/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../metrics-receiver_apache/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../metrics-receiver_jvm/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../metrics-receiver_nginx/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../metrics-receiver_redis/golden_otel.conf | 2 +- .../golden_otel.conf | 2 +- .../golden_otel.conf | 6 ++--- .../all-built_in_config/golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../metrics-receiver_apache/golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../golden_otel.conf | 4 ++-- .../metrics-receiver_jvm/golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- .../metrics-receiver_nginx/golden_otel.conf | 6 ++--- .../golden_otel.conf | 6 ++--- 75 files changed, 122 insertions(+), 154 deletions(-) diff --git a/apps/apache.go b/apps/apache.go index 5412f4c633..ff771f9345 100644 --- a/apps/apache.go +++ b/apps/apache.go @@ -44,7 +44,7 @@ func (r MetricsReceiverApache) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "httpd", Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "endpoint": r.ServerStatusURL, }, }, diff --git a/apps/builtinconf.go b/apps/builtinconf.go index 9f0c829464..6d707528b0 100644 --- a/apps/builtinconf.go +++ b/apps/builtinconf.go @@ -14,7 +14,11 @@ package apps -import cg "github.com/GoogleCloudPlatform/ops-agent/confgenerator" +import ( + "time" + + cg "github.com/GoogleCloudPlatform/ops-agent/confgenerator" +) var ( BuiltInConfStructs = map[string]*cg.UnifiedConfig{ @@ -39,7 +43,7 @@ var ( Receivers: map[string]cg.MetricsReceiver{ "hostmetrics": &MetricsReceiverHostmetrics{ ConfigComponent: cg.ConfigComponent{Type: "hostmetrics"}, - MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"}, + MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60}, }, }, Processors: map[string]cg.MetricsProcessor{ @@ -78,15 +82,15 @@ var ( Receivers: map[string]cg.MetricsReceiver{ "hostmetrics": &MetricsReceiverHostmetrics{ ConfigComponent: cg.ConfigComponent{Type: "hostmetrics"}, - MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"}, + MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60}, }, "iis": &MetricsReceiverIis{ ConfigComponent: cg.ConfigComponent{Type: "iis"}, - MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"}, + MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60}, }, "mssql": &MetricsReceiverMssql{ ConfigComponent: cg.ConfigComponent{Type: "mssql"}, - MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"}, + MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60}, }, }, Processors: map[string]cg.MetricsProcessor{ diff --git a/apps/cassandra.go b/apps/cassandra.go index e1a66d2af4..9c30a9d41d 100644 --- a/apps/cassandra.go +++ b/apps/cassandra.go @@ -58,7 +58,7 @@ func (r MetricsReceiverCassandra) Pipelines() []otel.Pipeline { config := map[string]interface{}{ "target_system": targetSystem, - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "endpoint": r.Endpoint, "jar_path": jarPath, } diff --git a/apps/hostmetrics.go b/apps/hostmetrics.go index 84bdc49915..a6ac645dc7 100644 --- a/apps/hostmetrics.go +++ b/apps/hostmetrics.go @@ -34,7 +34,7 @@ func (r MetricsReceiverHostmetrics) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "hostmetrics", Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "scrapers": map[string]interface{}{ "cpu": struct{}{}, "load": struct{}{}, diff --git a/apps/iis.go b/apps/iis.go index f338975fe5..d00b96fb84 100644 --- a/apps/iis.go +++ b/apps/iis.go @@ -34,7 +34,7 @@ func (r MetricsReceiverIis) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "windowsperfcounters", Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "perfcounters": []map[string]interface{}{ { "object": "Web Service", diff --git a/apps/jvm.go b/apps/jvm.go index fd9206837e..4e6e3cb81e 100644 --- a/apps/jvm.go +++ b/apps/jvm.go @@ -53,7 +53,7 @@ func (r MetricsReceiverJVM) Pipelines() []otel.Pipeline { config := map[string]interface{}{ "target_system": "jvm", - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "endpoint": r.Endpoint, "jar_path": jarPath, } diff --git a/apps/mssql.go b/apps/mssql.go index 0ebdddab4c..543e02a2fc 100644 --- a/apps/mssql.go +++ b/apps/mssql.go @@ -34,7 +34,7 @@ func (m MetricsReceiverMssql) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "windowsperfcounters", Config: map[string]interface{}{ - "collection_interval": m.CollectionIntervalString(), + "collection_interval": m.CollectionInterval, "perfcounters": []map[string]interface{}{ { "object": "SQLServer:General Statistics", diff --git a/apps/nginx.go b/apps/nginx.go index 2c4ad0dbd6..b6794377ef 100644 --- a/apps/nginx.go +++ b/apps/nginx.go @@ -44,7 +44,7 @@ func (r MetricsReceiverNginx) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "nginx", Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "endpoint": r.StubStatusURL, }, }, diff --git a/apps/redis.go b/apps/redis.go index d5323aaa71..79bd74bf39 100644 --- a/apps/redis.go +++ b/apps/redis.go @@ -46,7 +46,7 @@ func (r MetricsReceiverRedis) Pipelines() []otel.Pipeline { Receiver: otel.Component{ Type: "redis", Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), + "collection_interval": r.CollectionInterval, "endpoint": r.Address, "password": r.Password, }, diff --git a/confgenerator/built-in-config-linux.yaml b/confgenerator/built-in-config-linux.yaml index cd84fc39b6..566626ec92 100644 --- a/confgenerator/built-in-config-linux.yaml +++ b/confgenerator/built-in-config-linux.yaml @@ -13,7 +13,7 @@ metrics: receivers: hostmetrics: type: hostmetrics - collection_interval: 60s + collection_interval: 1m0s processors: metrics_filter: type: exclude_metrics diff --git a/confgenerator/built-in-config-windows.yaml b/confgenerator/built-in-config-windows.yaml index ddd74d9d93..6b564b0d0d 100644 --- a/confgenerator/built-in-config-windows.yaml +++ b/confgenerator/built-in-config-windows.yaml @@ -11,13 +11,13 @@ metrics: receivers: hostmetrics: type: hostmetrics - collection_interval: 60s + collection_interval: 1m0s iis: type: iis - collection_interval: 60s + collection_interval: 1m0s mssql: type: mssql - collection_interval: 60s + collection_interval: 1m0s processors: metrics_filter: type: exclude_metrics diff --git a/confgenerator/config.go b/confgenerator/config.go index 1b4ff3a2f3..3c613304be 100644 --- a/confgenerator/config.go +++ b/confgenerator/config.go @@ -141,18 +141,6 @@ func newValidator() *validator.Validate { v.RegisterValidationCtx("platform", func(ctx context.Context, fl validator.FieldLevel) bool { return ctx.Value(platformKey) == fl.Param() }) - // duration validates that the value is a valid duration and >= the parameter - v.RegisterValidation("duration", func(fl validator.FieldLevel) bool { - t, err := time.ParseDuration(fl.Field().String()) - if err != nil { - return false - } - tmin, err := time.ParseDuration(fl.Param()) - if err != nil { - panic(err) - } - return t >= tmin - }) // multipleof_time validates that the value duration is a multiple of the parameter v.RegisterValidation("multipleof_time", func(fl validator.FieldLevel) bool { t, ok := fl.Field().Interface().(time.Duration) @@ -372,15 +360,7 @@ type MetricsReceiver interface { } type MetricsReceiverShared struct { - CollectionInterval string `yaml:"collection_interval" validate:"required,duration=10s"` // time.Duration format -} - -func (m MetricsReceiverShared) CollectionIntervalString() string { - // TODO: Remove when https://github.com/goccy/go-yaml/pull/246 is merged - if m.CollectionInterval != "" { - return m.CollectionInterval - } - return "60s" + CollectionInterval time.Duration `yaml:"collection_interval" validate:"required,min=10s"` // time.Duration format } var MetricsReceiverTypes = &componentTypeRegistry{ diff --git a/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error b/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error index cbf429e5cf..55ca8b6b99 100644 --- a/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error +++ b/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error @@ -1,4 +1,4 @@ -[5:28] "collection_interval" must be a duration of at least 10s +[5:28] "collection_interval" must be a minimum of 10s 2 | receivers: 3 | receiver_1: 4 | type: hostmetrics diff --git a/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error b/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error index 2ed9ea40b3..80d6670584 100644 --- a/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error +++ b/confgenerator/testdata/invalid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error @@ -1,9 +1 @@ -[5:28] "collection_interval" must be a duration of at least 10s - 2 | receivers: - 3 | receiver_1: - 4 | type: hostmetrics -> 5 | collection_interval: 24 - ^ - 6 | service: - 7 | pipelines: - 8 | default_pipeline: \ No newline at end of file +cannot unmarshal uint64 into Go struct field UnifiedConfig.Metrics of type time.Duration \ No newline at end of file diff --git a/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error b/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error index cbf429e5cf..55ca8b6b99 100644 --- a/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error +++ b/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error @@ -1,4 +1,4 @@ -[5:28] "collection_interval" must be a duration of at least 10s +[5:28] "collection_interval" must be a minimum of 10s 2 | receivers: 3 | receiver_1: 4 | type: hostmetrics diff --git a/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error b/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error index 2ed9ea40b3..80d6670584 100644 --- a/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error +++ b/confgenerator/testdata/invalid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error @@ -1,9 +1 @@ -[5:28] "collection_interval" must be a duration of at least 10s - 2 | receivers: - 3 | receiver_1: - 4 | type: hostmetrics -> 5 | collection_interval: 24 - ^ - 6 | service: - 7 | pipelines: - 8 | default_pipeline: \ No newline at end of file +cannot unmarshal uint64 into Go struct field UnifiedConfig.Metrics of type time.Duration \ No newline at end of file diff --git a/confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf b/confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf index 89cde94e82..099586e859 100644 --- a/confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf @@ -344,7 +344,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf b/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_redis_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_redis_refresh_interval/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_redis_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_redis_refresh_interval/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_syslog_type_multiple_receivers/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_systemd/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_tcp/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_otel.conf index 721298fb8a..22d3a73fe4 100644 --- a/confgenerator/testdata/valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/logging-receiver_tcp_omitting_optional_parameters/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_otel.conf index e003d4abba..36150bd1c7 100644 --- a/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-custom_log_level/golden_otel.conf @@ -349,7 +349,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-default_overrides_disable_all/golden_otel.conf index 0a5fc33f1c..208c00f3b0 100644 --- a/confgenerator/testdata/valid/linux/metrics-default_overrides_disable_all/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-default_overrides_disable_all/golden_otel.conf @@ -350,7 +350,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf index 34832ea107..c061d84c19 100644 --- a/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf @@ -351,7 +351,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf index 092a63f56e..fbab8a2cf9 100644 --- a/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf @@ -351,7 +351,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_otel.conf index b9be17f535..d4ebbd1b36 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_apache/golden_otel.conf @@ -366,7 +366,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_otel.conf index d9a46493d2..cbd2c1c25b 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_apache_missing_status_url/golden_otel.conf @@ -366,7 +366,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_otel.conf index cfe412f171..62439493f3 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_cassandra/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_otel.conf index 12a02a9362..38c1d3743f 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_cassandra_no_jvm/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_otel.conf index 2fed8ba757..dd2bfa68b0 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_jvm/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_otel.conf index 2fed8ba757..dd2bfa68b0 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_jvm_missing_endpoint/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_otel.conf index b174564587..161be5daaa 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_jvm_with_auth/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_otel.conf index 78cf007796..cd954ea75a 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_nginx/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_otel.conf index 78cf007796..cd954ea75a 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_nginx_missing_status_url/golden_otel.conf @@ -356,7 +356,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_otel.conf index 5eca7c9374..8ee1e30e0c 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_redis/golden_otel.conf @@ -363,7 +363,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_otel.conf b/confgenerator/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_otel.conf index 5eca7c9374..8ee1e30e0c 100644 --- a/confgenerator/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_otel.conf +++ b/confgenerator/testdata/valid/linux/metrics-receiver_redis_missing_address/golden_otel.conf @@ -363,7 +363,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} diff --git a/confgenerator/testdata/valid/windows/all-backward_compatible_with_explicit_exporters/golden_otel.conf b/confgenerator/testdata/valid/windows/all-backward_compatible_with_explicit_exporters/golden_otel.conf index 17f2e2aec6..8dc623749d 100644 --- a/confgenerator/testdata/valid/windows/all-backward_compatible_with_explicit_exporters/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/all-backward_compatible_with_explicit_exporters/golden_otel.conf @@ -381,7 +381,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -401,7 +401,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -419,7 +419,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/all-built_in_config/golden_otel.conf b/confgenerator/testdata/valid/windows/all-built_in_config/golden_otel.conf index a5624336f4..43298bebc0 100644 --- a/confgenerator/testdata/valid/windows/all-built_in_config/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/all-built_in_config/golden_otel.conf @@ -396,7 +396,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/all-user_config_file_deleted/golden_otel.conf b/confgenerator/testdata/valid/windows/all-user_config_file_deleted/golden_otel.conf index a5624336f4..43298bebc0 100644 --- a/confgenerator/testdata/valid/windows/all-user_config_file_deleted/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/all-user_config_file_deleted/golden_otel.conf @@ -396,7 +396,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/logging-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/windows/logging-default_overrides_disable_all/golden_otel.conf index a5624336f4..43298bebc0 100644 --- a/confgenerator/testdata/valid/windows/logging-default_overrides_disable_all/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/logging-default_overrides_disable_all/golden_otel.conf @@ -396,7 +396,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/logging-receiver_files_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/windows/logging-receiver_files_refresh_interval/golden_otel.conf index a5624336f4..43298bebc0 100644 --- a/confgenerator/testdata/valid/windows/logging-receiver_files_refresh_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/logging-receiver_files_refresh_interval/golden_otel.conf @@ -396,7 +396,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/logging-receiver_files_type_multiple_receivers/golden_otel.conf b/confgenerator/testdata/valid/windows/logging-receiver_files_type_multiple_receivers/golden_otel.conf index a5624336f4..43298bebc0 100644 --- a/confgenerator/testdata/valid/windows/logging-receiver_files_type_multiple_receivers/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/logging-receiver_files_type_multiple_receivers/golden_otel.conf @@ -396,7 +396,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_all/golden_otel.conf index def6d095dd..b77095f6e2 100644 --- a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_all/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_all/golden_otel.conf @@ -399,7 +399,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -419,7 +419,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -437,7 +437,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_iis/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_iis/golden_otel.conf index 7329e7aeb6..d9d9f10199 100644 --- a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_iis/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_iis/golden_otel.conf @@ -399,7 +399,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -419,7 +419,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -437,7 +437,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_mssql/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_mssql/golden_otel.conf index c151d7b952..ebdc953319 100644 --- a/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_mssql/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-default_overrides_disable_mssql/golden_otel.conf @@ -399,7 +399,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -419,7 +419,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -437,7 +437,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_otel.conf index 6fa52df832..3a4f64bd8c 100644 --- a/confgenerator/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-pipeline_multiple_pipelines/golden_otel.conf @@ -381,7 +381,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -401,7 +401,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/another__another__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -419,7 +419,7 @@ receivers: - _Total object: Web Service windowsperfcounters/another__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf index f4e4106670..80c91b6e5b 100644 --- a/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden_otel.conf @@ -402,7 +402,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -422,7 +422,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -440,7 +440,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf index 0af6f0312a..fa20beee06 100644 --- a/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-processor_exclude_metrics_type_filter_with_globs/golden_otel.conf @@ -402,7 +402,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -422,7 +422,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -440,7 +440,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_apache/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_apache/golden_otel.conf index 1f757604ba..e38a955ac6 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_apache/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_apache/golden_otel.conf @@ -413,7 +413,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -436,7 +436,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -454,7 +454,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_apache_status_url/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_apache_status_url/golden_otel.conf index 499c6f10ce..be4a9a43da 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_apache_status_url/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_apache_status_url/golden_otel.conf @@ -413,7 +413,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -436,7 +436,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -454,7 +454,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_custom_collection_interval/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_custom_collection_interval/golden_otel.conf index 5f742795ca..045a34b96d 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_custom_collection_interval/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_custom_collection_interval/golden_otel.conf @@ -416,7 +416,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -434,7 +434,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_jvm/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_jvm/golden_otel.conf index 9a2dbabf77..6c670a815c 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_jvm/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_jvm/golden_otel.conf @@ -403,7 +403,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -428,7 +428,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -446,7 +446,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_jvm_missing_endpoint/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_jvm_missing_endpoint/golden_otel.conf index 9a2dbabf77..6c670a815c 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_jvm_missing_endpoint/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_jvm_missing_endpoint/golden_otel.conf @@ -403,7 +403,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -428,7 +428,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -446,7 +446,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_nginx/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_nginx/golden_otel.conf index 03973fec83..f53c7b8ce8 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_nginx/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_nginx/golden_otel.conf @@ -403,7 +403,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -426,7 +426,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -444,7 +444,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections diff --git a/confgenerator/testdata/valid/windows/metrics-receiver_nginx_missing_status_url/golden_otel.conf b/confgenerator/testdata/valid/windows/metrics-receiver_nginx_missing_status_url/golden_otel.conf index 03973fec83..f53c7b8ce8 100644 --- a/confgenerator/testdata/valid/windows/metrics-receiver_nginx_missing_status_url/golden_otel.conf +++ b/confgenerator/testdata/valid/windows/metrics-receiver_nginx_missing_status_url/golden_otel.conf @@ -403,7 +403,7 @@ processors: - gce receivers: hostmetrics/default__pipeline_hostmetrics: - collection_interval: 60s + collection_interval: 1m0s scrapers: cpu: {} disk: {} @@ -426,7 +426,7 @@ receivers: - targets: - 0.0.0.0:8888 windowsperfcounters/default__pipeline_iis: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - Current Connections @@ -444,7 +444,7 @@ receivers: - _Total object: Web Service windowsperfcounters/default__pipeline_mssql: - collection_interval: 60s + collection_interval: 1m0s perfcounters: - counters: - User Connections