From aac90e46ca2de9fb5026ed127857d65a0bfa3f97 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Tue, 4 Feb 2025 14:28:07 -0500 Subject: [PATCH] [OTAGENT-285] Increase the scraping interval of collector internal metrics --- cmd/otel-agent/dist/otel-config.yaml | 2 +- comp/metadata/inventoryotel/README.md | 4 ++-- .../inventoryotel/inventoryotelimpl/dummy_data/response.json | 4 ++-- comp/otelcol/converter/examples/prometheus.yaml | 2 +- comp/otelcol/converter/impl/converter_test.go | 2 ++ comp/otelcol/converter/impl/prometheus.go | 2 +- .../impl/testdata/connectors/already-set/config.yaml | 2 +- .../impl/testdata/connectors/no-dd-connector/config.yaml | 2 +- .../impl/testdata/connectors/set-default/config-result.yaml | 2 +- .../impl/testdata/connectors/set-default/config.yaml | 2 +- .../testdata/dd-core-cfg/all/api-section/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/all/api-section/config.yaml | 2 +- .../dd-core-cfg/all/key-site-section/config-result.yaml | 2 +- .../testdata/dd-core-cfg/all/key-site-section/config.yaml | 2 +- .../dd-core-cfg/all/no-api-section/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/all/no-api-section/config.yaml | 2 +- .../impl/testdata/dd-core-cfg/all/no-overrides/config.yaml | 2 +- .../dd-core-cfg/apikey/api-set-no-key/config-result.yaml | 2 +- .../testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml | 2 +- .../dd-core-cfg/apikey/empty-string/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml | 2 +- .../apikey/multiple-dd-exporter/config-result.yaml | 2 +- .../dd-core-cfg/apikey/multiple-dd-exporter/config.yaml | 2 +- .../dd-core-cfg/apikey/no-api-key-section/config-result.yaml | 2 +- .../dd-core-cfg/apikey/no-api-key-section/config.yaml | 2 +- .../testdata/dd-core-cfg/apikey/secret/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/apikey/secret/config.yaml | 2 +- .../impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/apikey/unset/config.yaml | 2 +- .../impl/testdata/dd-core-cfg/none/config-result.yaml | 2 +- .../converter/impl/testdata/dd-core-cfg/none/config.yaml | 2 +- .../dd-core-cfg/site/api-set-no-site/config-result.yaml | 2 +- .../testdata/dd-core-cfg/site/api-set-no-site/config.yaml | 2 +- .../testdata/dd-core-cfg/site/empty-string/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/site/empty-string/config.yaml | 2 +- .../dd-core-cfg/site/multiple-dd-exporter/config-result.yaml | 2 +- .../dd-core-cfg/site/multiple-dd-exporter/config.yaml | 2 +- .../dd-core-cfg/site/no-api-site-section/config-result.yaml | 2 +- .../testdata/dd-core-cfg/site/no-api-site-section/config.yaml | 2 +- .../site/unset-core-mptystr-col/config-result.yaml | 2 +- .../dd-core-cfg/site/unset-core-mptystr-col/config.yaml | 2 +- .../impl/testdata/dd-core-cfg/site/unset/config-result.yaml | 2 +- .../impl/testdata/dd-core-cfg/site/unset/config.yaml | 2 +- .../dd-connector-multi-pipelines/config-result.yaml | 2 +- .../processors/dd-connector-multi-pipelines/config.yaml | 2 +- .../impl/testdata/processors/dd-connector/config-result.yaml | 2 +- .../impl/testdata/processors/dd-connector/config.yaml | 2 +- .../converter/impl/testdata/processors/no-changes/config.yaml | 2 +- .../processors/no-processor-partial/config-result.yaml | 2 +- .../impl/testdata/processors/no-processor-partial/config.yaml | 2 +- .../impl/testdata/processors/no-processors/config-result.yaml | 2 +- .../impl/testdata/processors/no-processors/config.yaml | 2 +- .../testdata/processors/other-processors/config-result.yaml | 2 +- .../impl/testdata/processors/other-processors/config.yaml | 2 +- .../testdata/receivers/empty-staticconfigs/config-result.yaml | 4 ++-- .../impl/testdata/receivers/empty-staticconfigs/config.yaml | 2 +- .../testdata/receivers/job-name-change/config-result.yaml | 2 +- .../impl/testdata/receivers/job-name-change/config.yaml | 2 +- .../missing-staticconfigs-section/config-result.yaml | 4 ++-- .../receivers/missing-staticconfigs-section/config.yaml | 2 +- .../receivers/multi-dd-partial-prom/config-result.yaml | 4 ++-- .../impl/testdata/receivers/multi-dd-partial-prom/config.yaml | 2 +- .../no-changes-multiple-dd-same-pipeline/config.yaml | 2 +- .../testdata/receivers/no-changes-multiple-dd/config.yaml | 2 +- .../converter/impl/testdata/receivers/no-changes/config.yaml | 2 +- .../testdata/receivers/no-prom-multi-dd/config-result.yaml | 2 +- .../receivers/no-prom-not-default-addr/config-result.yaml | 2 +- .../receivers/no-prometheus-receiver/config-result.yaml | 2 +- .../receivers/no-receivers-defined/config-result.yaml | 2 +- .../provision/node/not_instrumented/package-lock.json | 4 ++-- test/new-e2e/tests/otel/otel-agent/config/complete.yml | 2 +- test/new-e2e/tests/otel/otel-agent/config/ia.yml | 2 +- .../tests/otel/otel-agent/testdata/minimal-full-config.yml | 2 +- .../otel/otel-agent/testdata/no-dd-exporter-full-config.yml | 2 +- 74 files changed, 81 insertions(+), 79 deletions(-) diff --git a/cmd/otel-agent/dist/otel-config.yaml b/cmd/otel-agent/dist/otel-config.yaml index fb916d72bb659c..f48456168681b3 100644 --- a/cmd/otel-agent/dist/otel-config.yaml +++ b/cmd/otel-agent/dist/otel-config.yaml @@ -24,7 +24,7 @@ receivers: config: scrape_configs: - job_name: 'otel-collector' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] metric_relabel_configs: diff --git a/comp/metadata/inventoryotel/README.md b/comp/metadata/inventoryotel/README.md index b95ee2fbc7f9df..d7db7a44289652 100644 --- a/comp/metadata/inventoryotel/README.md +++ b/comp/metadata/inventoryotel/README.md @@ -55,13 +55,13 @@ Here an example of an inventory payload: "description": "foo bar", "version": "1.0.0", "extension_version": "1.0.0", - "customer_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 10s\n static_configs:\n - + "customer_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 60s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [datadog]\n metrics:\n receivers: [otlp, prometheus]\n exporters: [datadog]\n logs:\n receivers: [otlp]\n exporters: [datadog]\"", "enabled": true, "environment_configuration": "", - "runtime_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 10s\n static_configs:\n - + "runtime_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 60s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nprocessors:\n tagenrich:\n batch:\n timeout: 10s\nconnectors:\n datadog/connector:\n\tcompute_stats_by_span_kind: true\n\tpeer_tags_aggregation: true\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n processors: [batch,tagenrich]\n exporters: [datadog/connector,datadog]\n metrics:\n receivers: diff --git a/comp/metadata/inventoryotel/inventoryotelimpl/dummy_data/response.json b/comp/metadata/inventoryotel/inventoryotelimpl/dummy_data/response.json index c49424f6368073..7abae1a7edbd5c 100644 --- a/comp/metadata/inventoryotel/inventoryotelimpl/dummy_data/response.json +++ b/comp/metadata/inventoryotel/inventoryotelimpl/dummy_data/response.json @@ -4,8 +4,8 @@ "extension_version": "1.0.0", "command": "otelcol", "description": "foo bar", - "provided_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 10s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [datadog]\n metrics:\n receivers: [otlp, prometheus]\n exporters: [datadog]\n logs:\n receivers: [otlp]\n exporters: [datadog]\n", + "provided_configuration": "\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 60s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [datadog]\n metrics:\n receivers: [otlp, prometheus]\n exporters: [datadog]\n logs:\n receivers: [otlp]\n exporters: [datadog]\n", "runtime_override_configuration":"\nprocessors:\n tagenrich:\n batch:\n timeout: 10s\nconnectors:\n datadog/connector:\n\tcompute_stats_by_span_kind: true\n\tpeer_tags_aggregation: true\nservice:\n pipelines:\n traces:\n processors: [batch,tagenrich]\n exporters: [datadog/connector,datadog]\n metrics:\n receivers: [otlp,prometheus,datadog/connector]\n processors: [batch,tagenrich]\n logs:\n processors: [batch,tagenrich]\n", "environment_variable_configuration":"", - "full_configuration":"\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 10s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nprocessors:\n tagenrich:\n batch:\n timeout: 10s\nconnectors:\n datadog/connector:\n\tcompute_stats_by_span_kind: true\n\tpeer_tags_aggregation: true\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n processors: [batch,tagenrich]\n exporters: [datadog/connector,datadog]\n metrics:\n receivers: [otlp, prometheus,datadog/connector]\n processors: [batch,tagenrich]\n exporters: [datadog]\n logs:\n receivers: [otlp]\n processors: [batch,tagenrich]\n exporters: [datadog]\n" + "full_configuration":"\nreceivers:\n prometheus:\n config:\n scrape_configs:\n - job_name: \"otelcol\"\n scrape_interval: 60s\n static_configs:\n - targets: [\"0.0.0.0:8888\"]\n metric_relabel_configs:\n - source_labels: [__name__]\n regex: \".*grpc_io.*\"\n action: drop\n otlp:\n protocols:\n grpc:\n http:\nexporters:\n datadog:\n api:\n key: $DD_API_KEY\nprocessors:\n tagenrich:\n batch:\n timeout: 10s\nconnectors:\n datadog/connector:\n\tcompute_stats_by_span_kind: true\n\tpeer_tags_aggregation: true\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n processors: [batch,tagenrich]\n exporters: [datadog/connector,datadog]\n metrics:\n receivers: [otlp, prometheus,datadog/connector]\n processors: [batch,tagenrich]\n exporters: [datadog]\n logs:\n receivers: [otlp]\n processors: [batch,tagenrich]\n exporters: [datadog]\n" } diff --git a/comp/otelcol/converter/examples/prometheus.yaml b/comp/otelcol/converter/examples/prometheus.yaml index 1e69237b20a0e3..ad3df1e82dca92 100644 --- a/comp/otelcol/converter/examples/prometheus.yaml +++ b/comp/otelcol/converter/examples/prometheus.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/converter_test.go b/comp/otelcol/converter/impl/converter_test.go index ae5814004a6842..363344f7526740 100644 --- a/comp/otelcol/converter/impl/converter_test.go +++ b/comp/otelcol/converter/impl/converter_test.go @@ -48,6 +48,8 @@ func TestNewConverterForAgent(t *testing.T) { } func TestConvert(t *testing.T) { + t.Setenv("DD_API_KEY", "") + t.Setenv("DD_SITE", "") tests := []struct { name string provided string diff --git a/comp/otelcol/converter/impl/prometheus.go b/comp/otelcol/converter/impl/prometheus.go index 23b57e6ba424b8..dda845500414ea 100644 --- a/comp/otelcol/converter/impl/prometheus.go +++ b/comp/otelcol/converter/impl/prometheus.go @@ -19,7 +19,7 @@ var ( "scrape_configs": []any{ map[string]any{ "job_name": "datadog-agent", - "scrape_interval": "10s", + "scrape_interval": "60s", "static_configs": []any{ map[string]any{ "targets": []any{"0.0.0.0:8888"}, diff --git a/comp/otelcol/converter/impl/testdata/connectors/already-set/config.yaml b/comp/otelcol/converter/impl/testdata/connectors/already-set/config.yaml index 4c06c79247850e..4dcb249a1dc68e 100644 --- a/comp/otelcol/converter/impl/testdata/connectors/already-set/config.yaml +++ b/comp/otelcol/converter/impl/testdata/connectors/already-set/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/connectors/no-dd-connector/config.yaml b/comp/otelcol/converter/impl/testdata/connectors/no-dd-connector/config.yaml index dccb5d98e85f96..c32daf04c6c548 100644 --- a/comp/otelcol/converter/impl/testdata/connectors/no-dd-connector/config.yaml +++ b/comp/otelcol/converter/impl/testdata/connectors/no-dd-connector/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/connectors/set-default/config-result.yaml b/comp/otelcol/converter/impl/testdata/connectors/set-default/config-result.yaml index 4d11433766dcb8..3f5c40cde00185 100644 --- a/comp/otelcol/converter/impl/testdata/connectors/set-default/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/connectors/set-default/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/connectors/set-default/config.yaml b/comp/otelcol/converter/impl/testdata/connectors/set-default/config.yaml index 45994878a3ee15..9eeeb4dfc72819 100644 --- a/comp/otelcol/converter/impl/testdata/connectors/set-default/config.yaml +++ b/comp/otelcol/converter/impl/testdata/connectors/set-default/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config-result.yaml index 45c95534aae749..6efad557a0c5b5 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config.yaml index 58a150f6584970..030a64d78c4d30 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/api-section/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config-result.yaml index 45c95534aae749..6efad557a0c5b5 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config.yaml index f9d9173c1238ab..3153d5b209139c 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/key-site-section/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config-result.yaml index 45c95534aae749..6efad557a0c5b5 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config.yaml index c8919b426c09a4..1e9fa60e156263 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-api-section/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-overrides/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-overrides/config.yaml index efe926f1a8046e..55bf7df414305b 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-overrides/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/all/no-overrides/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config-result.yaml index 959a117fc8eef8..53251b2253b9c7 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml index 63923dcf01eded..85a03502489421 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/api-set-no-key/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config-result.yaml index e43ecf79adc7bd..327ce8ad969fa8 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml index 3c69b1d8e16832..db950324c0169b 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/empty-string/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config-result.yaml index 3279246588d2ad..8c9040d61fa41f 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] processors: diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config.yaml index 13107c2732d1ab..e382b91aaf8907 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/multiple-dd-exporter/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config-result.yaml index e43ecf79adc7bd..327ce8ad969fa8 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config.yaml index c8919b426c09a4..1e9fa60e156263 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/no-api-key-section/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config-result.yaml index e43ecf79adc7bd..327ce8ad969fa8 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config.yaml index c7caf0e8f26ee4..ff5cf5e5c8d09f 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/secret/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml index e43ecf79adc7bd..327ce8ad969fa8 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config.yaml index b80558a7bc0402..c50b4394e438bc 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/apikey/unset/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config-result.yaml index 904c8474c0e539..cb8d3411e6f746 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config.yaml index e293d7ca773fe5..c795c57e9be673 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/none/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config-result.yaml index 959a117fc8eef8..53251b2253b9c7 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config.yaml index 0f4753e0690e5a..e1ff9ca6478ddc 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/api-set-no-site/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config-result.yaml index 959a117fc8eef8..53251b2253b9c7 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config.yaml index 1578ae633dbe1a..eca85a9267c6a9 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/empty-string/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config-result.yaml index 5018db5b7b3b25..729cf039e03951 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] processors: diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config.yaml index 7577e98dfdbfd8..c99f47a97d4b8f 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/multiple-dd-exporter/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config-result.yaml index 959a117fc8eef8..53251b2253b9c7 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config.yaml index 6c633ac386d33b..bd6e8458855acc 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/no-api-site-section/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config-result.yaml index eee38549dd7e0d..ebc8ce36e1fcb9 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config.yaml index 5de3ea2b69b9b6..d82a07087d92d3 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset-core-mptystr-col/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config-result.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config-result.yaml index c2bacbcf1533d1..76cd409d266071 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config.yaml b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config.yaml index 99ee6d6f9faa35..48b4819e220b59 100644 --- a/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config.yaml +++ b/comp/otelcol/converter/impl/testdata/dd-core-cfg/site/unset/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config-result.yaml b/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config-result.yaml index 0a2999ceee9dae..bfd7a66b7ede04 100644 --- a/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config-result.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: "datadog-agent" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] otlp: diff --git a/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config.yaml b/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config.yaml index 1ca43bb788867a..f38e70cb7aa3a6 100644 --- a/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/dd-connector-multi-pipelines/config.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: "otelcol" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] otlp: diff --git a/comp/otelcol/converter/impl/testdata/processors/dd-connector/config-result.yaml b/comp/otelcol/converter/impl/testdata/processors/dd-connector/config-result.yaml index f540128881e75e..9c8736415db3aa 100644 --- a/comp/otelcol/converter/impl/testdata/processors/dd-connector/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/dd-connector/config-result.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: "datadog-agent" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] otlp: diff --git a/comp/otelcol/converter/impl/testdata/processors/dd-connector/config.yaml b/comp/otelcol/converter/impl/testdata/processors/dd-connector/config.yaml index 70d4ee4f34c52c..c2ec37a51376ae 100644 --- a/comp/otelcol/converter/impl/testdata/processors/dd-connector/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/dd-connector/config.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: "otelcol" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] otlp: diff --git a/comp/otelcol/converter/impl/testdata/processors/no-changes/config.yaml b/comp/otelcol/converter/impl/testdata/processors/no-changes/config.yaml index 2ecc50630bc2a9..9a23f46b11105c 100644 --- a/comp/otelcol/converter/impl/testdata/processors/no-changes/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/no-changes/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config-result.yaml b/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config-result.yaml index 3c350b584f7a92..b4cdc527e1e59a 100644 --- a/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config.yaml b/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config.yaml index 513076b06b32ac..f60a75ec14b0e7 100644 --- a/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/no-processor-partial/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/no-processors/config-result.yaml b/comp/otelcol/converter/impl/testdata/processors/no-processors/config-result.yaml index fa3868f86a597e..17fd11cad87725 100644 --- a/comp/otelcol/converter/impl/testdata/processors/no-processors/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/no-processors/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/no-processors/config.yaml b/comp/otelcol/converter/impl/testdata/processors/no-processors/config.yaml index 18c8bde47c5334..4bbdba6af1cc09 100644 --- a/comp/otelcol/converter/impl/testdata/processors/no-processors/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/no-processors/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/other-processors/config-result.yaml b/comp/otelcol/converter/impl/testdata/processors/other-processors/config-result.yaml index bcb0096299ea8a..1d3f47843f5d3f 100644 --- a/comp/otelcol/converter/impl/testdata/processors/other-processors/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/other-processors/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/processors/other-processors/config.yaml b/comp/otelcol/converter/impl/testdata/processors/other-processors/config.yaml index f76d6b0e3a4a21..b2233c613e626a 100644 --- a/comp/otelcol/converter/impl/testdata/processors/other-processors/config.yaml +++ b/comp/otelcol/converter/impl/testdata/processors/other-processors/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config-result.yaml index a37951a21481bf..4158d2070f9342 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config-result.yaml @@ -3,14 +3,14 @@ receivers: config: scrape_configs: - job_name: 'custom' - scrape_interval: 10s + scrape_interval: 60s static_configs: prometheus/dd-autoconfigured: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] exporters: diff --git a/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config.yaml index 1b2094315f8d79..5058f8be2376b6 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/empty-staticconfigs/config.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: 'custom' - scrape_interval: 10s + scrape_interval: 60s static_configs: exporters: diff --git a/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config-result.yaml index c2f8aa89006deb..ffb7583fe312e8 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: "datadog-agent" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] diff --git a/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config.yaml index 2dcc8524c58cfa..7dd7754537c5d9 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/job-name-change/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: "otelcol" - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ["0.0.0.0:8888"] diff --git a/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config-result.yaml index 675642941c0012..7787bbd483029c 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config-result.yaml @@ -3,13 +3,13 @@ receivers: config: scrape_configs: - job_name: 'custom' - scrape_interval: 10s + scrape_interval: 60s prometheus/dd-autoconfigured: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config.yaml index 5334c4f953d0b1..2ab8117ce8bc96 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/missing-staticconfigs-section/config.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: 'custom' - scrape_interval: 10s + scrape_interval: 60s exporters: datadog: diff --git a/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config-result.yaml index e4434fd09f9523..4b1b27aa00be86 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config-result.yaml @@ -4,14 +4,14 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['localhost:1234'] prometheus/dd-autoconfigured: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['localhost:1234'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config.yaml index a4e8c166d74d82..88a583feb01440 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/multi-dd-partial-prom/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['localhost:1234'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd-same-pipeline/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd-same-pipeline/config.yaml index c17a3fdbd44820..805d97c53d5246 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd-same-pipeline/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd-same-pipeline/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd/config.yaml index 8f48837890504f..3668f5385e41f6 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-changes-multiple-dd/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-changes/config.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-changes/config.yaml index 3625ed308e7691..54b742df2b304a 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-changes/config.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-changes/config.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-prom-multi-dd/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-prom-multi-dd/config-result.yaml index da86cf23669645..61b38b7053fed1 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-prom-multi-dd/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-prom-multi-dd/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-prom-not-default-addr/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-prom-not-default-addr/config-result.yaml index f0c0de3c28d355..ce6826aab5bf72 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-prom-not-default-addr/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-prom-not-default-addr/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['localhost:1234'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-prometheus-receiver/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-prometheus-receiver/config-result.yaml index 67f8f6463ff1af..679fab1dbf3310 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-prometheus-receiver/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-prometheus-receiver/config-result.yaml @@ -4,7 +4,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/comp/otelcol/converter/impl/testdata/receivers/no-receivers-defined/config-result.yaml b/comp/otelcol/converter/impl/testdata/receivers/no-receivers-defined/config-result.yaml index 6e57ae36b8ddad..0e0916171a4afc 100644 --- a/comp/otelcol/converter/impl/testdata/receivers/no-receivers-defined/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/receivers/no-receivers-defined/config-result.yaml @@ -3,7 +3,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: ['0.0.0.0:8888'] diff --git a/test/new-e2e/tests/discovery/testdata/provision/node/not_instrumented/package-lock.json b/test/new-e2e/tests/discovery/testdata/provision/node/not_instrumented/package-lock.json index 56122ca318c18f..86ca19a55eee87 100644 --- a/test/new-e2e/tests/discovery/testdata/provision/node/not_instrumented/package-lock.json +++ b/test/new-e2e/tests/discovery/testdata/provision/node/not_instrumented/package-lock.json @@ -1,11 +1,11 @@ { - "name": "node-instrumented", + "name": "node-svc", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "node-instrumented", + "name": "node-svc", "version": "1.0.0" } } diff --git a/test/new-e2e/tests/otel/otel-agent/config/complete.yml b/test/new-e2e/tests/otel/otel-agent/config/complete.yml index 769be4e142d3c0..bf249e1a9fe4cd 100644 --- a/test/new-e2e/tests/otel/otel-agent/config/complete.yml +++ b/test/new-e2e/tests/otel/otel-agent/config/complete.yml @@ -9,7 +9,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: [ '0.0.0.0:8888' ] exporters: diff --git a/test/new-e2e/tests/otel/otel-agent/config/ia.yml b/test/new-e2e/tests/otel/otel-agent/config/ia.yml index 416a9d4829bf13..3d52e9f2a597ca 100644 --- a/test/new-e2e/tests/otel/otel-agent/config/ia.yml +++ b/test/new-e2e/tests/otel/otel-agent/config/ia.yml @@ -9,7 +9,7 @@ receivers: config: scrape_configs: - job_name: 'datadog-agent' - scrape_interval: 10s + scrape_interval: 60s static_configs: - targets: [ '0.0.0.0:8888' ] exporters: diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml index 0e2c82d8c9f629..6b3d753bec22a8 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml @@ -225,7 +225,7 @@ receivers: job_name: datadog-agent metrics_path: /metrics scheme: http - scrape_interval: 10s + scrape_interval: 60s scrape_protocols: - OpenMetricsText1.0.0 - OpenMetricsText0.0.1 diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml index 633b1a3f5b227d..c1ed64234f9179 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml @@ -203,7 +203,7 @@ receivers: job_name: datadog-agent metrics_path: /metrics scheme: http - scrape_interval: 10s + scrape_interval: 60s scrape_protocols: - OpenMetricsText1.0.0 - OpenMetricsText0.0.1