Merge pull request #28 from PaesslerAG/development

MAJOR UPDATE

Author: konstantinpae

.gitignore

@@ -3,3 +3,6 @@
 *.gz
 *.conf
 sensors/__init__.py
+dist
+*.egg-info
+build

.travis.yml

@@ -0,0 +1,22 @@
+language: python
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+os:
+  - linux
+matrix:
+  allow_failures:
+    - python: "3.2"
+    - python: "3.3"
+    - python: "3.4"
+branches:
+  only:
+    - master
+    - development
+install:
+  - pip install --upgrade pip
+  - pip install -r requirements.txt
+script: 
+  - nosetests -v

README.md

@@ -4,11 +4,39 @@ PythonMiniProbe
 Current Status: BETA  
 MiniProbe POC for PRTG Network Monitor written in Python which accesses the MiniProbe Interface on the PRTG Core Server.  
 
+Build Status
+------------
+[![Build Status](https://travis-ci.org/PaesslerAG/PythonMiniProbe.svg?branch=development)](https://travis-ci.org/PaesslerAG/PythonMiniProbe)
+
+IMPORTANT: Major changes in this branch. Please see Migration Howto below!
+Installation for this branch
+----------------------------
+- Install python-dev and build-essential (or at least gcc) packages
+- Install pip as outlined here https://pip.pypa.io/en/latest/installing.html (pre Python 2.7.9)
+- Download either zip or clone repository
+- run command 'sudo python setup.py install' which will install all necessary packages
+
+Migration Guide
+---------------
+- Copy away file probe.conf
+- Stop the mini probe process
+- Delete the files /etc/init.d/probe and /etc/logrotate.d/probe (filenames might be prtgprobe as well)
+- Remove the /probe folder
+- Install python-dev and build-essential (or at least gcc) packages
+- Install pip as outlined here https://pip.pypa.io/en/latest/installing.html (pre Python 2.7.9)
+- Download either zip or clone repository
+- Run command 'sudo python setup.py install' which will install all necessary packages and will run the configuration
+- [optional] Run 'install.sh' to skip the 4 steps above
+- Copy the gid line from your old probe.conf to the new probe.conf at /probe/miniprobe/probe.conf 
+- Start the mini probe process, the mini probe will connect with the previous GID and continue monitoring
+IMPORTANT: If replacing the new probe.conf with the old one, make sure the line 'subprocs:10' is present in the file!
+
+
 Prerequisites
 -----------------
 Debian based system (tested on Ubuntu, Debian, Raspbian)  
 Python 2.7+  
-Needed modules are delivered with the probe package:  
+Needed modules are installed using the setup.py install phase:  
 - 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.5.3)
@@ -21,7 +49,7 @@ Installation
 - 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
-- run the probe installer (e.g. "python probe_installer.py")
+- run the probe installer (e.g. "sudo python setup.py install")
 
 The miniprobe should now be started. You should also be able to start/stop the same using the command
 
@@ -80,6 +108,17 @@ Changelog
 =========
 
 =======
+11-06-2015
+----------
+MAJOR CHANGES:
+- restructuring project layout accoriding to pip compliance
+- removed included modules
+- added support for pip/reqirements.txt
+- for installation, see above "Installation for this branch"
+- added tests folder for future unit tests
+- dropped probe_installer.py, code moved to setup.py
+- added release 
+
 07-05-2015
 ----------
 - Finished the DNS Sensor for all dns types currently available in a Windows Probe

VERSION.txt

@@ -1 +1 @@
-15.2.2
+15.2.6