Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
c4bb248
added error handling when server does not return a JSON object but on…
May 22, 2015
ce45dc0
Merge branch 'master' into development
May 28, 2015
fb0b492
- restructuring project layout accoriding to pip compliance
May 29, 2015
b7d2013
changed snmp sensors, when no snmp modules are available, sensors won…
May 29, 2015
014497d
changed __init__.py to an default empty file and and changed write mo…
May 29, 2015
dc2fcab
moved all code from probe_installer to setup.py
May 29, 2015
3e5ff6c
adjusted documentation/changelog, fixed typo in setup.py
May 29, 2015
2eba976
renaming classes due to functionality
May 29, 2015
06c8c93
typos
May 29, 2015
657c375
code cleanup, some checks to prevent default sensors in initial error…
May 30, 2015
ccbb87a
fixed unfortunate naming of own var
May 30, 2015
c3d3425
Merge pull request #2 from PaesslerAG/development
eagle00789 May 31, 2015
846b0ba
Create .travis.yml
eagle00789 May 31, 2015
887375e
Update .travis.yml
eagle00789 May 31, 2015
12eb1e5
added first unittest script
eagle00789 May 31, 2015
19f73a9
changed setup to use requirements.txt, fixed .gitignore, set requirem…
eagle00789 May 31, 2015
033d994
Merge pull request #12 from eagle00789/development
konstantinpae Jun 1, 2015
1a711b2
test commit to test travis integration
Jun 1, 2015
5886b35
added build status from travis
Jun 1, 2015
d05a315
Merge pull request #3 from PaesslerAG/development
eagle00789 Jun 1, 2015
719d172
Added all sensors for minimum unittesting against get_kind()
eagle00789 Jun 1, 2015
0f7e580
Merge pull request #13 from eagle00789/development
konstantinpae Jun 1, 2015
f8c8fe3
Added installer which can be user as a single download to download/in…
eagle00789 Jun 1, 2015
1838277
Merge pull request #14 from eagle00789/development
konstantinpae Jun 1, 2015
2d51dd7
deleted changelog.txt -> changes located in readme
Jun 1, 2015
de43336
Merge pull request #4 from PaesslerAG/development
eagle00789 Jun 1, 2015
8faddda
added tests for sensor defintion
Jun 1, 2015
82ebb96
added testing params
Jun 1, 2015
de297a5
MiniProbe print replaced by logging, added start og miniprobe unittests
eagle00789 Jun 1, 2015
9546068
fixed test_sensordef for cputemp
Jun 1, 2015
9d45459
removed travis-ci python 2.6 as we now require a minimum of python 2.7
eagle00789 Jun 1, 2015
d2221b6
Merge pull request #15 from PaesslerAG/update_sensor_test
konstantinpae Jun 1, 2015
e83409b
Merge pull request #16 from eagle00789/development
konstantinpae Jun 1, 2015
d04fc50
Merge pull request #5 from PaesslerAG/development
eagle00789 Jun 1, 2015
34b379a
added more miniprobe unittests
eagle00789 Jun 1, 2015
a4fd919
Merge pull request #17 from eagle00789/development
konstantinpae Jun 1, 2015
392334b
Update install.sh to redirect apt-get output /tmp
eagle00789 Jun 1, 2015
a1d576f
typo fix....
eagle00789 Jun 1, 2015
ecb58b4
Merge pull request #18 from eagle00789/development
konstantinpae Jun 1, 2015
90a5f01
forgot the word then on line 28
eagle00789 Jun 2, 2015
7580013
changed nose tests to class based to make advantage of the setup_clas…
Jun 2, 2015
c4f34d4
Merge pull request #19 from PaesslerAG/unit_tests_extension
konstantinpae Jun 2, 2015
d80203b
added some more testing for error cases, fixed potential bugs in some…
Jun 2, 2015
b3bf603
added bugfix to more sensors. Bug could lead to sensor processes basi…
Jun 2, 2015
ba94552
Merge pull request #20 from PaesslerAG/sensor_get_data_tests
konstantinpae Jun 2, 2015
e2daf19
addeed more tests, minor code cleanup
Jun 2, 2015
e2f4265
Merge pull request #21 from PaesslerAG/more_error_tests_minor_code_cl…
konstantinpae Jun 2, 2015
a6381ef
done some code cleanup -> PEP8, fixed some logical stuff like not use…
Jun 2, 2015
649ed06
adapted setup.py to new classnames, fixed bug in probehealth sensor
Jun 3, 2015
db44a87
Merge pull request #22 from PaesslerAG/code_cleanup
konstantinpae Jun 3, 2015
9b4a440
Merge pull request #6 from PaesslerAG/development
eagle00789 Jun 5, 2015
5f9f713
Changed setup.py to use single command to install and configure, remo…
eagle00789 Jun 5, 2015
44002b4
removed leftover from testing new setup.py
eagle00789 Jun 5, 2015
45e54b4
Removed no longer needed command from README.md
eagle00789 Jun 6, 2015
bf86cb2
made change to prerequisites
eagle00789 Jun 6, 2015
46d0d56
Update README.md
eagle00789 Jun 6, 2015
4eccbee
Merge pull request #24 from eagle00789/development
konstantinpae Jun 9, 2015
4cb5867
bugfix for sensor, when WiFi is active sensor was stopping complete p…
Jun 9, 2015
784e0ab
Merge pull request #25 from PaesslerAG/bugfix_external_ip
konstantinpae Jun 9, 2015
5807348
updated documentation and version
Jun 11, 2015
8a45a4f
Merge pull request #27 from PaesslerAG/documentation_update_for_release
konstantinpae Jun 11, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
*.gz
*.conf
sensors/__init__.py
dist
*.egg-info
build
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
43 changes: 41 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.2.2
15.2.6
27 changes: 0 additions & 27 deletions changelog.txt

This file was deleted.

54 changes: 0 additions & 54 deletions dns/__init__.py

This file was deleted.

Loading