From d0869dcf7d59c1448b6e9e00b66011afddfc17dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Rossigneux?= <francois.rossigneux@inria.fr>
Date: Wed, 6 Feb 2013 15:53:02 +0100
Subject: [PATCH] Add refresh_interval parameter.

Change-Id: I01a55e14a169f257474cb6eff1a7b09a8eb9f293
---
 etc/kwapi/rrd.conf                     |  1 +
 kwapi/plugins/rrd/templates/index.html |  5 +++--
 kwapi/plugins/rrd/v1.py                | 11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/etc/kwapi/rrd.conf b/etc/kwapi/rrd.conf
index 801d805..9ef7e43 100644
--- a/etc/kwapi/rrd.conf
+++ b/etc/kwapi/rrd.conf
@@ -19,6 +19,7 @@ kwh_price = 0.125
 
 # Graphs
 max_watts = 200
+refresh_interval = 5
 
 # Log files
 log_file = /tmp/kwapi-rrd.log
diff --git a/kwapi/plugins/rrd/templates/index.html b/kwapi/plugins/rrd/templates/index.html
index 43cb691..cd0a301 100644
--- a/kwapi/plugins/rrd/templates/index.html
+++ b/kwapi/plugins/rrd/templates/index.html
@@ -10,7 +10,7 @@
         // <![CDATA[
             function reloadImage(img) {
                 var src = img.attr('src');
-                param_position = src.indexOf('#');
+                param_position = src.indexOf('#a');
                 if(param_position != -1) {
                     src = src.substring(0, param_position);
                 }
@@ -25,7 +25,7 @@
             }
             
             $(document).ready(function () {
-                setInterval('reloadAllImages()', 5000);
+                setInterval('reloadAllImages()', {{ refresh*1000 }});
             });
         // ]]>
         </script>
@@ -63,6 +63,7 @@
             
             <!-- Probe view (all scales for one probe) -->
             {% elif view == 'probe' %}
+                <h2>{{ probe }}</h2>
                 {% for scale in scales %}
                     <img class="graph" src="/graph/{{ scale }}/{{ probe }}/" alt="Graph {{ probe }}"/>
                 {% endfor %}
diff --git a/kwapi/plugins/rrd/v1.py b/kwapi/plugins/rrd/v1.py
index 7690c13..6ad67ce 100644
--- a/kwapi/plugins/rrd/v1.py
+++ b/kwapi/plugins/rrd/v1.py
@@ -19,8 +19,17 @@
 import flask
 from jinja2 import TemplateNotFound
 
+from kwapi.openstack.common import cfg
 import rrd
 
+web_opts = [
+    cfg.IntOpt('refresh_interval',
+               required=True,
+               ),
+]
+
+cfg.CONF.register_opts(web_opts)
+
 blueprint = flask.Blueprint('v1', __name__, static_folder='static')
 
 
@@ -37,6 +46,7 @@ def welcome_scale(scale):
     try:
         return flask.render_template('index.html',
                                      probes=sorted(flask.request.probes),
+                                     refresh=cfg.CONF.refresh_interval,
                                      scales=flask.request.scales,
                                      scale=scale,
                                      view='scale')
@@ -51,6 +61,7 @@ def welcome_probe(probe):
     try:
         return flask.render_template('index.html',
                                      probe=probe,
+                                     refresh=cfg.CONF.refresh_interval,
                                      scales=flask.request.scales,
                                      view='probe')
     except TemplateNotFound: