mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] stats: report max sessions/s and limit in CSV export

Browse Source
This commit is contained in:
Willy Tarreau 2009-05-10 19:01:49 +02:00
parent 13a34bd110
commit 8f208ecc7b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dumpstats.c
View File

@ -175,7 +175,8 @@ int print_csv_header(struct chunk *msg, int size)
"wretr,wredis," "wretr,wredis,"
"status,weight,act,bck," "status,weight,act,bck,"
"chkfail,chkdown,lastchg,downtime,qlimit," "chkfail,chkdown,lastchg,downtime,qlimit,"
"pid,iid,sid,throttle,lbtot,tracked,type,rate," "pid,iid,sid,throttle,lbtot,tracked,type,"
"rate,rate_lim,rate_max,"
"\n"); "\n");
} }
@ -743,8 +744,8 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
",,,,,,,," ",,,,,,,,"
/* pid, iid, sid, throttle, lbtot, tracked, type */ /* pid, iid, sid, throttle, lbtot, tracked, type */
"%d,%d,0,,,,%d," "%d,%d,0,,,,%d,"
/* rate */ /* rate, rate_lim, rate_max, */
"%u," "%u,%u,%u,"
"\n", "\n",
px->id, px->id,
px->feconn, px->feconn_max, px->maxconn, px->cum_feconn, px->feconn, px->feconn_max, px->maxconn, px->cum_feconn,
@ -754,7 +755,8 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
px->state == PR_STRUN ? "OPEN" : px->state == PR_STRUN ? "OPEN" :
px->state == PR_STIDLE ? "FULL" : "STOP", px->state == PR_STIDLE ? "FULL" : "STOP",
relative_pid, px->uuid, STATS_TYPE_FE, relative_pid, px->uuid, STATS_TYPE_FE,
read_freq_ctr(&px->fe_sess_per_sec)); read_freq_ctr(&px->fe_sess_per_sec),
px->fe_sps_lim, px->fe_sps_max);
} }
if (buffer_write_chunk(rep, &msg) >= 0) if (buffer_write_chunk(rep, &msg) >= 0)
@ -979,7 +981,9 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
chunk_printf(&msg, sizeof(trash), "%d,", STATS_TYPE_SV); chunk_printf(&msg, sizeof(trash), "%d,", STATS_TYPE_SV);
/* rate */ /* rate */
chunk_printf(&msg, sizeof(trash), "%u,", read_freq_ctr(&sv->sess_per_sec)); chunk_printf(&msg, sizeof(trash), "%u,,%u,",
read_freq_ctr(&sv->sess_per_sec),
sv->sps_max);
/* finish with EOL */ /* finish with EOL */
chunk_printf(&msg, sizeof(trash), "\n"); chunk_printf(&msg, sizeof(trash), "\n");
@ -1071,8 +1075,8 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
",%d,%d,%d,," ",%d,%d,%d,,"
/* pid, iid, sid, throttle, lbtot, tracked, type */ /* pid, iid, sid, throttle, lbtot, tracked, type */
"%d,%d,0,,%lld,,%d," "%d,%d,0,,%lld,,%d,"
/* rate */ /* rate, rate_lim, rate_max, */
"%u," "%u,,%u,"
"\n", "\n",
px->id, px->id,
px->nbpend /* or px->totpend ? */, px->nbpend_max, px->nbpend /* or px->totpend ? */, px->nbpend_max,
@ -1088,7 +1092,8 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
px->srv?be_downtime(px):0, px->srv?be_downtime(px):0,
relative_pid, px->uuid, relative_pid, px->uuid,
px->cum_lbconn, STATS_TYPE_BE, px->cum_lbconn, STATS_TYPE_BE,
read_freq_ctr(&px->be_sess_per_sec)); read_freq_ctr(&px->be_sess_per_sec),
px->be_sps_max);
} }
if (buffer_write_chunk(rep, &msg) >= 0) if (buffer_write_chunk(rep, &msg) >= 0)
return 0; return 0;