diff --git a/README.rst b/README.rst index 4458d23..2007917 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ Word of caution Puppetboard is very, very young but it works fairly well. -That being said a lot of the code is very exeprimental, just trying +That being said a lot of the code is very experimental, just trying to figure out what works and what not, what we need to do different and what features we need on the PuppetDB side of things. @@ -66,30 +66,37 @@ Packages ^^^^^^^^ Native packages for your operating system will be provided in the near future. -+------------------+-----------+--------------------------------------------+ -| OS | Status | | -+==================+===========+============================================+ -| Debian 6/Squeeze | planned | Requires Backports | -+------------------+-----------+--------------------------------------------+ -| Debian 7/Wheezy | planned | | -+------------------+-----------+--------------------------------------------+ -| Ubuntu 13.04 | planned | | -+------------------+-----------+--------------------------------------------+ -| Ubuntu 13.10 | planned | | -+------------------+-----------+--------------------------------------------+ -| CentOS/RHEL 5 | n/a | Python 2.4 | -+------------------+-----------+--------------------------------------------+ -| CentOS/RHEL 6 | planned | | -+------------------+-----------+--------------------------------------------+ -| `ArchLinux`_ | available | Maintained by `Niels Abspoel`_ | -+------------------+-----------+--------------------------------------------+ -| `OpenBSD`_ | available | Maintained by `Jasper Lievisse Adriaanse`_ | -+------------------+-----------+--------------------------------------------+ ++-------------------+-----------+--------------------------------------------+ +| OS | Status | | ++===================+===========+============================================+ +| Debian 6/Squeeze | planned | Requires Backports | ++-------------------+-----------+--------------------------------------------+ +| Debian 7/Wheezy | planned | | ++-------------------+-----------+--------------------------------------------+ +| Ubuntu 13.04 | planned | | ++-------------------+-----------+--------------------------------------------+ +| Ubuntu 13.10 | planned | | ++-------------------+-----------+--------------------------------------------+ +| CentOS/RHEL 5 | n/a | Python 2.4 | ++-------------------+-----------+--------------------------------------------+ +| CentOS/RHEL 6 | planned | | ++-------------------+-----------+--------------------------------------------+ +| `OpenSuSE 12/13`_ | available | Maintained on `OpenSuSE Build Service`_ | ++-------------------+-----------+--------------------------------------------+ +| `SuSE LE 11 SP3`_ | available | Maintained on `OpenSuSE Build Service`_ | ++-------------------+-----------+--------------------------------------------+ +| `ArchLinux`_ | available | Maintained by `Niels Abspoel`_ | ++-------------------+-----------+--------------------------------------------+ +| `OpenBSD`_ | available | Maintained by `Jasper Lievisse Adriaanse`_ | ++-------------------+-----------+--------------------------------------------+ .. _ArchLinux: https://aur.archlinux.org/packages/python2-puppetboard/ .. _Niels Abspoel: https://github.com/aboe76 .. _Jasper Lievisse Adriaanse: https://github.com/jasperla .. _OpenBSD: http://www.openbsd.org/cgi-bin/cvsweb/ports/www/puppetboard/ +.. _OpenSuSE Build Service: https://build.opensuse.org/package/show/systemsmanagement:puppet/python-puppetboard +.. _OpenSuSE 12/13: https://build.opensuse.org/package/show/systemsmanagement:puppet/python-puppetboard +.. _SuSE LE 11 SP3: https://build.opensuse.org/package/show/systemsmanagement:puppet/python-puppetboard Development @@ -273,7 +280,7 @@ Here is a sample configuration for Fedora: Note the directory path, it's the path to where pip installed Puppetboard; X.Y -must be replaced with your python version. We also alias the ``/static`` path +must be replaced with your python version. We also alias the ``/static`` path so that Apache will serve the static files like the included CSS and Javascript. Apache + mod_passenger @@ -393,7 +400,7 @@ Now we need to start uwsgi: .. code-block:: bash - $ uwsgi --http :9090 --wsgi-file /var/www/puppetboard/wsgi.py + $ uwsgi --socket :9090 --wsgi-file /var/www/puppetboard/wsgi.py Feel free to change the port to something other than ``9090``. @@ -429,7 +436,7 @@ instead of the traditional ``proxy_pass``. nginx + gunicorn ^^^^^^^^^^^^^ -You can use gunicorn instead of uwsgi if you prefer, the process doesn't +You can use gunicorn instead of uwsgi if you prefer, the process doesn't differ too much. As we can't use ``uwsgi_pass`` with gunicorn, the nginx configuration file is going to differ a bit: .. code-block:: nginx @@ -442,11 +449,11 @@ differ too much. As we can't use ``uwsgi_pass`` with gunicorn, the nginx configu listen 80; server_name puppetboard.example.tld; charset utf-8; - + location /static { alias /usr/local/lib/pythonX.Y/dist-packages/puppetboard/static; } - + location / { add_header Access-Control-Allow-Origin *; proxy_pass_header Server; diff --git a/puppetboard/app.py b/puppetboard/app.py index 463d0a4..11b1ccd 100644 --- a/puppetboard/app.py +++ b/puppetboard/app.py @@ -116,6 +116,7 @@ def index(): 'unchanged': 0, 'failed': 0, 'unreported': 0, + 'noop': 0 } for node in nodes: @@ -125,6 +126,8 @@ def index(): stats['changed'] += 1 elif node.status == 'failed': stats['failed'] += 1 + elif node.status == 'noop': + stats['noop'] += 1 else: stats['unchanged'] += 1 diff --git a/puppetboard/default_settings.py b/puppetboard/default_settings.py index 82f85ba..1333957 100644 --- a/puppetboard/default_settings.py +++ b/puppetboard/default_settings.py @@ -8,5 +8,6 @@ DEV_LISTEN_HOST = '127.0.0.1' DEV_LISTEN_PORT = 5000 UNRESPONSIVE_HOURS = 2 ENABLE_QUERY = True +LOCALISE_TIMESTAMP = True LOGLEVEL = 'info' REPORTS_COUNT = 10 diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html index 2aac1fd..a7dec4e 100644 --- a/puppetboard/templates/index.html +++ b/puppetboard/templates/index.html @@ -1,7 +1,7 @@ {% extends 'layout.html' %} {% block content %}
-
+

@@ -11,6 +11,15 @@ with status failed

+
+ +

+ {{stats['noop']}} + {% if stats['noop']== 1 %} node {% else %} nodes {% endif %} +

+ + with status pending +

@@ -30,7 +39,9 @@ unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours

-
+
+
+

{{metrics['num_nodes']}}

Population @@ -70,6 +81,8 @@ green {% elif node.status == 'unreported' %} black + {% elif node.status == 'noop' %} + blue {% endif %} " href="{{url_for('report_latest', node_name=node.name)}}"> {{node.status}} diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html index b7697d4..37d0a04 100644 --- a/puppetboard/templates/layout.html +++ b/puppetboard/templates/layout.html @@ -42,9 +42,11 @@ - + {% if config.LOCALISE_TIMESTAMP %} + + + {% endif %} - diff --git a/puppetboard/templates/nodes.html b/puppetboard/templates/nodes.html index 2b317e3..4bc2b68 100644 --- a/puppetboard/templates/nodes.html +++ b/puppetboard/templates/nodes.html @@ -24,6 +24,8 @@ green {% elif node.status == 'unreported' %} black + {% elif node.status == 'noop' %} + blue {% endif %} " href="{{url_for('report_latest', node_name=node.name)}}"> {{node.status}}