From 470ead0813554da8ebfef31ddfdc58fb9377de9d Mon Sep 17 00:00:00 2001 From: Michal Hybner <76526074+mu1f407@users.noreply.github.com> Date: Tue, 31 Dec 2024 02:46:10 +0100 Subject: [PATCH] zabbix_inventory - do not require login credentials when auth_token is provided (#1439) --- changelogs/fragments/1439-inventory-required-fix.yml | 3 +++ plugins/inventory/zabbix_inventory.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/1439-inventory-required-fix.yml diff --git a/changelogs/fragments/1439-inventory-required-fix.yml b/changelogs/fragments/1439-inventory-required-fix.yml new file mode 100644 index 000000000..618aa25ce --- /dev/null +++ b/changelogs/fragments/1439-inventory-required-fix.yml @@ -0,0 +1,3 @@ +bugfixes: + - zabbix inventory plugin - do not require ``login_user`` and ``login_password`` to be present + when ``auth_token`` is provided (https://github.com/ansible-collections/community.zabbix/pull/1439). diff --git a/plugins/inventory/zabbix_inventory.py b/plugins/inventory/zabbix_inventory.py index fba90b7ba..4dfb74182 100644 --- a/plugins/inventory/zabbix_inventory.py +++ b/plugins/inventory/zabbix_inventory.py @@ -190,14 +190,12 @@ description: - Zabbix user name. type: str - required: true env: - name: ZABBIX_USERNAME login_password: description: - Zabbix user password. type: str - required: true env: - name: ZABBIX_PASSWORD auth_token: @@ -205,7 +203,6 @@ - Zabbix authentication token (see https://www.zabbix.com/documentation/current/en/manual/web_interface/frontend_sections/users/api_tokens) - If provided then C(login_user) and C(login_password) are ignored type: str - required: false http_login_user: description: - Basic Auth login