feat: add support for configuring Prometheus external labels (#126)

Fixes: #125 Signed-off-by: cm891237 <cmwylie19@gmail.com>
rhobs · May 5, 2022 · 02289d1 · 02289d1
1 parent b6319a6
commit 02289d1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml b/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
@@ -48,6 +48,11 @@ spec:
               prometheusConfig:
                 description: Define prometheus config
                 properties:
+                  externalLabels:
+                    additionalProperties:
+                      type: string
+                    description: Define ExternalLabels for prometheus
+                    type: object
                   persistentVolumeClaim:
                     description: Define persistent volume claim for prometheus
                     properties:

diff --git a/docs/api.md b/docs/api.md
@@ -148,6 +148,13 @@ Define prometheus config
         </tr>
     </thead>
     <tbody><tr>
+        <td><b>externalLabels</b></td>
+        <td>map[string]string</td>
+        <td>
+          Define ExternalLabels for prometheus<br/>
+        </td>
+        <td>false</td>
+      </tr><tr>
         <td><b><a href="#monitoringstackspecprometheusconfigpersistentvolumeclaim">persistentVolumeClaim</a></b></td>
         <td>object</td>
         <td>

diff --git a/pkg/apis/v1alpha1/types.go b/pkg/apis/v1alpha1/types.go
@@ -88,6 +88,9 @@ type PrometheusConfig struct {
 	// Define persistent volume claim for prometheus
 	// +optional
 	PersistentVolumeClaim *corev1.PersistentVolumeClaimSpec `json:"persistentVolumeClaim,omitempty"`
+	// Define ExternalLabels for prometheus
+	// +optional
+	ExternalLabels map[string]string `json:"externalLabels,omitempty"`
 }
 
 // NamespaceSelector is a selector for selecting either all namespaces or a

diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllers/monitoring-stack/components.go b/pkg/controllers/monitoring-stack/components.go
@@ -489,8 +489,9 @@ func newPrometheus(
 				BaseImage: stringPtr("quay.io/thanos/thanos"),
 				Version:   stringPtr("v0.24.0"),
 			},
-			Storage:     storageForPVC(config.PersistentVolumeClaim),
-			RemoteWrite: config.RemoteWrite,
+			Storage:        storageForPVC(config.PersistentVolumeClaim),
+			RemoteWrite:    config.RemoteWrite,
+			ExternalLabels: config.ExternalLabels,
 		},
 	}