summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2012-06-22 11:47:07 +1000
committerDan Callaghan <dcallagh@redhat.com>2012-06-22 11:47:07 +1000
commitd03553588220f082cc3ea5136beac2ae7c945022 (patch)
tree61663b176a64cf248ced07b0aec3c97e53f09c4a
parent89c15646ef256177470b5b9626a68affc226badb (diff)
/distribution/beaker/setup: graphite prefixbeaker-distribution-beaker-setup-1_4-82
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index afa5237..43781c4 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -125,7 +125,10 @@ __EOF__
# Turn on wsgi
perl -pi -e 's|^#LoadModule wsgi_module modules/mod_wsgi.so|LoadModule wsgi_module modules/mod_wsgi.so|g' /etc/httpd/conf.d/wsgi.conf
if [ -n "$GRAPHITE_SERVER" ] ; then
- sed -i -e "/^#carbon.address /c carbon.address = ('$GRAPHITE_SERVER', ${GRAPHITE_PORT:-2023})" Server/server.cfg
+ sed -i \
+ -e "/^#carbon.address /c carbon.address = ('$GRAPHITE_SERVER', ${GRAPHITE_PORT:-2023})" \
+ -e "/^#carbon.prefix /c carbon.prefix = '${GRAPHITE_PREFIX:+$GRAPHITE_PREFIX.}beaker.'" \
+ /etc/beaker/server.cfg
fi
rlServiceStart httpd
rlServiceStart beakerd
@@ -144,7 +147,7 @@ LoadPlugin write_graphite
<Carbon>
Host "$GRAPHITE_SERVER"
Port "${GRAPHITE_PORT:-2023}"
- Prefix "host/"
+ Prefix "${GRAPHITE_PREFIX:+$GRAPHITE_PREFIX/}host/"
</Carbon>
</Plugin>
<Plugin processes>
@@ -208,7 +211,7 @@ LoadPlugin write_graphite
<Carbon>
Host "$GRAPHITE_SERVER"
Port "${GRAPHITE_PORT:-2023}"
- Prefix "host/"
+ Prefix "${GRAPHITE_PREFIX:+$GRAPHITE_PREFIX/}host/"
</Carbon>
</Plugin>
<Plugin processes>