feat(grafana2): Add support for grafana 2

Author: Jonathan Chauncey

grafana/Makefile

@@ -0,0 +1,35 @@
+SHORT_NAME ?= grafana
+BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
+DEIS_REGISTRY ?= ${DEV_REGISTRY}
+IMAGE_PREFIX ?= deis
+IMAGE_LATEST := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:latest
+IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${BUILD_TAG}
+
+info:
+	@echo "Build tag:  ${BUILD_TAG}"
+	@echo "Registry:   ${DEIS_REGISTRY}"
+	@echo "Image:      ${IMAGE}"
+
+docker-build:
+	docker build -t $(IMAGE_LATEST) rootfs
+	docker tag -f $(IMAGE_LATEST) $(IMAGE)
+
+docker-push:
+	docker push ${IMAGE}
+
+kube-delete: update-manifests
+	-kubectl delete -f manifests/deis-monitor-grafana-svc.yaml
+	-kubectl delete -f manifests/deis-monitor-grafana-proxy-pod.yaml
+	-kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml
+
+kube-create: update-manifests
+	kubectl create -f manifests/deis-monitor-grafana-svc.yaml
+	kubectl create -f manifests/deis-monitor-grafana-rc.tmp.yaml
+	kubectl create -f manifests/deis-monitor-grafana-proxy-pod.yaml
+
+kube-update: update-manifests
+	kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml
+	kubectl create -f manifests/deis-monitor-grafana-rc.tmp.yaml
+
+update-manifests:
+	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-monitor-grafana-rc.yaml > manifests/deis-monitor-grafana-rc.tmp.yaml

grafana/README.md

@@ -0,0 +1,6 @@
+# Grafana
+
+## Description
+[Grafana](http://grafana.org/) is a graphing application built for time series data. It natively supports influxdb and provides great dashboarding support.
+
+## Deployment

grafana/manifests/deis-monitor-grafana-proxy-pod.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: deis-monitor-grafana-proxy
+  namespace: deis
+  labels:
+    heritage: deis
+spec:
+  containers:
+  - name: grafana
+    image: gcr.io/google_containers/proxy-to-service:v2
+    args: [ "tcp", "3500", "deis-monitor-grafana.deis.svc.cluster.local" ]
+    ports:
+    - name: http-ui
+      protocol: TCP
+      containerPort: 3500
+      hostPort: 3500

grafana/manifests/deis-monitor-grafana-rc.yaml

@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: deis-monitor-grafana
+  namespace: deis
+  labels:
+    heritage: deis
+spec:
+  replicas: 1
+  selector:
+    app: deis-monitor-grafana
+  template:
+    metadata:
+      labels:
+        app: deis-monitor-grafana
+    spec:
+      containers:
+      - name: deis-monitor-grafana
+        image: grafana/grafana:2.6.0
+        imagePullPolicy: Always
+        env:
+        - name: "INFLUXDB_URLS"
+          value: http://$(DEIS_MONITOR_INFLUXDB_SERVICE_HOST):$(DEIS_MONITOR_INFLUXDB_PORT_8086_TCP_PORT)
+        - name: "KUBERNETES_DOCKER_ENDPOINT"
+          value: "unix:///var/run/docker.sock"
+        - name: "BIND_PORT"
+          value: "3500"
+        ports:
+        - containerPort: 3500
+          name: ui

grafana/manifests/deis-monitor-grafana-svc.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: deis-monitor-grafana
+  namespace: deis
+  labels:
+    heritage: deis
+    app: deis-monitor-grafana
+spec:
+  ports:
+  - port: 3500
+    name: ui
+    targetPort: ui
+  selector:
+    app: deis-monitor-grafana

grafana/rootfs/Dockerfile

@@ -0,0 +1,19 @@
+FROM grafana/grafana:2.6.0
+
+RUN apt-get update && \
+    apt-get install -y curl && \
+    rm /etc/grafana/grafana.ini
+
+ADD https://github.com/arschles/envtpl/releases/download/0.1.1/envtpl_linux_amd64 /usr/share/grafana/envtpl
+
+COPY dashboards /usr/share/grafana/dashboards
+COPY start-grafana /usr/share/grafana/start-grafana
+COPY grafana.ini.tpl /usr/share/grafana/grafana.ini.tpl
+
+RUN chmod +x /usr/share/grafana/envtpl && \
+    chmod +x /usr/share/grafana/start-grafana && \
+    chmod 644 /usr/share/grafana/grafana.ini.tpl
+
+EXPOSE 3000
+WORKDIR /usr/share/grafana
+ENTRYPOINT ["./start-grafana"]