jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 23:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

prometheus: Add prefix on all metrics

Browse Source 
All Prometheus metrics should have an application prefix
(https://prometheus.io/docs/practices/naming/#metric-names).
Historically a few produced by Tasmota didn't. With this change the
function writing metrics always outputs the prefix.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
This commit is contained in:
Michael Hanselmann 2021-08-08 16:57:54 +02:00
parent 4f3af0de55
commit 990ae38666
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/xsns_75_prometheus.ino
View File

@ -78,16 +78,15 @@ String FormatMetricName(const char *metric) {
} }
const uint8_t const uint8_t
kPromMetricNoPrefix = _BV(1), kPromMetricGauge = _BV(0),
kPromMetricGauge = _BV(2), kPromMetricCounter = _BV(1),
kPromMetricCounter = _BV(3),
kPromMetricTypeMask = kPromMetricGauge | kPromMetricCounter; kPromMetricTypeMask = kPromMetricGauge | kPromMetricCounter;
// Format and send a Prometheus metric to the client. Use flags to configure // Format and send a Prometheus metric to the client. Use flags to configure
// the type. Labels must be supplied in tuples of two character array pointers // the type. Labels must be supplied in tuples of two character array pointers
// and terminated by nullptr. // and terminated by nullptr.
void WritePromMetric(const char *name, uint8_t flags, const char *value, va_list labels) { void WritePromMetric(const char *name, uint8_t flags, const char *value, va_list labels) {
PGM_P const prefix = (flags & kPromMetricNoPrefix) ? PSTR("") : PSTR("tasmota_"); PGM_P const prefix = PSTR("tasmota_");
PGM_P tmp; PGM_P tmp;
String lval; String lval;
@ -258,29 +257,27 @@ void HandleMetrics(void) {
#endif #endif
#ifdef USE_ENERGY_SENSOR #ifdef USE_ENERGY_SENSOR
// TODO: Don't disable prefix on energy metrics
WritePromMetricDec(PSTR("energy_voltage_volts"), WritePromMetricDec(PSTR("energy_voltage_volts"),
kPromMetricGauge | kPromMetricNoPrefix, kPromMetricGauge,
Energy.voltage[0], Settings->flag2.voltage_resolution, nullptr); Energy.voltage[0], Settings->flag2.voltage_resolution, nullptr);
WritePromMetricDec(PSTR("energy_current_amperes"), WritePromMetricDec(PSTR("energy_current_amperes"),
kPromMetricGauge | kPromMetricNoPrefix, kPromMetricGauge,
Energy.current[0], Settings->flag2.current_resolution, nullptr); Energy.current[0], Settings->flag2.current_resolution, nullptr);
WritePromMetricDec(PSTR("energy_power_active_watts"), WritePromMetricDec(PSTR("energy_power_active_watts"),
kPromMetricGauge | kPromMetricNoPrefix, kPromMetricGauge,
Energy.active_power[0], Settings->flag2.wattage_resolution, nullptr); Energy.active_power[0], Settings->flag2.wattage_resolution, nullptr);
WritePromMetricDec(PSTR("energy_power_kilowatts_daily"), WritePromMetricDec(PSTR("energy_power_kilowatts_daily"),
kPromMetricCounter | kPromMetricNoPrefix, kPromMetricCounter,
Energy.daily, Settings->flag2.energy_resolution, nullptr); Energy.daily, Settings->flag2.energy_resolution, nullptr);
WritePromMetricDec(PSTR("energy_power_kilowatts_total"), WritePromMetricDec(PSTR("energy_power_kilowatts_total"),
kPromMetricCounter | kPromMetricNoPrefix, kPromMetricCounter,
Energy.total, Settings->flag2.energy_resolution, nullptr); Energy.total, Settings->flag2.energy_resolution, nullptr);
#endif #endif
for (uint32_t device = 0; device < TasmotaGlobal.devices_present; device++) { for (uint32_t device = 0; device < TasmotaGlobal.devices_present; device++) {
power_t mask = 1 << device; power_t mask = 1 << device;
// TODO: Don't disable prefix
snprintf_P(namebuf, sizeof(namebuf), PSTR("relay%d_state"), device + 1); snprintf_P(namebuf, sizeof(namebuf), PSTR("relay%d_state"), device + 1);
WritePromMetricInt32(namebuf, kPromMetricGauge | kPromMetricNoPrefix, WritePromMetricInt32(namebuf, kPromMetricGauge,
(TasmotaGlobal.power & mask), nullptr); (TasmotaGlobal.power & mask), nullptr);
} }