use `stats_fill_fe_stats` when possible to avoid duplicating code. this should not introduce any difference of output.
Signed-off-by: William Dauchy <[email protected]> --- .../prometheus-exporter/service-prometheus.c | 133 ++---------------- include/haproxy/stats.h | 2 + src/stats.c | 4 +- 3 files changed, 19 insertions(+), 120 deletions(-) diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c index b97bb22f7..6825c4d69 100644 --- a/contrib/prometheus-exporter/service-prometheus.c +++ b/contrib/prometheus-exporter/service-prometheus.c @@ -1379,6 +1379,7 @@ static int promex_dump_front_metrics(struct appctx *appctx, struct htx *htx) struct channel *chn = si_ic(appctx->owner); struct ist out = ist2(trash.area, 0); size_t max = htx_get_max_blksz(htx, channel_htx_recv_max(chn, htx)); + struct field *stats = stat_l[STATS_DOMAIN_PROXY]; int ret = 1; while (appctx->st2 && appctx->st2 < ST_F_TOTAL_FIELDS) { @@ -1389,144 +1390,41 @@ static int promex_dump_front_metrics(struct appctx *appctx, struct htx *htx) if (px->disabled || px->uuid <= 0 || !(px->cap & PR_CAP_FE)) goto next_px; + memset(stats, 0, sizeof(struct field) * stat_count[STATS_DOMAIN_PROXY]); + if (!stats_fill_fe_stats(px, stats, ST_F_TOTAL_FIELDS)) + return 0; + switch (appctx->st2) { case ST_F_STATUS: metric = mkf_u32(FO_STATUS, !px->disabled); break; - case ST_F_SCUR: - metric = mkf_u32(0, px->feconn); - break; - case ST_F_SMAX: - metric = mkf_u32(FN_MAX, px->fe_counters.conn_max); - break; - case ST_F_SLIM: - metric = mkf_u32(FO_CONFIG|FN_LIMIT, px->maxconn); - break; - case ST_F_STOT: - metric = mkf_u64(FN_COUNTER, px->fe_counters.cum_sess); - break; - case ST_F_RATE_LIM: - metric = mkf_u32(FO_CONFIG|FN_LIMIT, px->fe_sps_lim); - break; - case ST_F_RATE_MAX: - metric = mkf_u32(FN_MAX, px->fe_counters.sps_max); - break; - case ST_F_CONN_RATE_MAX: - metric = mkf_u32(FN_MAX, px->fe_counters.cps_max); - break; - case ST_F_CONN_TOT: - metric = mkf_u64(FN_COUNTER, px->fe_counters.cum_conn); - break; - case ST_F_BIN: - metric = mkf_u64(FN_COUNTER, px->fe_counters.bytes_in); - break; - case ST_F_BOUT: - metric = mkf_u64(FN_COUNTER, px->fe_counters.bytes_out); - break; - case ST_F_DREQ: - metric = mkf_u64(FN_COUNTER, px->fe_counters.denied_req); - break; - case ST_F_DRESP: - metric = mkf_u64(FN_COUNTER, px->fe_counters.denied_resp); - break; - case ST_F_EREQ: - metric = mkf_u64(FN_COUNTER, px->fe_counters.failed_req); - break; - case ST_F_DCON: - metric = mkf_u64(FN_COUNTER, px->fe_counters.denied_conn); - break; - case ST_F_DSES: - metric = mkf_u64(FN_COUNTER, px->fe_counters.denied_sess); - break; - case ST_F_WREW: - metric = mkf_u64(FN_COUNTER, px->fe_counters.failed_rewrites); - break; - case ST_F_EINT: - metric = mkf_u64(FN_COUNTER, px->fe_counters.internal_errors); - break; case ST_F_REQ_RATE_MAX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u32(FN_MAX, px->fe_counters.p.http.rps_max); - break; case ST_F_REQ_TOT: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.cum_req); - break; case ST_F_HRSP_1XX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[1]); - break; - case ST_F_HRSP_2XX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[2]); - break; - case ST_F_HRSP_3XX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[3]); - break; - case ST_F_HRSP_4XX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[4]); - break; - case ST_F_HRSP_5XX: - if (px->mode != PR_MODE_HTTP) - goto next_px; - appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[5]); - break; - case ST_F_HRSP_OTHER: - if (px->mode != PR_MODE_HTTP) - goto next_px; - appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.rsp[0]); - break; case ST_F_INTERCEPTED: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.intercepted_req); - break; case ST_F_CACHE_LOOKUPS: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.cache_lookups); - break; case ST_F_CACHE_HITS: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.cache_hits); - break; case ST_F_COMP_IN: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.comp_in); - break; case ST_F_COMP_OUT: - if (px->mode != PR_MODE_HTTP) - goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.comp_out); - break; case ST_F_COMP_BYP: + case ST_F_COMP_RSP: if (px->mode != PR_MODE_HTTP) goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.comp_byp); + metric = stats[appctx->st2]; break; - case ST_F_COMP_RSP: + case ST_F_HRSP_2XX: + case ST_F_HRSP_3XX: + case ST_F_HRSP_4XX: + case ST_F_HRSP_5XX: + case ST_F_HRSP_OTHER: if (px->mode != PR_MODE_HTTP) goto next_px; - metric = mkf_u64(FN_COUNTER, px->fe_counters.p.http.comp_rsp); + appctx->ctx.stats.flags &= ~PROMEX_FL_METRIC_HDR; + metric = stats[appctx->st2]; break; default: - goto next_metric; + metric = stats[appctx->st2]; } if (!promex_dump_metric(appctx, htx, prefix, &metric, &out, max)) @@ -1534,7 +1432,6 @@ static int promex_dump_front_metrics(struct appctx *appctx, struct htx *htx) next_px: appctx->ctx.stats.obj1 = px->next; } - next_metric: appctx->ctx.stats.flags |= PROMEX_FL_METRIC_HDR; appctx->ctx.stats.obj1 = proxies_list; appctx->st2 = promex_front_metrics[appctx->st2]; diff --git a/include/haproxy/stats.h b/include/haproxy/stats.h index 136e7a416..832df1cb7 100644 --- a/include/haproxy/stats.h +++ b/include/haproxy/stats.h @@ -38,6 +38,8 @@ extern const struct name_desc info_fields[]; extern const char *stat_status_codes[]; extern struct applet http_stats_applet; extern THREAD_LOCAL struct field info[]; +extern THREAD_LOCAL struct field *stat_l[]; +extern size_t stat_count[]; struct htx; int stats_putchk(struct channel *chn, struct htx *htx, struct buffer *chk); diff --git a/src/stats.c b/src/stats.c index 4ddcd7e41..edf791819 100644 --- a/src/stats.c +++ b/src/stats.c @@ -258,10 +258,10 @@ THREAD_LOCAL struct field info[INF_TOTAL_FIELDS]; /* description of statistics (static and dynamic) */ static struct name_desc *stat_f[STATS_DOMAIN_COUNT]; -static size_t stat_count[STATS_DOMAIN_COUNT]; +size_t stat_count[STATS_DOMAIN_COUNT]; /* one line for stats */ -static THREAD_LOCAL struct field *stat_l[STATS_DOMAIN_COUNT]; +THREAD_LOCAL struct field *stat_l[STATS_DOMAIN_COUNT]; /* list of all registered stats module */ static struct list stats_module_list[STATS_DOMAIN_COUNT] = { -- 2.29.2
