commit b713c4f2951b52681e89208884b723d0434cd81d
author Christopher Faulet <cfaulet@haproxy.com> Wed Jan 20 15:02:50 2021 +0100
committer Christopher Faulet <cfaulet@haproxy.com> Thu Jan 21 18:59:30 2021 +0100
tree e7f772c2d599f5b1d5a543458a5751e59f709b8c
parent 0175b1f0b7bd01ee62e56e825028935d062e49d6

MINOR: contrib/prometheus-exporter: Split the PROMEX_FL_STATS_METRIC flag

PROMEX_FL_STATS_METRIC flag is splitted in 3 flags to easily identify the
processed entity type (frontend, backend or server). Thus, now we are using
PROMEX_FL_FRONT_METRIC, PROMEX_FL_BACK_METRIC or PROMEX_FL_SRV_METRIC. These
flags will be used to know if a metric is defined and must be exported for a
given entity type.

contrib/prometheus-exporter/service-prometheus.c

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 81f5ba0..bad4be8 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -63,12 +63,14 @@
 /* Prometheus exporter flags (appctx->ctx.stats.flags) */
 #define PROMEX_FL_METRIC_HDR    0x00000001
 #define PROMEX_FL_INFO_METRIC   0x00000002
-#define PROMEX_FL_STATS_METRIC  0x00000004
-#define PROMEX_FL_SCOPE_GLOBAL  0x00000008
-#define PROMEX_FL_SCOPE_FRONT   0x00000010
-#define PROMEX_FL_SCOPE_BACK    0x00000020
-#define PROMEX_FL_SCOPE_SERVER  0x00000040
-#define PROMEX_FL_NO_MAINT_SRV  0x00000080
+#define PROMEX_FL_FRONT_METRIC  0x00000004
+#define PROMEX_FL_BACK_METRIC   0x00000008
+#define PROMEX_FL_SRV_METRIC    0x00000010
+#define PROMEX_FL_SCOPE_GLOBAL  0x00000020
+#define PROMEX_FL_SCOPE_FRONT   0x00000040
+#define PROMEX_FL_SCOPE_BACK    0x00000080
+#define PROMEX_FL_SCOPE_SERVER  0x00000100
+#define PROMEX_FL_NO_MAINT_SRV  0x00000200
 
 #define PROMEX_FL_SCOPE_ALL (PROMEX_FL_SCOPE_GLOBAL|PROMEX_FL_SCOPE_FRONT|PROMEX_FL_SCOPE_BACK|PROMEX_FL_SCOPE_SERVER)
 
@@ -1762,7 +1764,7 @@
 			appctx->ctx.stats.obj1 = proxies_list;
 			appctx->ctx.stats.obj2 = NULL;
 			appctx->ctx.stats.flags &= ~PROMEX_FL_INFO_METRIC;
-			appctx->ctx.stats.flags |= (PROMEX_FL_METRIC_HDR|PROMEX_FL_STATS_METRIC);
+			appctx->ctx.stats.flags |= (PROMEX_FL_METRIC_HDR|PROMEX_FL_FRONT_METRIC);
 			appctx->st2 = promex_front_metrics[ST_F_PXNAME];
 			appctx->st1 = PROMEX_DUMPER_FRONT;
 			/* fall through */
@@ -1779,7 +1781,8 @@
 
 			appctx->ctx.stats.obj1 = proxies_list;
 			appctx->ctx.stats.obj2 = NULL;
-			appctx->ctx.stats.flags |= PROMEX_FL_METRIC_HDR;
+			appctx->ctx.stats.flags &= ~PROMEX_FL_FRONT_METRIC;
+			appctx->ctx.stats.flags |= (PROMEX_FL_METRIC_HDR|PROMEX_FL_BACK_METRIC);
 			appctx->st2 = promex_back_metrics[ST_F_PXNAME];
 			appctx->st1 = PROMEX_DUMPER_BACK;
 			/* fall through */
@@ -1796,7 +1799,8 @@
 
 			appctx->ctx.stats.obj1 = proxies_list;
 			appctx->ctx.stats.obj2 = (appctx->ctx.stats.obj1 ? ((struct proxy *)appctx->ctx.stats.obj1)->srv : NULL);
-			appctx->ctx.stats.flags |= PROMEX_FL_METRIC_HDR;
+			appctx->ctx.stats.flags &= ~PROMEX_FL_BACK_METRIC;
+			appctx->ctx.stats.flags |= (PROMEX_FL_METRIC_HDR|PROMEX_FL_SRV_METRIC);
 			appctx->st2 = promex_srv_metrics[ST_F_PXNAME];
 			appctx->st1 = PROMEX_DUMPER_SRV;
 			/* fall through */
@@ -1813,7 +1817,7 @@
 
 			appctx->ctx.stats.obj1 = NULL;
 			appctx->ctx.stats.obj2 = NULL;
-			appctx->ctx.stats.flags &= ~(PROMEX_FL_METRIC_HDR|PROMEX_FL_INFO_METRIC|PROMEX_FL_STATS_METRIC);
+			appctx->ctx.stats.flags &= ~(PROMEX_FL_METRIC_HDR|PROMEX_FL_SRV_METRIC);
 			appctx->st2 = 0;
 			appctx->st1 = PROMEX_DUMPER_DONE;
 			/* fall through */