From 221bae69da67dd4fb0a7b642c67ec24c8399726d Mon Sep 17 00:00:00 2001
From: Michael McLeroy <michaelmcleroy@cloudfitsoftware.com>
Date: Thu, 4 Feb 2021 08:33:28 -0500
Subject: [PATCH] refactor(monitoring): prometheus service monitors updated
---
.../monitoring/monitoring-helmrelease.yaml | 22 ++++---------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/chart/templates/monitoring/monitoring-helmrelease.yaml b/chart/templates/monitoring/monitoring-helmrelease.yaml
index 559a281547..58ea320745 100644
--- a/chart/templates/monitoring/monitoring-helmrelease.yaml
+++ b/chart/templates/monitoring/monitoring-helmrelease.yaml
@@ -50,6 +50,9 @@ spec:
image:
pullSecrets:
- private-registry
+ prometheus:
+ prometheusSpec:
+ serviceMonitorSelectorNilUsesHelmValues: false
prometheus-node-exporter:
serviceAccount:
imagePullSecrets:
@@ -57,23 +60,6 @@ spec:
kube-state-metrics:
imagePullSecrets:
- name: private-registry
- {{- if .Values.addons.gitlabRunner.enabled }}
- prometheus:
- additionalServiceMonitors:
- {{- if .Values.addons.gitlabRunner.enabled }}
- - name: gitlab-gitlab-runner
- namespaceSelector:
- matchNames:
- - gitlab
- selector:
- matchLabels:
- release: gitlab-runner
- endpoints:
- - port: metrics
- path: /metrics
- {{- end }}
- {{- end }}
-
{{- if .Values.monitoring.sso.enabled }}
ingress:
prometheus:
@@ -98,4 +84,4 @@ spec:
namespace: {{ .Release.Namespace }}
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
--
GitLab