application/nagios-plugins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed special characters from checks

Browse Source
This commit is contained in:
Dirk Alders 2024-08-12 17:56:38 +02:00
parent f5d76c488b
commit 6f31697922
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
check_raspi_temp
View File

@ -40,4 +40,4 @@ if __name__ == "__main__":
else: else:
status = n.OK status = n.OK
# #
n.exit(status, f"cpu-temperature={cpu_temp}°C - gpu-temperature: {gpu_temp}°C") n.exit(status, f"cpu-temperature={cpu_temp:.1f} C - gpu-temperature: {gpu_temp:.1f} C")

2
check_shelly
View File

@ -89,4 +89,4 @@ if __name__ == "__main__":
status = n.WARNING status = n.WARNING
else: else:
status = n.OK status = n.OK
n.exit(status, f"temperature: {temperature}°C < {TMP_WARNING} < {TMP_ERROR}") n.exit(status, f"temperature: {temperature} C < {TMP_WARNING} < {TMP_ERROR}")

14
z_server/devices/__init__.py
View File

@ -110,16 +110,16 @@ class base(object):
tm_t, value_t = self.__target_storage__[self.KEY_SETPOINT] tm_t, value_t = self.__target_storage__[self.KEY_SETPOINT]
except KeyError: except KeyError:
if value_s is not None: if value_s is not None:
return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.OK, "Current temperature setpoint %.1f°C, but never received a setpoint. That might be okay." % value_s) return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.OK, "Current temperature setpoint %.1f C, but never received a setpoint. That might be okay." % value_s)
return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.UNKNOWN, "Device exists, but no data received") return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.UNKNOWN, "Device exists, but no data received")
else: else:
tm = time.time() tm = time.time()
dt = tm - tm_t dt = tm - tm_t
if value_t != value_s and dt > self.FOLLOW_REQUEST_ERROR: if value_t != value_s and dt > self.FOLLOW_REQUEST_ERROR:
return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.ERROR, "Requested setpoint %.1f°C unequal valve setpoint %.1f°C since %.1fmin" % (value_t, value_s, (time.time()-tm_s)/60)) return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.ERROR, "Requested setpoint %.1f C unequal valve setpoint %.1f C since %.1fmin" % (value_t, value_s, (time.time()-tm_s)/60))
elif value_t != value_s and dt > self.FOLLOW_REQUEST_WARNING: elif value_t != value_s and dt > self.FOLLOW_REQUEST_WARNING:
return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.WARNING, "Requested setpoint %.1f°C unequal valve setpoint %.1f°C since %.1fmin" % (value_t, value_s, (time.time()-tm_s))) return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.WARNING, "Requested setpoint %.1f C unequal valve setpoint %.1f C since %.1fmin" % (value_t, value_s, (time.time()-tm_s)))
return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.OK, "Requested setpoint equal valve setpoint %.1f°C" % value_s) return self.__nagios_return__(DID_FOLLOWS_SETPOINT, nagios.Nagios.OK, "Requested setpoint equal valve setpoint %.1f C" % value_s)
# #
# BATTERY # BATTERY
# #
@ -220,11 +220,11 @@ class brennenstuhl_heatingvalve(base):
elif value_s <= 5: elif value_s <= 5:
return self.__nagios_return__(DID_ACTOR, nagios.Nagios.OK, "No monitoring in Summer Mode") return self.__nagios_return__(DID_ACTOR, nagios.Nagios.OK, "No monitoring in Summer Mode")
elif value_c > value_s + self.ACTOR_ERR_OFFSET: elif value_c > value_s + self.ACTOR_ERR_OFFSET:
return self.__nagios_return__(DID_ACTOR, nagios.Nagios.ERROR, "Current Temperature much to high %.1f°C > %.1f°C" % (value_c, value_s)) return self.__nagios_return__(DID_ACTOR, nagios.Nagios.ERROR, "Current Temperature much to high %.1f C > %.1f C" % (value_c, value_s))
elif value_c > value_s + self.ACTOR_WARN_OFFSET: elif value_c > value_s + self.ACTOR_WARN_OFFSET:
return self.__nagios_return__(DID_ACTOR, nagios.Nagios.WARNING, "Current Temperature to high %.1f°C > %.1f°C" % (value_c, value_s)) return self.__nagios_return__(DID_ACTOR, nagios.Nagios.WARNING, "Current Temperature to high %.1f C > %.1f C" % (value_c, value_s))
else: else:
return self.__nagios_return__(DID_ACTOR, nagios.Nagios.OK, "Current Temperature okay %.1f°C > %.1f°C" % (value_c, value_s)) return self.__nagios_return__(DID_ACTOR, nagios.Nagios.OK, "Current Temperature okay %.1f C > %.1f C" % (value_c, value_s))
else: else:
return super().status(key) return super().status(key)