]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: stats: improve pending connections description
authorWilliam Dauchy <wdauchy@gmail.com>
Mon, 1 Feb 2021 12:11:53 +0000 (13:11 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Mon, 1 Feb 2021 14:16:33 +0000 (15:16 +0100)
In order to unify prometheus and stats description, we need to clarify
the description for pending connections.
- remove the BE reference in counters struct, as it is also used in
  servers
- remove reference of `qcur` field in description as it is specific to
  stats implemention
- try to reword cur and max pending connections description

Signed-off-by: William Dauchy <wdauchy@gmail.com>
include/haproxy/counters-t.h
src/stats.c

index b896c4d36eeb87a98be9573035b85052d611dbd5..1ea68dd6c3b0b7b02129a2240188eb7676f9abef 100644 (file)
@@ -73,7 +73,7 @@ struct be_counters {
 
        unsigned int cps_max;                   /* maximum of new connections received per second */
        unsigned int sps_max;                   /* maximum of new connections accepted per second (sessions) */
-       unsigned int nbpend_max;                /* max number of pending connections with no server assigned yet (BE only) */
+       unsigned int nbpend_max;                /* max number of pending connections with no server assigned yet */
        unsigned int cur_sess_max;              /* max number of currently active sessions */
 
        long long bytes_in;                     /* number of bytes transferred from the client to the server */
index 4b8bd89b48fcd31b870fcf06193349153fa699a9..fdb8e9adff26b342b20652b6f4761d134bf96055 100644 (file)
@@ -158,8 +158,8 @@ const struct name_desc info_fields[INF_TOTAL_FIELDS] = {
 const struct name_desc stat_fields[ST_F_TOTAL_FIELDS] = {
        [ST_F_PXNAME]                        = { .name = "pxname",                      .desc = "Proxy name" },
        [ST_F_SVNAME]                        = { .name = "svname",                      .desc = "Server name" },
-       [ST_F_QCUR]                          = { .name = "qcur",                        .desc = "Current number of connections waiting in the server of backend queue" },
-       [ST_F_QMAX]                          = { .name = "qmax",                        .desc = "Highest value of qcur encountered since process started" },
+       [ST_F_QCUR]                          = { .name = "qcur",                        .desc = "Number of current queued connections" },
+       [ST_F_QMAX]                          = { .name = "qmax",                        .desc = "Highest value of queued connections encountered since process started" },
        [ST_F_SCUR]                          = { .name = "scur",                        .desc = "Current number of sessions on the frontend, backend or server" },
        [ST_F_SMAX]                          = { .name = "smax",                        .desc = "Highest value of scur encountered since process started" },
        [ST_F_SLIM]                          = { .name = "slim",                        .desc = "Frontend/listener/server's maxconn, backend's fullconn" },