Merge pull request #4290 from sysown/v2.x-prometheus0717

Minor changes in mysql error code reported by Prometheus exporter
sysown · Jul 18, 2023 · 3cb9e5f · 3cb9e5f
2 parents 8a6ac7a + d450d86
commit 3cb9e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
@@ -1449,7 +1449,7 @@ void MySQL_HostGroups_Manager::p_update_mysql_error_counter(p_mysql_error_type e
 	std::string s_port = std::to_string(port);
 	// TODO: Create switch here to classify error codes
 	std::string s_code = std::to_string(code);
-	std::string metric_id = s_hostgroup + ":" + address + ":" + s_port;
+	std::string metric_id = s_hostgroup + ":" + address + ":" + s_port + ":" + s_code;
 	std::map<string, string> metric_labels {
 		{ "hostgroup", s_hostgroup },
 		{ "address", address },

diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
@@ -1526,7 +1526,7 @@ bool MySQL_Monitor_State_Data::create_new_connection() {
 		if (myrc==NULL) {
 			mysql_error_msg=strdup(mysql_error(mysql));
 			int myerrno=mysql_errno(mysql);
-			MyHGM->p_update_mysql_error_counter(p_mysql_error_type::mysql, hostgroup_id, hostname, port, myerrno);
+			MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, hostgroup_id, hostname, port, myerrno);
 			if (myerrno < 2000) {
 				mysql_close(mysql);
 			} else {