Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop extra prometheus metadata metrics for container insights #1555

Merged
merged 9 commits into from
Feb 20, 2025
Merged

drop extra prometheus metadata metrics for container insights #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd2a594
drop extra prometheus metadata metrics for container insights
movence Feb 19, 2025
21789fd
add a simple test
movence Feb 19, 2025
aef00bc
update comment
movence Feb 19, 2025
addbd5d
lint
movence Feb 19, 2025
b36b5e5
test config
movence Feb 19, 2025
d3e953a
use config yaml
movence Feb 19, 2025
561cb1a
use config yaml
movence Feb 19, 2025
bb289e2
tests
movence Feb 19, 2025
8d1b5b7
Merge branch 'main' into extra-emf
lisguo Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- ImageId
- InstanceId
- InstanceType
- ImageId
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down Expand Up @@ -90,11 +90,11 @@ service:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_cpu
- telegraf_disk
- telegraf_mem
- telegraf_netstat
- telegraf_swap
- telegraf_cpu
metrics/hostDeltaMetrics:
exporters:
- awscloudwatch
Expand Down
4 changes: 2 additions & 2 deletions translator/tocwconfig/sampleConfig/advanced_config_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- InstanceType
- ImageId
- InstanceId
- InstanceType
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down Expand Up @@ -98,13 +98,13 @@ service:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_netstat
- telegraf_swap
- telegraf_ethtool
- telegraf_nvidia_smi
- telegraf_cpu
- telegraf_disk
- telegraf_mem
- telegraf_netstat
metrics/hostDeltaMetrics:
exporters:
- awscloudwatch
Expand Down
8 changes: 4 additions & 4 deletions translator/tocwconfig/sampleConfig/advanced_config_windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- ImageId
- InstanceId
- InstanceType
- ImageId
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down Expand Up @@ -91,13 +91,13 @@ service:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_win_perf_counters/2073218482
- telegraf_win_perf_counters/2039663244
- telegraf_win_perf_counters/4283769065
- telegraf_win_perf_counters/1492679118
- telegraf_win_perf_counters/3610923661
- telegraf_win_perf_counters/3446270237
- telegraf_win_perf_counters/3762679655
- telegraf_win_perf_counters/2073218482
- telegraf_win_perf_counters/2039663244
- telegraf_win_perf_counters/4283769065
telemetry:
logs:
development: false
Expand Down
2 changes: 1 addition & 1 deletion translator/tocwconfig/sampleConfig/amp_config_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- ImageId
- InstanceId
- InstanceType
- ImageId
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,20 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 5s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
metricstransform/application_signals:
transforms:
- action: update
Expand Down Expand Up @@ -1553,6 +1567,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
traces/application_signals:
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,20 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 5s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
metricstransform/application_signals:
transforms:
- action: update
Expand Down Expand Up @@ -1534,6 +1548,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
traces/application_signals:
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,20 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 5s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
metricstransform/application_signals:
transforms:
- action: update
Expand Down Expand Up @@ -1553,6 +1567,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
traces/application_signals:
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,20 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 5s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
metricstransform/application_signals:
transforms:
- action: update
Expand Down Expand Up @@ -1553,6 +1567,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
traces/application_signals:
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/base_container_insights_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,20 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 5s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
receivers:
awscontainerinsightreceiver:
accelerated_compute_metrics: false
Expand Down Expand Up @@ -244,6 +258,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
telemetry:
Expand Down
2 changes: 1 addition & 1 deletion translator/tocwconfig/sampleConfig/basic_config_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ service:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_disk
- telegraf_mem
- telegraf_disk
telemetry:
logs:
development: false
Expand Down
2 changes: 1 addition & 1 deletion translator/tocwconfig/sampleConfig/compass_linux_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ service:
- ec2tagger
- awsentity/service/telegraf
receivers:
- telegraf_statsd
- telegraf_socket_listener
- telegraf_statsd
telemetry:
logs:
development: false
Expand Down
14 changes: 7 additions & 7 deletions translator/tocwconfig/sampleConfig/complete_darwin_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- ImageId
- InstanceId
- InstanceType
- ImageId
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down Expand Up @@ -289,23 +289,23 @@ service:
- transform
- awsentity/resource
receivers:
- telegraf_disk
- telegraf_swap
- telegraf_mem
- telegraf_cpu
- telegraf_processes
- telegraf_netstat
- telegraf_disk
- telegraf_processes
- telegraf_mem
- telegraf_procstat/1917393364
- telegraf_cpu
metrics/hostCustomMetrics:
exporters:
- awscloudwatch
processors:
- awsentity/service/telegraf
- ec2tagger
- transform
- awsentity/service/telegraf
receivers:
- telegraf_socket_listener
- telegraf_statsd
- telegraf_socket_listener
metrics/hostDeltaMetrics:
exporters:
- awscloudwatch
Expand Down
10 changes: 5 additions & 5 deletions translator/tocwconfig/sampleConfig/complete_linux_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ processors:
metric_statements:
- context: metric
statements:
- set(name, "kafka.fetch-rate") where name == "kafka.consumer.fetch-rate"
- set(unit, "unit") where name == "jvm.memory.heap.used"
- set(name, "JVM_MEM_HEAP_USED") where name == "jvm.memory.heap.used"
- set(name, "kafka.fetch-rate") where name == "kafka.consumer.fetch-rate"
trace_statements: []
transform/jmx/1:
error_mode: propagate
Expand Down Expand Up @@ -396,13 +396,13 @@ service:
- transform
- awsentity/resource
receivers:
- telegraf_processes
- telegraf_cpu
- telegraf_netstat
- telegraf_disk
- telegraf_mem
- telegraf_swap
- telegraf_netstat
- telegraf_processes
- telegraf_procstat/1917393364
- telegraf_mem
metrics/hostCustomMetrics/cloudwatch:
exporters:
- awscloudwatch
Expand All @@ -411,8 +411,8 @@ service:
- transform
- awsentity/service/telegraf
receivers:
- telegraf_socket_listener
- telegraf_statsd
- telegraf_socket_listener
metrics/hostDeltaMetrics/cloudwatch:
exporters:
- awscloudwatch
Expand Down
15 changes: 15 additions & 0 deletions translator/tocwconfig/sampleConfig/container_insights_jmx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,20 @@ processors:
match_type: ""
initial_value: 2
max_staleness: 0s
filter/containerinsights:
error_mode: propagate
logs: {}
metrics:
exclude:
match_type: strict
metric_names:
- up
- scrape_duration_seconds
- scrape_samples_scraped
- scrape_series_added
- scrape_samples_post_metric_relabeling
spans: {}
traces: {}
filter/containerinsightsjmx:
error_mode: propagate
logs: {}
Expand Down Expand Up @@ -537,6 +551,7 @@ service:
- awsemf/containerinsights
processors:
- batch/containerinsights
- filter/containerinsights
receivers:
- awscontainerinsightreceiver
metrics/containerinsightsjmx:
Expand Down
2 changes: 1 addition & 1 deletion translator/tocwconfig/sampleConfig/drop_origin_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ processors:
ec2_instance_tag_keys:
- AutoScalingGroupName
ec2_metadata_tags:
- InstanceType
- ImageId
- InstanceId
- InstanceType
imds_retries: 1
middleware: agenthealth/statuscode
refresh_interval_seconds: 0s
Expand Down
Loading