From f5d705d40b5d79959efccb507bae7099afbaea80 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 14 Jun 2019 15:56:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20netdata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/amber.yml                    | 15 +--------------
 ansible/roles/netdata/tasks/main.yml | 22 ++++++++++++++++++++++
 ansible/templates/Caddyfile.j2       |  6 ++++++
 3 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 ansible/roles/netdata/tasks/main.yml

diff --git a/ansible/amber.yml b/ansible/amber.yml
index 19e843e..42b4f69 100644
--- a/ansible/amber.yml
+++ b/ansible/amber.yml
@@ -40,21 +40,8 @@
       tags:
         - webserver
 
-    - name: 'Create NetData container.'
-      docker_container:
+    - import_role:
         name: netdata
-        image: 'netdata/netdata:v1.15.0'
-        restart_policy: 'always'
-        published_ports:
-          - '19999:19999'
-        volumes:
-          - '/proc:/host/proc:ro'
-          - '/sys:/host/sys:ro'
-          - '/var/run/docker.sock:/var/run/docker.sock:ro'
-        capabilities:
-          - 'SYS_PTRACE'
-        security_opts:
-          - 'apparmor:unconfined'
       tags:
         - monitoring
 
diff --git a/ansible/roles/netdata/tasks/main.yml b/ansible/roles/netdata/tasks/main.yml
new file mode 100644
index 0000000..37c679a
--- /dev/null
+++ b/ansible/roles/netdata/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+- name: 'Grab docker group id.'
+  shell: grep docker /etc/group | cut -d ':' -f 3
+  register: docker_group
+
+- name: 'Create NetData container.'
+  docker_container:
+    name: netdata
+    image: 'netdata/netdata:v1.15.0'
+    restart_policy: 'always'
+    published_ports:
+      - '127.0.0.1:19999:19999'
+    volumes:
+      - '/proc:/host/proc:ro'
+      - '/sys:/host/sys:ro'
+      - '/var/run/docker.sock:/var/run/docker.sock:ro'
+    capabilities:
+      - 'SYS_PTRACE'
+    security_opts:
+      - 'apparmor:unconfined'
+    env:
+      PGID: '{{ docker_group.stdout }}'
diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2
index e69de29..da77bf7 100644
--- a/ansible/templates/Caddyfile.j2
+++ b/ansible/templates/Caddyfile.j2
@@ -0,0 +1,6 @@
+# NetData proxy
+:29999 {
+    proxy / 127.0.0.1:19999 {
+        transparent
+    }
+}