probehealth sensor fixed and added to available sensors list, cputemp sensor fix and probe_installer change to include probehealth

Author: eagle00789

probe_installer.py

@@ -128,7 +128,7 @@ def add_sensor_to_load_list(sensors):
     f.write("# Announce modules available in this package\n")
     f.write("# Just extend this list for your modules and they will be automatically imported during runtime and\n")
     f.write("# are announced to the PRTG Core\n")
-    f.write("__all__ = [\"Ping\", \"HTTP\", \"Port\", \"SNMPCustom\", \"CPULoad\", \"Memory\", \"Diskspace\", \"SNMPTraffic\", \"DS18B20\"]\n")
+    f.write("__all__ = [\"Ping\", \"HTTP\", \"Port\", \"SNMPCustom\", \"CPULoad\", \"Memory\", \"Diskspace\", \"SNMPTraffic\", \"DS18B20\", \"CPUTemp\"]\n")
     f.write("DS18B20_sensors = [" + str(sensors) + "]\n")
     f.close()
 

sensors/__init__.py

@@ -21,5 +21,5 @@
 # Announce modules available in this package
 # Just extend this list for your modules and they will be automatically imported during runtime and
 # are announced to the PRTG Core
-__all__ = ["Ping", "HTTP", "Port", "SNMPCustom", "CPULoad", "Memory", "Diskspace", "SNMPTraffic", "DS18B20"]
+__all__ = ["Ping", "HTTP", "Port", "SNMPCustom", "CPULoad", "Memory", "Diskspace", "SNMPTraffic", "DS18B20", "CPUTemp", "Probehealth"]
 DS18B20_sensors = ["000006ad5c3f"]

sensors/cputemp.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+#Copyright (c) 2014, Paessler AG <[email protected]>
+#All rights reserved.
+#Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+# following conditions are met:
+#1. Redistributions of source code must retain the above copyright notice, this list of conditions
+# and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+# and the following disclaimer in the documentation and/or other materials provided with the distribution.
+#3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse
+# or promote products derived from this software without specific prior written permission.
+
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import gc
+import os
+import logging
+import time
+import __init__
+
+class CPUTemp(object):
+    def __init__(self):
+        gc.enable()
+
+    @staticmethod
+    def get_kind():
+        """
+        return sensor kind
+        """
+        return "mpcputemp"
+
+    @staticmethod
+    def get_sensordef():
+        """
+        Definition of the sensor and data to be shown in the PRTG WebGUI
+        """
+        sensordefinition = {
+            "kind": CPUTemp.get_kind(),
+            "name": "CPU Temperature",
+            "description": "Returns the CPU temperature",
+            "default": "yes",
+            "help": "Returns the CPU temperature",
+            "tag": "mpcputempsensor",
+            "groups": [
+		      ]
+        }
+        return sensordefinition
+
+    @staticmethod
+    def get_data(data):
+        temperature = CPUTemp()
+        logging.info("Running sensor: %s" % temperature.get_kind())
+        try:
+            temp = temperature.read_temp()
+        except Exception as e:
+            logging.error("Ooops Something went wrong with '%s' sensor %s. Error: %s" % (temperature.get_kind(),
+                                                                                         data['sensorid'], e))
+            data = {
+                "sensorid": int(data['sensorid']),
+                "error": "Exception",
+                "code": 1,
+                "message": "CPUTemp sensor failed. See log for details"
+            }
+            return data
+        tempdata = []
+        for element in temp:
+            tempdata.append(element)
+        data = {
+            "sensorid": int(data['sensorid']),
+            "message": "OK",
+            "channel": tempdata
+        }
+        del temperature
+        gc.collect()
+        return data
+
+    @staticmethod
+    def read_temp():
+	data = []
+        chandata = []
+        temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
+        lines = temp.readlines()
+        temp.close()
+        temp_string = lines[0]
+        logging.debug("CPUTemp Debug message: Temperature from file: %s" % temp_string)
+        temp_c = float(temp_string) / 1000.0
+        logging.debug("CPUTemp Debug message: Temperature after calculations:: %s" % temp_c)
+        data.append(temp_c)
+        for i in range(len(data)):
+            chandata.append({"name": "CPU Temperature",
+	                     "mode": "float",
+	                     "unit": "Custom",
+		             "customunit": "C",
+                             "LimitMode": 1,
+                             "LimitMaxError": 40,
+                             "LimitMaxWarning": 35,
+	                     "value": float(data[i])})
+        return chandata

sensors/probehealth.py

@@ -57,6 +57,7 @@ def get_data(data):
         try:
             mem = probehealth.read_memory('/proc/meminfo')
             cpu = probehealth.read_cpu('/proc/loadavg')
+            temperature = probehealth.read_temp()
             logging.info("Running sensor: %s" % probehealth.get_kind())
         except Exception as e:
             logging.error("Ooops Something went wrong with '%s' sensor %s. Error: %s" % (probehealth.get_kind(),
@@ -71,6 +72,8 @@ def get_data(data):
         probedata = []
         for element in mem:
             probedata.append(element)
+	for element in temperature:
+	    probedata.append(element)
         for element in cpu:
             probedata.append(element)
         data = {
@@ -136,3 +139,26 @@ def read_disk(self):
             if line.startswith("/"):
                 tmp.append(line.rstrip())     
         print disks
+
+    def read_temp(self):
+        data = []
+        chandata = []
+        temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
+        lines = temp.readlines()
+        temp.close()
+        temp_string = lines[0]
+        logging.debug("CPUTemp Debug message: Temperature from file: %s" % temp_string)
+        temp_c = float(temp_string) / 1000.0
+        logging.debug("CPUTemp Debug message: Temperature after calculations:: %s" % temp_c)
+        data.append(temp_c)
+        for i in range(len(data)):
+            chandata.append({"name": "CPU Temperature",
+                             "mode": "float",
+                             "unit": "Custom",
+                             "customunit": "C",
+                             "LimitMode": 1,
+                             "LimitMaxError": 40,
+                             "LimitMaxWarning": 35,
+                             "value": float(data[i])})
+        return chandata
+