diff --git a/src/dumpstats.c b/src/dumpstats.c index ea6f4460d..06094fb7d 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -659,21 +659,23 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri) if (!(s->data_ctx.stats.flags & STAT_FMT_CSV)) { /* print a new table */ chunk_printf(&msg, sizeof(trash), - "
| %s | " - "" + " | " " | |||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| " - " | Queue | Sessions | " + "Queue | " + "Session rate | Sessions | " "Bytes | Denied | " "Errors | Warnings | " "Server | " "|||||||||||||||||||||||||||||||||||||||||||
| Cur | Max | Limit | " "Cur | Max | Limit | Cur | Max | " - "Limit | Rate | Total | LbTot | In | Out | " + "Limit | Total | LbTot | In | Out | " "Req | Resp | Req | Conn | " "Resp | Retr | Redis | " "Status | Wght | Act | " @@ -697,16 +699,18 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri) chunk_printf(&msg, sizeof(trash), /* name, queue */ "|||||||||||||||||||||||||
| Frontend | " - /* sessions : current, max, limit, rate, total, lbtot */ - " | %s | %s | " - "%s | %s | " + /* sessions rate : current, max, limit */ + "%s | %s | %s | " + /* sessions : current, max, limit, total, lbtot */ + "%s | %s | %s | " "%s | " /* bytes : in, out */ " | %s | %s | " "", - U2H0(px->feconn), U2H1(px->feconn_max), U2H2(px->maxconn), - U2H3(read_freq_ctr(&px->fe_sess_per_sec)), U2H4(px->cum_feconn), - U2H5(px->bytes_in), U2H6(px->bytes_out)); + U2H0(read_freq_ctr(&px->fe_sess_per_sec)), + U2H1(px->fe_sps_max), LIM2A2(px->fe_sps_lim, "-"), + U2H3(px->feconn), U2H4(px->feconn_max), U2H5(px->maxconn), + U2H6(px->cum_feconn), U2H7(px->bytes_in), U2H8(px->bytes_out)); chunk_printf(&msg, sizeof(trash), /* denied: req, resp */ @@ -822,17 +826,18 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri) "||||||||||||||||||||||||||||||||||||||
| %s | " /* queue : current, max, limit */ "%s | %s | %s | " - /* sessions : current, max, limit, rate, total, lbtot */ - "%s | %s | " - "%s | %s | " + /* sessions rate : current, max, limit */ + "%s | %s | " + /* sessions : current, max, limit, total, lbtot */ + " | %s | %s | %s | " "%s | %s | " "", (sv->state & SRV_BACKUP) ? "backup" : "active", sv_state, sv->id, U2H0(sv->nbpend), U2H1(sv->nbpend_max), LIM2A2(sv->maxqueue, "-"), - U2H3(sv->cur_sess), U2H4(sv->cur_sess_max), LIM2A5(sv->maxconn, "-"), - U2H6(read_freq_ctr(&sv->sess_per_sec)), - U2H7(sv->cum_sess), U2H8(sv->cum_lbconn)); + U2H3(read_freq_ctr(&sv->sess_per_sec)), U2H4(sv->sps_max), + U2H5(sv->cur_sess), U2H6(sv->cur_sess_max), LIM2A7(sv->maxconn, "-"), + U2H8(sv->cum_sess), U2H9(sv->cum_lbconn)); chunk_printf(&msg, sizeof(trash), /* bytes : in, out */ @@ -1005,16 +1010,20 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri) "||||||||||||||||||||||||||||||||||||||
| Backend | " /* queue : current, max */ "%s | %s | " - /* sessions : current, max, limit, rate, total, lbtot */ - " | %s | %s | " - "%s | %s | " + /* sessions rate : current, max, limit */ + "%s | %s | " + "", + U2H0(px->nbpend) /* or px->totpend ? */, U2H1(px->nbpend_max), + U2H2(read_freq_ctr(&px->be_sess_per_sec)), U2H3(px->be_sps_max)); + + chunk_printf(&msg, sizeof(trash), + /* sessions : current, max, limit, total, lbtot */ + " | %s | %s | %s | " "%s | %s | " /* bytes : in, out */ "%s | %s | " "", - U2H0(px->nbpend) /* or px->totpend ? */, U2H1(px->nbpend_max), U2H2(px->beconn), U2H3(px->beconn_max), U2H4(px->fullconn), - U2H5(read_freq_ctr(&px->be_sess_per_sec)), U2H6(px->cum_beconn), U2H7(px->cum_lbconn), U2H8(px->bytes_in), U2H9(px->bytes_out));||||||||||||||||||||||||||||||||||||