utils.py merged with miniprobe.py - probe.py cleanmem fix - probe_installer fix - DS18B20 defult enable fix - Various minor fixes

Author: root

miniprobe.py

@@ -30,7 +30,8 @@
 import importlib
 import gc
 import logging
-
+import subprocess
+import os
 
 # import own modules
 sys.path.append('./')
@@ -136,4 +137,13 @@ def build_announce(self, sensor_list):
         sensors_avail = []
         for sensor in sensor_list:
             sensors_avail.append(sensor.get_sensordef())
-        return sensors_avail
+        return sensors_avail
+
+    @staticmethod
+    def clean_mem():
+        """Ugly brute force method to clean up Mem"""
+        subprocess.call("sync", shell=False)
+        os.popen("sysctl vm.drop_caches=1")
+        os.popen("sysctl vm.drop_caches=2")
+        os.popen("sysctl vm.drop_caches=3")
+

probe.py

@@ -31,6 +31,8 @@
 import gc
 import logging
 import socket
+import warnings
+from requests.packages.urllib3 import exceptions
 
 # import own modules
 sys.path.append('./')
@@ -60,6 +62,10 @@ def main():
             config['debug'] = True
 	else:
 	    config['debug'] = False
+	if config['cleanmem'] == "True":
+            config['cleanmem'] = True
+	else:
+	    config['cleanmem'] = False
         # Doing some startup logging
         logging.info("PRTG Small Probe '%s' starting on '%s'" % (config['name'], socket.gethostname()))
         logging.info("Connecting to PRTG Core Server at %s:%s" % (config['server'], config['port']))
@@ -75,7 +81,9 @@ def main():
         while not announce:
             try:
                 # announcing the probe and all sensors
-                request_announce = requests.get(url_announce, params=data_announce, verify=False)
+                with warnings.catch_warnings():
+                    warnings.simplefilter("ignore", exceptions.InsecureRequestWarning)
+                    request_announce = requests.get(url_announce, params=data_announce, verify=False)
                 announce = True
                 logging.info("ANNOUNCE request successfully sent to PRTG Core Server at %s:%s."
                              % (config["server"], config["port"]))
@@ -100,7 +108,9 @@ def main():
             while not task:
                 json_payload_data = []
                 try:
-                    request_task = requests.get(url_task, params=task_data, verify=False)
+                    with warnings.catch_warnings():
+                        warnings.simplefilter("ignore", exceptions.InsecureRequestWarning)
+                        request_task = requests.get(url_task, params=task_data, verify=False)
                     if config['debug']:
                         logging.debug(request_task.headers)
                         logging.debug(request_task.text)
@@ -154,8 +164,7 @@ def main():
 
             if config['cleanmem']:
                 # checking if the clean memory option has been chosen during install then call the method to flush mem
-                from utils import Utils
-                Utils.clean_mem()
+                mini_probe.clean_mem()
         sys.exit()
 
 if __name__ == "__main__":

probe_installer.py

@@ -34,6 +34,18 @@ class bcolor:
     END = '\033[0m'
 
 probe_conf = {}
+config_old = {}
+config_old['name'] = "Python MiniProbe"
+config_old['gid'] = str(uuid.uuid4())
+config_old['server'] = ""
+config_old['port'] = "443"
+config_old['baseinterval'] = "60"
+config_old['key'] = ""
+config_old['cleanmem'] = ""
+config_old['announced'] = "0"
+config_old['protocol'] = "1"
+config_old['debug'] = ""
+
 if sys.version_info < (2, 7):
     print bcolor.RED + "Python version too old! Please install at least version 2.7" + bcolor.END
     print "Exiting"
@@ -133,6 +145,8 @@ def install_w1_module():
 	        print "%s.Please install the same" % e
         	print "Exiting"
 	        sys.exit(1)
+        else:
+            return False
     else:
         print bcolor.RED + "Found hardware matching " + os.uname()[4][:3] + bcolor.END
         return False
@@ -181,21 +195,21 @@ def get_config_user(default="root"):
     else:
 	return default
 
-def get_config_name(default="Python MiniProbe"):
+def get_config_name(default):
     tmpName = "%s" % str(raw_input(bcolor.GREEN + "Please provide the desired name of your Mini Probe [" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not tmpName == "":
         return tmpName
     else:
         return default
 
-def get_config_gid(default=str(uuid.uuid4())):
+def get_config_gid(default):
     tmpGid = "%s" % str(raw_input(bcolor.GREEN + "Please provide the Probe GID [" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not tmpGid == "":
         return tmpGid
     else:
         return default
 
-def get_config_ip(default=""):
+def get_config_ip(default):
     tmpIP = "%s" % str(raw_input(bcolor.GREEN + "Please provide the IP/DNS name of the PRTG Core Server [" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not (tmpIP == "") or not (default == ""):
 	if (tmpIP == "") and not (default == ""):
@@ -213,21 +227,21 @@ def get_config_ip(default=""):
 	print bcolor.YELLOW + "You have not provided an IP/DNS name of the PRTG Core Server." + bcolor.END
 	return get_config_ip()
 
-def get_config_port(default="443"):
+def get_config_port(default):
     tmpPort = "%s" % str(raw_input(bcolor.GREEN + "Please provide the port the PRTG web server is listening to (IMPORTANT: Only SSL is supported)[" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not tmpPort == "":
         return tmpPort 
     else:
         return default
 
-def get_config_base_interval(default="60"):
+def get_config_base_interval(default):
     tmpInterval = "%s" % str(raw_input(bcolor.GREEN + "Please provide the base interval for your sensors [" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not tmpInterval == "":
         return tmpInterval 
     else:
         return default
 
-def get_config_access_key(default=""):
+def get_config_access_key(default):
     tmpAccessKey = "%s" % str(raw_input(bcolor.GREEN + "Please provide the Probe Access Key as defined on the PRTG Core [" + default + "]: " + bcolor.END)).rstrip().lstrip()
     if not (tmpAccessKey == "") or not (default == ""):
 	if (tmpAccessKey == "") and not (default == ""):
@@ -252,14 +266,14 @@ def get_config_clean_memory(default=""):
         return "False"
 
 #For future use
-def get_config_announced(default="0"):
+def get_config_announced(default):
     return "0"
 
 #For future use
-def get_config_protocol(default="1"):
+def get_config_protocol(default):
     return "1"
 
-def get_config_debug(default=""):
+def get_config_debug(default):
     tmpDebug = "%s" % str(raw_input(bcolor.GREEN + "Do you want to enable debug logging (" + bcolor.YELLOW + "can create massive logfiles!" + bcolor.GREEN + ") [y/N]: " + bcolor.END)).rstrip().lstrip()
     if tmpDebug.lower() == "y":
 	tmpDebug1 = "%s" % str(raw_input(bcolor.YELLOW + "Are you sure you want to enable debug logging? This will create massive logfiles [y/N]: " + bcolor.END)).rstrip().lstrip()
@@ -270,7 +284,7 @@ def get_config_debug(default=""):
     else:
         return "False"
 
-def get_config(config_old = {}):
+def get_config(config_old):
     print ""
     print bcolor.YELLOW + "Checking for necessary modules and Python Version" + bcolor.END
     try:
@@ -289,11 +303,11 @@ def get_config(config_old = {}):
         sys.exit(1)
     print bcolor.GREEN + "Successfully imported modules." + bcolor.END
     print ""
-    install_w1_module()
-    sensors = get_w1_sensors()
-    if not sensors == "":
-        print bcolor.GREEN + "Adding DS18B20.py and selected sensors to /sensors/__init__.py" + bcolor.END
-        add_sensor_to_load_list(sensors)
+    if install_w1_module():
+	sensors = get_w1_sensors()
+	if not sensors == "":
+            print bcolor.GREEN + "Adding DS18B20.py and selected sensors to /sensors/__init__.py" + bcolor.END
+            add_sensor_to_load_list(sensors)
     print ""
     try:
         probe_user = get_config_user()
@@ -362,7 +376,7 @@ def remove_config():
 	    else:
 		conf_avail = True
     else:
-	conf_avail = get_config()
+	conf_avail = get_config(config_old)
     if conf_avail:
         print subprocess.call("update-rc.d probe.sh defaults", shell=True)
         print bcolor.GREEN + "Starting Mini Probe" + bcolor.END

sensors/ds18b20.py

@@ -20,6 +20,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import gc
+import os
 import logging
 import time
 import __init__
@@ -40,15 +41,19 @@ def get_sensordef():
         """
         Definition of the sensor and data to be shown in the PRTG WebGUI
         """
+        if os.path.isdir("/sys/bus/w1/devices"):
+            default = "yes"
+        else:
+            default = "no"
         sensordefinition = {
             "kind": DS18B20.get_kind(),
             "name": "DS18B20 Temperature",
             "description": "Returns the temperature measured by an attached DS18B20 temperature sensor on pin 4",
-            "default": "yes",
+            "default": default,
             "help": "Returns the temperature measured by an attached DS18B20 temperature sensor on pin 4",
             "tag": "mpds18b20sensor",
-            "fields": [],
-            "groups": []
+            "groups": [
+		      ]
         }
         return sensordefinition