From fc363697baef9f3346306f1ef10df05ff69e86db Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 17 Apr 2020 18:50:14 +0200 Subject: [PATCH] Fixes #624. role that installs the zabbix agent. --- README.md | 42 ++++++++++++++++++++++++++++-- defaults/main.yml | 7 +++++ handlers/main.yml | 2 ++ meta/main.yml | 53 ++++++++++++++++++++++++++++++++++++++ tasks/main.yml | 9 +++++++ tasks/zabbix-agent-deb.yml | 15 +++++++++++ tasks/zabbix-agent-rh.yml | 10 +++++++ tests/inventory | 2 ++ tests/test.yml | 5 ++++ vars/main.yml | 2 ++ 10 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 defaults/main.yml create mode 100644 handlers/main.yml create mode 100644 meta/main.yml create mode 100644 tasks/main.yml create mode 100644 tasks/zabbix-agent-deb.yml create mode 100644 tasks/zabbix-agent-rh.yml create mode 100644 tests/inventory create mode 100644 tests/test.yml create mode 100644 vars/main.yml diff --git a/README.md b/README.md index b4ea0a6..f6f2bdd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,41 @@ -# ansible-role-zabbix-agent +Role Name +========= -Role that installs and configures a zabbix agent +Role that installs the Zabbix agent on the nodes + +Requirements +------------ + +None + +Role Variables +-------------- + +zabbix_use_external_repo: boolean used to select the official repository at zabbix.com or the distribution one +zabbix_agent_repo: URL of the external repository + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - src: https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git + version: master + name: zabbix-agent + +License +------- + +EUPL 1.2 + +Author Information +------------------ + +Andrea Dell'Amico diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..1368d0b --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,7 @@ +--- +zabbix_agent_install: False +zabbix_use_external_repo: True +zabbix_repo_version: '4.0' +zabbix_agent_ubuntu_repo: 'https://repo.zabbix.com/zabbix/{{ zabbix_repo_version }}/ubuntu/pool/main/z/zabbix-release/zabbix-release_{{ zabbix_repo_version }}-2+{{ ansible_distribution_release }}_all.deb' +zabbix_agent_centos_repo: 'https://repo.zabbix.com/zabbix/{{ zabbix_repo_version }}/rhel/{{ ansible_distribution_major_version }}/x86_64/zabbix-release-{{ zabbix_repo_version }}-1.el7.noarch.rpm' + diff --git a/handlers/main.yml b/handlers/main.yml new file mode 100644 index 0000000..7a4b4dd --- /dev/null +++ b/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for zabbix-agent \ No newline at end of file diff --git a/meta/main.yml b/meta/main.yml new file mode 100644 index 0000000..3a212a9 --- /dev/null +++ b/meta/main.yml @@ -0,0 +1,53 @@ +galaxy_info: + author: your name + description: your description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.4 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. + \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml new file mode 100644 index 0000000..d8be42a --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- import_tasks: zabbix-agent-deb.yml + when: + - zabbix_agent_install | bool + - ansible_distribution_file_variety == "Debian" +- import_tasks: zabbix-agent-rh.yml + when: + - ansible_distribution_file_variety == "RedHat" + - zabbix_agent_install | bool diff --git a/tasks/zabbix-agent-deb.yml b/tasks/zabbix-agent-deb.yml new file mode 100644 index 0000000..ad32899 --- /dev/null +++ b/tasks/zabbix-agent-deb.yml @@ -0,0 +1,15 @@ +--- +- name: Repository and packages, deb/ubuntu + block: + - name: Install the repository + apt: pkg={{ zabbix_agent_ubuntu_repo }} state=present + register: update_apt_cache + + - name: Update the apt cache if we just installed the repository + apt: update_cache=yes + when: update_apt_cache is changed + + - name: Install the Zabbix agent package + apt: pkg=zabbix-agent state=latest cache_valid_time=1800 + + tags: [ 'zabbix', 'zabbix_agent' ] diff --git a/tasks/zabbix-agent-rh.yml b/tasks/zabbix-agent-rh.yml new file mode 100644 index 0000000..c01ca9d --- /dev/null +++ b/tasks/zabbix-agent-rh.yml @@ -0,0 +1,10 @@ +--- +- name: Repository and packages, RH/CentOS + block: + - name: Install the repository + yum: name={{ zabbix_agent_centos_repo }} + + - name: Install the Zabbix agent package + yum: name=zabbix-agent state=latest + + tags: [ 'zabbix', 'zabbix_agent' ] diff --git a/tests/inventory b/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/tests/test.yml b/tests/test.yml new file mode 100644 index 0000000..400dc94 --- /dev/null +++ b/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - zabbix-agent \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..fedc36c --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for zabbix-agent \ No newline at end of file