MINOR: stats: duplicate 3 fields in bytes in info
in order to prepare a possible merge of fields between haproxy stats and
prometheus, duplicate 3 fields:
INF_MEMMAX
INF_POOL_ALLOC
INF_POOL_USED
Those were specifically named in MB unit which is not what prometheus
recommends. We therefore used them but changed the unit while doing the
calculation. It created a specific case for that, up to the description.
This patch:
- removes some possible confusion, i.e. using MB field for bytes
- will permit an easier merge of fields such as description
First consequence for now, is that we can remove the calculation on
prometheus side and move it on `fill_info`.
Signed-off-by: William Dauchy <wdauchy@gmail.com>
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 790b2f8..f636777 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -99,10 +99,10 @@
[INF_PROCESS_NUM] = INF_UPTIME_SEC,
[INF_PID] = 0,
[INF_UPTIME] = 0,
- [INF_UPTIME_SEC] = INF_MEMMAX_MB,
- [INF_MEMMAX_MB] = INF_POOL_ALLOC_MB,
- [INF_POOL_ALLOC_MB] = INF_POOL_USED_MB,
- [INF_POOL_USED_MB] = INF_POOL_FAILED,
+ [INF_UPTIME_SEC] = INF_MEMMAX_BYTES,
+ [INF_MEMMAX_BYTES] = INF_POOL_ALLOC_BYTES,
+ [INF_POOL_ALLOC_BYTES] = INF_POOL_USED_BYTES,
+ [INF_POOL_USED_BYTES] = INF_POOL_FAILED,
[INF_POOL_FAILED] = INF_ULIMIT_N,
[INF_ULIMIT_N] = INF_MAXSOCK,
[INF_MAXSOCK] = INF_MAXCONN,
@@ -482,9 +482,9 @@
[INF_PID] = IST("pid"),
[INF_UPTIME] = IST("uptime"),
[INF_UPTIME_SEC] = IST("start_time_seconds"),
- [INF_MEMMAX_MB] = IST("max_memory_bytes"),
- [INF_POOL_ALLOC_MB] = IST("pool_allocated_bytes"),
- [INF_POOL_USED_MB] = IST("pool_used_bytes"),
+ [INF_MEMMAX_BYTES] = IST("max_memory_bytes"),
+ [INF_POOL_ALLOC_BYTES] = IST("pool_allocated_bytes"),
+ [INF_POOL_USED_BYTES] = IST("pool_used_bytes"),
[INF_POOL_FAILED] = IST("pool_failures_total"),
[INF_ULIMIT_N] = IST("max_fds"),
[INF_MAXSOCK] = IST("max_sockets"),
@@ -655,9 +655,9 @@
[INF_PID] = IST("HAProxy PID."),
[INF_UPTIME] = IST("Uptime in a human readable format."),
[INF_UPTIME_SEC] = IST("Start time in seconds."),
- [INF_MEMMAX_MB] = IST("Per-process memory limit (in bytes); 0=unset."),
- [INF_POOL_ALLOC_MB] = IST("Total amount of memory allocated in pools (in bytes)."),
- [INF_POOL_USED_MB] = IST("Total amount of memory used in pools (in bytes)."),
+ [INF_MEMMAX_BYTES] = IST("Per-process memory limit (in bytes); 0=unset."),
+ [INF_POOL_ALLOC_BYTES] = IST("Total amount of memory allocated in pools (in bytes)."),
+ [INF_POOL_USED_BYTES] = IST("Total amount of memory used in pools (in bytes)."),
[INF_POOL_FAILED] = IST("Total number of failed pool allocations."),
[INF_ULIMIT_N] = IST("Maximum number of open file descriptors; 0=unset."),
[INF_MAXSOCK] = IST("Maximum number of open sockets."),
@@ -828,9 +828,9 @@
[INF_PID] = IST(""),
[INF_UPTIME] = IST(""),
[INF_UPTIME_SEC] = IST(""),
- [INF_MEMMAX_MB] = IST(""),
- [INF_POOL_ALLOC_MB] = IST(""),
- [INF_POOL_USED_MB] = IST(""),
+ [INF_MEMMAX_BYTES] = IST(""),
+ [INF_POOL_ALLOC_BYTES] = IST(""),
+ [INF_POOL_USED_BYTES] = IST(""),
[INF_POOL_FAILED] = IST(""),
[INF_ULIMIT_N] = IST(""),
[INF_MAXSOCK] = IST(""),
@@ -994,9 +994,9 @@
[INF_PID] = IST("untyped"),
[INF_UPTIME] = IST("untyped"),
[INF_UPTIME_SEC] = IST("gauge"),
- [INF_MEMMAX_MB] = IST("gauge"),
- [INF_POOL_ALLOC_MB] = IST("gauge"),
- [INF_POOL_USED_MB] = IST("gauge"),
+ [INF_MEMMAX_BYTES] = IST("gauge"),
+ [INF_POOL_ALLOC_BYTES] = IST("gauge"),
+ [INF_POOL_USED_BYTES] = IST("gauge"),
[INF_POOL_FAILED] = IST("counter"),
[INF_ULIMIT_N] = IST("gauge"),
[INF_MAXSOCK] = IST("gauge"),
@@ -1336,15 +1336,6 @@
case INF_UPTIME_SEC:
metric = mkf_u32(FN_DURATION, start_date.tv_sec);
break;
- case INF_MEMMAX_MB:
- metric = mkf_u64(FO_CONFIG|FN_LIMIT, global.rlimit_memmax * 1048576L);
- break;
- case INF_POOL_ALLOC_MB:
- metric = mkf_u64(0, pool_total_allocated());
- break;
- case INF_POOL_USED_MB:
- metric = mkf_u64(0, pool_total_used());
- break;
default:
metric = info[appctx->st2];