Merge branch 'master' into experimental

Conflicts:
	VERSION.txt
	probe_installer.py
	sensors/port.py
	sensors/snmpcustom.py
	sensors/snmptraffic.py
-> resolved

Author: konstantinpae

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*.log
+*.conf

README.md

@@ -1,7 +1,7 @@
 PythonMiniProbe
 ===============
 
-Current Status: EARLY BETA  
+Current Status: BETA  
 MiniProbe POC for PRTG Network Monitor written in Python which accesses the MiniProbe Interface on the PRTG Core Server.  
 
 Prerequisites
@@ -11,21 +11,33 @@ Python 2.7+
 Needed modules are delivered with the probe package:  
 - pyasn1 (https://pypi.python.org/pypi/pyasn1/0.1.7)  
 - pysnmp (https://pypi.python.org/pypi/pysnmp/4.2.5)  
-- requests (https://pypi.python.org/pypi/requests/2.3.0)  
+- requests (https://pypi.python.org/pypi/requests/2.5.1)
 
 Installation
 ------------
 - set up your PRTG server to use HTTPS (other connection methods not allowed at the moment)
 - allow MiniProbes to connect (Setup -> Probes -> Allow MiniProbes to connect)
 - make sure you can reach the PRTG web interface from the machine the mini probe should run on (e.g. wget https://YOUR_PRTG_SERVER)
+  - This is tested during the setup
 - copy the miniprobe folder to your linux machine
-- make the file "probe_installer.py" executable (e.g. "chmod 755 probe_installer.py")
-- within the folder you placed the probe.py file create another folder called "logs" (mkdir logs)
 - run the probe installer (e.g. "python probe_installer.py")
-- when asked for a username by the installer script, please choose "root" for now
 
 The miniprobe should now be started. You should also be able to start/stop the same using the command /etc/init.d/probe.sh start resp. /etc/init.d/probe.sh stop  
 
+Instalation of DS18B20
+----------------------
+Requirements:
+- DS18B20
+- 4.7K Ohm resistor
+
+Setup:
+- Solder the resister between pin 2 and 3 of the DS18B20 (when the flat part of the DS18B20 is facing ou, then pin 2 and 3 is from the middle pin to the right)
+- place Pin 1 on pin 6 on the Raspberry
+- place Pin 2 on pin 7 on the Raspberry
+- place Pin 3 on pin 1 on the Raspberry
+- Run the installscript of the probe and answer Yes to the question if you want to use the Raspberry Pi temperature sensor.
+- The installscript will now make a change to the raspberry boot process to include a special library and it will reboot the Raspberry. After the reboot, run the installer again and answer the same question again. It will now (if all is correct) detect your DS18B20 (using it's own unique serial number) and just confirm that this is correct by presing <Return> on your keyboard.
+
 Debugging
 ---------
 
@@ -38,3 +50,90 @@ with
 debug:True  
 
 This will enable detailed logging to folder "logs" which is as sub folder of the miniprobe folder. For further debugging, please stop the miniprobe process as outlined above. Navigate to the folder the file "probe.py" can be found then run following command "python probe.py". On major errors you will get the details and traceback directly on the console.
+
+Changelog
+=========
+14-02-2015
+----------
+- Added full support for the DS18B20 and a lot of cleanup and fixes
+- Also added the boot/config.txt fix for the DS18B20 that is needed on the RPi
+- Removed the no longer needed W1ThermSensor module from the repo
+    as the Raspbian Image for raspberry already includes everything needed
+
+02-02-2015
+----------
+- Installer cleanup and preparation for reading current config
+- Fix typo :(
+- Installer cleanup continued, added uninstall option to the installer, debug option added during installation
+- added W1ThermSensor module to the repo
+
+26-01-2015
+----------
+- Merge pull request #2 from eagle00789/master 
+-- Fixed Update-rd.d command
+-- Removed duplicate defined baseinterval check
+-- Fixed a bug in the installer that created the config file before any values where asked
+-- Added ping check for PRTG Server availability with possibility to still continue
+-- Added several checks and moved some code around to a function.
+
+19-01-2015
+----------
+- added optional debug information
+
+08-01-2015
+----------
+- fix for issue 1
+
+05-11-2014
+----------
+- updated module requests
+
+10-10-2014
+----------
+- dropped own logging
+-- now using python built in logging function (you might delete the file logger.py if existant)
+-- created file miniprobe.py which offers base functionality, probe.py now only does the work
+-- various changes and code cleanup
+-- added script templates for the probe_installer.py in folder /scripts
+-- changed version number to reflect YY.QQ.Release
+
+28-08-2014
+----------
+- added module retry
+
+26-08-2014
+----------
+- Updated module requests
+-- from now it is not necessary to use weakened security in the PRTG web server. There will be a one time warning if you are using a self signed certificate which can be ignored.
+- added VERSION.txt file
+-- the version number is built up from Year.Quarter.Buildnumber
+- moved Python version check to the beginning of the script
+- big code cleanup
+- applied PEP 8 rules to the code, some other refactoring). To be continued... (Probably tomorrow)
+
+17-07-2014
+----------
+- Changed readme file, adjusted setup.py
+ 
+07-07-2014
+----------
+- Fixed typos
+- Added check for logs folder
+
+27-06-2014
+----------
+- Updated documentation
+- Merge Remote-tracking branch
+
+26-06-2014
+----------
+- Updated Readme
+- Changed line separators
+- Initial Commit
+- Changed readme file
+- deleted readme
+
+25-06-2014
+----------
+- Initial commit
+ 

VERSION.txt

@@ -1 +1 @@
-14.4.7 experimental
+15.1.2

miniprobe.py

@@ -30,7 +30,8 @@
 import importlib
 import gc
 import logging
-
+import subprocess
+import os
 
 # import own modules
 sys.path.append('./')
@@ -52,7 +53,8 @@ def __init__(self):
         logging.basicConfig(
             filename="./logs/probe.log",
             filemode="a",
-            level=logging.DEBUG,
+#            level=logging.DEBUG,
+            level=logging.INFO,
             format="%(asctime)s - %(levelname)s - %(message)s",
             datefmt='%m/%d/%Y %H:%M:%S'
         )
@@ -136,4 +138,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('./')
@@ -44,7 +46,6 @@
     print e
     #sys.exit()
 
-
 def main():
         """
         Main routine for MiniProbe (Python)
@@ -57,6 +58,14 @@ def main():
         announce = False
         # read configuration file (existence check done in probe_controller.py)
         config = mini_probe.read_config('./probe.conf')
+	if config['debug'] == "True":
+            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']))
@@ -72,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"]))
@@ -99,7 +110,12 @@ 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)
                     json_response = request_task.json()
                     request_task.close()
                     gc.collect()
@@ -172,8 +188,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__":