Skip to content

Commit 31f9a9e

Browse files
author
Jonathan Chauncey
committed
chore(telegraf): Use the new kubernetes input plugin
Allows us to move away from the prometheus endpoint and instead use the local kubelet api
1 parent 3800140 commit 31f9a9e

13 files changed

Lines changed: 2246 additions & 1401 deletions

File tree

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ telegraf/manifests/*.tmp.yaml
77
influxdb/manifests/*.tmp.yaml
88
chronograf/manifests/*.tmp.yaml
99
grafana/manifests/*.tmp.yaml
10-
11-
telegraf/rootfs/bin/telegraf
10+
rootfs/usr/bin/telegraf

grafana/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ clean: check-docker
2222
docker rmi $(IMAGE)
2323

2424
update-manifests:
25-
sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-monitor-grafana-rc.yaml > manifests/deis-monitor-grafana-rc.tmp.yaml
25+
sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-monitor-grafana-deployment.yaml > manifests/deis-monitor-grafana-deployment.tmp.yaml
2626

2727
kube-install: update-manifests
2828
kubectl create -f manifests/deis-monitor-grafana-svc.yaml
29-
kubectl create -f manifests/deis-monitor-grafana-rc.tmp.yaml
29+
kubectl create -f manifests/deis-monitor-grafana-deployment.tmp.yaml
3030

3131
kube-delete: update-manifests
3232
kubectl delete -f manifests/deis-monitor-grafana-svc.yaml
33-
kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml
33+
kubectl delete -f manifests/deis-monitor-grafana-deployment.tmp.yaml
3434

3535
kube-update: update-manifests
36-
kubectl delete -f manifests/deis-monitor-grafana-rc.tmp.yaml
37-
kubectl create -f manifests/deis-monitor-grafana-rc.tmp.yaml
36+
kubectl delete -f manifests/deis-monitor-grafana-deployment.tmp.yaml
37+
kubectl create -f manifests/deis-monitor-grafana-deployment.tmp.yaml

grafana/manifests/deis-monitor-grafana-rc.yaml renamed to grafana/manifests/deis-monitor-grafana-deployment.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
apiVersion: v1
2-
kind: ReplicationController
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
33
metadata:
44
name: deis-monitor-grafana
55
namespace: deis
66
labels:
77
heritage: deis
88
spec:
99
replicas: 1
10+
strategy:
11+
rollingUpdate:
12+
maxSurge: 1
13+
maxUnavailable: 0
14+
type: RollingUpdate
1015
selector:
11-
app: deis-monitor-grafana
16+
matchLabels:
17+
app: deis-monitor-grafana
1218
template:
1319
metadata:
1420
labels:
@@ -21,8 +27,6 @@ spec:
2127
env:
2228
- name: "INFLUXDB_URLS"
2329
value: http://$(DEIS_MONITOR_INFLUXAPI_SERVICE_HOST):$(DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT)
24-
- name: "KUBERNETES_DOCKER_ENDPOINT"
25-
value: "unix:///var/run/docker.sock"
2630
- name: "BIND_PORT"
2731
value: "3500"
2832
ports:

0 commit comments

Comments
 (0)