Skip to content

[prometheus-blackbox-exporter] Add missing port names to ServiceMonitor endpoints #5322

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[prometheus-blackbox-exporter] Add missing port names to ServiceMonitor endpoints #5322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/prometheus-blackbox-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Prometheus Blackbox Exporter
name: prometheus-blackbox-exporter
version: 9.2.0
version: 9.2.1
appVersion: v0.25.0
kubeVersion: ">=1.21.0-0"
home: https://github.com/prometheus/blackbox_exporter
Expand Down
4 changes: 4 additions & 0 deletions charts/prometheus-blackbox-exporter/ci/servicemonitor-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
serviceMonitor:
selfMonitor:
enabled: true
enabled: true
5 changes: 2 additions & 3 deletions charts/prometheus-blackbox-exporter/templates/selfservicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ spec:
interval: {{ .Values.serviceMonitor.selfMonitor.interval }}
scrapeTimeout: {{ .Values.serviceMonitor.selfMonitor.scrapeTimeout }}
scheme: {{ .Values.serviceMonitor.selfMonitor.scheme }}
{{- with .Values.serviceMonitor.selfMonitor.port }}
port: {{ . }}
{{- end }}
port: http
{{- if .Values.serviceMonitor.selfMonitor.additionalMetricsRelabels }}
metricRelabelings:
{{- toYaml .Values.serviceMonitor.selfMonitor.additionalMetricsRelabels | nindent 6 }}
Expand All @@ -36,6 +34,7 @@ spec:
interval: {{ .Values.configReloader.serviceMonitor.selfMonitor.interval }}
scrapeTimeout: {{ .Values.configReloader.serviceMonitor.selfMonitor.scrapeTimeout }}
scheme: {{ .Values.configReloader.serviceMonitor.selfMonitor.scheme }}
port: reloader-web
{{- if .Values.configReloader.serviceMonitor.selfMonitor.tlsConfig }}
tlsConfig:
{{- toYaml .Values.configReloader.serviceMonitor.selfMonitor.tlsConfig | nindent 6 }}
Expand Down
2 changes: 0 additions & 2 deletions charts/prometheus-blackbox-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,6 @@ serviceMonitor:
tlsConfig: {}
interval: 30s
scrapeTimeout: 30s
## Port can be defined by assigning a value for the port key below
## port:

## If true, a ServiceMonitor CRD is created for a prometheus operator
## https://github.com/coreos/prometheus-operator for each target
Expand Down