update stack to push to logbox

setup.py

@@ -108,7 +108,9 @@ setup(name=name,
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
-          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
+          'slapmonitor = slapos.recipe.slapmonitor:Recipe',
+	  'slapreport = slapos.recipe.slapreport:Recipe',
+	  'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'sphinx= slapos.recipe.sphinx:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',

stack/lamp/buildout.cfg

@@ -35,6 +35,7 @@ extends =
   ../../component/dropbear/buildout.cfg
   ../slapos.cfg
   ../../component/python-2.7/buildout.cfg
+  ../../component/dash/buildout.cfg
 # python-2.7 component is here only for compatibility with old software.cfg.
 # It is not needed and should not be used in LAMP-based software.cfg
 
@@ -68,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 8ebed1e26127c066e5b69372e69e6c38
+md5sum = 166cc6dc2b5b4e54ad743748a55ad94c
 mode = 0644
 
 [template-apache-backup]
@@ -89,7 +90,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 70ab558c2e925c3627c39fbc20a7501c
+md5sum = ed079a1af9b6f1e0d0fbaa6c2c2afbba
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -181,4 +182,4 @@ signature-certificate-list =
   b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
   Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
   If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
\ No newline at end of file
+  -----END CERTIFICATE-----

stack/lamp/instance-apache-php.cfg

@@ -13,6 +13,8 @@ parts =
   cron
   cron-entry-logrotate
   promise
+  slapmonitor
+  slapreport
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -58,6 +60,27 @@ mysql-database = $${mariadb-urlparse:path}
 mysql-host = $${stunnel:local-host}
 mysql-port = $${stunnel:local-port}
 
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/apache.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/apache.pid
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+log-server-ip = 192.168.1.139
+log-server-port = 5122
+log-server-login = admin
+log-server-password = passer
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
+
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl

stack/lamp/instance-mariadb.cfg

@@ -11,6 +11,8 @@ parts =
   logrotate-entry-cron
   cron
   cron-entry-logrotate
+  slapmonitor
+  slapreport
 
 gzip-binary = ${gzip:location}/bin/gzip
 
@@ -49,6 +51,26 @@ mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
 mysqld-binary = ${mariadb:location}/libexec/mysqld
 
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/mariadb.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/apache.pid
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+log-server-ip = 192.168.1.139
+log-server-port = 5122
+log-server-login = admin
+log-server-password = passer
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority