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

Merge pull request #16044 from barbudor/prometheus_negative_values 

fix removal of negative values
This commit is contained in:
Theo Arends 2022-07-22 09:09:22 +02:00 committed by GitHub
parent 40a5d661fe 1d3bf157bf
commit 229691bb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/tasmota_xsns_sensor/xsns_75_prometheus.ino
View File

@ -298,7 +298,7 @@ void HandleMetrics(void) {
JsonParserObject Object3 = value2.getObject();
for (auto key3 : Object3) {
const char *value = key3.getValue().getStr(nullptr);
if (value != nullptr && isdigit(value[0])) {
if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.'))) {
String sensor = FormatMetricName(key2.getStr());
String type = FormatMetricName(key3.getStr());
@ -311,7 +311,7 @@ void HandleMetrics(void) {
}
} else {
const char *value = value2.getStr(nullptr);
if (value != nullptr && isdigit(value[0])) {
if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.'))) {
String sensor = FormatMetricName(key1.getStr());
String type = FormatMetricName(key2.getStr());
if (strcmp(type.c_str(), "totalstarttime") != 0) { // this metric causes Prometheus of fail
@ -336,7 +336,7 @@ void HandleMetrics(void) {
const char *value = value1.getStr(nullptr);
String sensor = FormatMetricName(key1.getStr());
if (value != nullptr && isdigit(value[0] && strcmp(sensor.c_str(), "time") != 0)) { //remove false 'time' metric
if (value != nullptr && (isdigit(value[0]) || (value[0] == '-') || (value[0] == '.')) && strcmp(sensor.c_str(), "time") != 0) { //remove false 'time' metric
WritePromMetricStr(PSTR("sensors"), kPromMetricGauge, value,
PSTR("sensor"), sensor.c_str(),
nullptr);