stack-monitor: now displays in only one interface

d630e6b4 · Nicolas Wavrant · 93fcdebf · d630e6b4 · d630e6b4 · d630e6b4
Commit d630e6b4 authored Dec 31, 2013 by Nicolas Wavrant
6 changed files
--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -53,20 +53,28 @@ download-only = true
 filename = monitor.py.in
 mode = 0644

-[monitor-cgi]
+[index]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
 #md5sum = 
-filename = monitor.cgi.in
+filename = index.html.jinja2
 mode = 0644

-[control-cgi]
+[status-cgi]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
 #md5sum = 
-filename = control.cgi.in
+filename = status.cgi.in
+mode = 0644
+
+[settings-cgi]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+#md5sum = 
+filename = settings.cgi.in
 mode = 0644

 [rss-bin]

--- a/stack/monitor/index.html.jinja2
+++ b/stack/monitor/index.html.jinja2
+<html>
+<head>
+ <title>Monitoring Interface</title>
+</head>
+<body style="padding:15px">
+<ul>
+ <li><a href="/{{ rss_filename }}" target="cgi-frame">RSS feed</a></li>
+ <li><a href="/{{ status_filename }}" target="cgi-frame">status</a></li>
+ <li><a href="/{{ settings_filename }}" target="cgi-frame">settings</a></li>
+</ul>
+<iframe name="cgi-frame" style="width:80%;height:70%;margin-left:15%;position:absolute;top:10px;border-style:none;border-left-style:solid"></iframe>
+<body>
--- a/stack/monitor/make-rss.sh.in
+++ b/stack/monitor/make-rss.sh.in
@@ -6,4 +6,4 @@ PYTHON=${buildout:directory}/bin/${extra-eggs:interpreter}
 STATUS2RSS=${rss-bin:location}/${rss-bin:filename}

 NAME=`basename $STATUS`
-cat $STATUS/* | $PYTHON $STATUS2RSS "Monitoring RSS feed" "https://[$${slap-parameters:ipv6-random}]:$${cgi-httpd-configuration-file:listening-port}/$${deploy-monitor-cgi:filename}" > $RSS_FILE
\ No newline at end of file
+cat $STATUS/* | $PYTHON $STATUS2RSS "Monitoring RSS feed" "https://[$${slap-parameters:ipv6-random}]:$${cgi-httpd-configuration-file:listening-port}/$${deploy-status-cgi:filename}" > $RSS_FILE
--- a/stack/monitor/monitor.cfg.in
+++ b/stack/monitor/monitor.cfg.in
@@ -11,7 +11,8 @@ monitor-dir = $${directory:var}/monitor
 result-dir = $${:monitor-dir}/bool
 json-filename = monitor.json
 json-path = $${:monitor-dir}/$${:json-filename}
-rss-path = $${directory:www}/index.html
+rss-path = $${directory:www}/$${:rss-filename}
+rss-filename = rssfeed.html
 executable = $${directory:bin}/monitor.py

 [directory]
@@ -64,11 +65,22 @@ name = build-rss
 frequency = * * * * *
 command = $${make-rss:output}

-[deploy-monitor-cgi]
+[deploy-index]
 recipe = slapos.recipe.template:jinja2
-template = ${monitor-cgi:location}/${monitor-cgi:filename}
+template = ${index:location}/${index:filename}
 rendered = $${directory:www}/$${:filename}
-filename = monitor.cgi
+filename = index.html
+mode = 0744
+context =
+  key rss_filename monitor-parameters:rss-filename
+  key settings_filename deploy-settings-cgi:filename
+  key status_filename deploy-status-cgi:filename
+
+[deploy-status-cgi]
+recipe = slapos.recipe.template:jinja2
+template = ${status-cgi:location}/${status-cgi:filename}
+rendered = $${directory:www}/$${:filename}
+filename = status.cgi
 mode = 0744
 context =
  key json_file monitor-parameters:json-path
@@ -76,11 +88,11 @@ context =
  raw python_executable ${buildout:executable}
  key this_filename :filename

-[deploy-control-cgi]
+[deploy-settings-cgi]
 recipe = slapos.recipe.template:jinja2
-template = ${control-cgi:location}/${control-cgi:filename}
+template = ${settings-cgi:location}/${settings-cgi:filename}
 rendered = $${directory:www}/$${:filename}
-filename = control.cgi
+filename = settings.cgi
 mode = 0744
 context =
  raw config_cfg $${buildout:directory}/knowledge0.cfg
@@ -215,5 +227,4 @@ wrapper-path = $${directory:bin}/cgi-httpd
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
 monitor_url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${cgi-httpd-configuration-file:listening-port}/index.html
-control_url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${cgi-httpd-configuration-file:listening-port}/control.cgi
 IMPORTANT_monitor_info = change the monitor_password as soon as possible ! Default is : $${public:monitor-password}
--- a/stack/monitor/control.cgi.in
+++ b/stack/monitor/control.cgi.in
--- a/stack/monitor/monitor.cgi.in
+++ b/stack/monitor/monitor.cgi.in