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

Jump to bottom

update relablings for servicemonitor resource #638

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update relablings for servicemonitor resource #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7343a68
update relablings for servicemonitor resource
dmitriy-lukyanchikov May 27, 2022
12cf2f6
update CHANGELOG.md
dmitriy-lukyanchikov May 27, 2022
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: 4 additions & 0 deletions charts/jenkins/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
The change log until v1.5.7 was auto-generated based on git commits.
Those entries include a reference to the git commit to be able to get more details.

## 4.1.2
Added 'controller.prometheus.relabelings' to allow relabling for all labels
Fix 'controller.prometheus.metricRelabelings' to generate template correctly by adding toyaml function in template

## 4.1.1
Added 'controller.prometheus.metricRelabelings' to allow relabling and dropping unused prometheus metrics

Expand Down
2 changes: 1 addition & 1 deletion charts/jenkins/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: jenkins
home: https://jenkins.io/
version: 4.1.1
version: 4.1.2
appVersion: 2.332.3
description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
sources:
Expand Down
7 changes: 6 additions & 1 deletion charts/jenkins/templates/jenkins-controller-servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ spec:
port: http
path: {{ .Values.controller.jenkinsUriPrefix }}{{ .Values.controller.prometheus.scrapeEndpoint }}
{{- if .Values.controller.prometheus.metricRelabelings }}
metricRelabelings: {{ .Values.controller.prometheus.metricRelabelings }}
metricRelabelings:
{{- toYaml .Values.controller.prometheus.metricRelabelings | trim | nindent 6 }}
{{- end }}
{{- if .Values.controller.prometheus.relabelings }}
relabelings:
{{- toYaml .Values.controller.prometheus.relabelings | trim | nindent 6 }}
{{- end }}
jobLabel: {{ template "jenkins.fullname" . }}
namespaceSelector:
Expand Down
4 changes: 4 additions & 0 deletions charts/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,10 @@ controller:
alertingrules: []
# Set a custom namespace where to deploy PrometheusRule resource
prometheusRuleNamespace: ""
# Set relabling for metrics
metricRelabelings: []
# Set relablings
relabelings: []

# Can be used to disable rendering controller test resources when using helm template
testEnabled: true
Expand Down