Address PR#16 feedback: terminology, consolidation, and security improvements

.ansible/roles/netdata

@@ -0,0 +1 @@
+/home/runner/work/netdata-ansible/netdata-ansible

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-# For the time being, @Ferroin is responsible for everything here
+# For the time being, @Ferroin is responsible for everything here.
 
 * @netdata/agent-sre

defaults/main.yml

@@ -1,8 +1,9 @@
 ---
-role_version: 1.0.0
+role_version: 0.1.0
 
-# Define the Netdata release version we install
-netdata_release_version: "stable"
+# Define the Netdata release channel we install
+# Supported values: stable, edge, nightly (alias for edge)
+netdata_release_channel: "stable"
 
 # Define if we manage the Netdata configuration
 netdata_manage_config: false

handlers/main.yml

@@ -6,3 +6,8 @@
     daemon_reload: true
     enabled: true
   when: ansible_service_mgr == "systemd"
+
+- name: Reload Netdata claiming state
+  ansible.builtin.command: netdatacli reload-claiming-state
+  changed_when: true
+  failed_when: false

tasks/configure-linux.yml

@@ -5,7 +5,7 @@
     owner: root
     group: netdata
     mode: '0644'
-  when: 
+  when:
     - netdata_manage_config
     - netdata_custom_config_path != ""
   notify: Restart Netdata
@@ -24,16 +24,6 @@
     - netdata_go_collector_plugins is defined and netdata_go_collector_plugins|length > 0
   notify: Restart Netdata
 
-- name: Lay down charts.d.conf
-  ansible.builtin.copy:
-    content: 'enable_all_charts="yes"'
-    dest: "/etc/netdata/charts.d.conf"
-    owner: root
-    group: netdata
-    mode: '0644'
-  when: netdata_manage_charts
-  notify: Restart Netdata
-
 - name: Process all Jinja2 chart templates
   ansible.builtin.template:
     src: "{{ item }}"

tasks/install-debian.yml

@@ -5,6 +5,10 @@
 
 # Debian
 
+    - name: Set repository URL
+      ansible.builtin.set_fact:
+        netdata_repo_url: "{{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/{{ ansible_facts.distribution | lower }}/"
+
     - name: Ensure gpg is installed.
       ansible.builtin.apt:
         name: gnupg
@@ -14,13 +18,13 @@
     - name: Install Netdata repo key.
       ansible.builtin.apt_key:
         url: "{{ netdata_repository_key_url }}"
+        id: "9DD4A74CECFA8F4F"
         state: present
 
     - name: Add repository
       ansible.builtin.apt_repository:
         filename: "netdata"
-        repo: |
-          deb {{ netdata_repository_url }}{{ netdata_release_version }}/{{ ansible_facts.distribution | lower }}/ {{ ansible_distribution_release | lower }}/
+        repo: "deb {{ netdata_repo_url }} {{ ansible_distribution_release | lower }}/"
         state: present
 
     - name: Install package

tasks/install-opensuse.yml

@@ -24,14 +24,14 @@
     - name: Add repository
       community.general.zypper_repository:
         name: "netdata"
-        repo: "{{ netdata_repository_url }}{{ netdata_release_version }}/opensuse/$releasever/$basearch"
+        repo: "{{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/opensuse/$releasever/$basearch"
         state: present
         auto_import_keys: true
 
     - name: Add repository configuration
       community.general.zypper_repository:
         name: "netdata-repoconfig"
-        repo: "{{ netdata_repository_url }}{{ netdata_release_version }}/opensuse/$releasever/$basearch"
+        repo: "{{ netdata_repository_url }}{{ netdata_release_channel_normalized }}/opensuse/$releasever/$basearch"
         state: present
         auto_import_keys: true
 

tasks/main.yml

@@ -3,13 +3,13 @@
 - name: Gather facts
   ansible.builtin.setup:
 
-- name: Install the Netdata Linux agent on Debian
-  ansible.builtin.include_tasks: install-debian.yml
-  when: "'debian' in ansible_facts.distribution | lower"
+- name: Normalize release channel (nightly -> edge)
+  ansible.builtin.set_fact:
+    netdata_release_channel_normalized: "{{ 'edge' if netdata_release_channel == 'nightly' else netdata_release_channel }}"
 
-- name: Install the Netdata Linux agent on Ubuntu
-  ansible.builtin.include_tasks: install-ubuntu.yml
-  when: "'ubuntu' in ansible_facts.distribution | lower"
+- name: Install the Netdata Linux agent on Debian/Ubuntu
+  ansible.builtin.include_tasks: install-debian.yml
+  when: "('debian' in ansible_facts.distribution | lower) or ('ubuntu' in ansible_facts.distribution | lower)"
 
 - name: Install the Netdata Linux agent on OpenSUSE
   ansible.builtin.include_tasks: install-opensuse.yml

tasks/node_claim.yml

@@ -7,4 +7,4 @@
     owner: root
     group: root
     mode: '0644'
-  notify: Restart Netdata
+  notify: Reload Netdata claiming state

templates/claim.conf.j2

@@ -5,4 +5,3 @@
     {% if netdata_proxy %}
         proxy = {{ netdata_proxy }}
     {% endif %}
-    insecure = 'no'