From: Willy Tarreau Date: Sun, 10 May 2009 17:19:41 +0000 (+0200) Subject: [MINOR] stats: report max sessions/s and limit in HTML stats X-Git-Tag: v1.3.18~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3e4942ccb63ea75b938154d10892808ea83bc60;p=thirdparty%2Fhaproxy.git [MINOR] stats: report max sessions/s and limit in HTML stats --- diff --git a/src/dumpstats.c b/src/dumpstats.c index ea6f4460d9..06094fb7d4 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), - "\n" + "
\n" "" "" - "" + "" "\n" "" "" - "" + "" + "" "" "" "" "\n" "" + "" "" - "" + "" "" "" "" @@ -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 */ "" - /* sessions : current, max, limit, rate, total, lbtot */ - "" - "" + /* sessions rate : current, max, limit */ + "" + /* sessions : current, max, limit, total, lbtot */ + "" "" /* bytes : in, out */ "" "", - 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) "" /* queue : current, max, limit */ "" - /* sessions : current, max, limit, rate, total, lbtot */ - "" - "" + /* sessions rate : current, max, limit */ + "" + /* sessions : current, max, limit, total, lbtot */ + "" "" "", (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) "" /* queue : current, max */ "" - /* sessions : current, max, limit, rate, total, lbtot */ - "" - "" + /* sessions rate : current, max, limit */ + "" + "", + 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 */ + "" "" /* bytes : in, out */ "" "", - 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));
%s
QueueSessionsQueueSession rateSessionsBytesDeniedErrorsWarningsServer
CurMaxLimitCurMaxLimitCurMaxLimitRateTotalLbTotInOutLimitTotalLbTotInOutReqRespReqConnRespRetrRedisStatusWghtAct
Frontend%s%s%s%s%s%s%s%s%s%s%s%s%s
%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s
Backend%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s