Added support for internal QA

Author: Konstantin Wolff

README.md

@@ -53,6 +53,10 @@ This will enable detailed logging to folder "logs" which is as sub folder of the
 
 Changelog
 =========
+10-03-2015
+----------
+- Added support for internal QA
+
 24-02-2015
 ----------
 - Added support for multiprocessing, now sensors are spawned as subprocesses (merged branch experimental with master)

VERSION.txt

@@ -1 +1 @@
-15.1.3
+15.1.5

miniprobe.py

@@ -41,7 +41,7 @@
     import requests
 except Exception as e:
     print e
-    #sys.exit()
+    # sys.exit()
 
 
 class MiniProbe(object):
@@ -53,7 +53,7 @@ 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'
@@ -116,17 +116,21 @@ def create_parameters(self, config, jsondata, i=None):
         else:
             return {'gid': config['gid'], 'key': self.hash_access_key(config['key']), 'protocol': config['protocol']}
 
-    def create_url(self, config, i=None):
+    def create_url(self, config, i=None, http=False):
         """
         creating the actual URL
         """
+        prefix = "https"
+        if http:
+            prefix = "http"
+
         if not (i is None) and (i != "data"):
-            return "https://%s:%s/probe/%s" % (
-                config['server'], config['port'], i)
+            return "%s://%s:%s/probe/%s" % (
+                prefix, config['server'], config['port'], i)
         elif i == "data":
-            return "https://%s:%s/probe/%s?gid=%s&protocol=%s&key=%s" % (config['server'], config['port'], i,
-                                                                         config['gid'], config['protocol'],
-                                                                         self.hash_access_key(config['key']))
+            return "%s://%s:%s/probe/%s?gid=%s&protocol=%s&key=%s" % (prefix, config['server'], config['port'], i,
+                                                                      config['gid'], config['protocol'],
+                                                                      self.hash_access_key(config['key']))
             pass
         else:
             return "No method given"

probe.py

@@ -46,6 +46,12 @@
     print e
     #sys.exit()
 
+# Implemented for internal testing only. Not for public usage!
+http = False
+if sys.argv[1:] and sys.argv[1] == "http":
+    http = True
+
+
 def main():
         """
         Main routine for MiniProbe (Python)
@@ -75,7 +81,7 @@ def main():
         sensor_list = mini_probe.get_import_sensors()
         sensor_announce = mini_probe.build_announce(sensor_list)
         announce_json = json.dumps(sensor_announce)
-        url_announce = mini_probe.create_url(config, 'announce')
+        url_announce = mini_probe.create_url(config, 'announce', http)
         data_announce = mini_probe.create_parameters(config, announce_json, 'announce')
 
         while not announce:
@@ -99,7 +105,7 @@ def main():
 
         while not probe_stop:
             # creating some objects only needed in loop
-            url_task = mini_probe.create_url(config, 'tasks')
+            url_task = mini_probe.create_url(config, 'tasks', http)
             task_data = {
                 'gid': config['gid'],
                 'protocol': config['protocol'],
@@ -157,7 +163,7 @@ def main():
                         logging.error(e)
                         pass
 
-                    url_data = mini_probe.create_url(config, 'data')
+                    url_data = mini_probe.create_url(config, 'data', http)
                     try:
                         request_data = requests.post(url_data, data=json.dumps(json_payload_data), verify=False)
                         logging.info("DATA request successfully sent to PRTG Core Server at %s:%s."