Skip to content

Commit cc10007

Browse files
author
Jonathan Chauncey
committed
chore(telegraf): Use env var to quiet telegraf instead of cli arg
1 parent 6de0c95 commit cc10007

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

telegraf/manifests/deis-monitor-telegraf-daemon.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ spec:
2222
fieldRef:
2323
fieldPath: metadata.namespace
2424
- name: "INFLUXDB_URLS"
25-
value: http://$(DEIS_MONITOR_INFLUXDB_SERVICE_HOST):$(DEIS_MONITOR_INFLUXDB_SERVICE_PORT_TRANSPORT)
25+
value: http://$(DEIS_MONITOR_INFLUXAPI_SERVICE_HOST):$(DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT)
2626
- name: "HOST_PROC"
2727
value: "/rootfs/proc"
2828
- name: "HOST_SYS"
2929
value: "/rootfs/sys"
30+
- name: "AGENT_QUIET"
31+
value: "true"
3032
volumeMounts:
3133
- mountPath: /var/run/docker.sock
3234
name: docker-socket

telegraf/rootfs/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN apk --update add bash curl
99
# So for now Im building this locally and copying it into the build context.
1010
ADD https://bintray.com/artifact/download/jchauncey/telegraf/telegraf/telegraf /telegraf
1111
ADD https://github.com/arschles/envtpl/releases/download/0.1.2/envtpl_linux_amd64 /envtpl
12+
1213
COPY start-telegraf /start-telegraf
1314
COPY config.toml.tpl /config.toml.tpl
1415

telegraf/rootfs/start-telegraf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ echo "###########################################"
1616
cat config.toml
1717
echo "###########################################"
1818
echo "###########################################"
19-
exec /telegraf -quiet -config config.toml
19+
exec /telegraf -config config.toml

0 commit comments

Comments
 (0)