Update manual.md

test/streaming/manual.md

@@ -34,30 +34,20 @@ The following command brings up the services
 * clmc-service: configured with influx, kapacitor, chornograf
 * apache1@DC1, apache2@DC2: configured with apache and a test video located at http://192.168.50.11:80/test_video/stream.mpd on the internal vbox network and at http://localhost:8081/test_video/stream.mpd if accessing from the host machine
 
-## Automatic set-up of the CLMC dashboard demonstrator
-To automatically set up a demonstrator CLMC dashboard and Kapacitor, run the following:
+### Run the test set-up
 
-### TO-DO: RE-FACTOR AUTOMATION FOR CONFIGURING KAPACITOR (kapacitor.conf)
-Once Vagrant is finished, you will need to copy the kapacitor.conf file into clmc-service, then SSH in, configure Kapacitor and restart it:
+`vagrant --infra=streaming ssh clmc-service -- "sudo /vagrant/test/streaming/setup.sh /vagrant/test/streaming"`
 
-```
-# Copy the kapacitor.conf file in
-vagrant plugin install vagrant-scp
-vagrant scp ./test/streaming/kapacitor.conf clmc-service:/tmp/kapacitor.conf
-
-# Configure and re-start kapacitor
-vagrant --infra=streaming ssh clmc-service
-sudo systemctl stop kapacitor
-sudo mv /tmp/kapacitor.conf /etc/kapacitor/
-sudo systemctl start kapacitor
-exit
-```
+### Run the automated test
 
-### Run the test set-up
-```
-cd ./test/streaming/
-./setup.sh
-```
+To run the load test using the following command
+
+`vagrant --infra=streaming ssh loadtest-streaming -- "/vagrant/test/streaming/run.sh"`
+
+This test currently just generates the load and does not have any assertions. It breaks at 1000.
+
+
+### Manual test 
 
 And then point your browser to:
 
@@ -147,15 +137,4 @@ Alerts can be found under the '#clmc' channel.
 
 Additional rules can be added to this demonstrator either via the Chronograf GUI (see [here](https://docs.influxdata.com/chronograf/v1.4/introduction/getting-started/#4-connect-chronograf-to-kapacitor) for more information) or by using the Kapacitor HTTP API and TICKscript (for an introduction, [look here](https://docs.influxdata.com/kapacitor/v1.4/tick/)).
  
-## Automatic test using JMeter and VLC command line
-
-To be completed.
-
-* Create a VM called `vlc-client` with vlc and jmeter installed
-* Write a testcase using the JMeter GUI that streams the test video to a set of clients.
-  * The options for scaling the number of client threads needs to be explored
-  * The test conditions needs to be defined i.e. triggers at specific thresholds when cpu usage reaches a certain point
-
-Issues, the Vagrantfile needs updating as the `vlc-client` needs to run two provisioning scripts adn the assumption is there's one provisioning script and the telegraf provisioning script. Looks like a hack is coming....if `vlc-client` then provision jmeter.
 
-We then need programtically create rules using the kapacitor CLI to set the KPIs and get the alerts rather than all the manual set up 
\ No newline at end of file