fix(telegraf): config.toml had an error

Author: Jonathan Chauncey

.gitignore

@@ -6,4 +6,6 @@
 telegraf/manifests/*.tmp.yaml
 influxdb/manifests/*.tmp.yaml
 chronograf/manifests/*.tmp.yaml
-grafana/manifests/*.tmp.yaml
+grafana/manifests/*.tmp.yaml
+
+telegraf/rootfs/telegraf

telegraf/rootfs/config.toml.tpl

@@ -155,16 +155,6 @@
 
 {{ if .HTTP_JSON_SERVERS }}
 [[inputs.httpjson]]
-<<<<<<< Updated upstream
-  name = "{{ .HTTP_JSON_NAME }}"
-  servers = [{{ .HTTP_JSON_SERVERS }}]
-  method = "{{ .HTTP_JSON_METHOD }}"
-  tag_keys = [{{ .HTTP_JSON_TAG_KEYS }}]
-  [inputs.httpjson.parameters]
-    event_type = "{{ .HTTP_JSON_EVENT_TYPE }}"
-    threshold = "{{ .HTTP_JSON_THRESHOLD }}"
-{{ end }}
-=======
   name = "{{.HTTP_JSON_NAME}}"
   servers = [{{.HTTP_JSON_SERVERS}}]
   method = "{{.HTTP_JSON_METHOD}}"
@@ -173,7 +163,6 @@
     event_type = "{{.HTTP_JSON_EVENT_TYPE}}"
     threshold = "{{.HTTP_JSON_THRESHOLD}}"
 {{end}}
->>>>>>> Stashed changes
 
 {{ if .INFLUXDB_URLS }}
 [[inputs.influxdb]]