Merge 99b0df8 into f2af25e

.gitignore

@@ -10,3 +10,129 @@ dist
 adagios.conf
 *.mo
 
+
+# Created by https://www.gitignore.io/api/python
+# Edit at https://www.gitignore.io/?templates=python
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+### Python Patch ###
+.venv/
+
+# VS Code
+.vscode/

.travis.yml

@@ -3,15 +3,16 @@ python:
 - '2.7'
 env:
   matrix:
-  - DJANGO_VERSION="Django<1.6"
   - DJANGO_VERSION="Django<1.7"
+  - DJANGO_VERSION="Django<1.8"
+  - DJANGO_VERSION="Django<1.9"
   global:
     secure: fNl4/GNkavnuvJVtPEj0PDt23143mtqMzrrv4iHUWfePQpHthMoNRsm5g5z/UTIwgDKqaK/EAxxtH5u1Bfq2Z4HEcpgsy48AI2uXGDZV+z++11XgXmTR9Jejn47iKVJHgIEItIMJYw/3WngP7oqVhd/5qgLcUF5ywBtbEflRSgQ=
 install:
 - whoami
 - sudo apt-get update
 - pip install coveralls
-- sudo apt-get install nagios3 check-mk-livestatus pnp4nagios python-simplejson python-django
+- sudo apt-get install nagios3 check-mk-livestatus pnp4nagios python-simplejson
   -y
 - sudo usermod travis -G nagios -a
 - sudo chown -R nagios:nagios /etc/nagios3

CHANGES

@@ -1,9 +1,18 @@
+Changes in 1.6.4
+========================
+
+Summary of features:
+
+* Django < 1.9 support
+
+* Documentation updated
+
 Changes in 1.6.3
 ========================
 
 Summary of features:
 
-* Nagios process interaction through adagios.daemon 
+* Nagios process interaction through adagios.daemon
 
 * License file added
 
@@ -56,21 +65,21 @@ Summary of features:
     Which can be set from settings.py. French translation
     has already started and anyone can help with the translation
     at https://www.transifex.com/projects/p/adagios/
-    
-    
+
+
 * Theme Support:
     Adagios now supports using multiple themes, which at the
     moment can be changed only by editing settings.py
-    
+
     Also a proof of concept spacelab theme from
     http://bootswatch.com/spacelab/
-    
-    
+
+
 * Authorization support
     Experimental support for authorization. Enable it by setting
     enable_authorization=True in adagios.conf
-    
-    and put a comma seperated list of users (or contactgroups) in 
+
+    and put a comma seperated list of users (or contactgroups) in
     adagios.conf like so:
     administrators="nagiosadmin,administrator,admins"
 
@@ -87,7 +96,7 @@ Changes in version 1.4.1
 ========================
 Start maintaining a changelog again.
 
-Adagios has changed a lot since 1.2.2. Please the commit log for 
+Adagios has changed a lot since 1.2.2. Please the commit log for
 details.
 
 Summary of features:
@@ -103,7 +112,7 @@ added lines: 34743 removed lines : 55573 total lines: -20830
 
 
 Changes in version 1.2.2
-======================== 
+========================
 We have a lot of bugfixes and lot of performance improvements. In this version.
 
 124 files changed, 3577 insertions(+), 4374 deletions(-)
@@ -135,7 +144,7 @@ Status:
 - Very rough protoptype of business intelligence
 - Removed the okconfig add host button
 - enable in-line saving of notes in status detail
-- Clock is back in the top_navigation_bar 
+- Clock is back in the top_navigation_bar
 - Dashboard items are now links
 
 Javascript API:

Makefile

@@ -1,14 +1,14 @@
-VERSION		= 1.6.3
-RELEASE		= 2
+VERSION		= 1.6.4
+RELEASE		= 1
 DATE		= $(shell date)
 NEWRELEASE	= $(shell echo $$(($(RELEASE) + 1)))
 PYTHON		= /usr/bin/python
 
 TOPDIR = $(shell pwd)
 DIRS	= build docs contrib etc examples adagios scripts debian.upstream
-PYDIRS	= adagios debian.upstream 
+PYDIRS	= adagios debian.upstream
 EXAMPLEDIR = examples
-MANPAGES = 
+MANPAGES =
 
 all: rpms
 
@@ -21,7 +21,7 @@ manpage:
 	for manpage in $(MANPAGES); do (pod2man --center=$$manpage --release="" ./docs/$$manpage.pod > ./docs/$$manpage.1); done
 
 
-build: clean 
+build: clean
 	$(PYTHON) setup.py build -f
 
 clean:
@@ -34,7 +34,7 @@ clean:
 	-rm -f etc/version
 
 clean_hard:
-	-rm -rf $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/adagios 
+	-rm -rf $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/adagios
 
 
 clean_hardest: clean_rpms
@@ -47,27 +47,27 @@ install_hard: clean_hard install
 
 install_harder: clean_harder install
 
-install_hardest: clean_harder clean_rpms rpms install_rpm 
+install_hardest: clean_harder clean_rpms rpms install_rpm
 
 install_rpm:
 	-rpm -Uvh rpm-build/adagios-$(VERSION)-$(NEWRELEASE)$(shell rpm -E "%{?dist}").noarch.rpm
 
 
-recombuild: install_harder 
+recombuild: install_harder
 
 clean_rpms:
 	-rpm -e adagios
 
-sdist: 
+sdist:
 	$(PYTHON) setup.py sdist
 
 pychecker:
-	-for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done   
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done
 pyflakes:
-	-for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done	
+	-for d in $(PYDIRS); do ($(MAKE) -C $$d pyflakes ); done
 
 money: clean
-	-sloccount --addlang "makefile" $(TOPDIR) $(PYDIRS) $(EXAMPLEDIR) 
+	-sloccount --addlang "makefile" $(TOPDIR) $(PYDIRS) $(EXAMPLEDIR)
 
 testit: clean
 	-cd test; sh test-it.sh

adagios.spec

@@ -4,10 +4,10 @@
 %endif
 
 %define name adagios
-%define release 2
+%define release 1
 
 Name: adagios
-Version: 1.6.3
+Version: 1.6.4
 Release: %{release}%{?dist}
 Summary: Web Based Nagios Configuration
 Group: Applications/Internet
@@ -21,22 +21,22 @@ Prefix: %{_prefix}
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 
-Requires: pynag >= 0.8.8
+Requires: pynag >= 0.9.1
 Requires: httpd
 Requires: mod_wsgi
 Requires: sudo
 Requires: python-simplejson
 
 %if 0%{?rhel} == 6
-Requires: python-django15
+Requires: python-django
 # Force django upgrade
 Conflicts: Django < 1.4.0
 %else
-Requires: python-django
+Requires: python2-django16
 %endif
 
 %description
-Adagios is a web based Nagios configuration interface build to be simple and intuitive in design, exposing less of the clutter under the hood of nagios. 
+Adagios is a web based Nagios configuration interface build to be simple and intuitive in design, exposing less of the clutter under the hood of nagios.
 
 %prep
 %setup -qn %{name}-%{version} -n %{name}-%{version}
@@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README.md 
+%doc README.md
 %{python_sitelib}/*
 %{_localstatedir}/lib/adagios/contrib/*
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/adagios.conf

adagios/__init__.py

@@ -17,7 +17,7 @@
 
 import os.path
 
-__version__ = '1.6.3'
+__version__ = '1.6.4'
 
 notifications = {}
 active_plugins = {}

adagios/bi/templates/business_process_add_graph.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}Business Process{% endblock %}

adagios/bi/templates/business_process_add_subprocess.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}Business Process{% endblock %}

adagios/bi/templates/business_process_delete.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}{% trans "Business Process" %}{% endblock %}

adagios/bi/templates/business_process_edit.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}Business Process{% endblock %}

adagios/bi/templates/business_process_generic.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}Business Process{% endblock %}

adagios/bi/templates/business_process_list.html

@@ -1,5 +1,5 @@
 {% extends "base_status.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block title %}Business Process{% endblock %}