Skip to content

Commit e2e5547

Browse files
authored
fix scrape target for rule type == port (#1865)
* fix scrape target for rule type == port * add chlog
1 parent 2c632c7 commit e2e5547

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.chloggen/fixapiserverrule.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: agent
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Fix scrape target in prometheus receivers added for k8s controlPlaneMetrics.
7+
# One or more tracking issues related to the change
8+
issues: [1865]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext:

examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ data:
245245
scheme: https
246246
static_configs:
247247
- targets:
248-
- '`endpoint`:`port`'
248+
- '`endpoint`'
249249
tls_config:
250250
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
251251
insecure_skip_verify: true

examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 4c68dc929cca0cc2217a2caaa0c028b9835633094e99697c0212e96ba38e8f59
35+
checksum/config: 8b0b91b3c4aab87ca2913cc5d95e29d7127466be7bb7ca86222d289955a01e4c
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ receivers:
323323
ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
324324
insecure_skip_verify: true
325325
static_configs:
326-
- targets: ["`endpoint`:`port`"]
326+
- targets: ["`endpoint`"]
327327
{{- end }}
328328
{{- if .Values.agent.controlPlaneMetrics.proxy.enabled }}
329329
prometheus/kubernetes-proxy:
@@ -345,7 +345,7 @@ receivers:
345345
credentials_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"
346346
type: Bearer
347347
static_configs:
348-
- targets: ["`endpoint`:`port`"]
348+
- targets: ["`endpoint`"]
349349
{{- else }}
350350
static_configs:
351351
- targets: ["`endpoint`:10249"]

0 commit comments

Comments
 (0)