Use Grafana 3.0.2, import dasboards from disk

.gitignore

@@ -46,3 +46,4 @@ grafana/grafana.ini
 grafana/data/
 grafana/gdk-pg-created
 grafana/grafana-dashboards
+grafana/sessions/

grafana/Makefile

 export GOPATH := $(shell pwd)
 GRAFANA_PARENT := src/github.com/grafana
 GRAFANA_SOURCE := ${GRAFANA_PARENT}/grafana
+GRAFANA_VERSION := 3.0.2
+GRAFANA_TAR_SHA256 = 754da4834460e5320155729dff8fe07f7a8a400ab1648b95ca49d3c9ebf14f29
 all: public vendor conf bin/grafana-server grafana-dashboards
-v3.0-beta5.tar.gz:
-	curl -LO https://github.com/grafana/grafana/archive/v3.0-beta5.tar.gz
-	echo 'db9fcc0f4d90236d0cdaba2ab1ddd06bc59264aff93ead5c3a1b680804c8f8cd  v3.0-beta5.tar.gz' | shasum -a256
-${GRAFANA_SOURCE}/build.go:	v3.0-beta5.tar.gz
+grafana.tar.gz:
+	curl -L https://github.com/grafana/grafana/archive/v${GRAFANA_VERSION}.tar.gz > $@
+${GRAFANA_SOURCE}/build.go:	grafana.tar.gz
+	echo "{GRAFANA_TAR_SHA256}  grafana.tar.gz" | shasum -a256
 	tar zxf $<
 	mkdir -p ${GRAFANA_PARENT}
-	mv grafana-3.0-beta5 ${GRAFANA_SOURCE}
+	mv grafana-${GRAFANA_VERSION} ${GRAFANA_SOURCE}
 	touch $@
 bin/grafana-server:	${GRAFANA_SOURCE}/build.go
@@ -36,4 +38,4 @@ grafana-dashboards:
 .PHONY:	clean
 clean:
-	rm -rf pkg bin src v3.0-beta5.tar.gz public vendor conf grafana-dashboards
+	rm -rf pkg bin src grafana.tar.gz public vendor conf grafana-dashboards

grafana/grafana.ini.example

@@ -242,8 +242,8 @@ mode = console
 ;#################################### Dashboard JSON files ##########################
 [dashboards.json]
-;enabled = false
-;path = /home/git/grafana/dashboards
+enabled = true
+path = /home/git/grafana/grafana-dashboards/dashboards