Merge pull request #199 from jchauncey/telegraf-binary

Telegraf binary

default.mk

@@ -8,37 +8,34 @@ IMAGE_PREFIX ?= deis
 
 include ../includes.mk
 include ../versioning.mk
+include ../deploy.mk
 
 TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash quay.io/deis/shell-dev
 
 build: docker-build
 push: docker-push
-deploy: check-kubectl docker-build docker-push upgrade
+deploy: check-kubectl docker-build docker-push install
 
 docker-build:
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 clean: check-docker
 	docker rmi $(IMAGE)
-
-KD = kubectl --namespace=deis
-upgrade:
-	${KD} patch ${RESOURCE_TYPE} deis-monitor-${SHORT_NAME} \
-		--type='json' \
-		-p='[ \
-			{"op": "replace", "path": "/spec/strategy", "value":{"type":"Recreate"}}, \
-			{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}, \
-			{"op": "replace", "path": "/spec/template/spec/containers/0/imagePullPolicy", "value":"Always"} \
-		]'
-	@if [ "${RESOURCE_TYPE}" == "daemonset" ]; then \
-		echo "Deleting daemonset pods as they aren't yet recreated when daemonset is patched..."; \
-		${KD} delete $$(${KD} get pod -o name | grep "${SHORT_NAME}"); \
-	fi
-
+
 test: test-style
 
 test-style:
 	${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS)
 
 .PHONY: build push docker-build clean upgrade deploy test test-style
+
+build-all:
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/influxdb:${VERSION} ../influxdb/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
+
+push-all:
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION}
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/influxdb:${VERSION}
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION}

deploy.mk

@@ -0,0 +1,9 @@
+install:
+	helm upgrade monitor ../charts/monitor --install --namespace deis --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},influxdb.org=${IMAGE_PREFIX},influxdb.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION}
+
+
+upgrade: 
+	helm upgrade monitor ../charts/monitor --namespace deis --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION},influxdb.org=${IMAGE_PREFIX},influxdb.docker_tag=${VERSION}
+
+uninstall:
+	helm delete monitor --purge

grafana/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= grafana
-RESOURCE_TYPE := deployment
 SHELL_SCRIPTS = rootfs/usr/share/grafana/start-grafana
 
 include ../default.mk

influxdb/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= influxdb
-RESOURCE_TYPE := deployment
 SHELL_SCRIPTS = rootfs/home/influxdb/start-influx
 
 include ../default.mk

telegraf/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= telegraf
-RESOURCE_TYPE := daemonset
 SHELL_SCRIPTS = rootfs/start-telegraf
 
 include ../default.mk

telegraf/rootfs/Dockerfile

@@ -4,12 +4,10 @@ COPY . /
 
 RUN mkdir -p /usr/local/bin/ \
   # This will come back once the kuberentes plugin is release in November
-  # && curl -fsSL -o /tmp/telegraf.deb https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0_amd64.deb \
-  # && dpkg -i /tmp/telegraf.deb \
-  # && rm /tmp/telegraf.deb \
-  && curl -fsSL -o /usr/bin/telegraf https://storage.googleapis.com/telegraf/telegraf \
-  && chmod +x /usr/bin/telegraf \
-	&& curl -fsSL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
+  && curl -fsSL -o /tmp/telegraf.deb https://dl.influxdata.com/telegraf/releases/telegraf_1.3.0-1_amd64.deb \
+  && dpkg -i /tmp/telegraf.deb \
+  && rm /tmp/telegraf.deb \
+  && curl -fsSL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
 	&& chmod +x /usr/bin/envtpl \
   && curl -fsSL -o /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \
   && chmod +x /usr/bin/jq