From 508e9ebd9e9082922675febdb40bf6e58496a4d9 Mon Sep 17 00:00:00 2001
From: Arkadius Jonczek <arkadius@jonczek.de>
Date: Sun, 1 Oct 2017 02:36:55 +0200
Subject: [PATCH 1/4] added grafana docker container

---
 docker-compose.yml | 19 +++++++++++++++++++
 grafana/Dockerfile |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 grafana/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index f3f34e2..7de65b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -222,6 +222,25 @@ services:
       networks:
         - backend
 
+### Grafana Container #########################################
+
+    grafana:
+      build:
+        context: ./grafana
+      volumes:
+        - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
+      ports:
+        - "3000:3000"
+      depends_on:
+        - mysql
+      networks:
+        - backend
+
+    #grafana-storage:
+    #    image: busybox:latest
+    #    volumes:
+    #      - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
+
 ### Percona Container #########################################
 
     percona:
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
new file mode 100644
index 0000000..8aa70a2
--- /dev/null
+++ b/grafana/Dockerfile
@@ -0,0 +1,3 @@
+FROM grafana/grafana:latest
+
+EXPOSE 3000
\ No newline at end of file

From bea122a1fd967523d59fb1fe8ac019e6fa45967f Mon Sep 17 00:00:00 2001
From: Arkadius Jonczek <arkadius@jonczek.de>
Date: Wed, 18 Oct 2017 14:34:27 +0200
Subject: [PATCH 2/4] removed depends_on from grafana and added Grafana port to
 env-example

---
 docker-compose.yml | 4 +---
 env-example        | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7de65b7..45f7a9e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -230,9 +230,7 @@ services:
       volumes:
         - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
       ports:
-        - "3000:3000"
-      depends_on:
-        - mysql
+        - "${GRAFANA_PORT}:3000"
       networks:
         - backend
 
diff --git a/env-example b/env-example
index 2fd338b..48b697f 100644
--- a/env-example
+++ b/env-example
@@ -234,6 +234,10 @@ JENKINS_HOST_HTTP_PORT=8090
 JENKINS_HOST_SLAVE_AGENT_PORT=50000
 JENKINS_HOME=./jenkins/jenkins_home
 
+### JENKINS ############################################################################################################
+
+GRAFANA_PORT=3000
+
 ### BLACKFIRE ##########################################################################################################
 
 # Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time.

From 182386b514be2260b87fb33f63a88274c3476003 Mon Sep 17 00:00:00 2001
From: Arkadius Jonczek <arkadius@jonczek.de>
Date: Wed, 18 Oct 2017 14:38:10 +0200
Subject: [PATCH 3/4] removed grafana-storage

---
 docker-compose.yml | 29 ++++++++++++-----------------
 env-example        |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 45f7a9e..2ccb330 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -222,23 +222,6 @@ services:
       networks:
         - backend
 
-### Grafana Container #########################################
-
-    grafana:
-      build:
-        context: ./grafana
-      volumes:
-        - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
-      ports:
-        - "${GRAFANA_PORT}:3000"
-      networks:
-        - backend
-
-    #grafana-storage:
-    #    image: busybox:latest
-    #    volumes:
-    #      - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
-
 ### Percona Container #########################################
 
     percona:
@@ -643,6 +626,18 @@ services:
         - frontend
         - backend
 
+### Grafana Container #########################################
+
+    grafana:
+      build:
+        context: ./grafana
+      volumes:
+        - ${DATA_SAVE_PATH}/grafana:/var/lib/grafana
+      ports:
+        - "${GRAFANA_PORT}:3000"
+      networks:
+        - backend
+
 ### Laravel Echo Server #######################################
     laravel-echo-server:
       build:
diff --git a/env-example b/env-example
index 48b697f..c0e4a7a 100644
--- a/env-example
+++ b/env-example
@@ -234,7 +234,7 @@ JENKINS_HOST_HTTP_PORT=8090
 JENKINS_HOST_SLAVE_AGENT_PORT=50000
 JENKINS_HOME=./jenkins/jenkins_home
 
-### JENKINS ############################################################################################################
+### GRAFANA ############################################################################################################
 
 GRAFANA_PORT=3000
 

From 8aaa074af2037a37f17a373ce0c05dd99bf2bc52 Mon Sep 17 00:00:00 2001
From: Arkadius Jonczek <arkadius@jonczek.de>
Date: Thu, 19 Oct 2017 14:29:50 +0200
Subject: [PATCH 4/4] add Use Grafana section to documention

---
 DOCUMENTATION/content/documentation/index.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 628c420..4c2a8bc 100644
--- a/DOCUMENTATION/content/documentation/index.md
+++ b/DOCUMENTATION/content/documentation/index.md
@@ -942,6 +942,24 @@ docker-compose up -d aws
 
 
 
+<br>
+<a name="Use-Grafana"></a>
+## Use Grafana
+
+1 - Configure Grafana: Change Port using `GRAFANA_PORT` if you wish to. Default is port 3000.
+
+2 - Run the Grafana Container (`grafana`) with the `docker-compose up`command:
+
+```bash
+docker-compose up -d grafana
+```
+
+3 - Open your browser and visit the localhost on port **3000** at the following URL: `http://localhost:3000`
+
+4 - Login using the credentials User = `admin` Passwort = `admin`. Change the password in the webinterface if you want to.
+
+
+
 <br>
 <a name="CodeIgniter"></a>