From f7c69a0fd3078233b23be75ccb66919d03f44bbc Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Thu, 6 Apr 2017 20:05:30 +0200
Subject: [PATCH] stack/monitor: Add statistic script which comes from
slapos.toolbox
Move instance-monitor.cfg to buildout.hash.cfg
---
stack/monitor/buildout.cfg | 3 ++-
stack/monitor/buildout.hash.cfg | 18 ++++++++++++++++++
stack/monitor/instance-monitor.cfg.jinja2.in | 1 +
3 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 stack/monitor/buildout.hash.cfg
diff --git a/stack/monitor/buildout.cfg b/stack/monitor/buildout.cfg
index 7d37c6dcb..304b4f5e3 100644
--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -1,6 +1,7 @@
[buildout]
extends =
+ buildout.hash.cfg
../../component/apache/buildout.cfg
../../component/curl/buildout.cfg
../../component/dash/buildout.cfg
@@ -102,13 +103,13 @@ recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = df3cc1c7e6d66204598920b2ea74b6da
context =
key apache_location apache:location
key gzip_location gzip:location
key template_logrotate_base template-logrotate-base:rendered
raw monitor_bin ${buildout:directory}/bin/monitor.bootstrap
raw monitor_collect ${buildout:directory}/bin/monitor.collect
+ raw monitor_statistic ${buildout:directory}/bin/monitor.statistic
raw monitor_runpromise ${buildout:directory}/bin/monitor.runpromise
raw monitor_genstatus ${buildout:directory}/bin/monitor.genstatus
raw monitor_configwrite ${buildout:directory}/bin/monitor.configwrite
diff --git a/stack/monitor/buildout.hash.cfg b/stack/monitor/buildout.hash.cfg
new file mode 100644
index 000000000..b309a7309
--- /dev/null
+++ b/stack/monitor/buildout.hash.cfg
@@ -0,0 +1,18 @@
+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+# - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+# But avoid directories, they are not portable.
+# Copied verbatim.
+# - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+# by the re-generation script.
+# Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[monitor2-template]
+filename = instance-monitor.cfg.jinja2.in
+md5sum = bb838915b547a18e828367a94718162e
diff --git a/stack/monitor/instance-monitor.cfg.jinja2.in b/stack/monitor/instance-monitor.cfg.jinja2.in
index 204cdf0bb..478402e15 100644
--- a/stack/monitor/instance-monitor.cfg.jinja2.in
+++ b/stack/monitor/instance-monitor.cfg.jinja2.in
@@ -108,6 +108,7 @@ parameter-list =
collector-db = ${monitor-instance-parameter:collector-db}
collect-script = {{ monitor_collect }}
+statistic-script = {{ monitor_statistic }}
python = {{ python_with_eggs }}
nice-cmd = ${xnice-bin:output}
--
2.30.9