Re: [PATCH 1/2] MINOR: contrib/prometheus-exporter: use stats desc when possible followup
Le 07/02/2021 à 20:42, William Dauchy a écrit :
Remove remaining descrition which are common to stats.c.
This patch is a followup of commit
82b2ce2f967d967139adb7afab064416fadad615 ("MINOR:
contrib/prometheus-exporter: use stats desc when possible"). I probably
messed up with one of my rebase because I'm pretty sure I removed them
at some point, but who knows what happened.
Signed-off-by: William Dauchy
---
.../prometheus-exporter/service-prometheus.c | 35 ---
1 file changed, 35 deletions(-)
diff --git a/contrib/prometheus-exporter/service-prometheus.c
b/contrib/prometheus-exporter/service-prometheus.c
index 126962f5e..769389735 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -284,42 +284,7 @@ const struct promex_metric
promex_st_metrics[ST_F_TOTAL_FIELDS] = {
/* Description of overriden stats fields */
const struct ist promex_st_metric_desc[ST_F_TOTAL_FIELDS] = {
- [ST_F_PXNAME] = IST("The proxy name."),
- [ST_F_SVNAME] = IST("The service name (FRONTEND for frontend,
BACKEND for backend, any name for server/listener)."),
- [ST_F_QCUR] = IST("Current number of queued requests."),
- [ST_F_QMAX] = IST("Maximum observed number of queued
requests."),
- [ST_F_SCUR] = IST("Current number of active sessions."),
- [ST_F_SMAX] = IST("Maximum observed number of active
sessions."),
- [ST_F_SLIM] = IST("Configured session limit."),
- [ST_F_STOT] = IST("Total number of sessions."),
- [ST_F_BIN]= IST("Current total of incoming bytes."),
- [ST_F_BOUT] = IST("Current total of outgoing bytes."),
- [ST_F_DREQ] = IST("Total number of denied requests."),
- [ST_F_DRESP] = IST("Total number of denied responses."),
- [ST_F_EREQ] = IST("Total number of request errors."),
- [ST_F_ECON] = IST("Total number of connection errors."),
- [ST_F_ERESP] = IST("Total number of response errors."),
- [ST_F_WRETR] = IST("Total number of retry warnings."),
- [ST_F_WREDIS] = IST("Total number of redispatch warnings."),
[ST_F_STATUS] = IST("Current status of the service, per state label
value."),
- [ST_F_WEIGHT] = IST("Service weight."),
- [ST_F_ACT]= IST("Current number of active servers."),
- [ST_F_BCK]= IST("Current number of backup servers."),
- [ST_F_CHKFAIL]= IST("Total number of failed check (Only counts
checks failed when the server is up)."),
- [ST_F_CHKDOWN]= IST("Total number of UP->DOWN transitions."),
- [ST_F_LASTCHG]= IST("Number of seconds since the last UP<->DOWN
transition."),
- [ST_F_DOWNTIME] = IST("Total downtime (in seconds) for the
service."),
- [ST_F_QLIMIT] = IST("Configured maxqueue for the server (0 meaning
no limit)."),
- [ST_F_PID]= IST("Process id (0 for first instance, 1 for second,
...)"),
- [ST_F_IID]= IST("Unique proxy id."),
- [ST_F_SID]= IST("Server id (unique inside a proxy)."),
- [ST_F_THROTTLE] = IST("Current throttle percentage for the server,
when slowstart is active, or no value if not in slowstart."),
- [ST_F_LBTOT] = IST("Total number of times a service was selected,
either for new sessions, or when redispatching."),
- [ST_F_TRACKED]= IST("Id of proxy/server if tracking is
enabled."),
- [ST_F_TYPE] = IST("Service type (0=frontend, 1=backend, 2=server,
3=socket/listener)."),
- [ST_F_RATE] = IST("Current number of sessions per second over last
elapsed second."),
- [ST_F_RATE_LIM] = IST("Configured limit on new sessions per
second."),
- [ST_F_RATE_MAX] = IST("Maximum observed number of sessions per
second."),
[ST_F_CHECK_STATUS] = IST("Status of last health check, per state label
value."),
[ST_F_CHECK_CODE] = IST("layer5-7 code, if available of the last health
check."),
[ST_F_CHECK_DURATION] = IST("Total duration of the latest server health
check, in seconds."),
Both merged, thanks William !
--
Christopher Faulet
[PATCH 1/2] MINOR: contrib/prometheus-exporter: use stats desc when possible followup
Remove remaining descrition which are common to stats.c.
This patch is a followup of commit
82b2ce2f967d967139adb7afab064416fadad615 ("MINOR:
contrib/prometheus-exporter: use stats desc when possible"). I probably
messed up with one of my rebase because I'm pretty sure I removed them
at some point, but who knows what happened.
Signed-off-by: William Dauchy
---
.../prometheus-exporter/service-prometheus.c | 35 ---
1 file changed, 35 deletions(-)
diff --git a/contrib/prometheus-exporter/service-prometheus.c
b/contrib/prometheus-exporter/service-prometheus.c
index 126962f5e..769389735 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -284,42 +284,7 @@ const struct promex_metric
promex_st_metrics[ST_F_TOTAL_FIELDS] = {
/* Description of overriden stats fields */
const struct ist promex_st_metric_desc[ST_F_TOTAL_FIELDS] = {
- [ST_F_PXNAME] = IST("The proxy name."),
- [ST_F_SVNAME] = IST("The service name (FRONTEND for frontend,
BACKEND for backend, any name for server/listener)."),
- [ST_F_QCUR] = IST("Current number of queued requests."),
- [ST_F_QMAX] = IST("Maximum observed number of queued
requests."),
- [ST_F_SCUR] = IST("Current number of active sessions."),
- [ST_F_SMAX] = IST("Maximum observed number of active
sessions."),
- [ST_F_SLIM] = IST("Configured session limit."),
- [ST_F_STOT] = IST("Total number of sessions."),
- [ST_F_BIN]= IST("Current total of incoming bytes."),
- [ST_F_BOUT] = IST("Current total of outgoing bytes."),
- [ST_F_DREQ] = IST("Total number of denied requests."),
- [ST_F_DRESP] = IST("Total number of denied responses."),
- [ST_F_EREQ] = IST("Total number of request errors."),
- [ST_F_ECON] = IST("Total number of connection errors."),
- [ST_F_ERESP] = IST("Total number of response errors."),
- [ST_F_WRETR] = IST("Total number of retry warnings."),
- [ST_F_WREDIS] = IST("Total number of redispatch warnings."),
[ST_F_STATUS] = IST("Current status of the service, per state
label value."),
- [ST_F_WEIGHT] = IST("Service weight."),
- [ST_F_ACT]= IST("Current number of active servers."),
- [ST_F_BCK]= IST("Current number of backup servers."),
- [ST_F_CHKFAIL]= IST("Total number of failed check (Only counts
checks failed when the server is up)."),
- [ST_F_CHKDOWN]= IST("Total number of UP->DOWN transitions."),
- [ST_F_LASTCHG]= IST("Number of seconds since the last UP<->DOWN
transition."),
- [ST_F_DOWNTIME] = IST("Total downtime (in seconds) for the
service."),
- [ST_F_QLIMIT] = IST("Configured maxqueue for the server (0
meaning no limit)."),
- [ST_F_PID]= IST("Process id (0 for first instance, 1 for
second, ...)"),
- [ST_F_IID]= IST("Unique proxy id."),
- [ST_F_SID]= IST("Server id (unique inside a proxy)."),
- [ST_F_THROTTLE] = IST("Current throttle percentage for the
server, when slowstart is active, or no value if not in slowstart."),
- [ST_F_LBTOT] = IST("Total number of times a service was
selected, either for new sessions, or when redispatching."),
- [ST_F_TRACKED]= IST("Id of proxy/server if tracking is
enabled."),
- [ST_F_TYPE] = IST("Service type (0=frontend, 1=backend,
2=server, 3=socket/listener)."),
- [ST_F_RATE] = IST("Current number of sessions per second over
last elapsed second."),
- [ST_F_RATE_LIM] = IST("Configured limit on new sessions per
second."),
- [ST_F_RATE_MAX] = IST("Maximum observed number of sessions per
second."),
[ST_F_CHECK_STATUS] = IST("Status of last health check, per state
label value."),
[ST_F_CHECK_CODE] = IST("layer5-7 code, if available of the last
health check."),
[ST_F_CHECK_DURATION] = IST("Total duration of the latest server health
check, in seconds."),
--
2.30.0
