From ef811d6eaaeddfdfba5bd687703282f772b021a7 Mon Sep 17 00:00:00 2001
From: Rowan Powell <rp17@it-innovation.soton.ac.uk>
Date: Sat, 24 Feb 2018 13:43:29 +0000
Subject: [PATCH] Fixed apache telegraf config
---
scripts/clmc-agent/install.sh | 3 +++
scripts/clmc-service/install.sh | 4 ++++
test/services/apache/telegraf_template.conf | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/clmc-agent/install.sh b/scripts/clmc-agent/install.sh
index 55d1b77..1655210 100755
--- a/scripts/clmc-agent/install.sh
+++ b/scripts/clmc-agent/install.sh
@@ -24,6 +24,9 @@
#//
#/////////////////////////////////////////////////////////////////////////
+# Force fail on command fail
+set -euo pipefail
+
# Install telegraf
if [ "$#" -ne 10 ]; then
echo "Error: illegal number of arguments: "$#
diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh
index f96d123..bf262be 100755
--- a/scripts/clmc-service/install.sh
+++ b/scripts/clmc-service/install.sh
@@ -24,6 +24,10 @@
#//
#/////////////////////////////////////////////////////////////////////////
+# Force fail on command fail
+set -euo pipefail
+
+
# install python for the simulator
apt-get update
apt-get -y install python
diff --git a/test/services/apache/telegraf_template.conf b/test/services/apache/telegraf_template.conf
index dbc14da..dd61410 100644
--- a/test/services/apache/telegraf_template.conf
+++ b/test/services/apache/telegraf_template.conf
@@ -2,7 +2,7 @@
## An array of URLs to gather from, must be directed at the machine
## readable version of the mod_status page including the auto query string.
## Default is "http://localhost/server-status?auto".
- urls = ["http://localhost/server-status?auto"]
+ urls = ["http://localhost:8890/server-status?auto"]
## Credentials for basic HTTP authentication.
# username = "myuser"
--
GitLab