monitoring: apisonator dashboard

3scale · Apr 1, 2020 · d8008a9 · d8008a9
1 parent 55964e8
commit d8008a9
Show file tree

Hide file tree

Showing 5 changed files with 1,606 additions and 180 deletions.
diff --git a/pkg/3scale/amp/component/backend_monitoring.go b/pkg/3scale/amp/component/backend_monitoring.go
@@ -134,22 +134,22 @@ func BackendWorkerServiceMonitor() *monitoringv1.ServiceMonitor {
 	}
 }
 
-func BackendWorkerGrafanaDashboard(ns string) *grafanav1alpha1.GrafanaDashboard {
+func BackendGrafanaDashboard(ns string) *grafanav1alpha1.GrafanaDashboard {
 	data := &struct {
 		Namespace string
 	}{
 		ns,
 	}
 	return &grafanav1alpha1.GrafanaDashboard{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "backend-worker",
+			Name: "backend",
 			Labels: map[string]string{
 				"monitoring-key": common.MonitoringKey,
 			},
 		},
 		Spec: grafanav1alpha1.GrafanaDashboardSpec{
-			Json: assets.TemplateAsset("monitoring/backend-worker-grafana-dashboard-1.json.tpl", data),
-			Name: fmt.Sprintf("%s/backend-worker-grafana-dashboard-1.json", ns),
+			Json: assets.TemplateAsset("monitoring/backend-grafana-dashboard-1.json.tpl", data),
+			Name: fmt.Sprintf("%s/backend-grafana-dashboard-1.json", ns),
 		},
 	}
 }

diff --git a/pkg/3scale/amp/operator/backend_reconciler.go b/pkg/3scale/amp/operator/backend_reconciler.go
@@ -175,7 +175,7 @@ func (r *BackendReconciler) Reconcile() (reconcile.Result, error) {
 		return reconcile.Result{}, err
 	}
 
-	err = r.reconcileGrafanaDashboard(component.BackendWorkerGrafanaDashboard(r.apiManager.Namespace))
+	err = r.reconcileGrafanaDashboard(component.BackendGrafanaDashboard(r.apiManager.Namespace))
 	if err != nil {
 		return reconcile.Result{}, err
 	}