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.

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

Update config for setting up internal metrics scraper #1573

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .chloggen/update-service-telemetry-endpoint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
component: agent, clusterReceiver, gateway
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Update config for scraping internal metrics to use new config interface and loopback address.
# One or more tracking issues related to the change
issues: [1573]
# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: "This also drops redundant attributes reported with the internal metrics: `net.host.name` and `server.address`"
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
smartagent/coredns:
Expand Down Expand Up @@ -493,4 +493,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 599ae6240b728a0f8301552303b8efc55a0040caac39ecba1e04d4fe41f879ac
checksum/config: e62f6ee4ef1ba1d8771d4056077ed10afe5d3bc6b4052980b2a7cc9f15a2bcdd
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
smartagent/coredns:
Expand Down Expand Up @@ -443,4 +443,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: f1de5c58c5e1dade0ae34291f7c2052ec977104cd591d80af085e46119c7a4c1
checksum/config: e8ae8de67a024a79ab31a0ac261fdb0c85fd63b509681242d93917bfc29b8a76
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
postgresql:
Expand Down Expand Up @@ -321,4 +321,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: 879c032d48dac95fa58dae345063f3209037b6b8f1f2941bc3799ccfa343cb43
checksum/config: 46b8ba55ad9b9c54254be9211b0396df3cd0d3a71dbc20fb3ba8893b6318ad88
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
smartagent/coredns:
Expand Down Expand Up @@ -310,4 +310,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
2 changes: 1 addition & 1 deletion examples/add-sampler/rendered_manifests/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: ea59bab11b6951542d0951611791b361ddad62449c19bb69ebb2d43ca14869e3
checksum/config: 4a6276e318600d9ea3e76c91b6670f201c626ba375a03af94eac9d8efcf71cdb
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
prometheus_simple:
Expand Down Expand Up @@ -485,4 +485,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: cec7fb80a25b44aac4bbe1a98c3a7dbec489c2cf18f28d68a5f932c0f2879257
checksum/config: c22db802040791e7ed72c236060ae18ce39720b23c968d35bd6d8aac1fb07295
kubectl.kubernetes.io/default-container: otel-collector
sidecar.istio.io/inject: "false"
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
sidecar.istio.io/inject: "false"
spec:
serviceAccountName: default-splunk-otel-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
smartagent/coredns:
Expand Down Expand Up @@ -306,4 +306,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-collector-agent
release: default
annotations:
checksum/config: f1c0ed384f3dcb0048464394fbcac49f7ade4ffe0a21cada1479371bced3c829
checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
receiver_creator:
receivers:
smartagent/coredns:
Expand Down Expand Up @@ -290,4 +290,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
service:
extensions:
- health_check
Expand Down Expand Up @@ -119,4 +119,9 @@ data:
- prometheus/k8s_cluster_receiver
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ data:
scrape_interval: 10s
static_configs:
- targets:
- ${K8S_POD_IP}:8889
- localhost:8889
signalfx:
access_token_passthrough: true
endpoint: 0.0.0.0:9943
Expand Down Expand Up @@ -216,4 +216,9 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8889
readers:
- pull:
exporter:
prometheus:
host: localhost
port: 8889
Loading
Loading