From 6e0f16084b6c68a3c92bfdb9ba5f80eb10f104b8 Mon Sep 17 00:00:00 2001
From: ukkopahis <95980324+ukkopahis@users.noreply.github.com>
Date: Sat, 30 Apr 2022 14:59:08 +0300
Subject: [PATCH 1/2] telegraf: fix deprecated options

Fixes #556
---
 .../telegraf/iotstack_defaults/auto_include/inputs.docker.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.templates/telegraf/iotstack_defaults/auto_include/inputs.docker.conf b/.templates/telegraf/iotstack_defaults/auto_include/inputs.docker.conf
index 79acf85e2..359f0472c 100644
--- a/.templates/telegraf/iotstack_defaults/auto_include/inputs.docker.conf
+++ b/.templates/telegraf/iotstack_defaults/auto_include/inputs.docker.conf
@@ -3,13 +3,12 @@
 [[inputs.docker]]
   endpoint = "unix:///var/run/docker.sock"
   gather_services = false
-  container_names = []
   source_tag = false
   container_name_include = []
   container_name_exclude = []
   timeout = "5s"
   perdevice = false
-  total = true
+  total_include = ["cpu", "blkio", "network"]
   docker_label_include = []
   docker_label_exclude = []
   tag_env = ["HEAP_SIZE"]

From d0018a5967616534daf89d7841400038ee348bcc Mon Sep 17 00:00:00 2001
From: ukkopahis <95980324+ukkopahis@users.noreply.github.com>
Date: Sun, 1 May 2022 09:30:31 +0300
Subject: [PATCH 2/2] docs/Telegraf: small fixes

---
 docs/Containers/Telegraf.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/Containers/Telegraf.md b/docs/Containers/Telegraf.md
index 83e271422..45cd7f9fc 100644
--- a/docs/Containers/Telegraf.md
+++ b/docs/Containers/Telegraf.md
@@ -181,7 +181,6 @@ The first time you launch the Telegraf container, the following structure will b
 ```
 ~/IOTstack/volumes/telegraf
 ├── [drwxr-xr-x root    ]  additions
-│   ├── [-rw-r--r-- root    ]  inputs.docker.conf
 │   └── [-rw-r--r-- root    ]  inputs.mqtt_consumer.conf
 ├── [-rw-r--r-- root    ]  telegraf.conf
 └── [-r--r--r-- root    ]  telegraf-reference.conf
@@ -200,7 +199,7 @@ The file:
 	- is created by removing all comment lines and blank lines from `telegraf-reference.conf`, leaving only the "active" configuration options, and then adding options necessary for IOTstack.
 	- is less than 30 lines and is significantly easier to understand than `telegraf-reference.conf`.
 
-* `inputs.docker.conf` – see [Applying optional additions](#optionalAdditions) below.
+* `inputs.mqtt_consumer.conf` – see [Applying optional additions](#optionalAdditions) below.
 
 The intention of this structure is that you:
 
@@ -223,7 +222,7 @@ $ docker-compose restart telegraf
   ``` console
   $ echo $(cat /boot/cmdline.txt) cgroup_memory=1 cgroup_enable=memory | sudo tee /boot/cmdline.txt
   ```
-* `inputs.cpu_temp.conf' collects cpu temperature.
+* `inputs.cpu_temp.conf` collects cpu temperature.
  
 ### Applying optional additions { #optionalAdditions }