MINOR: promex: introduce haproxy_backend_agg_check_status

This patch introduces haproxy_backend_agg_check_status metric
as we wanted in 42d7c402d but with the right data source.

This patch could be backported as far as 2.4.

diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 9330a860cd8826cd2effdd14a4439e82752d2db7..5622b80390990a359a81eb074df4edc4465a633b 100644 (file)
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -303,6 +303,7 @@ const struct promex_metric promex_st_metrics[ST_F_TOTAL_FIELDS] = {
        [ST_F_UWEIGHT]              = { .n = IST("uweight"),                          .type = PROMEX_MT_GAUGE,    .flags = (                                               PROMEX_FL_BACK_METRIC | PROMEX_FL_SRV_METRIC) },
        [ST_F_AGG_SRV_CHECK_STATUS] = { .n = IST("agg_server_check_status"),          .type = PROMEX_MT_GAUGE,    .flags = (                                               PROMEX_FL_BACK_METRIC                       ) },
        [ST_F_AGG_SRV_STATUS ]      = { .n = IST("agg_server_status"),                .type = PROMEX_MT_GAUGE,    .flags = (                                               PROMEX_FL_BACK_METRIC                       ) },
+       [ST_F_AGG_CHECK_STATUS]     = { .n = IST("agg_check_status"),                 .type = PROMEX_MT_GAUGE,    .flags = (                                               PROMEX_FL_BACK_METRIC                       ) },
 };
 
 /* Description of overridden stats fields */
@@ -812,6 +813,7 @@ static int promex_dump_back_metrics(struct appctx *appctx, struct htx *htx)
        double secs;
        enum promex_back_state bkd_state;
        enum promex_srv_state srv_state;
+       enum healthcheck_status srv_check_status;
 
        for (;ctx->field_num < ST_F_TOTAL_FIELDS; ctx->field_num++) {
                if (!(promex_st_metrics[ctx->field_num].flags & ctx->flags))
@@ -820,6 +822,8 @@ static int promex_dump_back_metrics(struct appctx *appctx, struct htx *htx)
                while (ctx->px) {
                        struct promex_label labels[PROMEX_MAX_LABELS-1] = {};
                        unsigned int srv_state_count[PROMEX_SRV_STATE_COUNT] = { 0 };
+                       unsigned int srv_check_count[HCHK_STATUS_SIZE] = { 0 };
+                       const char *check_state;
 
                        px = ctx->px;
 
@@ -854,6 +858,28 @@ static int promex_dump_back_metrics(struct appctx *appctx, struct htx *htx)
                                        }
                                        ctx->obj_state = 0;
                                        goto next_px;
+                               case ST_F_AGG_CHECK_STATUS:
+                                       if (!px->srv)
+                                               goto next_px;
+                                       sv = px->srv;
+                                       while (sv) {
+                                               srv_check_status = sv->check.status;
+                                               srv_check_count[srv_check_status] += 1;
+                                               sv = sv->next;
+                                       }
+                                       for (; ctx->obj_state < HCHK_STATUS_SIZE; ctx->obj_state++) {
+                                               if (get_check_status_result(ctx->obj_state) < CHK_RES_FAILED)
+                                                               continue;
+                                               val = mkf_u32(FO_STATUS, srv_check_count[ctx->obj_state]);
+                                               check_state = get_check_status_info(ctx->obj_state);
+                                               labels[1].name = ist("state");
+                                               labels[1].value = ist(check_state);
+                                               if (!promex_dump_metric(appctx, htx, prefix, &promex_st_metrics[ctx->field_num],
+                                                                       &val, labels, &out, max))
+                                                       goto full;
+                                       }
+                                       ctx->obj_state = 0;
+                                       goto next_px;
                                case ST_F_STATUS:
                                        bkd_state = ((px->lbprm.tot_weight > 0 || !px->srv) ? 1 : 0);
                                        for (; ctx->obj_state < PROMEX_BACK_STATE_COUNT; ctx->obj_state++) {

diff --git a/include/haproxy/stats-t.h b/include/haproxy/stats-t.h
index a50676ae05153bc81050ab1c6cf5cd729006ef78..4dd65f4d74b8a2eb981201117aac3216c25ea045 100644 (file)
--- a/include/haproxy/stats-t.h
+++ b/include/haproxy/stats-t.h
@@ -457,6 +457,7 @@ enum stat_field {
        ST_F_UWEIGHT,
        ST_F_AGG_SRV_STATUS,
        ST_F_AGG_SRV_CHECK_STATUS,
+       ST_F_AGG_CHECK_STATUS,
        ST_F_SRID,
 
        /* must always be the last one */

diff --git a/src/stats.c b/src/stats.c
index 7d34e54c4699714b606b65dd4e5378cbb1e6ed9a..cdf6a1807d1cebd28571caffbfc525a49a121469 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -261,6 +261,7 @@ const struct name_desc stat_fields[ST_F_TOTAL_FIELDS] = {
        [ST_F_UWEIGHT]                       = { .name = "uweight",                     .desc = "Server's user weight, or sum of active servers' user weights for a backend" },
        [ST_F_AGG_SRV_CHECK_STATUS]          = { .name = "agg_server_check_status",     .desc = "[DEPRECATED] Backend's aggregated gauge of servers' status" },
        [ST_F_AGG_SRV_STATUS ]               = { .name = "agg_server_status",           .desc = "Backend's aggregated gauge of servers' status" },
+       [ST_F_AGG_CHECK_STATUS]              = { .name = "agg_check_status",            .desc = "Backend's aggregated gauge of servers' state check status" },
        [ST_F_SRID]                          = { .name = "srid",                        .desc = "Server id revision, to prevent server id reuse mixups" },
 };
 
@@ -2682,6 +2683,9 @@ int stats_fill_be_stats(struct proxy *px, int flags, struct field *stats, int le
                        case ST_F_AGG_SRV_STATUS:
                                metric = mkf_u32(FN_GAUGE, 0);
                                break;
+                       case ST_F_AGG_CHECK_STATUS:
+                               metric = mkf_u32(FN_GAUGE, 0);
+                               break;
                        case ST_F_WEIGHT:
                                metric = mkf_u32(FN_AVG, (px->lbprm.tot_weight * px->lbprm.wmult + px->lbprm.wdiv - 1) / px->lbprm.wdiv);
                                break;