cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

zabbix: improve arguments and prevent to log password

Browse source
This commit is contained in:
Rene Moser 2015-05-26 15:33:50 +02:00 committed by Matt Clay
parent a9449aa078
commit 47eab56280
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/extras/monitoring/zabbix_host.py
View file

@ -335,13 +335,13 @@ def main():
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, default=None, aliases=['url']), server_url=dict(required=True, default=None, aliases=['url']),
login_user=dict(required=True), login_user=dict(required=True),
login_password=dict(required=True), login_password=dict(required=True, no_log=True),
host_name=dict(required=True), host_name=dict(required=True),
host_groups=dict(required=False), host_groups=dict(required=False),
link_templates=dict(required=False), link_templates=dict(required=False),
status=dict(default="enabled"), status=dict(default="enabled", choices=['enabled', 'disabled']),
state=dict(default="present"), state=dict(default="present", choices=['present', 'absent']),
timeout=dict(default=10), timeout=dict(type='int', default=10),
interfaces=dict(required=False) interfaces=dict(required=False)
), ),
supports_check_mode=True supports_check_mode=True

6
lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py
View file

@ -168,12 +168,12 @@ def main():
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, default=None, aliases=['url']), server_url=dict(required=True, default=None, aliases=['url']),
login_user=dict(required=True), login_user=dict(required=True),
login_password=dict(required=True), login_password=dict(required=True, no_log=True),
host_name=dict(required=True), host_name=dict(required=True),
macro_name=dict(required=True), macro_name=dict(required=True),
macro_value=dict(required=True), macro_value=dict(required=True),
state=dict(default="present"), state=dict(default="present", choices=['present', 'absent']),
timeout=dict(default=10) timeout=dict(type='int', default=10)
), ),
supports_check_mode=True supports_check_mode=True
) )

6
lib/ansible/modules/extras/monitoring/zabbix_screen.py
View file

@ -314,9 +314,9 @@ def main():
argument_spec=dict( argument_spec=dict(
server_url=dict(required=True, default=None, aliases=['url']), server_url=dict(required=True, default=None, aliases=['url']),
login_user=dict(required=True), login_user=dict(required=True),
login_password=dict(required=True), login_password=dict(required=True, no_log=True),
timeout=dict(default=10), timeout=dict(type='int', default=10),
screens=dict(required=True) screens=dict(type='dict', required=True)
), ),
supports_check_mode=True supports_check_mode=True
) )