From 39131a956e3f99513c01c1c2786a4a06eeb266db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?=
 <jaramago.fernandez.javier@gmail.com>
Date: Sat, 7 Nov 2020 02:27:18 +0100
Subject: [PATCH] Fixed several prometheus metrics names and tags to follow the
 latest convention

---
 lib/MySQL_Thread.cpp     | 11 +++++------
 lib/ProxySQL_Cluster.cpp | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index d1e87476e..0067af198 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -934,7 +934,7 @@ th_metrics_map = std::make_tuple(
 		),
 		std::make_tuple (
 			p_th_gauge::mysql_monitor_enabled,
-			"mysql_monitor_enabled",
+			"proxysql_mysql_monitor_enabled",
 			"Enables or disables MySQL Monitor.",
 			metric_tags {}
 		),
@@ -976,21 +976,20 @@ th_metrics_map = std::make_tuple(
 		),
 		std::make_tuple (
 			p_th_gauge::mysql_monitor_replication_lag_interval,
-			"mysql_monitor_replication_lag_interval_seconds",
+			"proxysql_mysql_monitor_replication_lag_interval_seconds",
 			"How frequently a replication lag check is performed, in seconds.",
 			metric_tags {}
 		),
 		std::make_tuple (
 			p_th_gauge::mysql_monitor_replication_lag_timeout,
-			"mysql_monitor_replication_lag_timeout_seconds",
+			"proxysql_mysql_monitor_replication_lag_timeout_seconds",
 			"Replication lag check timeout in seconds.",
 			metric_tags {}
 		),
-		// TODO: Current help looks too complicated to be exposed as a metric help.
 		std::make_tuple (
 			p_th_gauge::mysql_monitor_history,
-			"mysql_monitor_history",
-			".",
+			"proxysql_mysql_monitor_history_timeout_seconds",
+			"The duration for which the events for the checks made by the Monitor module are kept, in seconds.",
 			metric_tags {}
 		)
 	}
diff --git a/lib/ProxySQL_Cluster.cpp b/lib/ProxySQL_Cluster.cpp
index 405de0e19..663ecd870 100644
--- a/lib/ProxySQL_Cluster.cpp
+++ b/lib/ProxySQL_Cluster.cpp
@@ -2417,29 +2417,41 @@ cluster_metrics_map = std::make_tuple(
 		// mysql_variables_*
 		std::make_tuple (
 			p_cluster_counter::pulled_mysql_variables_success,
-			"pulled_mysql_variables",
-			"Number of times 'mysql_variables' have been pulled from a peer.",
-			metric_tags { { "status", "success" } }
+			"proxysql_cluster_pulled_total",
+			"Number of times a 'module' have been pulled from a peer.",
+			metric_tags {
+				{ "module_name", "mysql_variables" },
+				{ "status", "success" }
+			}
 		),
 		std::make_tuple (
 			p_cluster_counter::pulled_mysql_variables_failure,
-			"pulled_mysql_variables",
-			"Number of times 'mysql_variables' have been pulled from a peer.",
-			metric_tags { { "status", "failure" } }
+			"proxysql_cluster_pulled_total",
+			"Number of times a 'module' have been pulled from a peer.",
+			metric_tags {
+				{ "module_name", "mysql_variables" },
+				{ "status", "failure" }
+			}
 		),
 
 		// admin_variables_*
 		std::make_tuple (
 			p_cluster_counter::pulled_admin_variables_success,
-			"pulled_admin_variables",
-			"Number of times 'admin_variables' have been pulled from a peer.",
-			metric_tags { { "status", "success" } }
+			"proxysql_cluster_pulled_total",
+			"Number of times a 'module' have been pulled from a peer.",
+			metric_tags {
+				{ "module_name", "admin_variables" },
+				{ "status", "success" }
+			}
 		),
 		std::make_tuple (
 			p_cluster_counter::pulled_admin_variables_failure,
-			"pulled_admin_variables",
-			"Number of times 'admin_variables' have been pulled from a peer.",
-			metric_tags { { "status", "failure" } }
+			"proxysql_cluster_pulled_total",
+			"Number of times a 'module' have been pulled from a peer.",
+			metric_tags {
+				{ "module_name", "admin_variables" },
+				{ "status", "failure" }
+			}
 		),
 
 		// sync_conflict same epoch
@@ -2540,7 +2552,7 @@ cluster_metrics_map = std::make_tuple(
 		),
 		std::make_tuple (
 			p_cluster_counter::sync_delayed_mysql_variables_version_one,
-			"sync_delayed_mysql_variables_version_one",
+			"proxysql_cluster_syn_conflict_total",
 			"Number of times a 'module' has not been able to be synced.",
 			metric_tags {
 				{ "module_name", "mysql_variables" },
@@ -2549,7 +2561,7 @@ cluster_metrics_map = std::make_tuple(
 		),
 		std::make_tuple (
 			p_cluster_counter::sync_delayed_admin_variables_version_one,
-			"sync_delayed_admin_variables_version_one",
+			"proxysql_cluster_syn_conflict_total",
 			"Number of times a 'module' has not been able to be synced.",
 			metric_tags {
 				{ "module_name", "admin_variables" },