DevFW-CICD/argocd-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(argo-workflows): Add honorLabels parameter to Argo Workflows ServiceMonitor (#2920)

Browse source 
* Update workflow-controller-servicemonitor.yaml

Signed-off-by: venegator <m.venega94@gmail.com>

* Update values.yaml

Signed-off-by: venegator <m.venega94@gmail.com>

* Update Chart.yaml

Signed-off-by: venegator <m.venega94@gmail.com>

* Update README.md

Signed-off-by: venegator <m.venega94@gmail.com>

* Update charts/argo-workflows/Chart.yaml

Co-authored-by: kiblik <5609770+kiblik@users.noreply.github.com>
Signed-off-by: venegator <m.venega94@gmail.com>

* Update workflow-controller-servicemonitor.yaml

Signed-off-by: venegator <m.venega94@gmail.com>

---------

Signed-off-by: venegator <m.venega94@gmail.com>
Co-authored-by: kiblik <5609770+kiblik@users.noreply.github.com>
This commit is contained in:
venegator 2024-09-13 16:01:59 +02:00 committed by GitHub
parent 7c8bbd62e8
commit e718e46651
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-workflows/Chart.yaml
View file

@ -3,7 +3,7 @@ appVersion: v3.5.10
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.42.1 version: 0.42.2
icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:
@ -17,4 +17,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: changed - kind: changed
description: add loadBalancerClass field for Service resources description: add honorLabels config for ServiceMonitor resource

1
charts/argo-workflows/README.md
View file

@ -175,6 +175,7 @@ Fields to note:
| controller.logging.level | string | `"info"` | Set the logging level (one of: `debug`, `info`, `warn`, `error`) | | controller.logging.level | string | `"info"` | Set the logging level (one of: `debug`, `info`, `warn`, `error`) |
| controller.metricsConfig.enabled | bool | `false` | Enables prometheus metrics server | | controller.metricsConfig.enabled | bool | `false` | Enables prometheus metrics server |
| controller.metricsConfig.headlessService | bool | `false` | Flag to enable headless service | | controller.metricsConfig.headlessService | bool | `false` | Flag to enable headless service |
| controller.metricsConfig.honorLabels | bool | `false` | When true, honorLabels preserves the metric’s labels when they collide with the target’s labels. |
| controller.metricsConfig.ignoreErrors | bool | `false` | Flag that instructs prometheus to ignore metric emission errors. | | controller.metricsConfig.ignoreErrors | bool | `false` | Flag that instructs prometheus to ignore metric emission errors. |
| controller.metricsConfig.metricRelabelings | list | `[]` | ServiceMonitor metric relabel configs to apply to samples before ingestion | | controller.metricsConfig.metricRelabelings | list | `[]` | ServiceMonitor metric relabel configs to apply to samples before ingestion |
| controller.metricsConfig.metricsTTL | string | `""` | How often custom metrics are cleared from memory | | controller.metricsConfig.metricsTTL | string | `""` | How often custom metrics are cleared from memory |

2
charts/argo-workflows/templates/controller/workflow-controller-servicemonitor.yaml
View file

@ -24,6 +24,7 @@ spec:
metricRelabelings: metricRelabelings:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
honorLabels: {{ .Values.controller.metricsConfig.honorLabels }}
{{- end }} {{- end }}
{{- if .Values.controller.telemetryConfig.enabled }} {{- if .Values.controller.telemetryConfig.enabled }}
- port: telemetry - port: telemetry
@ -37,6 +38,7 @@ spec:
metricRelabelings: metricRelabelings:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
honorLabels: {{ .Values.controller.metricsConfig.honorLabels }}
{{- end }} {{- end }}
{{- with .Values.controller.metricsConfig.targetLabels }} {{- with .Values.controller.metricsConfig.targetLabels }}
targetLabels: targetLabels:

3
charts/argo-workflows/values.yaml
View file

@ -143,6 +143,9 @@ controller:
servicePortName: metrics servicePortName: metrics
# -- Flag to enable headless service # -- Flag to enable headless service
headlessService: false headlessService: false
# -- When true, honorLabels preserves the metric’s labels when they collide with the target’s labels.
## Ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#honorlabels
honorLabels: false
# -- ServiceMonitor relabel configs to apply to samples before scraping # -- ServiceMonitor relabel configs to apply to samples before scraping
## Ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig ## Ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
relabelings: [] relabelings: []