MINOR: stats: add check and agent's health values in the output

This adds the following fields :
- check_rise [...S]: server's "rise" parameter used by checks
- check_fall [...S]: server's "fall" parameter used by checks
- check_health [...S]: server's health check value between 0 and rise+fall-1
- agent_rise [...S]: agent's "rise" parameter, normally 1
- agent_fall [...S]: agent's "fall" parameter, normally 1
- agent_health [...S]: agent's health parameter, between 0 and rise+fall-1

diff --git a/doc/management.txt b/doc/management.txt
index 6b491ff06c7aecff26bc4d86cbf2ef960ec78a2c..253dd0dfff79fb4cfc56198195877716320e450f 100644 (file)
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1016,6 +1016,12 @@ S (Servers).
  64. agent_duration [...S]: time in ms taken to finish last check
  65. check_desc [...S]: short human-readable description of check_status
  66. agent_desc [...S]: short human-readable description of agent_status
+ 67. check_rise [...S]: server's "rise" parameter used by checks
+ 68. check_fall [...S]: server's "fall" parameter used by checks
+ 69. check_health [...S]: server's health check value between 0 and rise+fall-1
+ 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
 
 
 9.2. Unix Socket commands

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 38abc4274191606ac668cc303f57f8bbce7c5f4d..d9812bcd9389952b566f88ba9d6256f878ab5515 100644 (file)
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -327,6 +327,12 @@ enum stat_field {
        ST_F_AGENT_DURATION,
        ST_F_CHECK_DESC,
        ST_F_AGENT_DESC,
+       ST_F_CHECK_RISE,
+       ST_F_CHECK_FALL,
+       ST_F_CHECK_HEALTH,
+       ST_F_AGENT_RISE,
+       ST_F_AGENT_FALL,
+       ST_F_AGENT_HEALTH,
 
        /* must always be the last one */
        ST_F_TOTAL_FIELDS
@@ -404,6 +410,12 @@ const char *stat_field_names[ST_F_TOTAL_FIELDS] = {
        [ST_F_AGENT_DURATION] = "agent_duration",
        [ST_F_CHECK_DESC]     = "check_desc",
        [ST_F_AGENT_DESC]     = "agent_desc",
+       [ST_F_CHECK_RISE]     = "check_rise",
+       [ST_F_CHECK_FALL]     = "check_fall",
+       [ST_F_CHECK_HEALTH]   = "check_health",
+       [ST_F_AGENT_RISE]     = "agent_rise",
+       [ST_F_AGENT_FALL]     = "agent_fall",
+       [ST_F_AGENT_HEALTH]   = "agent_health",
 };
 
 /* one line of stats */
@@ -3757,6 +3769,9 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
 
                stats[ST_F_CHECK_DESC] = mkf_str(FN_OUTPUT, get_check_status_description(sv->check.status));
                stats[ST_F_LAST_CHK] = mkf_str(FN_OUTPUT, sv->check.desc);
+               stats[ST_F_CHECK_RISE]   = mkf_u32(FO_CONFIG|FS_SERVICE, ref->check.rise);
+               stats[ST_F_CHECK_FALL]   = mkf_u32(FO_CONFIG|FS_SERVICE, ref->check.fall);
+               stats[ST_F_CHECK_HEALTH] = mkf_u32(FO_CONFIG|FS_SERVICE, ref->check.health);
        }
 
        if ((sv->agent.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) {
@@ -3777,6 +3792,9 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
 
                stats[ST_F_AGENT_DESC] = mkf_str(FN_OUTPUT, get_check_status_description(sv->agent.status));
                stats[ST_F_LAST_AGT] = mkf_str(FN_OUTPUT, sv->agent.desc);
+               stats[ST_F_AGENT_RISE]   = mkf_u32(FO_CONFIG|FS_SERVICE, sv->agent.rise);
+               stats[ST_F_AGENT_FALL]   = mkf_u32(FO_CONFIG|FS_SERVICE, sv->agent.fall);
+               stats[ST_F_AGENT_HEALTH] = mkf_u32(FO_CONFIG|FS_SERVICE, sv->agent.health);
        }
 
        /* http response: 1xx, 2xx, 3xx, 4xx, 5xx, other */
@@ -3968,7 +3986,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
                        chunk_appendf(&trash, "%s MAINT", human_time(stats[ST_F_LASTCHG].u.u32, 1));
                }
                else if (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0 &&
-                        stats[ST_F_AGENT_STATUS].type && !(sv->agent.health)) {
+                        stats[ST_F_AGENT_STATUS].type && !stats[ST_F_AGENT_HEALTH].u.u32) {
                        /* DOWN (agent) */
                        chunk_appendf(&trash, "%s ", human_time(stats[ST_F_LASTCHG].u.u32, 1));
                        chunk_appendf(&trash, srv_hlt_st[1], "GCC: your -Werror=format-security is bogus, annoying, and hides real bugs, I don't thank you, really!");
@@ -3977,12 +3995,12 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in
                        chunk_appendf(&trash, "%s ", human_time(stats[ST_F_LASTCHG].u.u32, 1));
                        chunk_appendf(&trash,
                                      srv_hlt_st[state],
-                                     (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0) ? ref->check.health : ref->check.health - ref->check.rise + 1,
-                                     (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0) ? ref->check.rise : ref->check.fall);
+                                     (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0) ? stats[ST_F_CHECK_HEALTH].u.u32 : stats[ST_F_CHECK_HEALTH].u.u32 - stats[ST_F_CHECK_RISE].u.u32 + 1,
+                                     (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0) ? stats[ST_F_CHECK_RISE].u.u32 : stats[ST_F_CHECK_FALL].u.u32);
                }
 
                if (memcmp(field_str(stats, ST_F_STATUS), "DOWN", 4) == 0 &&
-                   stats[ST_F_AGENT_STATUS].type && !(sv->agent.health)) {
+                   stats[ST_F_AGENT_STATUS].type && !stats[ST_F_AGENT_HEALTH].u.u32) {
                        chunk_appendf(&trash,
                                      "</td><td class=ac><u> %s",
                                      field_str(stats, ST_F_AGENT_STATUS));