From 6abf147cca6724877be40ce54a102bab195a151c Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Thu, 7 Jul 2016 10:55:40 +0200
Subject: [PATCH] Add grafana stuff

---
 Grafana.dockerfile | 19 ++++++++++---------
 Makefile           | 16 ++++++++++++++--
 README.md          |  7 +++----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Grafana.dockerfile b/Grafana.dockerfile
index 281acfd..6025572 100644
--- a/Grafana.dockerfile
+++ b/Grafana.dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:14.04
 MAINTAINER Gregory Eremin <g@erem.in>
 LABEL app="grafana"
-LABEL version="3.0.4"
+LABEL version="3.1.0-beta1"
 LABEL github="https://github.com/grafana/grafana"
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update
 RUN apt-get -y upgrade
-RUN apt-get install -y curl make git nodejs npm
+RUN apt-get install -y curl make git build-essential
 
 RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
 WORKDIR /tmp
@@ -21,18 +21,19 @@ RUN go env
 
 RUN go get -d -v github.com/grafana/grafana || true
 WORKDIR /go/src/github.com/grafana/grafana
-RUN git checkout v3.0.4
+RUN git checkout v3.1.0-beta1
 
 RUN go run build.go setup
 RUN rm -rf Godeps/_workspace
 RUN godep restore
 RUN go run build.go build
+
+RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+RUN apt-get install -y nodejs
+RUN node -v
+RUN npm -v
 RUN npm install
 RUN npm run build
 
-# COPY configs/carbon.toml /etc/carbon.toml
-# COPY configs/storage-schemas.conf /etc/storage-schemas.conf
-# RUN mkdir -p /data/graphite/whisper
-# EXPOSE 2003 2004 7002
-# ENTRYPOINT ./go-carbon -config=/etc/carbon.toml
-ENTRYPOINT sleep 1000
+EXPOSE 3000
+ENTRYPOINT ./bin/grafana-server
diff --git a/Makefile b/Makefile
index 63dbda0..0b8e505 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,31 @@
 graphite:
+	@echo "Building Carbon"
 	docker build -t localhots/carbon:v1 -f Carbon.dockerfile .
-	docker build -t localhots/brubeck:v1 -f Brubeck.dockerfile .
+	@echo "Starting Carbon"
 	docker run -d --name carbon \
 		-p 2003:2003 \
 		-p 2004:2004 \
 		-p 7002:7002 \
+		-v /data/graphite/whisper /var/whisper \
 		localhots/carbon:v1
+
+	@echo "Building Brubeck"
+	docker build -t localhots/brubeck:v1 -f Brubeck.dockerfile .
+	@echo "Starting Brubeck"
 	docker run -d --name brubeck --link carbon:carbon \
 		-p 8080:8080 \
 		-p 8126:8126 \
 		-p 9126:9126 \
 		localhots/brubeck:v1
 
+	@echo "Building Grafana"
+	docker build -t localhots/grafana:v1 -f Grafana.dockerfile .
+	@echo "Starting Brubeck"
+	docker run -d --name grafana --link carbon:carbon --link brubeck:brubeck \
+		-p 3000:3000 \
+		localhots/brubeck:v1
+
 fast:
-	# LOL
 	@echo "Graphite is fast now!"
 
 again:
diff --git a/README.md b/README.md
index 4f7a4d1..4f1ccae 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,12 @@
 # Graphite-ish
 
-Original Graphite stack is written in Python and it's speed could have been
-better. Luckily it is possible to replace original stack with other components
-that have [better](https://github.com/lomik/go-carbon/tree/v0.7.2#performance)
+Original [Graphite](http://graphiteapp.org/) stack is written in Python and it's
+speed could have been better. Luckily it is possible to replace original stack
+with other components that have [better](https://github.com/lomik/go-carbon/tree/v0.7.2#performance)
 performance. Quite [impressive](https://github.com/github/brubeck/tree/5d139a4#faq).
 
 Grafana 3 is also included.
 
-
 **Included software:**
 
 * [go-carbon](https://github.com/lomik/go-carbon/tree/v0.7.2) `v0.7.2`