[MINOR] stats: report numerical process ID, proxy ID and server ID
It is very convenient for SNMP monitoring to have unique process ID,
proxy ID and server ID. Those have been added to the CSV outputs.
The numbers start at 1. 0 is reserved. For servers, 0 means that the
reported name is not a server name but half a proxy (FRONTEND/BACKEND).
A remaining hidden "-" in the CSV output has been eliminated too.
diff --git a/src/dumpstats.c b/src/dumpstats.c
index 7126de9..b38cd6c 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -374,6 +374,7 @@
"wretr,wredis,"
"status,weight,act,bck,"
"chkfail,chkdown,lastchg,downtime,qlimit,"
+ "pid,iid,sid,"
"\n");
}
if (buffer_write_chunk(rep, &msg) != 0)
@@ -659,6 +660,8 @@
"%s,"
/* rest of server: nothing */
",,,,,,,,"
+ /* pid, iid, sid, */
+ "%d,%d,0,"
"\n",
px->id,
px->feconn, px->feconn_max, px->maxconn, px->cum_feconn,
@@ -666,7 +669,8 @@
px->denied_req, px->denied_resp,
px->failed_req,
px->state == PR_STRUN ? "OPEN" :
- px->state == PR_STIDLE ? "FULL" : "STOP");
+ px->state == PR_STIDLE ? "FULL" : "STOP",
+ relative_pid, px->uuid);
}
if (buffer_write_chunk(rep, &msg) != 0)
@@ -787,7 +791,7 @@
"",
px->id, sv->id,
sv->nbpend, sv->nbpend_max,
- sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess,
+ sv->cur_sess, sv->cur_sess_max, LIM2A0(sv->maxconn, ""), sv->cum_sess,
sv->bytes_in, sv->bytes_out,
sv->failed_secu,
sv->failed_conns, sv->failed_resp,
@@ -817,10 +821,13 @@
chunk_printf(&msg, sizeof(trash),
",,,,");
- /* queue limit and EOL */
+ /* queue limit, pid, iid, sid and EOL */
chunk_printf(&msg, sizeof(trash),
- "%s,\n",
- LIM2A0(sv->maxqueue, ""));
+ "%s,"
+ "%d,%d,%d,"
+ "\n",
+ LIM2A0(sv->maxqueue, ""),
+ relative_pid, px->uuid, sv->puid);
}
if (buffer_write_chunk(rep, &msg) != 0)
return 0;
@@ -910,6 +917,8 @@
/* rest of backend: nothing, down transformations,
* last change, total downtime. */
",%d,%d,%d,,"
+ /* pid, iid, sid, */
+ "%d,%d,0,"
"\n",
px->id,
px->nbpend /* or px->totpend ? */, px->nbpend_max,
@@ -921,7 +930,8 @@
(px->srv_map_sz > 0 || !px->srv) ? "UP" : "DOWN",
px->srv_map_sz * gcd, px->srv_act, px->srv_bck,
px->down_trans, now.tv_sec - px->last_change,
- px->srv?be_downtime(px):0);
+ px->srv?be_downtime(px):0,
+ relative_pid, px->uuid);
}
if (buffer_write_chunk(rep, &msg) != 0)
return 0;