feat(prometheus): delete prometheus_status_fail along with prometheus

Signed-off-by: Feng Kun <[email protected]>
jianzzz · Jul 15, 2020 · 790f8d9 · 790f8d9
1 parent 92a7721
commit 790f8d9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/pkg/monitor/controller/prometheus/controller.go b/pkg/monitor/controller/prometheus/controller.go
@@ -382,6 +382,9 @@ func (c *Controller) processPrometheusDelete(ctx context.Context, cachedPromethe
  log.Info("prometheus will be dropped", log.String("prome", key))
 
  prometheus := cachedPrometheus.state
+ if prometheus != nil {
+ DeleteMetricPrometheusStatusFail(prometheus.Spec.TenantID, prometheus.Spec.ClusterName, prometheus.Name)
+ }
  err := c.uninstallPrometheus(ctx, prometheus, true)
  if err != nil {
  log.Errorf("Prometheus uninstall fail: %v", err)

diff --git a/pkg/monitor/controller/prometheus/metrics.go b/pkg/monitor/controller/prometheus/metrics.go
@@ -41,3 +41,8 @@ func UpdateMetricPrometheusStatusFail(tenantID string, clusterName string, prome
  prometheusStatusFail.With(labels).Set(0)
  }
 }
+
+func DeleteMetricPrometheusStatusFail(tenantID string, clusterName string, prometheusName string) {
+ labels := map[string]string{"tenant_id": tenantID, "cluster_name": clusterName, "prometheus_name": prometheusName}
+ prometheusStatusFail.Delete(labels)
+}
diff --git a/pkg/platform/controller/addon/prometheus/controller.go b/pkg/platform/controller/addon/prometheus/controller.go
@@ -378,6 +378,9 @@ func (c *Controller) processPrometheusDelete(ctx context.Context, cachedPromethe
  log.Info("prometheus will be dropped", log.String("prome", key))
 
  prometheus := cachedPrometheus.state
+ if prometheus != nil {
+ DeleteMetricPrometheusStatusFail(prometheus.Spec.TenantID, prometheus.Spec.ClusterName, prometheus.Name)
+ }
  err := c.uninstallPrometheus(ctx, prometheus, true)
  if err != nil {
  log.Errorf("Prometheus uninstall fail: %v", err)

diff --git a/pkg/platform/controller/addon/prometheus/metrics.go b/pkg/platform/controller/addon/prometheus/metrics.go
@@ -41,3 +41,8 @@ func UpdateMetricPrometheusStatusFail(tenantID string, clusterName string, prome
  prometheusStatusFail.With(labels).Set(0)
  }
 }
+
+func DeleteMetricPrometheusStatusFail(tenantID string, clusterName string, prometheusName string) {
+ labels := map[string]string{"tenant_id": tenantID, "cluster_name": clusterName, "prometheus_name": prometheusName}
+ prometheusStatusFail.Delete(labels)
+}