From c0815363a9a99970ecdfd72442b5aa2cb58114e3 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 19 Nov 2018 19:53:08 -0500
Subject: [PATCH] Common Module - Grafana Updates to Datasources and Telegraf

---
 salt/common/grafana/etc/datasources/influxdb.yaml |  9 +++------
 salt/common/telegraf/etc/telegraf.conf            | 10 +++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/salt/common/grafana/etc/datasources/influxdb.yaml b/salt/common/grafana/etc/datasources/influxdb.yaml
index 0b07038ea..4409d7394 100644
--- a/salt/common/grafana/etc/datasources/influxdb.yaml
+++ b/salt/common/grafana/etc/datasources/influxdb.yaml
@@ -11,10 +11,7 @@ datasources:
     database: telegraf
     url: https://{{ grains.master }}:8086
     jsonData:
-      tlsAuth: true
-      tlsAuthWithCACert: true
-    secureJsonData:
-      tlsCACert: "/etc/pki/ca.crt"
-      tlsClientCert: "/etc/pki/grafana.crt"
-      tlsClientKey: "/etc/pki/grafana.key"
+      tlsAuth: false
+      tlsAuthWithCACert: false
+      tlsSkipVerify: true
     version: 1
diff --git a/salt/common/telegraf/etc/telegraf.conf b/salt/common/telegraf/etc/telegraf.conf
index abbb59cac..861b5bd21 100644
--- a/salt/common/telegraf/etc/telegraf.conf
+++ b/salt/common/telegraf/etc/telegraf.conf
@@ -516,11 +516,11 @@
 
 
 # # Read metrics about docker containers
-# [[inputs.docker]]
+ [[inputs.docker]]
 #   ## Docker Endpoint
 #   ##   To use TCP, set endpoint = "tcp://[ip]:[port]"
 #   ##   To use environment variables (ie, docker-machine), set endpoint = "ENV"
-#   endpoint = "unix:///var/run/docker.sock"
+   endpoint = "unix:///var/run/docker.sock"
 #
 #   ## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
 #   gather_services = false
@@ -563,11 +563,11 @@
 
 
 # # Read stats from one or more Elasticsearch servers or clusters
-# [[inputs.elasticsearch]]
+ [[inputs.elasticsearch]]
 #   ## specify a list of one or more Elasticsearch servers
 #   # you can add username and password to your url to use basic authentication:
 #   # servers = ["http://user:pass@localhost:9200"]
-#   servers = ["http://localhost:9200"]
+   servers = ["http://{{ MASTER }}:9200"]
 #
 #   ## Timeout for HTTP requests to the elastic search server(s)
 #   http_timeout = "5s"
@@ -916,7 +916,7 @@
 
 
 # # Read metrics about network interface usage
-# [[inputs.net]]
+ [[inputs.net]]
 #   ## By default, telegraf gathers stats from any up interface (excluding loopback)
 #   ## Setting interfaces will tell it to gather these explicit interfaces,
 #   ## regardless of status.