From fc5f7ce0138c50afc1d3badc9fac14ac6c3666f1 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Fri, 16 Feb 2018 17:16:42 +0000
Subject: [PATCH] updated streaming test run.sh to remove jmeter, added cpu,
mem and net inputs to telegraf
---
test/services/apache/telegraf_template.conf | 61 +++++++++++++++++++++
test/streaming/run.sh | 15 ++---
2 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/test/services/apache/telegraf_template.conf b/test/services/apache/telegraf_template.conf
index be8d9f3..98141e4 100644
--- a/test/services/apache/telegraf_template.conf
+++ b/test/services/apache/telegraf_template.conf
@@ -95,6 +95,67 @@
###############################################################################
# INPUTS #
###############################################################################
+# # Read metrics about network interface usage
+ [[inputs.net]]
+# ## By default, telegraf gathers stats from any up interface (excluding loopback)
+# ## Setting interfaces will tell it to gather these explicit interfaces,
+# ## regardless of status.
+# ##
+# # interfaces = ["eth0"]
+
+# Read metrics about cpu usage
+[[inputs.cpu]]
+ ## Whether to report per-cpu stats or not
+ percpu = true
+ ## Whether to report total system cpu stats or not
+ totalcpu = true
+ ## If true, collect raw CPU time metrics.
+ collect_cpu_time = false
+ ## If true, compute and report the sum of all non-idle CPU states.
+ #report_active = false
+
+
+# Read metrics about disk usage by mount point
+[[inputs.disk]]
+ ## By default, telegraf gather stats for all mountpoints.
+ ## Setting mountpoints will restrict the stats to the specified mountpoints.
+ # mount_points = ["/"]
+
+ ## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
+ ## present on /run, /var/run, /dev/shm or /dev).
+ ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
+
+
+# Read metrics about disk IO by device
+[[inputs.diskio]]
+ ## By default, telegraf will gather stats for all devices including
+ ## disk partitions.
+ ## Setting devices will restrict the stats to the specified devices.
+ # devices = ["sda", "sdb"]
+ ## Uncomment the following line if you need disk serial numbers.
+ # skip_serial_number = false
+ #
+ ## On systems which support it, device metadata can be added in the form of
+ ## tags.
+ ## Currently only Linux is supported via udev properties. You can view
+ ## available properties for a device by running:
+ ## 'udevadm info -q property -n /dev/sda'
+ # device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
+ #
+ ## Using the same metadata source as device_tags, you can also customize the
+ ## name of the device via templates.
+ ## The 'name_templates' parameter is a list of templates to try and apply to
+ ## the device. The template may contain variables in the form of '$PROPERTY' or
+ ## '${PROPERTY}'. The first template which does not contain any variables not
+ ## present for the device is used as the device name tag.
+ ## The typical use case is for LVM volumes, to get the VG/LV name instead of
+ ## the near-meaningless DM-0 name.
+ # name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
+
+# Read metrics about memory usage
+[[inputs.mem]]
+ # no configuration
+
# # Influx HTTP write listener
[[inputs.http_listener]]
## Address and port to host HTTP listener on
diff --git a/test/streaming/run.sh b/test/streaming/run.sh
index 9627697..e13a07a 100755
--- a/test/streaming/run.sh
+++ b/test/streaming/run.sh
@@ -34,15 +34,16 @@ mkdir -p "$testdir"
# run testplan
cd $testdir
-jmeter -n -LDEBUG -t /vagrant/test/streaming/testplan.jmx -l results.jtx -j jmeter.log
+#jmeter -n -LDEBUG -t /vagrant/test/streaming/testplan.jmx -l results.jtx -j jmeter.log
# quick bash equivalent in case Jmeter fails
-#COUNTER=0
-#while [ $COUNTER -lt 1 ]; do
-# cvlc -Vdummy --no-audio http://192.168.50.11/test_video/stream.mpd &
-# sleep 1
-# let COUNTER=COUNTER+1
-#done
+COUNTER=0
+MAX=10
+while [ $COUNTER -lt $MAX ]; do
+ cvlc -Vdummy --no-audio http://192.168.50.11/test_video/stream.mpd &>/tmp/stdout$COUNTER &
+ sleep 1
+ let COUNTER=COUNTER+1
+done
--
GitLab