Merge pull request #142 from jchauncey/remove-quote-call

chore(config): Remove calls to quote

Author: Jonathan Chauncey

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

@@ -22,7 +22,9 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: "INFLUXDB_URLS"
-            value: http://$(DEIS_MONITOR_INFLUXAPI_SERVICE_HOST):$(DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT)
+            value: "\"http://$(DEIS_MONITOR_INFLUXAPI_SERVICE_HOST):$(DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT)\""
+          - name: "INFLUXDB_INPUT_URLS"
+            value: "\"http://$(DEIS_MONITOR_INFLUXAPI_SERVICE_HOST):$(DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT)/debug/vars\""
           - name: "HOST_PROC"
             value: "/rootfs/proc"
           - name: "HOST_SYS"
@@ -36,18 +38,20 @@ spec:
           - name: "ENABLE_PROMETHEUS"
             value: "true"
           - name: "NSQ_CONSUMER_SERVER"
-            value: $(DEIS_NSQD_SERVICE_HOST):$(DEIS_NSQD_SERVICE_PORT_TRANSPORT)
+            value: "$(DEIS_NSQD_SERVICE_HOST):$(DEIS_NSQD_SERVICE_PORT_TRANSPORT)"
           - name: "NSQ_CONSUMER_TOPIC"
             value: "metrics"
           - name: "NSQ_ENDPOINTS"
-            value: http://$(DEIS_NSQD_SERVICE_HOST):$(DEIS_NSQD_SERVICE_PORT_HTTP)
+            value: "\"http://$(DEIS_NSQD_SERVICE_HOST):$(DEIS_NSQD_SERVICE_PORT_HTTP)\""
+          {{- if env "LOGGER_REDIS_LOCATION" | default .logger_redis_location | ne "off-cluster" }}
           - name: DEIS_LOGGER_REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: logger-redis-creds
                 key: password
           - name: "REDIS_SERVERS"
-            value: tcp://:$(DEIS_LOGGER_REDIS_PASSWORD)@$(DEIS_LOGGER_REDIS_SERVICE_HOST):$(DEIS_LOGGER_REDIS_SERVICE_PORT)
+            value: "\"tcp://:$(DEIS_LOGGER_REDIS_PASSWORD)@$(DEIS_LOGGER_REDIS_SERVICE_HOST):$(DEIS_LOGGER_REDIS_SERVICE_PORT)\""
+          {{- end }}
           volumeMounts:
           - mountPath: /var/run/docker.sock
             name: docker-socket

telegraf/rootfs/config.toml.tpl

@@ -56,7 +56,7 @@
 
 {{ if .INFLUXDB_URLS}}
 [[outputs.influxdb]]
-  urls = [{{ .INFLUXDB_URLS | quote }}]
+  urls = [{{ .INFLUXDB_URLS }}]
   database = {{default "kubernetes" .INFLUXDB_DATABASE | quote }}
   precision = {{ default "ns" .INFLUXDB_PRECISION | quote }}
   timeout = {{ default "5s" .INFLUXDB_TIMEOUT | quote }}
@@ -68,7 +68,7 @@
 
 {{ if .KAFKA_BROKERS}}
 [[outputs.kafka]]
-  brokers = [{{ .KAFKA_BROKERS | quote }}]
+  brokers = [{{ .KAFKA_BROKERS }}]
   topic = {{ default "telegraf" .KAFKA_TOPIC | quote }}
   routing_tag = {{ .KAFKA_ROUTING_TAG | quote }}
   {{ if .KAFKA_CERTIFICATE }} certificate = {{ .KAFKA_CERTIFICATE | quote }} {{ end }}
@@ -166,7 +166,7 @@
 
 {{ if .ENABLE_INFLUXDB_INPUT }}
 [[inputs.influxdb]]
-  urls = [{{ (print .INFLUXDB_URLS "/debug/vars") | quote }}]
+  urls = [{{ .INFLUXDB_INPUT_URLS }}]
 {{ end }}
 
 {{ if .MEMCACHED_SERVERS }}
@@ -191,7 +191,7 @@
 
 {{ if .NSQ_ENDPOINTS }}
 [[inputs.nsq]]
-  endpoints = [{{ .NSQ_ENDPOINTS | quote }}]
+  endpoints = [{{ .NSQ_ENDPOINTS }}]
   interval = {{ default "1s" .AGENT_INTERVAL | quote }}
 {{ end }}
 
@@ -210,7 +210,7 @@
 
 {{ if .ENABLE_ETCD }}
 [[inputs.prometheus]]
-  urls = [{{  (default "http://localhost:2379/metrics" .ETCD_URLS) }}]
+  urls = [{{ .ETCD_URLS }}]
 {{ end }}
 
 {{ if .RABBITMQ_URL }}
@@ -224,7 +224,7 @@
 
 {{ if .REDIS_SERVERS }}
 [[inputs.redis]]
-  servers = [{{ .REDIS_SERVERS | quote }}]
+  servers = [{{ .REDIS_SERVERS }}]
 {{ end }}
 
 {{ if .RETHINKDB_SERVERS }}