Merge branch 'main' into add-sharding-strategy-support

CHANGELOG.md

@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add per cluster and installation overridable sharding strategy support for mimir-backed installations.
 
+### Fixed
+
+- Fix mimir heartbeat priority.
+
+### Changed
+
+- Do nothing if mimir is disabled to avoid deleting prometheus-meta-operator managed resources.
+
 ## [0.0.3] - 2024-05-24
 
 ### Changed

internal/controller/cluster_monitoring_controller.go

@@ -80,8 +80,13 @@ func (r *ClusterMonitoringReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		return ctrl.Result{}, errors.WithStack(err)
 	}
 
+	if !r.MonitoringEnabled {
+		logger.Info("Monitoring is disabled at the installation level")
+		return ctrl.Result{}, nil
+	}
+
 	// Handle deletion reconciliation loop.
-	if !cluster.ObjectMeta.DeletionTimestamp.IsZero() || !r.MonitoringConfig.Enabled {
+	if !cluster.ObjectMeta.DeletionTimestamp.IsZero() {
 		logger.Info("Handling deletion for Cluster", "cluster", cluster.Name)
 		return r.reconcileDelete(ctx, cluster)
 	}
@@ -158,6 +163,5 @@ func (r *ClusterMonitoringReconciler) reconcileDelete(ctx context.Context, clust
 		}
 		logger.Info("removed finalizer", "finalizer", monitoring.MonitoringFinalizer)
 	}
-	controllerutil.RemoveFinalizer(cluster, monitoring.MonitoringFinalizer)
 	return ctrl.Result{}, nil
 }

pkg/monitoring/heartbeat/opsgenie.go

@@ -58,7 +58,7 @@ func (r OpsgenieHeartbeatRepository) makeHeartbeat() *heartbeat.Heartbeat {
 			Name: "alerts_router_team",
 		},
 		AlertTags:     tags,
-		AlertPriority: "P1",
+		AlertPriority: "P3",
 		AlertMessage:  fmt.Sprintf("Heartbeat [%s] is expired.", r.ManagementCluster.Name),
 	}
 }