fix apcupsd status (#17960)
Ilya Mashchenko committed
Jun 19, 2024 at 16:18 UTC
7fc605b7f1066179bc42634d36bf7b68dc0d006d
1 file changed
+15
-14
src/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh
+15
-14
@@ -163,6 +163,7 @@ BEGIN {
163
load = 0;
164
temp = 0;
165
time = 0;
166
+ online = 0;
167
nompower = 0;
168
load_usage = 0;
169
selftest_OK = 0;
@@ -197,25 +198,25 @@ BEGIN {
198
/^ITEMP.*/ { temp = \$3 * 100 };
199
/^NOMPOWER.*/ { nompower = \$3 };
200
/^TIMELEFT.*/ { time = \$3 * 100 };
200
-/^STATUS.*/ { online=(\$3 != \"COMMLOST\" && !(\$3 == \"SHUTTING\" && \$4 == \"DOWN\"))?1:0; };
201
+/^STATUS.*/ { online=(\$0 !~ \"COMMLOST\" && \$0 !~ \"SHUTTING\") ? 1 : 0; };
202
/^SELFTEST.*/ { selftest_OK = (\$3 == \"OK\") ? 1 : 0;
203
selftest_NO = (\$3 == \"NO\") ? 1 : 0;
204
selftest_BT = (\$3 == \"BT\") ? 1 : 0;
205
selftest_NG = (\$3 == \"NG\") ? 1 : 0;
206
};
206
-/^STATUS.*/ { status_ONLINE = (\$3 == \"ONLINE\") ? 1 : 0;
207
- status_CAL = (\$3 == \"CAL\") ? 1 : 0;
208
- status_TRIM = (\$3 == \"TRIM\") ? 1 : 0;
209
- status_BOOST = (\$3 == \"BOOST\") ? 1 : 0;
210
- status_ONBATT = (\$3 == \"ONBATT\") ? 1 : 0;
211
- status_OVERLOAD = (\$3 == \"OVERLOAD\") ? 1 : 0;
212
- status_LOWBATT = (\$3 == \"LOWBATT\") ? 1 : 0;
213
- status_REPLACEBATT = (\$3 == \"REPLACEBATT\") ? 1 : 0;
214
- status_NOBATT = (\$3 == \"NOBATT\") ? 1 : 0;
215
- status_SLAVE = (\$3 == \"SLAVE\") ? 1 : 0;
216
- status_SLAVEDOWN = (\$3 == \"SLAVEDOWN\") ? 1 : 0;
217
- status_COMMLOST = (\$3 == \"COMMLOST\") ? 1 : 0;
218
- status_SHUTTING_DOWN = (\$3 == \"SHUTTING\" && \$4 == \"DOWN\") ? 1 : 0;
207
+/^STATUS.*/ { status_ONLINE = (\$0 ~ \"ONLINE\") ? 1 : 0;
208
+ status_CAL = (\$0 ~ \"CAL\") ? 1 : 0;
209
+ status_TRIM = (\$0 ~ \"TRIM\") ? 1 : 0;
210
+ status_BOOST = (\$0 ~ \"BOOST\") ? 1 : 0;
211
+ status_ONBATT = (\$0 ~ \"ONBATT\") ? 1 : 0;
212
+ status_OVERLOAD = (\$0 ~ \"OVERLOAD\") ? 1 : 0;
213
+ status_LOWBATT = (\$0 ~ \"LOWBATT\") ? 1 : 0;
214
+ status_REPLACEBATT = (\$0 ~ \"REPLACEBATT\") ? 1 : 0;
215
+ status_NOBATT = (\$0 ~ \"NOBATT\") ? 1 : 0;
216
+ status_SLAVE = (\$0 ~ \"SLAVE\") ? 1 : 0;
217
+ status_SLAVEDOWN = (\$0 ~ \"SLAVEDOWN\") ? 1 : 0;
218
+ status_COMMLOST = (\$0 ~ \"COMMLOST\") ? 1 : 0;
219
+ status_SHUTTING_DOWN = (\$0 ~ \"SHUTTING\") ? 1 : 0;
220
};
221
222
END {