From ebd2ce2847900da2c0d7cb4553c0a1c081896fc0 Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@tiolive.com>
Date: Mon, 30 Dec 2013 11:03:04 +0100
Subject: [PATCH] slaprunner: develops stack monitor

---
 software/slaprunner/common.cfg                  |  1 +
 .../slaprunner/instance-runner-export.cfg.in    | 17 +++++++++++++++++
 .../slaprunner/instance-runner-import.cfg.in    | 16 ++++++++++++++++
 software/slaprunner/instance-runner.cfg         | 17 +++++++++++++++++
 4 files changed, 51 insertions(+)

diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index 5d55d99de..032a0eb27 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -19,6 +19,7 @@ extends =
   ../../stack/flask.cfg
   ../../stack/shacache-client.cfg
   ../../stack/resilient/buildout.cfg
+  ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
 parts =
diff --git a/software/slaprunner/instance-runner-export.cfg.in b/software/slaprunner/instance-runner-export.cfg.in
index f044ded07..a2030721a 100644
--- a/software/slaprunner/instance-runner-export.cfg.in
+++ b/software/slaprunner/instance-runner-export.cfg.in
@@ -1,6 +1,7 @@
 [buildout]
 extends = template-runner.cfg
           ${pbsready-export:output}
+          ${monitor-template:output}
 
 parts +=
   nginx_conf
@@ -25,6 +26,22 @@ parts +=
   slapos-repo-config
   prepare-software
   cron-entry-backup
+###Parts to add for monitoring
+  slap-parameters
+  certificate-authority
+  cron
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-monitor-cgi
+  deploy-control-cgi
+  deploy-monitor-script
+  deploy-rss-script
+  make-rss
+  certificate-authority
+  public
+  zero-parameters
+  cgi-httpd-wrapper
+
 
 [exporter]
 recipe = slapos.cookbook:slaprunner.export
diff --git a/software/slaprunner/instance-runner-import.cfg.in b/software/slaprunner/instance-runner-import.cfg.in
index d5763ab77..56c40b58a 100644
--- a/software/slaprunner/instance-runner-import.cfg.in
+++ b/software/slaprunner/instance-runner-import.cfg.in
@@ -1,6 +1,7 @@
 [buildout]
 extends = template-runner.cfg
           ${pbsready-import:output}
+          ${monitor-template:output}
 
 parts +=
   nginx_conf
@@ -24,6 +25,21 @@ parts +=
   prepare-software
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
+###Parts to add for monitoring
+  slap-parameters
+  certificate-authority
+  cron
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-monitor-cgi
+  deploy-control-cgi
+  deploy-monitor-script
+  deploy-rss-script
+  make-rss
+  certificate-authority
+  public
+  zero-parameters
+  cgi-httpd-wrapper
 
 [importer]
 recipe = slapos.cookbook:slaprunner.import
diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg
index ff3d60c4e..523687c14 100644
--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -24,6 +24,23 @@ parts =
 {% if slapparameter_dict.get('custom-frontend-backend-url') %}
   custom-frontend-promise
 {% endif %}
+###Parts to add for monitoring
+  slap-parameters
+  certificate-authority
+  cron
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-monitor-cgi
+  deploy-control-cgi
+  deploy-monitor-script
+  deploy-rss-script
+  make-rss
+  certificate-authority
+  public
+  zero-parameters
+  cgi-httpd-wrapper
+
+extends = ${monitor-template:output}
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
-- 
2.30.9