Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

3553 SNMPv3 noAuthNoPriv: Fixed diagnostic page

by Andreas Boesl

Module: check_mk Branch: master Commit: 7eaa163f8a48e9edcd6c4aa0561ecb1b1b328556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eaa163f8a48e9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 4 12:20:31 2016 +0200 3553 SNMPv3 noAuthNoPriv: Fixed diagnostic page --- .werks/3553 | 9 +++++++++ ChangeLog | 1 + modules/automation.py | 6 +++++- web/htdocs/js/wato.js | 6 ++++-- web/htdocs/wato.py | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/3553 b/.werks/3553 new file mode 100644 index 0000000..d7e1879 --- /dev/null +++ b/.werks/3553 @@ -0,0 +1,9 @@ +Title: SNMPv3 noAuthNoPriv: Fixed diagnostic page +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1467627593 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 42d5122..d794d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 3687 Hostname translation for piggybacked host: now it's possible to enter any number of regular expressions within this ruleset... * 3657 Custom host attributes can now be configured... * 3658 LDAP: Connections can now be enabled/disabled per site... + * 3553 SNMPv3 noAuthNoPriv: Fixed diagnostic page * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/modules/automation.py b/modules/automation.py index 1cf3683..e3b5bcf 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -694,6 +694,8 @@ def automation_diag_host(args): snmpv3_use = args[8] if snmpv3_use in ["authNoPriv", "authPriv"]: snmpv3_auth_proto, snmpv3_security_name, snmpv3_security_password = args[9:12] + else: + snmpv3_security_name = args[10] if snmpv3_use == "authPriv": snmpv3_privacy_proto, snmpv3_privacy_password = args[12:14] @@ -733,7 +735,7 @@ def automation_diag_host(args): elif test.startswith('snmp'): # SNMPv3 tuples - # ('noAuthNoPriv',) + # ('noAuthNoPriv', "username") # ('authNoPriv', 'md5', '11111111', '22222222') # ('authPriv', 'md5', '11111111', '22222222', 'DES', '33333333') @@ -743,6 +745,8 @@ def automation_diag_host(args): snmpv3_credentials = [snmpv3_use] if snmpv3_use in ["authNoPriv", "authPriv"]: snmpv3_credentials.extend([snmpv3_auth_proto, snmpv3_security_name, snmpv3_security_password]) + else: + snmpv3_credentials.extend([snmpv3_security_name]) if snmpv3_use == "authPriv": snmpv3_credentials.extend([snmpv3_privacy_proto, snmpv3_privacy_password]) explicit_snmp_communities[hostname] = tuple(snmpv3_credentials) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 842d92d..1e38291 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -772,7 +772,10 @@ function start_host_diag_test(ident, hostname) { if (document.getElementsByName("vs_host_p_snmp_v3_credentials_USE")[0].checked) { v3_use = encodeURIComponent(document.getElementsByName('vs_host_p_snmp_v3_credentials_use')[0].value); vars += '&snmpv3_use=' + v3_use; - if (v3_use == "1") { + if (v3_use == "0") { + vars += '&snmpv3_security_name=' + encodeURIComponent(document.getElementsByName('vs_host_p_snmp_v3_credentials_0_1')[0].value); + } + else if (v3_use == "1") { vars += '&snmpv3_auth_proto=' + encodeURIComponent(document.getElementsByName('vs_host_p_snmp_v3_credentials_1_1')[0].value); vars += '&snmpv3_security_name=' + encodeURIComponent(document.getElementsByName('vs_host_p_snmp_v3_credentials_1_2')[0].value); vars += '&snmpv3_security_password=' + encodeURIComponent(document.getElementsByName('vs_host_p_snmp_v3_credentials_1_3')[0].value); @@ -786,7 +789,6 @@ function start_host_diag_test(ident, hostname) { } } - vars += '&agent_port=' + encodeURIComponent(document.getElementsByName('vs_rules_p_agent_port')[0].value); vars += '&snmp_timeout=' + encodeURIComponent(document.getElementsByName('vs_rules_p_snmp_timeout')[0].value); vars += '&snmp_retries=' + encodeURIComponent(document.getElementsByName('vs_rules_p_snmp_retries')[0].value); diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 742eb61..073c7b6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2628,6 +2628,8 @@ def ajax_diag_host(): snmpv3_privacy_proto = { "0": "DES", "1": "AES" }.get(html.var("snmpv3_privacy_proto")) args[10] = snmpv3_privacy_proto args[11] = html.var("snmpv3_privacy_password") + else: + args[8] = html.var("snmpv3_security_name") result = check_mk_automation(host.site_id(), "diag-host", [hostname, _test] + args) # API is defined as follows: Two data fields, separated by space.

8 years, 2 months

3552 FIX SNMPv3: Fixed login with security level noAuthNoPriv

by Andreas Boesl

Module: check_mk Branch: master Commit: e30ac224cea22c31a620d449ce0bcfe97649a9bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30ac224cea22c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 4 11:00:21 2016 +0200 3552 FIX SNMPv3: Fixed login with security level noAuthNoPriv --- .werks/3552 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 4 +++- web/plugins/wato/builtin_attributes.py | 26 +++++++++++++++++--------- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.werks/3552 b/.werks/3552 new file mode 100644 index 0000000..7ff0642 --- /dev/null +++ b/.werks/3552 @@ -0,0 +1,9 @@ +Title: SNMPv3: Fixed login with security level noAuthNoPriv +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1467622758 +Class: fix + +The security level noAuthNoPriv did never work. diff --git a/ChangeLog b/ChangeLog index 0925668..42d5122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -295,6 +295,7 @@ * 3151 FIX: windows agent: further fix to crashes on failures to query wmi * 3693 FIX: ups_eaton_enviroment: Fixed handling of dictionary-based parameters... NOTE: Please refer to the migration notes! + * 3552 FIX: SNMPv3: Fixed login with security level noAuthNoPriv... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk.py b/modules/check_mk.py index 6a61d27..b5cb4b9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1661,8 +1661,10 @@ def snmp_base_command(what, hostname): options = "-v3 -l '%s' -a '%s' -u '%s' -A '%s' -x '%s' -X '%s'" % tuple(credentials) elif len(credentials) == 4: options = "-v3 -l '%s' -a '%s' -u '%s' -A '%s'" % tuple(credentials) + elif len(credentials) == 2: + options = "-v3 -l '%s' -u '%s'" % tuple(credentials) else: - raise MKGeneralException("Invalid SNMP credentials '%r' for host %s: must be string, 4-tuple or 6-tuple" % (credentials, hostname)) + raise MKGeneralException("Invalid SNMP credentials '%r' for host %s: must be string, 2-tuple, 4-tuple or 6-tuple" % (credentials, hostname)) # Do not load *any* MIB files. This save lot's of CPU. options += " -m '' -M ''" diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 8cd9a17..6ed1be7 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -97,7 +97,7 @@ class SNMPCredentials(Alternative): return x and (len(x) == 6 and 2 or len(x) == 4 and 1) or 0 else: return type(x) == tuple and ( \ - len(x) == 1 and 1 or \ + len(x) in [1, 2] and 1 or \ len(x) == 4 and 2 or 3) or 0 kwargs.update({ @@ -106,14 +106,22 @@ class SNMPCredentials(Alternative): title = _("SNMP community (SNMP Versions 1 and 2c)"), allow_empty = False, ), - Tuple( - title = _("Credentials for SNMPv3 without authentication and privacy (noAuthNoPriv)"), - elements = [ - FixedValue("noAuthNoPriv", - title = _("Security Level"), - totext = _("No authentication, no privacy"), - ), - ] + Transform( + Tuple( + title = _("Credentials for SNMPv3 without authentication and privacy (noAuthNoPriv)"), + elements = [ + FixedValue("noAuthNoPriv", + title = _("Security Level"), + totext = _("No authentication, no privacy"), + ), + TextAscii( + title = _("Security name"), + attrencode = True, + allow_empty = False + ), + ] + ), + forth = lambda x: len(x) == 2 and x or (x[0], "") ), Tuple( title = _("Credentials for SNMPv3 with authentication but without privacy (authNoPriv)"),

8 years, 2 months

3693 FIX ups_eaton_enviroment: Fixed handling of dictionary-based parameters

by Konstantin Büttner

Module: check_mk Branch: master Commit: 81616ce25f8cba91083ebcfd655676253f1ccc2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81616ce25f8cba… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 4 09:56:51 2016 +0200 3693 FIX ups_eaton_enviroment: Fixed handling of dictionary-based parameters Rediscovery of the affected hosts is required --- .werks/3693 | 10 ++++++++++ ChangeLog | 2 ++ checks/ups_eaton_enviroment | 24 ++++++++++++++---------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.werks/3693 b/.werks/3693 new file mode 100644 index 0000000..1aa0cc9 --- /dev/null +++ b/.werks/3693 @@ -0,0 +1,10 @@ +Title: ups_eaton_enviroment: Fixed handling of dictionary-based parameters +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.4.0i1 +Date: 1467618964 + +Rediscovery of the affected hosts is required diff --git a/ChangeLog b/ChangeLog index 7f59a79..0925668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -293,6 +293,8 @@ * 3686 FIX: hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 * 3150 FIX: fixed helpers failing to start and high cpu load when an unparsable local check is installed... * 3151 FIX: windows agent: further fix to crashes on failures to query wmi + * 3693 FIX: ups_eaton_enviroment: Fixed handling of dictionary-based parameters... + NOTE: Please refer to the migration notes! Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment index 61e3fc8..c090e6c 100644 --- a/checks/ups_eaton_enviroment +++ b/checks/ups_eaton_enviroment @@ -25,14 +25,17 @@ # Boston, MA 02110-1301 USA. -ups_eaton_enviroment_default = { +factory_settings["ups_eaton_enviroment_default"] = { "temp" : (40, 50), "remote_temp" : (40, 50), "humidity" : (65, 80), } + + def inventory_ups_eaton_enviroment(info): if len(info) > 0: - return [ (None, "ups_eaton_enviroment_default") ] + return [ (None, {}) ] + def check_ups_eaton_enviroment(item, params, info): wert = map(saveint, info[0]) @@ -55,13 +58,14 @@ def check_ups_eaton_enviroment(item, params, info): messages.append(text) return (state, ", ".join(messages), perfdata) -check_info['ups_eaton_enviroment'] = { - "inventory_function" : inventory_ups_eaton_enviroment, - "check_function" : check_ups_eaton_enviroment, - "service_description" : "Enviroment", - "has_perfdata" : True, - "group" : "eaton_enviroment", - "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1"] +check_info['ups_eaton_enviroment'] = { + "default_levels_variable" : "ups_eaton_enviroment_default", + "inventory_function" : inventory_ups_eaton_enviroment, + "check_function" : check_ups_eaton_enviroment, + "service_description" : "Enviroment", + "has_perfdata" : True, + "group" : "eaton_enviroment", + "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1"], }

8 years, 2 months

Reserved 3 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: fe9f40f8e09d3a126b40699a027d9273d4d56a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe9f40f8e09d3a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 4 09:54:56 2016 +0200 Reserved 3 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7f0e18c..0ee948f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3693 +3696

8 years, 2 months

pyinotify now supports moved_to/moved_from/move_self events

by Andreas Boesl

Module: check_mk Branch: master Commit: c889f37f2e458c00613c69c16f15dd906d505494 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c889f37f2e458c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 4 09:43:02 2016 +0200 pyinotify now supports moved_to/moved_from/move_self events --- agents/plugins/mk_inotify | 71 +++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify index ba8a190..453faaf 100755 --- a/agents/plugins/mk_inotify +++ b/agents/plugins/mk_inotify @@ -115,26 +115,27 @@ if os.path.exists(pid_filename): # +----------------------------------------------------------------------+ # Reaching this point means that no mk_inotify is currently running -try: - pid = os.fork() - if pid > 0: - sys.exit(0) - # Decouple from parent environment - os.chdir("/") - os.umask(0) - os.setsid() - - # Close all fd - for fd in range(0, 256): - try: - os.close(fd) - except OSError: - pass -except Exception, e: - sys.stderr.write("Error forking mk_inotify: %s" % e) - -# Save pid of working process. -file(pid_filename, "w").write("%d" % os.getpid()) +if not opt_foreground: + try: + pid = os.fork() + if pid > 0: + sys.exit(0) + # Decouple from parent environment + os.chdir("/") + os.umask(0) + os.setsid() + + # Close all fd + for fd in range(0, 256): + try: + os.close(fd) + except OSError: + pass + except Exception, e: + sys.stderr.write("Error forking mk_inotify: %s" % e) + + # Save pid of working process. + file(pid_filename, "w").write("%d" % os.getpid()) # .--Main----------------------------------------------------------------. # | __ __ _ | @@ -216,21 +217,26 @@ def do_output(what, event): map_events = { - # Mode Mask Report_filestats (currently unused) - "access": (pyinotify.IN_ACCESS, False), - "open": (pyinotify.IN_OPEN, False), - "create": (pyinotify.IN_CREATE, False), - "delete": (pyinotify.IN_DELETE, False), - "modify": (pyinotify.IN_MODIFY, False), + # Mode Mask Report_filestats (currently unused) + "access" : (pyinotify.IN_ACCESS, False), + "open" : (pyinotify.IN_OPEN, False), + "create" : (pyinotify.IN_CREATE, False), + "delete" : (pyinotify.IN_DELETE, False), + "modify" : (pyinotify.IN_MODIFY, False), + "movedto" : (pyinotify.IN_MOVED_TO, False), + "movedfrom": (pyinotify.IN_MOVED_FROM, False), + "moveself" : (pyinotify.IN_MOVE_SELF, False), } class NotifyEventHandler(pyinotify.ProcessEvent): - def process_IN_ACCESS(self, event): - do_output("access", event) + def process_IN_MOVED_TO(self, event): + do_output("movedto", event) -# def process_IN_ATTRIB(self, event): -# print "ATTRIB event:", event.pathname -# + def process_IN_MOVED_FROM(self, event): + do_output("movedfrom", event) + + def process_IN_MOVE_SELF(self, event): + do_output("moveself", event) # def process_IN_CLOSE_NOWRITE(self, event): # print "CLOSE_NOWRITE event:", event.pathname # @@ -329,6 +335,9 @@ def main(): attributes["mask"] |= map_events[mode][0] update_watched_folders() + if opt_foreground: + import pprint + pprint.pprint(folder_configs) # Save monitored file/folder information specified in mk_inotify.cfg file(configured_paths, "w").write("\n".join(get_watched_files())+"\n")

8 years, 2 months

3551 FIX Now able to open BI aggregations containing a few hundred hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: 1ac72a3e2cf972ddb430caf66d622003decb7832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ac72a3e2cf972… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 30 17:11:56 2016 +0200 3551 FIX Now able to open BI aggregations containing a few hundred hosts A BI in the GUI could not get unfolded correctly if it had too much hosts. This has been fixed. --- .werks/3551 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 24 ++++++++++++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.werks/3551 b/.werks/3551 new file mode 100644 index 0000000..d47518f --- /dev/null +++ b/.werks/3551 @@ -0,0 +1,10 @@ +Title: Now able to open BI aggregations containing a few hundred hosts +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i1 +Date: 1467299366 +Class: fix + +A BI in the GUI could not get unfolded correctly if it had too much hosts. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index f4f4edf..7f59a79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -493,6 +493,7 @@ * 3439 FIX: Fixed processing of BI aggregations containing umlauts * 3440 FIX: Fixed possible BI exception "Unknown BI aggregation group ..."... * 3574 FIX: Fixed broken aggregations snapin when using aggregations based on hard states... + * 3551 FIX: Now able to open BI aggregations containing a few hundred hosts... Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c967dd8..55036ba 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -524,12 +524,24 @@ function get_url_sync(url) return AJAX.responseText; } -function post_url(url, params) +function post_url(url, post_params, responseHandler, handler_data, errorHandler) { - call_ajax(url, { + var args = { method: "POST", - post_data: params - }); + post_data: post_params + } + + if (typeof responseHandler !== 'undefined') { + args.response_handler = responseHandler; + } + + if (typeof handler_data !== 'undefined') + args.handler_data = handler_data; + + if (typeof errorHandler !== 'undefined') + args.error_handler = errorHandler; + + call_ajax(url, args); } function bulkUpdateContents(ids, codes) @@ -2958,8 +2970,8 @@ function bi_update_tree(oImg, code) while (oDiv.className != "bi_tree_container") { oDiv = oDiv.parentNode; } - var url = "bi_render_tree.py?" + oDiv.id; - get_url(url, bi_update_tree_response, oDiv); + + post_url("bi_render_tree.py", oDiv.id, bi_update_tree_response, oDiv); } function bi_update_tree_response(oDiv, code) {

8 years, 2 months

added notification script for glpi to doc/treasures

by Sebastian Herbord

Module: check_mk Branch: master Commit: 219f72930f7d15e524c7073a900aec4026fd412f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=219f72930f7d15… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jul 4 09:07:41 2016 +0200 added notification script for glpi to doc/treasures --- doc/treasures/notifications/glpi.py | 673 +++++++++++++++++++++++++++++++++++ 1 file changed, 673 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=219f72930f…

8 years, 2 months

3691 oracle_jobs: status of missing jobs is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: 651fa0653dfc526352a33ca3df17a5b592d53875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=651fa0653dfc52… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 1 15:26:09 2016 +0200 3691 oracle_jobs: status of missing jobs is now configurable --- .werks/3691 | 9 +++++++ ChangeLog | 1 + checks/oracle_jobs | 8 ++++-- web/plugins/wato/check_parameters.py | 48 +++++++++++++++++++++------------- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/.werks/3691 b/.werks/3691 new file mode 100644 index 0000000..4a638b3 --- /dev/null +++ b/.werks/3691 @@ -0,0 +1,9 @@ +Title: oracle_jobs: status of missing jobs is now configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1467379514 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a067ed6..f4f4edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ * 3688 perle_chassis, perle_chassis.temp, perle_chassis_slots, perle_modules_cm1000, perle_modules_cm1110, perle_modules_mgt, perle_psmu, perle_psmu.fan: new checks for Perle Mediaconverter devices which support the PERLE-MCR-MGT MIB * 3689 brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received * 3690 apache_status: upper levels for busy workers are now configurable + * 3691 oracle_jobs: status of missing jobs is now configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/oracle_jobs b/checks/oracle_jobs index 7cc39bd..f3d44f3 100644 --- a/checks/oracle_jobs +++ b/checks/oracle_jobs @@ -107,13 +107,17 @@ def check_oracle_jobs(item, params, info): raise MKCounterWrapped("Login not possible for check %s" % item) if not service_found: - return (2, 'Job is missing') + state = 2 + infotext = "Job is missing" + if "status_missing_jobs" in params: + state = params["status_missing_jobs"] + infotext += " (configured through WATO)" + return state, infotext state = 0 output = [] perfdata = [] - txt = "Job-State: %s" % job_state if job_state == "BROKEN": txt += "(!!)" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ccd62d2..aeb584f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6757,31 +6757,42 @@ register_check_parameters( register_check_parameters( subgroup_applications, "oracle_jobs", - _("ORACLE Scheduler Job"), + _("Oracle Scheduler Job"), Dictionary( help = _("A scheduler job is an object in an ORACLE database which could be " "compared to a cron job on Unix. "), elements = [ ( "run_duration", - Tuple( - title = _("Maximum run duration for last execution"), - help = _("Here you can define an upper limit for the run duration of " - "last execution of the job."), - elements = [ - Age(title = _("warning at")), - Age(title = _("critical at")), - ])), - ( "disabled", DropdownChoice( - title = _("Job State"), - totext = "", - choices = [ - ( True, _("Ignore the state of the Job")), - ( False, _("Consider the state of the job")),], - help = _("The state of the job is ignored per default.") + Tuple( + title = _("Maximum run duration for last execution"), + help = _("Here you can define an upper limit for the run duration of " + "last execution of the job."), + elements = [ + Age(title = _("warning at")), + Age(title = _("critical at")), + ] )), - ( "status_disabled_jobs", MonitoringState( - title = "Status of service in case of disabled job", default_value = 0 + ( "disabled", + DropdownChoice( + title = _("Job State"), + help = _("The state of the job is ignored per default."), + totext = "", + choices = [ + ( True, _("Ignore the state of the Job")), + ( False, _("Consider the state of the job")), + ], + )), + ( "status_disabled_jobs", + MonitoringState( + title = "Status of service in case of disabled job", + default_value = 0 + )), + ( "status_missing_jobs", + MonitoringState( + title = _("Status of service in case of missing job."), + default_value = 2, )), + ] ), TextAscii( @@ -12079,3 +12090,4 @@ register_check_parameters( TextAscii( title = _("Node ID")), "first" ) +

8 years, 2 months

Single user session: Fixed bug when no session info present for user

by Lars Michelsen

Module: check_mk Branch: master Commit: 6528a45b3988457891cd4d3ffbe1cd8cbb6a887e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6528a45b398845… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 13:56:08 2016 +0200 Single user session: Fixed bug when no session info present for user --- web/htdocs/userdb.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 5ae219f..bd20b6a 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -333,7 +333,12 @@ def is_valid_user_session(username, session_id): if config.single_user_session == None: return True # No login session limitation enabled, no validation - active_session_id, last_activity = load_session_info(username) + session_info = load_session_info(username) + if session_info == None: + return False # no session active + else: + active_session_id, last_activity = session_info + if session_id == active_session_id: return True # Current session. Fine.

8 years, 2 months

3661 FIX Service discovery is now possible with only "modify services" permission

by Lars Michelsen

Module: check_mk Branch: master Commit: a962b14c265d5e236958a2634619c6f154637a79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a962b14c265d5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 11:54:53 2016 +0200 3661 FIX Service discovery is now possible with only "modify services" permission Users which are permitted on a host, are not permitted to modify existing hosts but have the permission "modify services" are now able to perform service discoveries again using WATO. --- .werks/3661 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 - 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3661 b/.werks/3661 new file mode 100644 index 0000000..e7be038 --- /dev/null +++ b/.werks/3661 @@ -0,0 +1,12 @@ +Title: Service discovery is now possible with only "modify services" permission +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467366512 + +Users which are permitted on a host, are not permitted to modify existing hosts +but have the permission "modify services" are now able to perform service discoveries +again using WATO. diff --git a/ChangeLog b/ChangeLog index b012bc4..a067ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -465,6 +465,7 @@ * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... * 3547 FIX: Deleting a subfolder now generates a correct audit message... + * 3661 FIX: Service discovery is now possible with only "modify services" permission... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 031ed5c..742eb61 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2686,7 +2686,6 @@ def mode_inventory(phase, firsttime): html.context_button(_("Full Scan"), html.makeuri([("_scan", "yes")])) elif phase == "action": - host.need_permission("write") if html.check_transaction(): # Settings for showing parameters if html.var("_show_parameters"):

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016