mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for issue #11930

This commit is contained in:
twollweber 2021-04-28 18:58:19 +02:00 committed by GitHub
parent 6c87d4c553
commit 072302d821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/xsns_75_prometheus.ino
View File

@ -50,6 +50,9 @@ const char *UnitfromType(const char *type) // find unit for measurment type
if (strcmp(type, "humidity") == 0) { if (strcmp(type, "humidity") == 0) {
return "percentage"; return "percentage";
} }
if (strcmp(type, "id") == 0) {
return "untyped";
}
return ""; return "";
} }
@ -148,8 +151,13 @@ void HandleMetrics(void) {
String type = FormatMetricName(key2.getStr()); String type = FormatMetricName(key2.getStr());
const char *unit = UnitfromType(type.c_str()); const char *unit = UnitfromType(type.c_str());
if (strcmp(type.c_str(), "totalstarttime") != 0) { // this metric causes prometheus of fail if (strcmp(type.c_str(), "totalstarttime") != 0) { // this metric causes prometheus of fail
WSContentSend_P(PSTR("# TYPE tasmota_sensors_%s_%s gauge\ntasmota_sensors_%s_%s{sensor=\"%s\"} %s\n"), if (strcmp(type.c_str(), "id") == 0) { // this metric is NaN, so convert it to a label, see Wi-Fi metrics above
type.c_str(), unit, type.c_str(), unit, sensor.c_str(), value); WSContentSend_P(PSTR("# TYPE tasmota_sensors_%s_%s gauge\ntasmota_sensors_%s_%s{sensor=\"%s\",id=\"%s\"} 1\n"),
type.c_str(), unit, type.c_str(), unit, sensor.c_str(), value);
} else {
WSContentSend_P(PSTR("# TYPE tasmota_sensors_%s_%s gauge\ntasmota_sensors_%s_%s{sensor=\"%s\"} %s\n"),
type.c_str(), unit, type.c_str(), unit, sensor.c_str(), value);
}
} }
} }
} }