use slapmonitor-xml in place of slapreport

stack/lamp/apache/instance-apache-php.cfg.in

@@ -10,7 +10,8 @@ parts =
   cron-entry-logrotate
   promise
   slapmonitor
-  slapreport
+  slapmonitor-xml
+
   frontend-promise
   content-promise
   publish-connection-informations
@@ -42,16 +43,18 @@ promises = $${rootdirectory:etc}/promise
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
 ca-dir = $${rootdirectory:srv}/ssl
 httpd-log = $${basedirectory:log}/apache
 php-ini-dir = $${rootdirectory:etc}/php
 tmp-php = $${rootdirectory:tmp}/php
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 logrotate-backup = $${basedirectory:backup}/logrotate
+report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
+xml-report = $${rootdirectory:var}/xml_report
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -249,27 +252,19 @@ config-custom_domain = $${slap-parameter:domain}
 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
+[slapmonitor-xml]
+recipe = slapos.cookbook:slapmonitor-xml
 database-path = $${basedirectory:log}/slapmonitor.db
-consumption-log-path = $${basedirectory:log}/instance_consumption.log
-logbox-ip = 87.98.152.12
-logbox-port = 5122
-logbox-user = admin
-logbox-passwd = passer
-shell-path = ${dash:location}/bin/dash
-slapreport-path = ${buildout:bin-directory}/slapreport
-path = $${basedirectory:services}/slapreport
+slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
+path = $${directory:report}/slapmonitor-xml
 
 
 #----------------
 #--
-#-- Publish all instance parameters (url of instance).
+#-- Publish instance parameters.
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish

stack/lamp/buildout.cfg

@@ -70,7 +70,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = dec36ec4fe54d87f4a5e5b8573f72fb7
+md5sum = fc29d853dcd0802dd61c60b09e898c11
 mode = 0644
 
 [instance-apache-backup]
@@ -92,7 +92,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 5151295af3994499e2be6d68938787d3
+md5sum = 5605ad8896c2718854bf26148c4ae940
 mode = 0644
  
 
@@ -100,7 +100,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
 output = ${buildout:directory}/instance-mariadb.cfg
-md5sum = aa33c843f04753a34154467522f0c65e
+md5sum = ba8dd08dfd5e6a9dc614693d066eb21d
 mode = 0644
 
 [instance-mariadb-import]

stack/lamp/mariadb/instance-mariadb.cfg.in

@@ -12,7 +12,7 @@ parts =
   cron
   cron-entry-logrotate
   slapmonitor
-  slapreport
+  slapmonitor-xml
 
 gzip-binary = ${gzip:location}/bin/gzip
 
@@ -50,9 +50,11 @@ crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
 ca-dir = $${rootdirectory:srv}/ssl
 mariadb-data = $${rootdirectory:srv}/mariadb
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
 logrotate-backup = $${basedirectory:backup}/logrotate
+report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
+xml-report = $${rootdirectory:var}/xml_report
 
 
 #----------------
@@ -225,22 +227,14 @@ mysqld-binary = ${mariadb:location}/bin/mysqld
 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}/mariadb.pid
+[slapmonitor-xml]
+recipe = slapos.cookbook:slapmonitor-xml
 database-path = $${basedirectory:log}/slapmonitor.db
-consumption-log-path = $${basedirectory:log}/instance_consumption.log
-logbox-ip = 87.98.152.12
-logbox-port = 5122
-logbox-user = admin
-logbox-passwd = passer
-shell-path = ${dash:location}/bin/dash
-slapreport-path = ${buildout:bin-directory}/slapreport
-path = $${basedirectory:services}/slapreport
+slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
+path = $${directory:report}/slapmonitor-xml
 
 
 #----------------

stack/lamp/template-resilient.cfg.in

@@ -6,7 +6,8 @@
 extends =
    {{templateapache}}
 
-parts =
+# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
+parts +=
   {{ parts.replicate("mariadb","3") }}
   request-apache-backup-1
   request-apache-backup-2

stack/lapp/apache/instance-apache-php.cfg.in

@@ -11,7 +11,8 @@ parts =
   cron-entry-logrotate
   promise
   slapmonitor
-  slapreport
+  slapmonitor-xml
+
   frontend-promise
   content-promise
   publish-connection-informations
@@ -44,16 +45,18 @@ promises = $${rootdirectory:etc}/promise
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
 ca-dir = $${rootdirectory:srv}/ssl
 httpd-log = $${basedirectory:log}/apache
 php-ini-dir = $${rootdirectory:etc}/php
 tmp-php = $${rootdirectory:tmp}/php
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 logrotate-backup = $${basedirectory:backup}/logrotate
+report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
+xml-report = $${rootdirectory:var}/xml_report
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -252,22 +255,14 @@ config-custom_domain = $${slap-parameter:domain}
 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
+[slapmonitor-xml]
+recipe = slapos.cookbook:slapmonitor-xml
 database-path = $${basedirectory:log}/slapmonitor.db
-consumption-log-path = $${basedirectory:log}/instance_consumption.log
-logbox-ip = 87.98.152.12
-logbox-port = 5122
-logbox-user = admin
-logbox-passwd = passer
-shell-path = ${dash:location}/bin/dash
-slapreport-path = ${buildout:bin-directory}/slapreport
-path = $${basedirectory:services}/slapreport
+slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
+path = $${directory:report}/slapmonitor-xml
 
 
 #----------------

stack/lapp/buildout.cfg

@@ -55,7 +55,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = fb34918c73ba242ffc08dfd7745367b3
+md5sum = bed286b680bd8cd494da080cdc229f1e
 mode = 0644
 
 [instance-apache-backup]
@@ -77,7 +77,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 5bf1aa09d7d608c95d3c54bc50a8b5c1
+md5sum = 525f50e60d0a96557a552de6afa4ab88
 mode = 0644
  
 
@@ -85,7 +85,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
 output = ${buildout:directory}/instance-postgres.cfg
-md5sum = 8227a2c382e84ddacc733cf998e6cdc3
+md5sum = c5cd2a644fcd8450bc5d13bf53ec9f7d
 mode = 0644
 
 [instance-postgres-import]

stack/lapp/postgres/instance-postgres.cfg.in

@@ -12,7 +12,7 @@ parts =
   cron
   cron-entry-logrotate
   slapmonitor
-  slapreport
+  slapmonitor-xml
 
 gzip-binary = ${gzip:location}/bin/gzip
 
@@ -50,8 +50,10 @@ crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
 ca-dir = $${rootdirectory:srv}/ssl
 logrotate-backup = $${basedirectory:backup}/logrotate
+report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
+xml-report = $${rootdirectory:var}/xml_report
 
 
 #----------------
@@ -208,22 +210,14 @@ symlink_base = ${postgresql:location}/bin
 recipe = slapos.cookbook:slapmonitor
 pid-file = $${postgres-instance:pgdata-directory}/postmaster.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 = $${postgres-instance:pgdata-directory}/postmaster.pid
+[slapmonitor-xml]
+recipe = slapos.cookbook:slapmonitor-xml
 database-path = $${basedirectory:log}/slapmonitor.db
-consumption-log-path = $${basedirectory:log}/instance_consumption.log
-logbox-ip = 87.98.152.12
-logbox-port = 5122
-logbox-user = admin
-logbox-passwd = passer
-shell-path = ${dash:location}/bin/dash
-slapreport-path = ${buildout:bin-directory}/slapreport
-path = $${basedirectory:services}/slapreport
+slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
+path = $${directory:report}/slapmonitor-xml
 
 
 #----------------

stack/lapp/template-resilient.cfg.in

@@ -6,7 +6,7 @@
 extends =
    {{templateapache}}
 
-# += because we need to take up parts (like instance-custom) from the profile we extended
+# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
 parts +=
   {{ parts.replicate("postgres","3") }}
   request-apache-backup-1