From 57e1cd69602dd52c6e4d0d009a3794482b506978 Mon Sep 17 00:00:00 2001 From: Christian Brauchli Date: Tue, 10 May 2022 09:40:49 +0200 Subject: [PATCH] feat(argo-cd): Make metrics and serviceMonitors usable on an istio service mesh (#1270) * feat(argo-cd): Make metrics and serviceMonitors usable on an istio service mesh Signed-off-by: Christian Brauchli * change back default values Signed-off-by: Christian Brauchli * update README Signed-off-by: Christian Brauchli * change values to the values they where before Signed-off-by: Christian Brauchli * fix lint Signed-off-by: Christian Brauchli * adjust default portName to be istio compatible Signed-off-by: Christian Brauchli * update docs Signed-off-by: Christian Brauchli * Resolve copy-paste errors Signed-off-by: Marco Kilchhofer * Restore dex/deployment.yaml and adapt dex/service.yaml Signed-off-by: Marco Kilchhofer * Bump minor chart version and add port renaming to changelog Signed-off-by: Marco Kilchhofer Co-authored-by: Christian Brauchli Co-authored-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 6 ++- charts/argo-cd/README.md | 20 ++++++++++ .../metrics-service.yaml | 2 +- .../servicemonitor.yaml | 9 ++++- .../metrics-service.yaml | 2 +- .../argocd-applicationset/servicemonitor.yaml | 9 ++++- .../argocd-notifications/service-metrics.yaml | 2 +- .../argocd-notifications/servicemonitor.yaml | 9 ++++- .../argocd-repo-server/metrics-service.yaml | 2 +- .../argocd-repo-server/servicemonitor.yaml | 9 ++++- .../argocd-server/metrics-service.yaml | 2 +- .../argocd-server/servicemonitor.yaml | 9 ++++- charts/argo-cd/templates/dex/service.yaml | 2 +- .../argo-cd/templates/dex/servicemonitor.yaml | 9 ++++- .../templates/redis/servicemonitor.yaml | 7 ++++ charts/argo-cd/values.yaml | 40 +++++++++++++++++++ 16 files changed, 125 insertions(+), 14 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 43ea6731..2f357f8d 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.3 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.5.12 +version: 4.6.0 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,6 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Fixed]: Consider global securityContext for notifications and applicationset deployment" + - "[Added]: Metrics service name can now be changed" + - "[Added]: ServiceMonitor now support tlsConfig" + - "[Changed]: All metrics Service ports were renamed from 'metrics' to 'http-metrics' (istio compatibility)" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index e60f1789..bb2bfd2c 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -291,6 +291,7 @@ NAME: my-release | controller.metrics.rules.spec | list | `[]` | PrometheusRule.Spec for the application controller | | controller.metrics.service.annotations | object | `{}` | Metrics service annotations | | controller.metrics.service.labels | object | `{}` | Metrics service labels | +| controller.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | controller.metrics.service.servicePort | int | `8082` | Metrics service port | | controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | @@ -298,7 +299,9 @@ NAME: my-release | controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | controller.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | controller.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| controller.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | controller.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| controller.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | controller.name | string | `"application-controller"` | Application controller name string | | controller.nodeSelector | object | `{}` | [Node selector] | | controller.pdb.annotations | object | `{}` | Annotations to be added to application controller pdb | @@ -361,6 +364,7 @@ NAME: my-release | repoServer.metrics.enabled | bool | `false` | Deploy metrics service | | repoServer.metrics.service.annotations | object | `{}` | Metrics service annotations | | repoServer.metrics.service.labels | object | `{}` | Metrics service labels | +| repoServer.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | repoServer.metrics.service.servicePort | int | `8084` | Metrics service port | | repoServer.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | repoServer.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | @@ -368,7 +372,9 @@ NAME: my-release | repoServer.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | repoServer.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | repoServer.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| repoServer.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | repoServer.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| repoServer.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | repoServer.name | string | `"repo-server"` | Repo server name | | repoServer.nodeSelector | object | `{}` | [Node selector] | | repoServer.pdb.annotations | object | `{}` | Annotations to be added to Repo server pdb | @@ -476,6 +482,7 @@ NAME: my-release | server.metrics.enabled | bool | `false` | Deploy metrics service | | server.metrics.service.annotations | object | `{}` | Metrics service annotations | | server.metrics.service.labels | object | `{}` | Metrics service labels | +| server.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | server.metrics.service.servicePort | int | `8083` | Metrics service port | | server.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | server.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | @@ -483,7 +490,9 @@ NAME: my-release | server.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | server.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | server.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| server.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | server.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| server.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | server.name | string | `"server"` | Argo CD server name | | server.nodeSelector | object | `{}` | [Node selector] | | server.pdb.annotations | object | `{}` | Annotations to be added to server pdb | @@ -564,13 +573,16 @@ NAME: my-release | dex.metrics.enabled | bool | `false` | Deploy metrics service | | dex.metrics.service.annotations | object | `{}` | Metrics service annotations | | dex.metrics.service.labels | object | `{}` | Metrics service labels | +| dex.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | dex.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | dex.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | | dex.metrics.serviceMonitor.interval | string | `"30s"` | Prometheus ServiceMonitor interval | | dex.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | dex.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | dex.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| dex.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | dex.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| dex.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | dex.name | string | `"dex-server"` | Dex name | | dex.nodeSelector | object | `{}` | [Node selector] | | dex.pdb.annotations | object | `{}` | Annotations to be added to Dex server pdb | @@ -634,7 +646,9 @@ NAME: my-release | redis.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | redis.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | redis.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| redis.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | redis.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| redis.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | redis.name | string | `"redis"` | Redis name | | redis.nodeSelector | object | `{}` | [Node selector] | | redis.pdb.annotations | object | `{}` | Annotations to be added to Redis server pdb | @@ -695,6 +709,7 @@ NAME: my-release | applicationSet.metrics.enabled | bool | `false` | Deploy metrics service | | applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations | | applicationSet.metrics.service.labels | object | `{}` | Metrics service labels | +| applicationSet.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | applicationSet.metrics.service.servicePort | int | `8085` | Metrics service port | | applicationSet.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | applicationSet.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | @@ -702,7 +717,9 @@ NAME: my-release | applicationSet.metrics.serviceMonitor.metricRelabelings | list | `[]` | Prometheus [MetricRelabelConfigs] to apply to samples before ingestion | | applicationSet.metrics.serviceMonitor.namespace | string | `""` | Prometheus ServiceMonitor namespace | | applicationSet.metrics.serviceMonitor.relabelings | list | `[]` | Prometheus [RelabelConfigs] to apply to samples before scraping | +| applicationSet.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | applicationSet.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| applicationSet.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | applicationSet.name | string | `"applicationset-controller"` | Application Set controller name string | | applicationSet.nodeSelector | object | `{}` | [Node selector] | | applicationSet.podAnnotations | object | `{}` | Annotations for the controller pods | @@ -772,9 +789,12 @@ NAME: my-release | notifications.metrics.port | int | `9001` | Metrics port | | notifications.metrics.service.annotations | object | `{}` | Metrics service annotations | | notifications.metrics.service.labels | object | `{}` | Metrics service labels | +| notifications.metrics.service.portName | string | `"http-metrics"` | Metrics service port name | | notifications.metrics.serviceMonitor.additionalLabels | object | `{}` | Prometheus ServiceMonitor labels | | notifications.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | +| notifications.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme | | notifications.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | +| notifications.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig | | notifications.name | string | `"notifications-controller"` | Notifications controller name string | | notifications.nodeSelector | object | `{}` | [Node selector] | | notifications.notifiers | object | See [values.yaml] | Configures notification services such as slack, email or custom webhook | diff --git a/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml b/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml index 7331765d..44e8eff3 100644 --- a/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml @@ -16,7 +16,7 @@ metadata: name: {{ template "argo-cd.controller.fullname" . }}-metrics spec: ports: - - name: metrics + - name: {{ .Values.controller.metrics.service.portName }} protocol: TCP port: {{ .Values.controller.metrics.service.servicePort }} targetPort: controller diff --git a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml index 249d4e38..28b230db 100644 --- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml @@ -16,7 +16,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.controller.metrics.service.portName }} {{- with .Values.controller.metrics.serviceMonitor.interval }} interval: {{ . }} {{- end }} @@ -29,6 +29,13 @@ spec: metricRelabelings: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.controller.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.controller.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/argocd-applicationset/metrics-service.yaml b/charts/argo-cd/templates/argocd-applicationset/metrics-service.yaml index bba26e4c..a6ce523f 100644 --- a/charts/argo-cd/templates/argocd-applicationset/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/metrics-service.yaml @@ -16,7 +16,7 @@ metadata: name: {{ template "argo-cd.applicationSet.fullname" . }}-metrics spec: ports: - - name: metrics + - name: {{ .Values.applicationSet.metrics.service.portName }} protocol: TCP port: {{ .Values.applicationSet.metrics.service.servicePort }} targetPort: metrics diff --git a/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml b/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml index 1ad3f765..10c950da 100644 --- a/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml @@ -17,7 +17,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.applicationSet.metrics.service.portName }} {{- with .Values.applicationSet.metrics.serviceMonitor.interval }} interval: {{ . }} {{- end }} @@ -30,6 +30,13 @@ spec: metricRelabelings: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.applicationSet.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.applicationSet.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/argocd-notifications/service-metrics.yaml b/charts/argo-cd/templates/argocd-notifications/service-metrics.yaml index cdae581c..118fc428 100644 --- a/charts/argo-cd/templates/argocd-notifications/service-metrics.yaml +++ b/charts/argo-cd/templates/argocd-notifications/service-metrics.yaml @@ -16,7 +16,7 @@ spec: selector: {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }} ports: - - name: metrics + - name: {{ .Values.notifications.metrics.service.portName }} port: {{ .Values.notifications.metrics.port }} targetPort: {{ .Values.notifications.metrics.port }} {{- end }} diff --git a/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml b/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml index d61b3b56..7ed6237a 100644 --- a/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml @@ -16,7 +16,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.notifications.metrics.service.portName }} path: /metrics {{- if .Values.notifications.metrics.serviceMonitor.interval }} interval: {{ .Values.notifications.metrics.serviceMonitor.interval }} @@ -24,6 +24,13 @@ spec: {{- if .Values.notifications.metrics.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.notifications.metrics.serviceMonitor.scrapeTimeout }} {{- end }} + {{- with .Values.notifications.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.notifications.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml b/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml index 99061736..14ca18d9 100644 --- a/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/metrics-service.yaml @@ -16,7 +16,7 @@ metadata: name: {{ template "argo-cd.repoServer.fullname" . }}-metrics spec: ports: - - name: metrics + - name: {{ .Values.repoServer.metrics.service.portName }} protocol: TCP port: {{ .Values.repoServer.metrics.service.servicePort }} targetPort: metrics diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml index 2c353479..8f6bf9c8 100644 --- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml @@ -16,7 +16,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.repoServer.metrics.service.portName }} {{- with .Values.repoServer.metrics.serviceMonitor.interval }} interval: {{ . }} {{- end }} @@ -29,6 +29,13 @@ spec: metricRelabelings: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.repoServer.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.repoServer.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/argocd-server/metrics-service.yaml b/charts/argo-cd/templates/argocd-server/metrics-service.yaml index 3c1f4077..4d19dc07 100644 --- a/charts/argo-cd/templates/argocd-server/metrics-service.yaml +++ b/charts/argo-cd/templates/argocd-server/metrics-service.yaml @@ -16,7 +16,7 @@ metadata: name: {{ template "argo-cd.server.fullname" . }}-metrics spec: ports: - - name: metrics + - name: {{ .Values.server.metrics.service.portName }} protocol: TCP port: {{ .Values.server.metrics.service.servicePort }} targetPort: metrics diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml index ab97acc2..61d31390 100644 --- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml +++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml @@ -16,7 +16,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.server.metrics.service.portName }} {{- with .Values.server.metrics.serviceMonitor.interval }} interval: {{ . }} {{- end }} @@ -29,6 +29,13 @@ spec: metricRelabelings: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.server.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.server.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/dex/service.yaml b/charts/argo-cd/templates/dex/service.yaml index c93b085e..9661c7e0 100644 --- a/charts/argo-cd/templates/dex/service.yaml +++ b/charts/argo-cd/templates/dex/service.yaml @@ -25,7 +25,7 @@ spec: port: {{ .Values.dex.servicePortGrpc }} targetPort: grpc {{- if .Values.dex.metrics.enabled }} - - name: metrics + - name: {{ .Values.dex.metrics.service.portName }} protocol: TCP port: {{ .Values.dex.servicePortMetrics }} targetPort: metrics diff --git a/charts/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo-cd/templates/dex/servicemonitor.yaml index ca1d54b0..ec98991a 100644 --- a/charts/argo-cd/templates/dex/servicemonitor.yaml +++ b/charts/argo-cd/templates/dex/servicemonitor.yaml @@ -16,7 +16,7 @@ metadata: {{- end }} spec: endpoints: - - port: metrics + - port: {{ .Values.dex.metrics.service.portName }} {{- with .Values.dex.metrics.serviceMonitor.interval }} interval: {{ . }} {{- end }} @@ -29,6 +29,13 @@ spec: metricRelabelings: {{- toYaml . |nindent 8 }} {{- end }} + {{- with .Values.dex.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.dex.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/templates/redis/servicemonitor.yaml b/charts/argo-cd/templates/redis/servicemonitor.yaml index b7029b74..8cd9a111 100644 --- a/charts/argo-cd/templates/redis/servicemonitor.yaml +++ b/charts/argo-cd/templates/redis/servicemonitor.yaml @@ -30,6 +30,13 @@ spec: metricRelabelings: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.redis.metrics.serviceMonitor.scheme }} + scheme: {{ . }} + {{- end }} + {{- with .Values.redis.metrics.serviceMonitor.tlsConfig }} + tlsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index e2db1edc..652e912c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -258,6 +258,8 @@ controller: labels: {} # -- Metrics service port servicePort: 8082 + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -271,6 +273,10 @@ controller: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # "monitoring" # -- Prometheus ServiceMonitor labels @@ -373,6 +379,8 @@ dex: annotations: {} # -- Metrics service labels labels: {} + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -386,6 +394,10 @@ dex: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # "monitoring" # -- Prometheus ServiceMonitor labels @@ -732,6 +744,10 @@ redis: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # "monitoring" # -- Prometheus ServiceMonitor labels @@ -991,6 +1007,8 @@ server: labels: {} # -- Metrics service port servicePort: 8083 + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -1004,6 +1022,10 @@ server: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # monitoring # -- Prometheus ServiceMonitor labels @@ -1568,6 +1590,8 @@ repoServer: labels: {} # -- Metrics service port servicePort: 8084 + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -1581,6 +1605,10 @@ repoServer: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # "monitoring" # -- Prometheus ServiceMonitor labels @@ -1925,6 +1953,8 @@ applicationSet: labels: {} # -- Metrics service port servicePort: 8085 + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -1938,6 +1968,10 @@ applicationSet: selector: {} # prometheus: kube-prometheus + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Prometheus ServiceMonitor namespace namespace: "" # monitoring # -- Prometheus ServiceMonitor labels @@ -2178,6 +2212,8 @@ notifications: annotations: {} # -- Metrics service labels labels: {} + # -- Metrics service port name + portName: http-metrics serviceMonitor: # -- Enable a prometheus ServiceMonitor enabled: false @@ -2189,6 +2225,10 @@ notifications: # namespace: monitoring # interval: 30s # scrapeTimeout: 10s + # -- Prometheus ServiceMonitor scheme + scheme: "" + # -- Prometheus ServiceMonitor tlsConfig + tlsConfig: {} # -- Configures notification services such as slack, email or custom webhook # @default -- See [values.yaml]