From 6f31697922f436e9645323156a0fe1e612d1dbf9 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Mon, 12 Aug 2024 17:56:38 +0200 Subject: [PATCH] Removed special characters from checks --- check_raspi_temp | 2 +- check_shelly | 2 +- z_server/devices/__init__.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/check_raspi_temp b/check_raspi_temp index 391f20e..1377bf6 100755 --- a/check_raspi_temp +++ b/check_raspi_temp @@ -40,4 +40,4 @@ if __name__ == "__main__": else: 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") diff --git a/check_shelly b/check_shelly index 98dd8aa..71f8dee 100755 --- a/check_shelly +++ b/check_shelly @@ -89,4 +89,4 @@ if __name__ == "__main__": status = n.WARNING else: 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}") diff --git a/z_server/devices/__init__.py b/z_server/devices/__init__.py index a4483c4..f16cd71 100644 --- a/z_server/devices/__init__.py +++ b/z_server/devices/__init__.py @@ -110,16 +110,16 @@ class base(object): tm_t, value_t = self.__target_storage__[self.KEY_SETPOINT] except KeyError: 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") else: tm = time.time() dt = tm - tm_t 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: - 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.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) # # BATTERY # @@ -220,11 +220,11 @@ class brennenstuhl_heatingvalve(base): elif value_s <= 5: return self.__nagios_return__(DID_ACTOR, nagios.Nagios.OK, "No monitoring in Summer Mode") 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: - 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: - 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: return super().status(key)