Skip to content

Commit 13ded1d

Browse files
author
Evgeny Kuzin
committed
add protolol labels for shared metrics between mysql and psql
1 parent afb1865 commit 13ded1d

File tree

2 files changed

+50
-20
lines changed

2 files changed

+50
-20
lines changed

‎lib/MySQL_HostGroups_Manager.cpp‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -320,23 +320,26 @@ hg_metrics_map = std::make_tuple(
320320
"proxysql_server_connections_total",
321321
"Total number of server connections (created|delayed|aborted).",
322322
metric_tags {
323-
{ "status", "created" }
323+
{ "status", "created" },
324+
{ "protocol", "mysql" }
324325
}
325326
),
326327
std::make_tuple (
327328
p_hg_counter::server_connections_delayed,
328329
"proxysql_server_connections_total",
329330
"Total number of server connections (created|delayed|aborted).",
330331
metric_tags {
331-
{ "status", "delayed" }
332+
{ "status", "delayed" },
333+
{ "protocol", "mysql" }
332334
}
333335
),
334336
std::make_tuple (
335337
p_hg_counter::server_connections_aborted,
336338
"proxysql_server_connections_total",
337339
"Total number of server connections (created|delayed|aborted).",
338340
metric_tags {
339-
{ "status", "aborted" }
341+
{ "status", "aborted" },
342+
{ "protocol", "mysql" }
340343
}
341344
),
342345
// ====================================================================
@@ -347,7 +350,8 @@ hg_metrics_map = std::make_tuple(
347350
"proxysql_client_connections_total",
348351
"Total number of client connections created.",
349352
metric_tags {
350-
{ "status", "created" }
353+
{ "status", "created" },
354+
{ "protocol", "mysql" }
351355
}
352356
),
353357
std::make_tuple (
@@ -361,7 +365,8 @@ hg_metrics_map = std::make_tuple(
361365
"proxysql_client_connections_total",
362366
"Total number of client failed connections (or closed improperly).",
363367
metric_tags {
364-
{ "status", "aborted" }
368+
{ "status", "aborted" },
369+
{ "protocol", "mysql" }
365370
}
366371
),
367372
// ====================================================================
@@ -448,19 +453,25 @@ hg_metrics_map = std::make_tuple(
448453
p_hg_counter::access_denied_wrong_password,
449454
"proxysql_access_denied_wrong_password_total",
450455
"Total access denied \"wrong password\".",
451-
metric_tags {}
456+
metric_tags {
457+
{ "protocol", "mysql" }
458+
}
452459
),
453460
std::make_tuple (
454461
p_hg_counter::access_denied_max_connections,
455462
"proxysql_access_denied_max_connections_total",
456463
"Total access denied \"max connections\".",
457-
metric_tags {}
464+
metric_tags {
465+
{ "protocol", "mysql" }
466+
}
458467
),
459468
std::make_tuple (
460469
p_hg_counter::access_denied_max_user_connections,
461470
"proxysql_access_denied_max_user_connections_total",
462471
"Total access denied \"max user connections\".",
463-
metric_tags {}
472+
metric_tags {
473+
{ "protocol", "mysql" }
474+
}
464475
),
465476

466477
// ====================================================================
@@ -518,13 +529,17 @@ hg_metrics_map = std::make_tuple(
518529
p_hg_gauge::server_connections_connected,
519530
"proxysql_server_connections_connected",
520531
"Backend connections that are currently connected.",
521-
metric_tags {}
532+
metric_tags {
533+
{ "protocol", "mysql" }
534+
}
522535
),
523536
std::make_tuple (
524537
p_hg_gauge::client_connections_connected,
525538
"proxysql_client_connections_connected",
526539
"Client connections that are currently connected.",
527-
metric_tags {}
540+
metric_tags {
541+
{ "protocol", "mysql" }
542+
}
528543
),
529544
std::make_tuple (
530545
p_hg_gauge::client_connections_connected_prim,

‎lib/PgSQL_HostGroups_Manager.cpp‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -352,23 +352,26 @@ hg_metrics_map = std::make_tuple(
352352
"proxysql_server_connections_total",
353353
"Total number of server connections (created|delayed|aborted).",
354354
metric_tags {
355-
{ "status", "created" }
355+
{ "status", "created" },
356+
{ "protocol", "pgsql" }
356357
}
357358
),
358359
std::make_tuple (
359360
PgSQL_p_hg_counter::server_connections_delayed,
360361
"proxysql_server_connections_total",
361362
"Total number of server connections (created|delayed|aborted).",
362363
metric_tags {
363-
{ "status", "delayed" }
364+
{ "status", "delayed" },
365+
{ "protocol", "pgsql" }
364366
}
365367
),
366368
std::make_tuple (
367369
PgSQL_p_hg_counter::server_connections_aborted,
368370
"proxysql_server_connections_total",
369371
"Total number of server connections (created|delayed|aborted).",
370372
metric_tags {
371-
{ "status", "aborted" }
373+
{ "status", "aborted" },
374+
{ "protocol", "pgsql" }
372375
}
373376
),
374377
// ====================================================================
@@ -379,15 +382,17 @@ hg_metrics_map = std::make_tuple(
379382
"proxysql_client_connections_total",
380383
"Total number of client connections created.",
381384
metric_tags {
382-
{ "status", "created" }
385+
{ "status", "created" },
386+
{ "protocol", "pgsql" }
383387
}
384388
),
385389
std::make_tuple (
386390
PgSQL_p_hg_counter::client_connections_aborted,
387391
"proxysql_client_connections_total",
388392
"Total number of client failed connections (or closed improperly).",
389393
metric_tags {
390-
{ "status", "aborted" }
394+
{ "status", "aborted" },
395+
{ "protocol", "pgsql" }
391396
}
392397
),
393398
// ====================================================================
@@ -474,19 +479,25 @@ hg_metrics_map = std::make_tuple(
474479
PgSQL_p_hg_counter::access_denied_wrong_password,
475480
"proxysql_access_denied_wrong_password_total",
476481
"Total access denied \"wrong password\".",
477-
metric_tags {}
482+
metric_tags {
483+
{ "protocol", "pgsql" }
484+
}
478485
),
479486
std::make_tuple (
480487
PgSQL_p_hg_counter::access_denied_max_connections,
481488
"proxysql_access_denied_max_connections_total",
482489
"Total access denied \"max connections\".",
483-
metric_tags {}
490+
metric_tags {
491+
{ "protocol", "pgsql" }
492+
}
484493
),
485494
std::make_tuple (
486495
PgSQL_p_hg_counter::access_denied_max_user_connections,
487496
"proxysql_access_denied_max_user_connections_total",
488497
"Total access denied \"max user connections\".",
489-
metric_tags {}
498+
metric_tags {
499+
{ "protocol", "pgsql" }
500+
}
490501
),
491502

492503
// ====================================================================
@@ -544,13 +555,17 @@ hg_metrics_map = std::make_tuple(
544555
PgSQL_p_hg_gauge::server_connections_connected,
545556
"proxysql_server_connections_connected",
546557
"Backend connections that are currently connected.",
547-
metric_tags {}
558+
metric_tags {
559+
{ "protocol", "pgsql" }
560+
}
548561
),
549562
std::make_tuple (
550563
PgSQL_p_hg_gauge::client_connections_connected,
551564
"proxysql_client_connections_connected",
552565
"Client connections that are currently connected.",
553-
metric_tags {}
566+
metric_tags {
567+
{ "protocol", "pgsql" }
568+
}
554569
)
555570
},
556571
// prometheus dynamic counters

0 commit comments

Comments
 (0)