Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions lib/MySQL_HostGroups_Manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,23 +320,26 @@ 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 (
p_hg_counter::server_connections_delayed,
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "delayed" }
{ "status", "delayed" },
{ "protocol", "mysql" }
}
),
std::make_tuple (
p_hg_counter::server_connections_aborted,
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "mysql" }
}
),
// ====================================================================
Expand All @@ -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 (
Expand All @@ -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" }
}
),
// ====================================================================
Expand Down Expand Up @@ -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" }
}
),

// ====================================================================
Expand Down Expand Up @@ -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,
Expand Down
35 changes: 25 additions & 10 deletions lib/PgSQL_HostGroups_Manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -352,23 +352,26 @@ 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 (
PgSQL_p_hg_counter::server_connections_delayed,
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "delayed" }
{ "status", "delayed" },
{ "protocol", "pgsql" }
}
),
std::make_tuple (
PgSQL_p_hg_counter::server_connections_aborted,
"proxysql_server_connections_total",
"Total number of server connections (created|delayed|aborted).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "pgsql" }
}
),
// ====================================================================
Expand All @@ -379,15 +382,17 @@ 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 (
PgSQL_p_hg_counter::client_connections_aborted,
"proxysql_client_connections_total",
"Total number of client failed connections (or closed improperly).",
metric_tags {
{ "status", "aborted" }
{ "status", "aborted" },
{ "protocol", "pgsql" }
}
),
// ====================================================================
Expand Down Expand Up @@ -474,19 +479,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" }
}
),

// ====================================================================
Expand Down Expand Up @@ -544,13 +555,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
Expand Down
4 changes: 4 additions & 0 deletions lib/ProxySQL_Admin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2512,6 +2512,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();
Expand Down