Skip to content

Commit

Permalink
[OTAGENT-285] Increase the scraping interval of collector internal me…
Browse files Browse the repository at this point in the history
…trics
  • Loading branch information
songy23 committed Feb 4, 2025
1 parent 56e1c70 commit aac90e4
Show file tree
Hide file tree
Showing 74 changed files with 81 additions and 79 deletions.
2 changes: 1 addition & 1 deletion cmd/otel-agent/dist/otel-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions comp/metadata/inventoryotel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion comp/otelcol/converter/examples/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
2 changes: 2 additions & 0 deletions comp/otelcol/converter/impl/converter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion comp/otelcol/converter/impl/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
Loading

0 comments on commit aac90e4

Please sign in to comment.