From 36285bb89e00916c80a2cdfe3a3e57a15b141ed5 Mon Sep 17 00:00:00 2001 From: valem Date: Mon, 23 Dec 2019 08:52:41 -0300 Subject: [PATCH 1/2] add variable zabbix_agent_version --- defaults/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7f08628a..f63cfecf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,8 @@ --- # defaults file for zabbix-agent -zabbix_version: 4.4 +zabbix_agent_version: 4.4 +zabbix_version: "{{ zabbix_agent_version }}" zabbix_version_patch: 0 zabbix_repo: zabbix zabbix_agent_package: zabbix-agent @@ -39,7 +40,8 @@ zabbix_repo_yum: state: present # Zabbix API stuff -zabbix_url: "http://zabbix.dj-wasabi.local" +zabbix_agent_server_url: "http://zabbix.dj-wasabi.local" +zabbix_url: "{{ zabbix_agent_server_url }}" # zabbix_api_http_user: admin # zabbix_api_http_password: admin zabbix_api_user: Admin From cbb48e5bb230f8855934b459f26d55d1b319e413 Mon Sep 17 00:00:00 2001 From: santiagomr Date: Tue, 4 Feb 2020 11:18:51 -0300 Subject: [PATCH 2/2] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 01aad533..0158327a 100644 --- a/README.md +++ b/README.md @@ -180,11 +180,11 @@ This will install the zabbix-agent role into your `roles` directory. In order to get the Zabbix Agent running, you'll have to define the following properties before executing the role: -* zabbix_version +* zabbix_agent_version * zabbix_agent_server * zabbix_agent_serveractive (When using active checks) -The `zabbix_version` is optional. The latest available major.minor version of Zabbix will be installed on the host(s). If you want to use an older version, please specify this in the major.minor format. Example: `zabbix_version: 4.0`, `zabbix_version: 3.4` or `zabbix_version: 2.2`. +The `zabbix_agent_version` is optional. The latest available major.minor version of Zabbix will be installed on the host(s). If you want to use an older version, please specify this in the major.minor format. Example: `zabbix_agent_version: 4.0`, `zabbix_agent_version: 3.4` or `zabbix_agent_version: 2.2`. The `zabbix_agent_server` (and `zabbix_agent_serveractive`) should contain the ip or fqdn of the host running the Zabbix Server. @@ -202,7 +202,7 @@ There are some variables in default/main.yml which can (or need to) be overridde * `zabbix_agent_serveractive`: The ip address for the zabbix-server or zabbix-proxy for active checks. -* `zabbix_version`: This is the version of zabbix. Default it is 4.0, but can be overridden to one of the versions mentioned in [Zabbix Versions](#zabbix-versions). +* `zabbix_agent_version`: This is the version of zabbix. Default it is 4.4, but can be overridden to one of the versions mentioned in [Zabbix Versions](#zabbix-versions). Previously the variable `zabbix_version` was used directly but it could cause [some inconvenience](https://github.com/dj-wasabi/ansible-zabbix-agent/pull/303). That variable is maintained by retrocompativility. * `zabbix_repo`: Default: _zabbix_ * _epel_ install agent from EPEL repo