aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5069 from evkuzin/v3.0-fix-prometheus-metrics-dumplication

Browse Source 
add protocol labels for shared metrics between mysql and psql
v3.0-5069
René Cannaò 2 weeks ago committed by GitHub
parent 0e605f4170 949eda1ccd
commit fa35bda62b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File

35
lib/MySQL_HostGroups_Manager.cpp
Unescape View File

@ -320,7 +320,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "created" }
{ "status", "created" },
{ "protocol", "mysql" }
}
),
std::make_tuple (
@ -328,7 +329,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "delayed" }
{ "status", "delayed" },
{ "protocol", "mysql" }
}
),
std::make_tuple (
@ -336,7 +338,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "mysql" }
}
),
// ====================================================================
@ -347,7 +350,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total",
"Total number of client connections created.",
metric_tags {
{ "status", "created" }
{ "status", "created" },
{ "protocol", "mysql" }
}
),
std::make_tuple (
@ -361,7 +365,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total",
"Total number of client failed connections (or closed improperly).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "mysql" }
}
),
// ====================================================================
@ -448,19 +453,25 @@ hg_metrics_map = std::make_tuple(
p_hg_counter::access_denied_wrong_password,
"proxysql_access_denied_wrong_password_total",
"Total access denied \"wrong password\".",
metric_tags {}
metric_tags {
{ "protocol", "mysql" }
}
),
std::make_tuple (
p_hg_counter::access_denied_max_connections,
"proxysql_access_denied_max_connections_total",
"Total access denied \"max connections\".",
metric_tags {}
metric_tags {
{ "protocol", "mysql" }
}
),
std::make_tuple (
p_hg_counter::access_denied_max_user_connections,
"proxysql_access_denied_max_user_connections_total",
"Total access denied \"max user connections\".",
metric_tags {}
metric_tags {
{ "protocol", "mysql" }
}
),
// ====================================================================
@ -518,13 +529,17 @@ hg_metrics_map = std::make_tuple(
p_hg_gauge::server_connections_connected,
"proxysql_server_connections_connected",
"Backend connections that are currently connected.",
metric_tags {}
metric_tags {
{ "protocol", "mysql" }
}
),
std::make_tuple (
p_hg_gauge::client_connections_connected,
"proxysql_client_connections_connected",
"Client connections that are currently connected.",
metric_tags {}
metric_tags {
{ "protocol", "mysql" }
}
),
std::make_tuple (
p_hg_gauge::client_connections_connected_prim,

35
lib/PgSQL_HostGroups_Manager.cpp
Unescape View File

@ -455,7 +455,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "created" }
{ "status", "created" },
{ "protocol", "pgsql" }
}
),
std::make_tuple (
@ -463,7 +464,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "delayed" }
{ "status", "delayed" },
{ "protocol", "pgsql" }
}
),
std::make_tuple (
@ -471,7 +473,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "pgsql" }
}
),
// ====================================================================
@ -482,7 +485,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total",
"Total number of client connections created.",
metric_tags {
{ "status", "created" }
{ "status", "created" },
{ "protocol", "pgsql" }
}
),
std::make_tuple (
@ -490,7 +494,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total",
"Total number of client failed connections (or closed improperly).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "pgsql" }
}
),
// ====================================================================
@ -577,19 +582,25 @@ hg_metrics_map = std::make_tuple(
PgSQL_p_hg_counter::access_denied_wrong_password,
"proxysql_access_denied_wrong_password_total",
"Total access denied \"wrong password\".",
metric_tags {}
metric_tags {
{ "protocol", "pgsql" }
}
),
std::make_tuple (
PgSQL_p_hg_counter::access_denied_max_connections,
"proxysql_access_denied_max_connections_total",
"Total access denied \"max connections\".",
metric_tags {}
metric_tags {
{ "protocol", "pgsql" }
}
),
std::make_tuple (
PgSQL_p_hg_counter::access_denied_max_user_connections,
"proxysql_access_denied_max_user_connections_total",
"Total access denied \"max user connections\".",
metric_tags {}
metric_tags {
{ "protocol", "pgsql" }
}
),
// ====================================================================
@ -647,13 +658,17 @@ hg_metrics_map = std::make_tuple(
PgSQL_p_hg_gauge::server_connections_connected,
"proxysql_server_connections_connected",
"Backend connections that are currently connected.",
metric_tags {}
metric_tags {
{ "protocol", "pgsql" }
}
),
std::make_tuple (
PgSQL_p_hg_gauge::client_connections_connected,
"proxysql_client_connections_connected",
"Client connections that are currently connected.",
metric_tags {}
metric_tags {
{ "protocol", "pgsql" }
}
)
},
// prometheus dynamic counters

4
lib/ProxySQL_Admin.cpp
Unescape View File

@ -2621,6 +2621,10 @@ void update_modules_metrics() {
if (MyHGM) {
MyHGM->p_update_metrics();
}
// Update pgsql_hostgroups_manager metrics
if (PgHGM) {
PgHGM->p_update_metrics();
}
// Update monitor metrics
if (GloMyMon) {
GloMyMon->p_update_metrics();

Write Preview
Loading…
Cancel
Save