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

add protocol labels for shared metrics between mysql and psql

Browse Source
pull/5069/head
Evgeny Kuzin 9 months ago
parent afb1865107
commit 2b44aaa58c
No known key found for this signature in database
GPG Key ID: E5551E49A3DBBD35
2 changed files with 50 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", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "created" } { "status", "created" },
{ "protocol", "mysql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -328,7 +329,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "delayed" } { "status", "delayed" },
{ "protocol", "mysql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -336,7 +338,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "aborted" } { "status", "aborted" },
{ "protocol", "mysql" }
} }
), ),
// ==================================================================== // ====================================================================
@ -347,7 +350,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total", "proxysql_client_connections_total",
"Total number of client connections created.", "Total number of client connections created.",
metric_tags { metric_tags {
{ "status", "created" } { "status", "created" },
{ "protocol", "mysql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -361,7 +365,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total", "proxysql_client_connections_total",
"Total number of client failed connections (or closed improperly).", "Total number of client failed connections (or closed improperly).",
metric_tags { 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, p_hg_counter::access_denied_wrong_password,
"proxysql_access_denied_wrong_password_total", "proxysql_access_denied_wrong_password_total",
"Total access denied \"wrong password\".", "Total access denied \"wrong password\".",
metric_tags {} metric_tags {
{ "protocol", "mysql" }
}
), ),
std::make_tuple ( std::make_tuple (
p_hg_counter::access_denied_max_connections, p_hg_counter::access_denied_max_connections,
"proxysql_access_denied_max_connections_total", "proxysql_access_denied_max_connections_total",
"Total access denied \"max connections\".", "Total access denied \"max connections\".",
metric_tags {} metric_tags {
{ "protocol", "mysql" }
}
), ),
std::make_tuple ( std::make_tuple (
p_hg_counter::access_denied_max_user_connections, p_hg_counter::access_denied_max_user_connections,
"proxysql_access_denied_max_user_connections_total", "proxysql_access_denied_max_user_connections_total",
"Total access denied \"max user connections\".", "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, p_hg_gauge::server_connections_connected,
"proxysql_server_connections_connected", "proxysql_server_connections_connected",
"Backend connections that are currently connected.", "Backend connections that are currently connected.",
metric_tags {} metric_tags {
{ "protocol", "mysql" }
}
), ),
std::make_tuple ( std::make_tuple (
p_hg_gauge::client_connections_connected, p_hg_gauge::client_connections_connected,
"proxysql_client_connections_connected", "proxysql_client_connections_connected",
"Client connections that are currently connected.", "Client connections that are currently connected.",
metric_tags {} metric_tags {
{ "protocol", "mysql" }
}
), ),
std::make_tuple ( std::make_tuple (
p_hg_gauge::client_connections_connected_prim, p_hg_gauge::client_connections_connected_prim,

35
lib/PgSQL_HostGroups_Manager.cpp
Unescape View File

@ -352,7 +352,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "created" } { "status", "created" },
{ "protocol", "pgsql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -360,7 +361,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "delayed" } { "status", "delayed" },
{ "protocol", "pgsql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -368,7 +370,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_server_connections_total", "proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).", "Total number of server connections (created|delayed|aborted).",
metric_tags { metric_tags {
{ "status", "aborted" } { "status", "aborted" },
{ "protocol", "pgsql" }
} }
), ),
// ==================================================================== // ====================================================================
@ -379,7 +382,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total", "proxysql_client_connections_total",
"Total number of client connections created.", "Total number of client connections created.",
metric_tags { metric_tags {
{ "status", "created" } { "status", "created" },
{ "protocol", "pgsql" }
} }
), ),
std::make_tuple ( std::make_tuple (
@ -387,7 +391,8 @@ hg_metrics_map = std::make_tuple(
"proxysql_client_connections_total", "proxysql_client_connections_total",
"Total number of client failed connections (or closed improperly).", "Total number of client failed connections (or closed improperly).",
metric_tags { metric_tags {
{ "status", "aborted" } { "status", "aborted" },
{ "protocol", "pgsql" }
} }
), ),
// ==================================================================== // ====================================================================
@ -474,19 +479,25 @@ hg_metrics_map = std::make_tuple(
PgSQL_p_hg_counter::access_denied_wrong_password, PgSQL_p_hg_counter::access_denied_wrong_password,
"proxysql_access_denied_wrong_password_total", "proxysql_access_denied_wrong_password_total",
"Total access denied \"wrong password\".", "Total access denied \"wrong password\".",
metric_tags {} metric_tags {
{ "protocol", "pgsql" }
}
), ),
std::make_tuple ( std::make_tuple (
PgSQL_p_hg_counter::access_denied_max_connections, PgSQL_p_hg_counter::access_denied_max_connections,
"proxysql_access_denied_max_connections_total", "proxysql_access_denied_max_connections_total",
"Total access denied \"max connections\".", "Total access denied \"max connections\".",
metric_tags {} metric_tags {
{ "protocol", "pgsql" }
}
), ),
std::make_tuple ( std::make_tuple (
PgSQL_p_hg_counter::access_denied_max_user_connections, PgSQL_p_hg_counter::access_denied_max_user_connections,
"proxysql_access_denied_max_user_connections_total", "proxysql_access_denied_max_user_connections_total",
"Total access denied \"max user connections\".", "Total access denied \"max user connections\".",
metric_tags {} metric_tags {
{ "protocol", "pgsql" }
}
), ),
// ==================================================================== // ====================================================================
@ -544,13 +555,17 @@ hg_metrics_map = std::make_tuple(
PgSQL_p_hg_gauge::server_connections_connected, PgSQL_p_hg_gauge::server_connections_connected,
"proxysql_server_connections_connected", "proxysql_server_connections_connected",
"Backend connections that are currently connected.", "Backend connections that are currently connected.",
metric_tags {} metric_tags {
{ "protocol", "pgsql" }
}
), ),
std::make_tuple ( std::make_tuple (
PgSQL_p_hg_gauge::client_connections_connected, PgSQL_p_hg_gauge::client_connections_connected,
"proxysql_client_connections_connected", "proxysql_client_connections_connected",
"Client connections that are currently connected.", "Client connections that are currently connected.",
metric_tags {} metric_tags {
{ "protocol", "pgsql" }
}
) )
}, },
// prometheus dynamic counters // prometheus dynamic counters

Write Preview
Loading…
Cancel
Save