diff --git a/README.md b/README.md index e778e82..d52374d 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ netdata_agent_web_allow_from: ## Dependencies -``` +```yaml community.general ``` diff --git a/handlers/main.yml b/handlers/main.yml index 6b4ae85..2889082 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -19,7 +19,7 @@ name: netdata state: absent -- name: "Update apt cache (Debian Family)" +- name: "Update apt cache" become: true ansible.builtin.apt: update_cache: true diff --git a/meta/main.yml b/meta/main.yml index 41a0628..f2c4d82 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: company: none description: An Ansible role that installs and configures Netdata agent. license: MIT - min_ansible_version: "2.12" + min_ansible_version: "2.13" namespace: dgibbs64 role_name: netdata diff --git a/tasks/repo-RedHat.yml b/tasks/repo-RedHat.yml index cd7bbc5..cbd8244 100644 --- a/tasks/repo-RedHat.yml +++ b/tasks/repo-RedHat.yml @@ -1,5 +1,5 @@ --- -- name: "Set netdata_el_repo_distro (EL Family)" +- name: "Set netdata_el_repo_distro (Enterprise Linux)" ansible.builtin.set_fact: netdata_el_repo_distro: el @@ -18,8 +18,8 @@ netdata_el_repo_distro: amazonlinux when: ansible_distribution == "Amazon" -- name: "Ensure netdata-repo is removed (EL Family)" - ansible.builtin.yum: +- name: "Ensure netdata-repo is removed (RedHat Family)" + ansible.builtin.package: name: - netdata-repo - netdata-repo-edge @@ -28,12 +28,12 @@ - name: "Add netdata repository" when: netdata_agent_state == "present" block: - - name: "Ensure netdata repo key is present (EL Family)" + - name: "Ensure netdata repo key is present (RedHat Family)" ansible.builtin.rpm_key: state: present key: https://repo.netdata.cloud/netdatabot.gpg.key - - name: "Ensure netdata repository is configured (EL Family): {{ netdata_agent_channel }}" + - name: "Ensure netdata repository is configured (RedHat Family): {{ netdata_agent_channel }}" ansible.builtin.yum_repository: baseurl: https://repo.netdata.cloud/repos/{{ netdata_agent_channel }}/{{ netdata_el_repo_distro }}/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/ description: Netdata {{ netdata_agent_channel }} @@ -59,7 +59,7 @@ netdata_agent_channel_remove: stable when: netdata_agent_channel == "edge" - - name: "Ensure netdata repository is removed (EL Family): {{ netdata_agent_channel_remove }}" + - name: "Ensure netdata repository is removed (RedHat Family): {{ netdata_agent_channel_remove }}" ansible.builtin.yum_repository: baseurl: https://repo.netdata.cloud/repos/{{ netdata_agent_channel_remove }}/{{ netdata_el_repo_distro }}/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/ description: Netdata {{ netdata_agent_channel_remove }} @@ -78,7 +78,7 @@ - name: "Remove netdata repository" when: netdata_agent_state == "absent" block: - - name: "Ensure netdata repository is removed (EL Family): stable" + - name: "Ensure netdata repository is removed (RedHat Family): stable" ansible.builtin.yum_repository: baseurl: https://repo.netdata.cloud/repos/stable/{{ netdata_el_repo_distro }}/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/ description: Netdata stable @@ -93,7 +93,7 @@ sslcacert: /etc/pki/tls/certs/ca-bundle.crt sslverify: true - - name: "Ensure netdata repository is removed (EL Family): edge" + - name: "Ensure netdata repository is removed (RedHat Family): edge" ansible.builtin.yum_repository: baseurl: https://repo.netdata.cloud/repos/edge/{{ netdata_el_repo_distro }}/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/ description: Netdata edge @@ -108,7 +108,7 @@ sslcacert: /etc/pki/tls/certs/ca-bundle.crt sslverify: true - - name: "Ensure netdata repo key is removed (EL Family)" + - name: "Ensure netdata repo key is removed (RedHat Family)" ansible.builtin.rpm_key: state: absent key: https://repo.netdata.cloud/netdatabot.gpg.key