[checkmk-commits] check_http: support for password safe also for proxy_auth

Module: check_mk Branch: master Commit: 35cf92912a788bb2a8210e32a2fd9c75a3eabb57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35cf92912a788b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 28 16:06:51 2016 +0200 check_http: support for password safe also for proxy_auth --- checks/check_http | 4 ++-- web/plugins/wato/active_checks.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/checks/check_http b/checks/check_http index 95ff8a6..6e7bfec 100644 --- a/checks/check_http +++ b/checks/check_http @@ -97,8 +97,8 @@ def check_http_arguments(params): args += [ "-a", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "proxy_auth" in settings: - auth = settings["proxy_auth"] - args += [ '-b', ":".join(auth) ] + username, password = settings["auth"] + args += [ "-b", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "onredirect" in settings: args += [ '--onredirect=%s' % settings["onredirect"] ] diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9a2e57c..edb4755 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -904,10 +904,8 @@ register_rule(group, size = 12, allow_empty = False ), - Password( + IndividualOrStoredPassword( title = _("Password"), - size = 12, - allow_empty = False ), ] )