From b2dc74121ca86e0c4cdf4ceacdf8d395fe78eb50 Mon Sep 17 00:00:00 2001 From: "Mortimer, M (Mathijs)" Date: Wed, 28 Sep 2016 12:59:35 +0000 Subject: [PATCH] Initial work on pollers overview --- controller/app/__init__.py | 2 ++ .../app/mod_configuration/controllers.py | 2 +- controller/app/mod_pollers/__init__.py | 0 controller/app/mod_pollers/controllers.py | 10 ++++++ controller/app/templates/navigation.html | 6 ++++ controller/app/templates/pollers/pollers.html | 35 +++++++++++++++++++ controller/libs/pollers.py | 15 ++++++++ 7 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 controller/app/mod_pollers/__init__.py create mode 100644 controller/app/mod_pollers/controllers.py create mode 100644 controller/app/templates/pollers/pollers.html create mode 100644 controller/libs/pollers.py diff --git a/controller/app/__init__.py b/controller/app/__init__.py index 92305c1..2668137 100755 --- a/controller/app/__init__.py +++ b/controller/app/__init__.py @@ -6,7 +6,9 @@ from app.mod_tasks.controllers import mod_tasks from app.mod_inventory.controllers import mod_inventory from app.mod_configuration.controllers import mod_configuration +from app.mod_pollers.controllers import mod_pollers app.register_blueprint(mod_tasks) app.register_blueprint(mod_inventory) app.register_blueprint(mod_configuration) +app.register_blueprint(mod_pollers) diff --git a/controller/app/mod_configuration/controllers.py b/controller/app/mod_configuration/controllers.py index 963d17e..b7261b1 100644 --- a/controller/app/mod_configuration/controllers.py +++ b/controller/app/mod_configuration/controllers.py @@ -6,5 +6,5 @@ @mod_configuration.route('/', methods=['GET']) -def get_configuration(): +def home(): return render_template('configuration/index.html') diff --git a/controller/app/mod_pollers/__init__.py b/controller/app/mod_pollers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/controller/app/mod_pollers/controllers.py b/controller/app/mod_pollers/controllers.py new file mode 100644 index 0000000..8e0a346 --- /dev/null +++ b/controller/app/mod_pollers/controllers.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python3 + +from flask import Blueprint, render_template + +mod_pollers = Blueprint('pollers', __name__, url_prefix='/pollers') + + +@mod_pollers.route('/', methods=['GET']) +def home(): + return render_template('pollers/pollers.html') diff --git a/controller/app/templates/navigation.html b/controller/app/templates/navigation.html index 811710b..019ca48 100755 --- a/controller/app/templates/navigation.html +++ b/controller/app/templates/navigation.html @@ -119,6 +119,12 @@
John Smith
  • Tasks
  • +
  • + Pollers +
  • +
  • + Configuration +
  • Dropdown
      diff --git a/controller/app/templates/pollers/pollers.html b/controller/app/templates/pollers/pollers.html new file mode 100644 index 0000000..e793ee5 --- /dev/null +++ b/controller/app/templates/pollers/pollers.html @@ -0,0 +1,35 @@ + +{% extends "base.html" %} +{% block content %} + + + +
      +
      + + + + + + + + + + {% for poller in pollers %} + + + + + + + + + {% else %} + + {% endfor %} +
      NameIPPortStatusOnline sinceLast healthpoll
      {{ poller.name }}{{ poller.ip }}{{ poller.port }}
      No pollers found
      +
      +
      +{% endblock %} diff --git a/controller/libs/pollers.py b/controller/libs/pollers.py new file mode 100644 index 0000000..b6c3629 --- /dev/null +++ b/controller/libs/pollers.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 + +class Poller: + """A single poller connection""" + + def __init__(self, ip, port, name=None): + """ Initialise task handler + + :param ip: Poller IP address + :param port: Poller listening port + :param name: Poller name + """ + self.ip = ip + self.port = port + self.port = name