From 20a35dfe62bec4941bd82612b038cdee85521390 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 13 Apr 2021 15:57:01 -0400
Subject: [PATCH] Reclaiming netdata

---
 ansible/roles/netdata/tasks/main.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/netdata/tasks/main.yml b/ansible/roles/netdata/tasks/main.yml
index 1c812e36d..f04773524 100644
--- a/ansible/roles/netdata/tasks/main.yml
+++ b/ansible/roles/netdata/tasks/main.yml
@@ -12,10 +12,15 @@
     state: started
     healthcheck:
       test: curl localhost:19999
-    image: netdata/netdata
+    image: netdata/netdata:latest
     ports: 19999:19999
+    pull: yes
     hostname: "{{ ansible_hostname }}"
     container_default_behavior: no_defaults
+    capabilities:
+      - SYS_PTRACE
+    security_opts:
+      - apparmor:unconfined
     env:
       MONITOR_URL: "https://{{ ansible_ssh_host }}/monitor"
       STAGING: "True"
@@ -25,12 +30,12 @@
       - /srv/newsblur/docker/netdata/netdataconfig/python.d.conf:/usr/lib/netdata/conf.d/python.d.conf 
       - /srv/newsblur/docker/netdata/netdataconfig/conf/:/usr/lib/netdata/conf.d/python.d/
       - /srv/newsblur/docker/netdata/netdataconfig/charts/newsblur.chart.py:/usr/libexec/netdata/python.d/newsblur.chart.py
-
       - /etc/passwd:/host/etc/passwd:ro
       - /etc/group:/host/etc/group:ro
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /etc/os-release:/host/etc/os-release:ro
+      - /var/run/docker.sock:/var/run/docker.sock
   notify: restart netdata
 
 
@@ -55,6 +60,14 @@
     become: yes
   when: reclaim == false
 
+- name: Check if reclaiming
+  debug: msg=Reclaiming
+  changed_when: yes
+  register: reclaim
+  tags:
+    - never
+    - reclaim
+
 - name: Re-claim a node to Netdata Cloud
   block:
 
@@ -69,8 +82,8 @@
     when: uuidgen_result.stat.exists == false
 
   - name: Reclaim the node with `-id=`
-    command: "docker exec netdata netdata-claim.sh -token={{ netdata_token }} -rooms={{ netdata_room }} -url={{ netdata_url }} -id=$(uuidgen -hostname={{ ansible_hostname }}"
+    command: "docker exec netdata netdata-claim.sh -token={{ netdata_token }} -rooms={{ netdata_room }} -url={{ netdata_url }} -id=$(uuidgen) -hostname={{ ansible_hostname }}"
     when: uuidgen_result.stat.exists == true
     notify: restart netdata
     become: yes
-  when: reclaim == true
+  when: reclaim is defined