fix(telegraf): Set insecure verify to true

Author: Jonathan Chauncey

grafana/Makefile

@@ -13,7 +13,7 @@ push: docker-push
 install: kube-install
 uninstall: kube-delete
 upgrade: kube-update
-	
+
 docker-build:
 	docker build -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
@@ -26,11 +26,11 @@ update-manifests:
 
 kube-install: update-manifests
 	kubectl create -f manifests/deis-monitor-grafana-svc.yaml
-	kubectl create -f manifests/deis-monitor-grafana-rc.yaml
+	kubectl create -f manifests/deis-monitor-grafana-rc.tmp.yaml
 
-kube-delete:
+kube-delete: update-manifests
 	kubectl delete -f manifests/deis-monitor-grafana-svc.yaml
-	kubectl delete -f manifests/deis-monitor-grafana-rc.yaml
+	kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml
 
 kube-update: update-manifests
 	kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml

influxdb/Makefile

@@ -27,12 +27,12 @@ update-manifests:
 kube-install: update-manifests
 	kubectl create -f manifests/deis-monitor-influxdb-api-svc.yaml
 	kubectl create -f manifests/deis-monitor-influxdb-ui-svc.yaml
-	kubectl create -f manifests/deis-monitor-influxdb-rc.yaml
+	kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml
 
-kube-delete:
+kube-delete: update-manifests
 	kubectl delete -f manifests/deis-monitor-influxdb-api-svc.yaml
 	kubectl delete -f manifests/deis-monitor-influxdb-ui-svc.yaml
-	kubectl delete -f manifests/deis-monitor-influxdb-rc.yaml
+	kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml
 
 kube-update: update-manifests
 	kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml

influxdb/rootfs/Dockerfile

@@ -16,19 +16,20 @@ RUN \
   adduser -S -s /bin/bash -G influxdb influxdb
 
 RUN \
-  mkdir -p /usr/local/bin/ && \
-  apk update && \
-  apk add ca-certificates wget curl bash && \
-  wget -q -O /etc/apk/keys/andyshinn.rsa.pub https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/andyshinn.rsa.pub && \
-  wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk && \
-  apk add glibc-2.23-r1.apk && \
-  curl -SL https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUX_VERSION}-1_linux_amd64.tar.gz | tar xzC / && \
-  chown influxdb:influxdb /usr/bin/influx* && \
-  rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+    mkdir -p /usr/local/bin/ && \
+    apk add -U ca-certificates wget curl bash
+
+RUN curl -sSL https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/andyshinn.rsa.pub -o /etc/apk/keys/andyshinn.rsa.pub && \
+    curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk -O && \
+    apk add glibc-2.23-r1.apk && rm /glibc-2.23-r1.apk
+
+RUN curl -SL https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUX_VERSION}-1_linux_amd64.tar.gz | tar xzC / && \
+    chown influxdb:influxdb /usr/bin/influx* && \
+    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
 RUN \
- mkdir -p /data && \
- chown influxdb:influxdb /data
+    mkdir -p /data && \
+    chown influxdb:influxdb /data
 
 VOLUME /data
 

telegraf/rootfs/config.toml.tpl

@@ -204,6 +204,7 @@
 {{ if .PROMETHEUS_URLS }}
 [[inputs.prometheus]]
   urls = [{{ .PROMETHEUS_URLS }}]
+  insecure_skip_verify = {{ default true .PROMETHEUS_INSECURE_SKIP_VERIFY }}
   bearer_token = {{ .PROMETHEUS_BEARER_TOKEN | quote }}
 {{ end }}