From 884dd11365916da64b071f038af9733d373b7d1d Mon Sep 17 00:00:00 2001
From: Simon Crowle <sgc@it-innovation.soton.ac.uk>
Date: Thu, 15 Feb 2018 10:08:55 +0000
Subject: [PATCH] Renames /test/streaming set-up files
---
.../{clmcDashboard.json => dashboard.json} | 0
test/streaming/{clmcSource.json => influx.json} | 0
.../{clmcKapacitor.json => kapacitor.json} | 0
test/streaming/manual.md | 4 +++-
test/streaming/{clmcDemoRule.json => rules.json} | 0
test/streaming/{config-dashboard.sh => setup.sh} | 16 ++++++++--------
6 files changed, 11 insertions(+), 9 deletions(-)
rename test/streaming/{clmcDashboard.json => dashboard.json} (100%)
rename test/streaming/{clmcSource.json => influx.json} (100%)
rename test/streaming/{clmcKapacitor.json => kapacitor.json} (100%)
rename test/streaming/{clmcDemoRule.json => rules.json} (100%)
rename test/streaming/{config-dashboard.sh => setup.sh} (80%)
diff --git a/test/streaming/clmcDashboard.json b/test/streaming/dashboard.json
similarity index 100%
rename from test/streaming/clmcDashboard.json
rename to test/streaming/dashboard.json
diff --git a/test/streaming/clmcSource.json b/test/streaming/influx.json
similarity index 100%
rename from test/streaming/clmcSource.json
rename to test/streaming/influx.json
diff --git a/test/streaming/clmcKapacitor.json b/test/streaming/kapacitor.json
similarity index 100%
rename from test/streaming/clmcKapacitor.json
rename to test/streaming/kapacitor.json
diff --git a/test/streaming/manual.md b/test/streaming/manual.md
index a231356..4d3d8be 100644
--- a/test/streaming/manual.md
+++ b/test/streaming/manual.md
@@ -37,9 +37,11 @@ The following command brings up the services
## Automatic set-up of the CLMC dashboard demonstrator
To automatically set up a demonstrator CLMC dashboard and Kapacitor, run the following:
+### TO-DO: RE-FACTOR AUTOMATION FOR CONFIGURING KAPACITOR (kapacitor.conf)
+
```
cd ./test/streaming/
-./config-dashboard.sh
+./setup.sh
```
And then point your browser to:
diff --git a/test/streaming/clmcDemoRule.json b/test/streaming/rules.json
similarity index 100%
rename from test/streaming/clmcDemoRule.json
rename to test/streaming/rules.json
diff --git a/test/streaming/config-dashboard.sh b/test/streaming/setup.sh
similarity index 80%
rename from test/streaming/config-dashboard.sh
rename to test/streaming/setup.sh
index d817a65..35017f7 100644
--- a/test/streaming/config-dashboard.sh
+++ b/test/streaming/setup.sh
@@ -24,14 +24,14 @@
#//
#/////////////////////////////////////////////////////////////////////////
-# Set up CLMC data source
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources -d @./clmcSource.json
+# Set up Influx data source
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources -d @./influx.json
-# Set up CLMC Kapacitor
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources/1/kapacitors -d @./clmcKapacitor.json
+# Set up Kapacitor
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/sources/1/kapacitors -d @./kapacitor.json
-# Set up CLMC demo rule
-curl -i -X POST -H "Content-Type: application/json" http://localhost:9092/kapacitor/v1/tasks -d @./clmcDemoRule.json
+# Set up rules
+curl -i -X POST -H "Content-Type: application/json" http://localhost:9092/kapacitor/v1/tasks -d @./rules.json
-# Set up CLMC Dashboard
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @./clmcDashboard.json
\ No newline at end of file
+# Set up dashboard
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @./dashboard.json
\ No newline at end of file
--
GitLab