Include proof of concept on monitoring (WIP)

Conflicts:
	software/kvm/common.cfg

software/kvm/common.cfg

@@ -13,6 +13,7 @@ extends =
   ../../component/dcron/buildout.cfg
   ../../stack/nodejs.cfg
   ../../stack/resilient/buildout.cfg
+  ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
 parts =
@@ -41,6 +42,7 @@ recipe = z3c.recipe.scripts
 eggs =
   ${lxml-python:egg}
   websockify
+  cns.recipe.symlink
   slapos.cookbook
   slapos.toolbox
   erp5.util
@@ -80,7 +82,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = bc5a986c7208d02d3284a897ea90b39d
+md5sum = 792fd3329fa9edc54c76245b8a90df45 
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -88,7 +90,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 83d1991cb298c87ec7d37e1b8c466417
+md5sum = df2f38172a4c45ad1f41e10edab9b3f2 
 download-only = true
 on-update = true
 
@@ -111,7 +113,7 @@ on-update = true
 [template-kvm-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm-import.cfg.in
-md5sum = 7b36d6c61154b7ec3113a1bfaa25a904
+md5sum = 6f85713280a1cec959e9acb8aae49170
 output = ${buildout:directory}/template-kvm-import.cfg
 mode = 0644
 
@@ -127,7 +129,7 @@ mode = 0755
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
 mode = 644
-md5sum = 900f416956903fa4858e67e93b5169a1
+md5sum = 5fa4072b630036abd2d2d1226629dd6e
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-export.cfg.jinja2

@@ -2,6 +2,7 @@
 extends =
   {{ kvm_template }}
   {{ pbsready_export_template }}
+  {{ monitor_template_output }}
 
 parts +=
   cron-entry-backup
@@ -14,6 +15,26 @@ parts +=
   novnc-promise
   cron
   frontend-promise
+## Parts introduced by monitoring
+  slap-parameters                                                              
+  certificate-authority
+  cron
+  cron-entry-monitor                                                           
+  cron-entry-rss                                                               
+  deploy-index                                                                 
+  deploy-index-template
+  deploy-monitor-script
+##  deploy-rss-script
+  deploy-settings-cgi
+  deploy-status-cgi
+  make-rss
+  monitor-promise
+  setup-static-files                                                           
+  certificate-authority                                                        
+  public
+  zero-parameters
+  cgi-httpd-wrapper
+  public-symlink
 
 # Create the exporter executable, which is a simple shell script
 [exporter]

software/kvm/instance-kvm-import.cfg.in

@@ -2,6 +2,7 @@
 # Here, we don't need KVM to run to import data, so we don't
 # even extend the kvm instance profile.
 extends = ${pbsready-import:output}
+          ${monitor-template:output}
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}

software/kvm/instance-kvm.cfg.jinja2

@@ -11,15 +11,36 @@ parts =
   kvm-disk-image-corruption-promise
   websockify-sighandler
   novnc-promise
-#  kvm-monitor
-  cron
-#  cron-entry-monitor
   frontend-promise
 
+## Parts which come from monitoring
+  slap-parameters                                                              
+  certificate-authority
+  cron
+  cron-entry-monitor                                                           
+  cron-entry-rss                                                               
+  deploy-index                                                                 
+  deploy-index-template
+  deploy-monitor-script
+##  deploy-rss-script
+  deploy-settings-cgi
+  deploy-status-cgi
+  make-rss
+  monitor-promise
+  setup-static-files                                                           
+  certificate-authority                                                        
+  public
+  zero-parameters
+  cgi-httpd-wrapper
+  public-symlink
+
+
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
+extends = {{ monitor_template_output }}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
@@ -170,24 +191,6 @@ hostname = ${novnc-instance:ip}
 port = ${novnc-instance:port}
 
 
-#----------------
-#--
-#-- Deploy cron.
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = {{ dcron_executable_location }}
-cron-entries = ${directory:cron-entries}
-crontabs = ${directory:crontabs}
-cronstamps = ${directory:cronstamps}
-catcher = ${cron-simplelogger:wrapper}
-binary = ${directory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = ${directory:bin}/cron_simplelogger
-log = ${directory:log}/crond.log
-
 #----------------
 #--
 #-- Deploy frontend.

software/kvm/instance.cfg.in

@@ -49,6 +49,7 @@ context =
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
     raw websockify_executable_location ${buildout:directory}/bin/websockify
+    raw monitor_template_output ${monitor-template:output}
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
 import-list = file parts :template-parts-destination
@@ -82,6 +83,7 @@ context =
     raw kvm_template $${dynamic-template-kvm:rendered}
     raw template_kvm_export ${template-kvm-export-script:location}/${template-kvm-export-script:filename}
     raw pbsready_export_template ${pbsready-export:output}
+    raw monitor_template_output ${monitor-template:output}
 mode = 0644
 
 [dynamic-template-kvm-resilient-test]

software/kvm/software.cfg

@@ -131,8 +131,9 @@ meld3 = 0.6.10
 plone.recipe.command = 1.1
 psutil = 1.1.1
 pycrypto = 2.6
+PyRSS2Gen = 1.1
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.84.2
+slapos.cookbook = 0.87
 slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
 slapos.toolbox = 0.37.4
@@ -190,11 +191,11 @@ paramiko = 1.12.0
 pyflakes = 0.7.3
 
 # Required by:
-# slapos.cookbook==0.84.2
+# slapos.cookbook==0.87
 pytz = 2013.7
 
 # Required by:
-# slapos.cookbook==0.84.2
+# slapos.cookbook==0.87
 # slapos.toolbox==0.37.4
 slapos.core = 0.35.1
 
@@ -207,7 +208,7 @@ supervisor = 3.0
 unittest2 = 0.5.1
 
 # Required by:
-# slapos.cookbook==0.84.2
+# slapos.cookbook==0.87
 # slapos.toolbox==0.37.4
 xml-marshaller = 0.9.7