Skip to content
This repository has been archived by the owner on Jul 31, 2020. It is now read-only.

Avoid conflicts with the zabbix_version and zabbix_url variables #303

Merged
merged 2 commits into from
Feb 4, 2020
Merged

Avoid conflicts with the zabbix_version and zabbix_url variables #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36285bb
add variable zabbix_agent_version
Dec 23, 2019
cbb48e5
Update README.md
santiagomr Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down