From 4adc08659ec0d23575178bfdc26620b5ea078b64 Mon Sep 17 00:00:00 2001
From: Alvaro Alda <alvaro.alda@bbva.com>
Date: Fri, 5 Apr 2019 19:49:20 +0200
Subject: [PATCH] Fix previous definitions

---
 .../files/grafana/dashboards/QED.json         | 12 ++--
 metrics/definitions.go                        | 71 -------------------
 2 files changed, 6 insertions(+), 77 deletions(-)
 delete mode 100644 metrics/definitions.go

diff --git a/deploy/aws/provision/files/grafana/dashboards/QED.json b/deploy/aws/provision/files/grafana/dashboards/QED.json
index c5d693fc4..3a416c5fe 100644
--- a/deploy/aws/provision/files/grafana/dashboards/QED.json
+++ b/deploy/aws/provision/files/grafana/dashboards/QED.json
@@ -215,7 +215,7 @@
       "tableColumn": "Value",
       "targets": [
         {
-          "expr": "sum(qed_balloon_add_total) / sum(qed_server_instances)",
+          "expr": "sum(qed_raft_balloon_adds) / sum(qed_server_instances)",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -296,7 +296,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(qed_balloon_digest_membership_total)",
+          "expr": "sum(qed_raft_balloon_digest_membership_queries)",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -375,7 +375,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(qed_balloon_incremental_total)",
+          "expr": "sum(qed_raft_balloon_incremental_queries)",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -443,7 +443,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(qed_balloon_add_total[$interval])) by (job)",
+          "expr": "sum(rate(qed_raft_balloon_adds[$interval])) by (job)",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -530,7 +530,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(qed_balloon_digest_membership_total[$interval])) by (job)",
+          "expr": "sum(rate(qed_raft_balloon_digest_membership_queries[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}",
@@ -615,7 +615,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(qed_balloon_incremental_total[$interval])) by (job)",
+          "expr": "sum(rate(qed_raft_balloon_incremental_queries[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}",
diff --git a/metrics/definitions.go b/metrics/definitions.go
deleted file mode 100644
index 877147a19..000000000
--- a/metrics/definitions.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-   Copyright 2018-2019 Banco Bilbao Vizcaya Argentaria, S.A.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package metrics
-
-import (
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-
-	// API
-
-	QedAPIHealthcheckRequestsTotal = prometheus.NewCounter(
-		prometheus.CounterOpts{
-			Name: "qed_api_healthcheck_requests_total",
-			Help: "The total number of healthcheck api requests",
-		},
-	)
-
-	// BALLOON
-
-	QedBalloonAddTotal = prometheus.NewCounter(
-		prometheus.CounterOpts{
-			Name: "qed_balloon_add_total",
-			Help: "Number of add operations",
-		},
-	)
-	QedBalloonMembershipTotal = prometheus.NewCounter(
-		prometheus.CounterOpts{
-			Name: "qed_balloon_membership_total",
-			Help: "Number of membership queries.",
-		},
-	)
-	QedBalloonDigestMembershipTotal = prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "qed_balloon_digest_membership_total",
-			Help: "Number of membership by digest queries.",
-		},
-	)
-	QedBalloonIncrementalTotal = prometheus.NewCounter(
-		prometheus.CounterOpts{
-			Name: "qed_balloon_incremental_total",
-			Help: "Number of incremental queries.",
-		},
-	)
-
-	// PROMETHEUS
-
-	DefaultMetrics = []prometheus.Collector{
-		QedAPIHealthcheckRequestsTotal,
-
-		QedBalloonAddTotal,
-		QedBalloonMembershipTotal,
-		QedBalloonDigestMembershipTotal,
-		QedBalloonIncrementalTotal,
-	}
-)