refactor: Internal Grafana resource reconciler logging

grafana · Jan 23, 2025 · c2d45cb · c2d45cb
1 parent 447ef04
commit c2d45cb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/controllers/reconcilers/grafana/complete_reconciler.go b/controllers/reconcilers/grafana/complete_reconciler.go
@@ -16,7 +16,7 @@ func NewCompleteReconciler() reconcilers.OperatorGrafanaReconciler {
 }
 
 func (r *CompleteReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, vars *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	logger := log.FromContext(ctx).WithName("CompleteReconciler")
-	logger.Info("grafana installation complete")
+	log := log.FromContext(ctx).WithName("CompleteReconciler")
+	log.Info("grafana installation complete")
 	return v1beta1.OperatorStageResultSuccess, nil
 }
diff --git a/controllers/reconcilers/grafana/deployment_reconciler.go b/controllers/reconcilers/grafana/deployment_reconciler.go
@@ -45,10 +45,10 @@ func NewDeploymentReconciler(client client.Client, isOpenShift bool) reconcilers
 }
 
 func (r *DeploymentReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, vars *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	logger := log.FromContext(ctx).WithName("DeploymentReconciler")
+	log := log.FromContext(ctx).WithName("DeploymentReconciler")
 
 	openshiftPlatform := r.isOpenShift
-	logger.Info("reconciling deployment", "openshift", openshiftPlatform)
+	log.Info("reconciling deployment", "openshift", openshiftPlatform)
 
 	deployment := model.GetGrafanaDeployment(cr, scheme)
 	_, err := controllerutil.CreateOrUpdate(ctx, r.client, deployment, func() error {

diff --git a/controllers/reconcilers/grafana/ingress_reconciler.go b/controllers/reconcilers/grafana/ingress_reconciler.go
@@ -33,13 +33,13 @@ func NewIngressReconciler(client client.Client, isOpenShift bool) reconcilers.Op
 }
 
 func (r *IngressReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, vars *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	logger := log.FromContext(ctx).WithName("IngressReconciler")
+	log := log.FromContext(ctx).WithName("IngressReconciler")
 
 	if r.isOpenShift {
-		logger.Info("reconciling route", "platform", "openshift")
+		log.Info("reconciling route", "platform", "openshift")
 		return r.reconcileRoute(ctx, cr, status, vars, scheme)
 	} else {
-		logger.Info("reconciling ingress", "platform", "kubernetes")
+		log.Info("reconciling ingress", "platform", "kubernetes")
 		return r.reconcileIngress(ctx, cr, status, vars, scheme)
 	}
 }

diff --git a/controllers/reconcilers/grafana/plugins_reconciler.go b/controllers/reconcilers/grafana/plugins_reconciler.go
@@ -24,7 +24,7 @@ func NewPluginsReconciler(client client.Client) reconcilers.OperatorGrafanaRecon
 }
 
 func (r *PluginsReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, vars *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	logger := log.FromContext(ctx).WithName("PluginsReconciler")
+	log := log.FromContext(ctx).WithName("PluginsReconciler")
 
 	vars.Plugins = ""
 
@@ -34,7 +34,7 @@ func (r *PluginsReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana,
 		return nil
 	})
 	if err != nil {
-		logger.Error(err, "error getting plugins config map", "name", plugins.Name, "namespace", plugins.Namespace)
+		log.Error(err, "error getting plugins config map", "name", plugins.Name, "namespace", plugins.Namespace)
 		return v1beta1.OperatorStageResultFailed, err
 	}
 
@@ -49,7 +49,7 @@ func (r *PluginsReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana,
 		var dashboardPlugins v1beta1.PluginList
 		err = json.Unmarshal(plugins, &dashboardPlugins)
 		if err != nil {
-			logger.Error(err, "error consolidating plugins", "dashboard", dashboard)
+			log.Error(err, "error consolidating plugins", "dashboard", dashboard)
 			return v1beta1.OperatorStageResultFailed, err
 		}
 
@@ -64,12 +64,12 @@ func (r *PluginsReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana,
 			// newer version of plugin already installed
 			hasNewer, err := consolidatedPlugins.HasNewerVersionOf(&plugin)
 			if err != nil {
-				logger.Error(err, "error checking existing plugins", "dashboard", dashboard)
+				log.Error(err, "error checking existing plugins", "dashboard", dashboard)
 				return v1beta1.OperatorStageResultFailed, err
 			}
 
 			if hasNewer {
-				logger.Info("skipping plugin", "dashboard", dashboard, "plugin",
+				log.Info("skipping plugin", "dashboard", dashboard, "plugin",
 					plugin.Name, "version", plugin.Version)
 				continue
 			}

diff --git a/controllers/reconcilers/grafana/pvc_reconciler.go b/controllers/reconcilers/grafana/pvc_reconciler.go
@@ -23,10 +23,10 @@ func NewPvcReconciler(client client.Client) reconcilers.OperatorGrafanaReconcile
 }
 
 func (r *PvcReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, vars *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	logger := log.FromContext(ctx).WithName("PvcReconciler")
+	log := log.FromContext(ctx).WithName("PvcReconciler")
 
 	if cr.Spec.PersistentVolumeClaim == nil {
-		logger.Info("skip creating persistent volume claim")
+		log.Info("skip creating persistent volume claim")
 		return v1beta1.OperatorStageResultSuccess, nil
 	}