diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index 7b579a231..76f992733 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -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, diff --git a/lib/PgSQL_HostGroups_Manager.cpp b/lib/PgSQL_HostGroups_Manager.cpp index f9b67fed5..8ee002939 100644 --- a/lib/PgSQL_HostGroups_Manager.cpp +++ b/lib/PgSQL_HostGroups_Manager.cpp @@ -352,7 +352,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 ( @@ -360,7 +361,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 ( @@ -368,7 +370,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" } } ), // ==================================================================== @@ -379,7 +382,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 ( @@ -387,7 +391,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" } } ), // ==================================================================== @@ -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" } + } ), // ==================================================================== @@ -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