Merge branch 'master' into fix_patch_not_update_notificationpolicy_annotation

Author: weisdd

controllers/alertrulegroup_controller.go

@@ -202,11 +202,12 @@ func (r *GrafanaAlertRuleGroupReconciler) reconcileWithInstance(ctx context.Cont
 		}
 		if rule.NotificationSettings != nil {
 			apiRule.NotificationSettings = &models.AlertRuleNotificationSettings{
-				Receiver:       &rule.NotificationSettings.Receiver,
-				GroupBy:        rule.NotificationSettings.GroupBy,
-				GroupWait:      rule.NotificationSettings.GroupWait,
-				GroupInterval:  rule.NotificationSettings.GroupInterval,
-				RepeatInterval: rule.NotificationSettings.RepeatInterval,
+				Receiver:          &rule.NotificationSettings.Receiver,
+				GroupBy:           rule.NotificationSettings.GroupBy,
+				GroupWait:         rule.NotificationSettings.GroupWait,
+				MuteTimeIntervals: rule.NotificationSettings.MuteTimeIntervals,
+				GroupInterval:     rule.NotificationSettings.GroupInterval,
+				RepeatInterval:    rule.NotificationSettings.RepeatInterval,
 			}
 		}
 		if rule.Record != nil {

controllers/client/grafana_client.go

@@ -142,7 +142,8 @@ func NewGeneratedGrafanaClient(ctx context.Context, c client.Client, grafana *v1
 	}
 
 	transport := NewInstrumentedRoundTripper(grafana.IsExternal(), tlsConfig, metrics.GrafanaApiRequests.MustCurryWith(prometheus.Labels{
-		"instance_name": grafana.Name,
+		"instance_namespace": grafana.Namespace,
+		"instance_name":      grafana.Name,
 	}))
 	if grafana.Spec.Client != nil && grafana.Spec.Client.Headers != nil {
 		transport.(*instrumentedRoundTripper).addHeaders(grafana.Spec.Client.Headers) //nolint:errcheck

controllers/client/http_client.go

@@ -28,7 +28,8 @@ func NewHTTPClient(ctx context.Context, c client.Client, grafana *v1beta1.Grafan
 	}
 
 	transport := NewInstrumentedRoundTripper(grafana.IsExternal(), tlsConfig, metrics.GrafanaApiRequests.MustCurryWith(prometheus.Labels{
-		"instance_name": grafana.Name,
+		"instance_namespace": grafana.Namespace,
+		"instance_name":      grafana.Name,
 	}))
 	if grafana.Spec.Client != nil && grafana.Spec.Client.Headers != nil {
 		transport.(*instrumentedRoundTripper).addHeaders(grafana.Spec.Client.Headers) //nolint:errcheck

controllers/grafana_controller.go

@@ -77,7 +77,7 @@ func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, err
 	}
 
-	metrics.GrafanaReconciles.WithLabelValues(grafana.Name).Inc()
+	metrics.GrafanaReconciles.WithLabelValues(grafana.Namespace, grafana.Name).Inc()
 
 	finished := true
 	stages := getInstallationStages()
@@ -127,7 +127,7 @@ func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 			log.Error(err, "reconciler error in stage", "stage", stage)
 			nextStatus.LastMessage = err.Error()
 
-			metrics.GrafanaFailedReconciles.WithLabelValues(grafana.Name, string(stage)).Inc()
+			metrics.GrafanaFailedReconciles.WithLabelValues(grafana.Namespace, grafana.Name, string(stage)).Inc()
 		} else {
 			nextStatus.LastMessage = ""
 		}

controllers/metrics/metrics.go

@@ -11,21 +11,21 @@ var (
 		Subsystem: "reconciler",
 		Name:      "reconciles",
 		Help:      "reconciles per Grafana instance",
-	}, []string{"instance_name"})
+	}, []string{"instance_namespace", "instance_name"})
 
 	GrafanaFailedReconciles = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "grafana_operator",
 		Subsystem: "reconciler",
 		Name:      "failed_reconciles",
 		Help:      "failed reconciles per Grafana instance and stage",
-	}, []string{"instance_name", "stage"})
+	}, []string{"instance_namespace", "instance_name", "stage"})
 
 	GrafanaApiRequests = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "grafana_operator",
 		Subsystem: "grafana_api",
 		Name:      "requests",
 		Help:      "requests against the grafana api per instance",
-	}, []string{"instance_name", "method", "status"})
+	}, []string{"instance_namespace", "instance_name", "method", "status"})
 
 	// Deprecated: will be removed in a future version of the operator. Use
 	// ContentUrlRequests instead, which handles more types of resources that