RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: stats: report server's address in the CSV output 

This new field "addr" presents the server's address:port if the client
is either enabled via "stats show legends" in case of HTTP dumps, or
has at least level operator on the CLI. The address formats might be :
 - ipv4:port
 - [ipv6]:port
 - unix
 - (error message)
This commit is contained in:
Willy Tarreau 2016-01-08 15:35:43 +01:00
parent 0deb85acd1
commit 3a4ec3a04b
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/management.txt
View File

@ -1022,6 +1022,7 @@ S (Servers).
70. agent_rise [...S]: agent's "rise" parameter, normally 1
71. agent_fall [...S]: agent's "fall" parameter, normally 1
72. agent_health [...S]: agent's health parameter, between 0 and rise+fall-1
73. addr [...S]: server's address:port. IPv6 has brackets around the address.
9.2. Unix Socket commands

46
src/dumpstats.c
View File

@ -333,6 +333,7 @@ enum stat_field {
ST_F_AGENT_RISE,
ST_F_AGENT_FALL,
ST_F_AGENT_HEALTH,
ST_F_ADDR,
/* must always be the last one */
ST_F_TOTAL_FIELDS
@ -416,6 +417,7 @@ const char *stat_field_names[ST_F_TOTAL_FIELDS] = {
[ST_F_AGENT_RISE] = "agent_rise",
[ST_F_AGENT_FALL] = "agent_fall",
[ST_F_AGENT_HEALTH] = "agent_health",
[ST_F_ADDR] = "addr",
};
/* one line of stats */
@ -3819,6 +3821,28 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
stats[ST_F_RTIME] = mkf_u32(FN_AVG, swrate_avg(sv->counters.d_time, TIME_STATS_SAMPLES));
stats[ST_F_TTIME] = mkf_u32(FN_AVG, swrate_avg(sv->counters.t_time, TIME_STATS_SAMPLES));
if (flags & ST_SHLGNDS) {
switch (addr_to_str(&sv->addr, str, sizeof(str))) {
case AF_INET:
stats[ST_F_ADDR] = mkf_str(FO_CONFIG|FS_SERVICE, chunk_newstr(out));
chunk_appendf(out, "%s:%d", str, get_host_port(&sv->addr));
break;
case AF_INET6:
stats[ST_F_ADDR] = mkf_str(FO_CONFIG|FS_SERVICE, chunk_newstr(out));
chunk_appendf(out, "[%s]:%d", str, get_host_port(&sv->addr));
break;
case AF_UNIX:
stats[ST_F_ADDR] = mkf_str(FO_CONFIG|FS_SERVICE, "unix");
break;
case -1:
stats[ST_F_ADDR] = mkf_str(FO_CONFIG|FS_SERVICE, chunk_newstr(out));
chunk_strcat(out, strerror(errno));
break;
default: /* address family not supported */
break;
}
}
if (appctx->ctx.stats.flags & STAT_FMT_HTML) {
if (memcmp(field_str(stats, ST_F_STATUS), "MAINT", 5) == 0)
chunk_appendf(&trash, "<tr class=\"maintain\">");
@ -3843,22 +3867,12 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
if (flags & ST_SHLGNDS) {
chunk_appendf(&trash, "<div class=tips>");
switch (addr_to_str(&sv->addr, str, sizeof(str))) {
case AF_INET:
chunk_appendf(&trash, "IPv4: %s:%d, ", str, get_host_port(&sv->addr));
break;
case AF_INET6:
chunk_appendf(&trash, "IPv6: [%s]:%d, ", str, get_host_port(&sv->addr));
break;
case AF_UNIX:
chunk_appendf(&trash, "unix, ");
break;
case -1:
chunk_appendf(&trash, "(%s), ", strerror(errno));
break;
default: /* address family not supported */
break;
}
if (isdigit(*field_str(stats, ST_F_ADDR)))
chunk_appendf(&trash, "IPv4: %s, ", field_str(stats, ST_F_ADDR));
else if (*field_str(stats, ST_F_ADDR) == '[')
chunk_appendf(&trash, "IPv6: %s, ", field_str(stats, ST_F_ADDR));
else if (*field_str(stats, ST_F_ADDR))
chunk_appendf(&trash, "%s, ", field_str(stats, ST_F_ADDR));
/* id */
chunk_appendf(&trash, "id: %d", stats[ST_F_SID].u.u32);