From c5a77e9bf44ef6bf16a16d7686ac330fca25e069 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 9 May 2017 14:25:54 +0200 Subject: [PATCH 1/7] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fb7a50..8933591 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,11 @@ For more information about each component, please check their git repositories r In this section, we'll go through how to setup the pipeline. It will cover dependencies, how to manage containers and how to use the system. ### Dependencies -In order to install everything and get it up and running, you'll first need to download and install some dependencies: +In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: +``` +./installscript.sh +``` +The dependencies you will need are: - Git - Docker - SBT @@ -48,6 +52,7 @@ This can be done by running the following command for MacOS and debian based dis ``` ./installscript.sh ``` + If you get the error "node is not installed" even though it is; it can be worked around by symlinking nodejs to node: ``` sudo ln -s /usr/bin/nodejs /usr/bin/node From 576d2baa9fe03c26e32c6122a7cef0128957ff99 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 9 May 2017 15:04:26 +0200 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8933591..0c6f645 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ git clone https://github.com/qvantel/orcd.git To fetch the subrepositories you can run: ``` git submodule update --init --recursive --remote -git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)"; git checkout $branch' +git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)"; git checkout $branch; git pull' ``` ### The Docker container script From 4469dac9ce70c374853e932bd2ec3cd618c5cabb Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 9 May 2017 15:30:45 +0200 Subject: [PATCH 3/7] Update README.md Some header sizes updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c6f645..e1aa80b 100644 --- a/README.md +++ b/README.md @@ -119,10 +119,10 @@ If you now navigate to http://localhost:3000 you should access your webserver co You can also navigate to http://localhost:2000 to directly access your webserver containing Graphite. ### Testing -## Unit tests +#### Unit tests For the CDRGenerator and the DBConnector we have implemented various test cases for unit testing. -## Integration tests +#### Integration tests We have some bash scripts that tests the CDRGenerator -> Cassandra -> DBConnector -> Graphite path. There is also a python script that tests this pipeline. From f141143e92a5a81ffb8da922146e133b712e720b Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 9 May 2017 14:25:54 +0200 Subject: [PATCH 4/7] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e1aa80b..df1e152 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,11 @@ For more information about each component, please check their git repositories r In this section, we'll go through how to setup the pipeline. It will cover dependencies, how to manage containers and how to use the system. ### Dependencies +<<<<<<< 4469dac9ce70c374853e932bd2ec3cd618c5cabb In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: +======= +In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: +>>>>>>> Update README.md ``` ./installscript.sh ``` From faa79ca4e8c47aefb148de22e0d5ce859411a592 Mon Sep 17 00:00:00 2001 From: Rasmus Appelqvist Date: Tue, 9 May 2017 16:44:29 +0200 Subject: [PATCH 5/7] Update README.md --- README.md | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index df1e152..1e11d6c 100644 --- a/README.md +++ b/README.md @@ -34,15 +34,26 @@ For more information about each component, please check their git repositories r In this section, we'll go through how to setup the pipeline. It will cover dependencies, how to manage containers and how to use the system. +### Cloning the repository + +The first thing we'll need to do is to clone the master repository. To clone the repository run: +``` +git clone https://github.com/qvantel/orcd.git +``` + +The repository contains a set of subrepositories, to fetch the subrepositories you can run: +``` +git submodule update --init --recursive --remote +git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)"; git checkout $branch; git pull' +``` + ### Dependencies -<<<<<<< 4469dac9ce70c374853e932bd2ec3cd618c5cabb -In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: -======= In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: ->>>>>>> Update README.md + ``` ./installscript.sh ``` + The dependencies you will need are: - Git - Docker @@ -62,19 +73,6 @@ If you get the error "node is not installed" even though it is; it can be worked sudo ln -s /usr/bin/nodejs /usr/bin/node ``` -When you have installed the dependencies, you'll need to clone this repository and fetch the subrepositories. - -To clone the repository run: -``` -git clone https://github.com/qvantel/orcd.git -``` - -To fetch the subrepositories you can run: -``` -git submodule update --init --recursive --remote -git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)"; git checkout $branch; git pull' -``` - ### The Docker container script In the root folder, you'll see a script called **containers.sh**. This script manages all the required docker containers in order to maintain the pipeline (CDR -> Cassandra -> DBConnector -> Graphite -> Grafana) (?). This script can **start**, **stop** and **remove** containers. From 905ddf217e3a74f30b06e0f636a43a1485df77d1 Mon Sep 17 00:00:00 2001 From: per-lennartsson Date: Wed, 10 May 2017 09:55:17 +0200 Subject: [PATCH 6/7] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 1e11d6c..521bb5d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ git submodule foreach -q --recursive 'branch="$(git config -f $toplevel/.gitmodu ``` ### Dependencies -In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros: +In order to install everything and get it up and running, you'll first need to download and install some dependencies. This can be done manually or by running the following command for debian based distros and MacOS: ``` ./installscript.sh @@ -63,11 +63,6 @@ The dependencies you will need are: - NodeJS - Grunt -This can be done by running the following command for MacOS and debian based distros: -``` -./installscript.sh -``` - If you get the error "node is not installed" even though it is; it can be worked around by symlinking nodejs to node: ``` sudo ln -s /usr/bin/nodejs /usr/bin/node From d94cc79dc98d21ca82178f8b24b34dcde92ab416 Mon Sep 17 00:00:00 2001 From: per-lennartsson Date: Wed, 10 May 2017 09:59:43 +0200 Subject: [PATCH 7/7] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 521bb5d..3835658 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ A single Grafana container with a few plugins that fetches data from the graphit Plugins: - GeoMap - Heatmap +- Cassandra Health **Team members:** Dennis Rojas, Rasmus Appelqvist, Tord Eliasson, Per Lennartsson, Filip Stål, Oliver Örnmyr and Kim Sand. @@ -71,7 +72,7 @@ sudo ln -s /usr/bin/nodejs /usr/bin/node ### The Docker container script In the root folder, you'll see a script called **containers.sh**. This script manages all the required docker containers in order to maintain the pipeline (CDR -> Cassandra -> DBConnector -> Graphite -> Grafana) (?). This script can **start**, **stop** and **remove** containers. -Footnote: our containerscript requires you to have the permission as normal user to run docker commands. This means you can't run `containers.sh` as root. To make your user be able to run docker commands, [please visit this wiki page.](https://github.com/flygare/orcd/wiki/Docker-Help) +**Important**: our containerscript requires you to have the permission as normal user to run docker commands. This means you can't run `containers.sh` as root. To make your user be able to run docker commands, [please visit this wiki page.](https://github.com/flygare/orcd/wiki/Docker-Help) To start all the containers run the following command: ```