Skip to content

Commit a5b1857

Browse files
jinja2jinja2
committed
keep histograms in envoy prometheus receiver
1 parent 8049f0f commit a5b1857

File tree

6 files changed

+516
-221
lines changed

6 files changed

+516
-221
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### 🧰 Bug fixes 🧰
6+
7+
- (Splunk) `discovery`: Fix the prometheus config for envoy discovery receiver ([#6243](https://github.com/signalfx/splunk-otel-collector/pull/6243))
8+
59
## v0.125.0
610

711
This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.125.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.125.0)

‎cmd/otelcol/config/collector/config.d.linux/receivers/envoy.discovery.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,25 @@
2424
# metric_relabel_configs:
2525
# - source_labels: [__name__]
2626
# action: keep
27-
# regex: '(envoy_cluster_upstream_cx_active|envoy_cluster_upstream_cx_total|envoy_cluster_upstream_cx_connect_fail|envoy_cluster_upstream_cx_connect_ms|envoy_cluster_upstream_rq_active|envoy_cluster_upstream_rq_total|envoy_cluster_upstream_rq_timeout|envoy_cluster_upstream_rq_pending_active|envoy_cluster_upstream_rq_pending_overflow|envoy_cluster_upstream_rq_time|envoy_cluster_membership_total|envoy_cluster_membership_degraded|envoy_cluster_membership_excluded|envoy_listener_downstream_cx_active|envoy_listener_downstream_cx_total|envoy_listener_downstream_cx_transport_socket_connect_timeout|envoy_listener_downstream_cx_overflow|envoy_listener_downstream_cx_overload_reject|envoy_listener_downstream_global_cx_overflow)'
27+
# regex: "(envoy_cluster_upstream_cx_active|\
28+
# envoy_cluster_upstream_cx_total|\
29+
# envoy_cluster_upstream_cx_connect_fail|\
30+
# envoy_cluster_upstream_cx_connect_ms|\
31+
# envoy_cluster_upstream_rq_active|\
32+
# envoy_cluster_upstream_rq_total|\
33+
# envoy_cluster_upstream_rq_timeout|\
34+
# envoy_cluster_upstream_rq_pending_active|\
35+
# envoy_cluster_upstream_rq_pending_overflow|\
36+
# envoy_cluster_upstream_rq_time|\
37+
# envoy_cluster_membership_total|\
38+
# envoy_cluster_membership_degraded|\
39+
# envoy_cluster_membership_excluded|\
40+
# envoy_listener_downstream_cx_active|\
41+
# envoy_listener_downstream_cx_total|\
42+
# envoy_listener_downstream_cx_transport_socket_connect_timeout|\
43+
# envoy_listener_downstream_cx_overflow|\
44+
# envoy_listener_downstream_cx_overload_reject|\
45+
# envoy_listener_downstream_global_cx_overflow)(?:_sum|_count|_bucket)?"
2846
# status:
2947
# metrics:
3048
# - status: successful

‎internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,25 @@ prometheus:
2020
metric_relabel_configs:
2121
- source_labels: [__name__]
2222
action: keep
23-
regex: '(envoy_cluster_upstream_cx_active|envoy_cluster_upstream_cx_total|envoy_cluster_upstream_cx_connect_fail|envoy_cluster_upstream_cx_connect_ms|envoy_cluster_upstream_rq_active|envoy_cluster_upstream_rq_total|envoy_cluster_upstream_rq_timeout|envoy_cluster_upstream_rq_pending_active|envoy_cluster_upstream_rq_pending_overflow|envoy_cluster_upstream_rq_time|envoy_cluster_membership_total|envoy_cluster_membership_degraded|envoy_cluster_membership_excluded|envoy_listener_downstream_cx_active|envoy_listener_downstream_cx_total|envoy_listener_downstream_cx_transport_socket_connect_timeout|envoy_listener_downstream_cx_overflow|envoy_listener_downstream_cx_overload_reject|envoy_listener_downstream_global_cx_overflow)'
23+
regex: "(envoy_cluster_upstream_cx_active|\
24+
envoy_cluster_upstream_cx_total|\
25+
envoy_cluster_upstream_cx_connect_fail|\
26+
envoy_cluster_upstream_cx_connect_ms|\
27+
envoy_cluster_upstream_rq_active|\
28+
envoy_cluster_upstream_rq_total|\
29+
envoy_cluster_upstream_rq_timeout|\
30+
envoy_cluster_upstream_rq_pending_active|\
31+
envoy_cluster_upstream_rq_pending_overflow|\
32+
envoy_cluster_upstream_rq_time|\
33+
envoy_cluster_membership_total|\
34+
envoy_cluster_membership_degraded|\
35+
envoy_cluster_membership_excluded|\
36+
envoy_listener_downstream_cx_active|\
37+
envoy_listener_downstream_cx_total|\
38+
envoy_listener_downstream_cx_transport_socket_connect_timeout|\
39+
envoy_listener_downstream_cx_overflow|\
40+
envoy_listener_downstream_cx_overload_reject|\
41+
envoy_listener_downstream_global_cx_overflow)(?:_sum|_count|_bucket)?"
2442
status:
2543
metrics:
2644
- status: successful

‎internal/confmapprovider/discovery/bundle/bundle.d/receivers/envoy.discovery.yaml.tmpl

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,25 @@
1616
metric_relabel_configs:
1717
- source_labels: [__name__]
1818
action: keep
19-
regex: '(envoy_cluster_upstream_cx_active|envoy_cluster_upstream_cx_total|envoy_cluster_upstream_cx_connect_fail|envoy_cluster_upstream_cx_connect_ms|envoy_cluster_upstream_rq_active|envoy_cluster_upstream_rq_total|envoy_cluster_upstream_rq_timeout|envoy_cluster_upstream_rq_pending_active|envoy_cluster_upstream_rq_pending_overflow|envoy_cluster_upstream_rq_time|envoy_cluster_membership_total|envoy_cluster_membership_degraded|envoy_cluster_membership_excluded|envoy_listener_downstream_cx_active|envoy_listener_downstream_cx_total|envoy_listener_downstream_cx_transport_socket_connect_timeout|envoy_listener_downstream_cx_overflow|envoy_listener_downstream_cx_overload_reject|envoy_listener_downstream_global_cx_overflow)'
19+
regex: "(envoy_cluster_upstream_cx_active|\
20+
envoy_cluster_upstream_cx_total|\
21+
envoy_cluster_upstream_cx_connect_fail|\
22+
envoy_cluster_upstream_cx_connect_ms|\
23+
envoy_cluster_upstream_rq_active|\
24+
envoy_cluster_upstream_rq_total|\
25+
envoy_cluster_upstream_rq_timeout|\
26+
envoy_cluster_upstream_rq_pending_active|\
27+
envoy_cluster_upstream_rq_pending_overflow|\
28+
envoy_cluster_upstream_rq_time|\
29+
envoy_cluster_membership_total|\
30+
envoy_cluster_membership_degraded|\
31+
envoy_cluster_membership_excluded|\
32+
envoy_listener_downstream_cx_active|\
33+
envoy_listener_downstream_cx_total|\
34+
envoy_listener_downstream_cx_transport_socket_connect_timeout|\
35+
envoy_listener_downstream_cx_overflow|\
36+
envoy_listener_downstream_cx_overload_reject|\
37+
envoy_listener_downstream_global_cx_overflow)(?:_sum|_count|_bucket)?"
2038
status:
2139
metrics:
2240
- status: successful

0 commit comments

Comments
 (0)