From 2b733e3e1164e00815524dcc99257571c01ea52a Mon Sep 17 00:00:00 2001
From: Rene Mewissen <rene@tantooine.myfirewall.org>
Date: Thu, 27 Nov 2025 16:56:10 +0100
Subject: [PATCH] moved telegraf config for docker to docker role

---
 global_handlers/global_handlers.yml             |  7 ++++++-
 roles/docker/files/telegraf.d/input_docker.conf | 14 ++++++++++++++
 roles/docker/tasks/configure_telegraf.yml       |  7 +++++++
 roles/docker/tasks/main.yml                     | 15 +++++++++------
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 roles/docker/files/telegraf.d/input_docker.conf
 create mode 100644 roles/docker/tasks/configure_telegraf.yml

diff --git a/global_handlers/global_handlers.yml b/global_handlers/global_handlers.yml
index c038baa..bfc187e 100644
--- a/global_handlers/global_handlers.yml
+++ b/global_handlers/global_handlers.yml
@@ -31,4 +31,9 @@
 - name: restart rsyslog
   ansible.builtin.service:
     name: rsyslog
-    state: restarted
\ No newline at end of file
+    state: restarted
+
+- name: restart_telegraf
+  ansible.builtin.service:
+    name: "telegraf"
+    state: restarted
diff --git a/roles/docker/files/telegraf.d/input_docker.conf b/roles/docker/files/telegraf.d/input_docker.conf
new file mode 100644
index 0000000..d379f2b
--- /dev/null
+++ b/roles/docker/files/telegraf.d/input_docker.conf
@@ -0,0 +1,14 @@
+[[inputs.docker]]
+  endpoint = "unix:///var/run/docker.sock"
+  gather_services = true
+  container_names = []
+  source_tag = false
+  container_name_include = []
+  container_name_exclude = []
+  timeout = "5s"
+  perdevice = false
+  perdevice_include = ["cpu", "blkio", "network"]
+  total = false
+  total_include = ["cpu", "blkio", "network"]
+  docker_label_include = []
+  docker_label_exclude = []
\ No newline at end of file
diff --git a/roles/docker/tasks/configure_telegraf.yml b/roles/docker/tasks/configure_telegraf.yml
new file mode 100644
index 0000000..88b9bd3
--- /dev/null
+++ b/roles/docker/tasks/configure_telegraf.yml
@@ -0,0 +1,7 @@
+- name: docker | telegraf | copy basic config
+  ansible.builtin.copy:
+    dest: "/etc/telegraf/telegraf.d/{{ item | basename }}"
+    src: "{{ item }}"
+  with_fileglob:
+    - "telegraf.d/*.conf"
+  notify: restart_telegraf
\ No newline at end of file
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 41abdb8..0192b80 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,17 +1,20 @@
 ---
 # Load distro specific variables
-- include_vars: "{{ ansible_distribution | lower }}.yml"
+- ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml"
   tags: always
   ignore_errors: True
-- include_vars: "{{ ansible_fqdn | lower }}.yml"
+- ansible.builtin.include_vars: "{{ ansible_fqdn | lower }}.yml"
   ignore_errors: True
 
-- import_tasks: install_docker.yml
-- import_tasks: install_portainer.yml
+- ansible.builtin.import_tasks: install_docker.yml
+- ansible.builtin.import_tasks: install_portainer.yml
   when:
     - run_portainer is defined
     - run_portainer == true
-- import_tasks: install_portainer_agent.yml
+- ansible.builtin.import_tasks: install_portainer_agent.yml
   when:
     - run_portainer_agent is defined
-    - run_portainer_agent == true
\ No newline at end of file
+    - run_portainer_agent == true
+
+- ansible.builtin.import_tasks: configure_telegraf.yml
+  
\ No newline at end of file