Merge pull request #759 from sapcc/add_kluster_info_metric_labels

Add backup & audit labels to infoMetric

Author: uwe-mayer

pkg/controller/metrics/kluster.go

@@ -29,7 +29,7 @@ func NewKlusterCollector(lister kubernikus_lister.KlusterLister) *klusterCollect
 		infoMetric: prometheus.NewDesc(
 			"kubernikus_kluster_info",
 			"Detailed information on a kluster",
-			[]string{"kluster_namespace", "kluster_name", "phase", "api_version", "chart_version", "chart_name", "creator", "project_id"},
+			[]string{"kluster_namespace", "kluster_name", "phase", "api_version", "chart_version", "chart_name", "creator", "project_id", "backup", "audit"},
 			nil,
 		),
 		lister: lister,
@@ -65,6 +65,8 @@ func (collector *klusterCollector) Collect(ch chan<- prometheus.Metric) {
 			kluster.Status.ChartName,
 			getCreatorFromAnnotations(kluster.Annotations),
 			getAccountFromLabels(kluster.Labels),
+			kluster.Spec.Backup,
+			getAuditFromSpec(kluster.Spec),
 		)
 	}
 

pkg/controller/metrics/metrics.go

@@ -133,6 +133,13 @@ func getAccountFromLabels(labels map[string]string) string {
 	return account
 }
 
+func getAuditFromSpec(spec models.KlusterSpec) string {
+	if spec.Audit == nil {
+		return ""
+	}
+	return *spec.Audit
+}
+
 func init() {
 	prometheus.MustRegister(
 		klusterStatusPhase,