Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: jolokia_metrics: fixed incorrect plugin output

by Andreas Boesl

Module: check_mk Branch: master Commit: cb9e1dd8f183cc1ce86a39c988db53c2574aef49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb9e1dd8f183cc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 20 12:25:26 2013 +0200 jolokia_metrics: fixed incorrect plugin output --- ChangeLog | 1 + checks/jolokia_metrics | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 365a5f1..91e5a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ new script caching options "off", "async", "sync" * windows_agent: increased maximum local/plugin script output length to 512kB (output buffer now grows dynamically) + * jolokia_metrics: fixed incorrect plugin output for high warn/crit levels Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 35a1802..eb00e4b 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -346,10 +346,10 @@ def check_jolokia_metrics_app_sess(item, params, info): status_txt = ' (Below or equal %d)' % lo_warn elif hi_crit is not None and sess >= hi_crit: status = 2 - status_txt = ' (Above or equal %d)' % lo_warn + status_txt = ' (Above or equal %d)' % hi_crit elif hi_warn is not None and sess >= hi_warn: status = 1 - status_txt = ' (Above or equal %d)' % lo_crit + status_txt = ' (Above or equal %d)' % hi_warn if maxActive and maxActive > 0: status_txt += " (max active sessions: %d)" % maxActive

10 years, 10 months

Check_MK Git: check_mk: notify.py: fixed bug with local notification spooling

by Andreas Boesl

Module: check_mk Branch: master Commit: cf9c14425541236fe69d13e6adab99b3ba1e249c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf9c1442554123… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 20 10:16:58 2013 +0200 notify.py: fixed bug with local notification spooling --- ChangeLog | 1 + modules/notify.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7497da1..365a5f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ Notifications: * notify.py: Matching service level: Use the hosts service level if a service has no service level set + * notify.py: fixed bug with local notification spooling Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/modules/notify.py b/modules/notify.py index 5ac931f..4f5a12e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -508,7 +508,7 @@ def notify_notify(context): "that are prefixed with NOTIFY_\n") sys.exit(1) - if notification_spooling: + if notification_spool_to: # Create spoolfile target_site = "%s:%s" % notification_spool_to[0:2] create_spoolfile({"context": context, "forward": target_site})

10 years, 10 months

Check_MK Git: check_mk: network topology: Using new on-demand automap header template

by Lars Michelsen

Module: check_mk Branch: master Commit: 2aaef66d8232314d7abab7d45f1d64fc4ca1496d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2aaef66d823231… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 20 09:26:27 2013 +0200 network topology: Using new on-demand automap header template --- web/plugins/dashboard/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 92d4a0c..765708b 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -77,7 +77,7 @@ if defaults.omd_site: { "title" : "Topology of Site " + defaults.omd_site, "iframe" : defaults.url_prefix + 'nagvis/frontend/nagvis-js/index.php?' + \ - 'mod=Map&header_template=default&header_menu=0&label_show=1' + \ + 'mod=Map&header_template=on-demand-filter&header_menu=1&label_show=1' + \ '&sources=automap&act=view&backend_id=' + defaults.omd_site + \ '&render_mode=undirected&url_target=main', "reload_on_resize" : True,

10 years, 10 months

Check_MK Git: check_mk: Added minvalue param to age valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: a66640d27fb2c456b1c6d24f4b8af780fe2a2ab2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a66640d27fb2c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 19 12:48:01 2013 +0200 Added minvalue param to age valuespec --- web/htdocs/valuespec.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 21c0e52..00cf4df 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -160,9 +160,13 @@ class Age(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._label = kwargs.get("label") + self._minvalue = kwargs.get("minvalue") def canonical_value(self): - return 0 + if self._minvalue: + return self._minvalue + else: + return 0 def render_input(self, varprefix, value): days, rest = divmod(value, 60*60*24) @@ -199,6 +203,10 @@ class Age(ValueSpec): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type int") % (value, type_name(value))) + def validate_value(self, value, varprefix): + if self._minvalue != None and value < self._minvalue: + raise MKUserError(varprefix, _("%s is too low. The minimum allowed value is %s." % ( + value, self._minvalue))) # Editor for a single integer class Integer(ValueSpec):

10 years, 10 months

Check_MK Git: check_mk: added blackberry 10 to mobile browser detection

by Götz Golla

Module: check_mk Branch: master Commit: 99b150fc58656b36cf09812d486d993e253d960b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b150fc58656b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Aug 20 08:12:22 2013 +0200 added blackberry 10 to mobile browser detection --- web/htdocs/mobile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f666f87..810d21c 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -30,7 +30,7 @@ import views, config # These regexes are taken from the public domain code of Matt Sullivan # http://sullerton.com/2011/03/django-mobile-browser-detection-middleware/ -reg_b = re.compile(r"android.+mobile|avantgo|bada\\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino", re.I|re.M) +reg_b = re.compile(r"android.+mobile|avantgo|bada\\/|blackberry|bb10|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino", re.I|re.M) reg_v = re.compile(r"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-", re.I|re.M) def is_mobile(user_agent):

10 years, 10 months

Check_MK Git: check_mk: more wording fixes for inventory rules

by Götz Golla

Module: check_mk Branch: master Commit: 55b95a224ca985185179a7b915c8cfa8220604d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55b95a224ca985… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 19 18:01:18 2013 +0200 more wording fixes for inventory rules --- web/plugins/wato/check_parameters.py | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7d66bf3..7e49bf3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -658,7 +658,7 @@ register_check_parameters( register_check_parameters( subgroup_os, "uptime", - _("Uptime (seconds since last reboot)"), + _("Uptime since last reboot"), Dictionary( elements = [ ( "min", @@ -949,8 +949,8 @@ register_check_parameters( Tuple( title = _("Write"), elements = [ - Filesize(title = _("Warning when higher than")), - Filesize(title = _("Critical when higher than")), + Filesize(title = _("Warning if above")), + Filesize(title = _("Critical if above")), ] ) ) @@ -975,17 +975,17 @@ register_check_parameters( title = _("Memory Levels"), elements = [ Tuple( - title = _("Levels in percent"), + title = _("Usage Levels in Percent"), elements = [ - Percentage(title = _("Warning if above"), label = _("% usage")), - Percentage(title = _("Critical if above"), label = _("% usage")), + Percentage(title = _("Warning if above") ), + Percentage(title = _("Critical if above") ), ] ), Tuple( - title = _("Absolute levels"), + title = _("Absolute Usage Levels"), elements = [ - Filesize(title = _("Warning when higher than")), - Filesize(title = _("Critical when higher than")), + Filesize(title = _("Warning if above")), + Filesize(title = _("Critical if above")), ] ) ])), @@ -994,17 +994,17 @@ register_check_parameters( title = _("Pagefile Levels"), elements = [ Tuple( - title = _("Levels in percent"), + title = _("Usage Levels in Percent"), elements = [ - Percentage(title = _("Warning if above"), label = _("% usage")), - Percentage(title = _("Critical if above"), label = _("% usage")), + Percentage(title = _("Warning if above")), + Percentage(title = _("Critical if above")), ] ), Tuple( - title = _("Absolute levels"), + title = _("Absolute Usage Levels"), elements = [ - Filesize(title = _("Warning when higher than")), - Filesize(title = _("Critical when higher than")), + Filesize(title = _("Warning if above")), + Filesize(title = _("Critical if above")), ] ) ])), @@ -1864,10 +1864,10 @@ register_check_parameters( help = _("This Rulset sets the threshold limits for humidity sensors attached to " "AKCP Sensor Probe "), elements = [ - Integer(title = _("Critical if moisture lower than")), - Integer(title = _("Warning if moisture lower than")), - Integer(title = _("Warning if moisture higher than")), - Integer(title = _("Critical if moisture higher than")), + Integer(title = _("Critical if below"), unit="%" ), + Integer(title = _("Warning if below"), unit="%" ), + Integer(title = _("Warning if above"), unit="%" ), + Integer(title = _("Critical if above"), unit="%" ), ]), TextAscii( title = _("Service descriptions"),

10 years, 10 months

Check_MK Git: check_mk: intergrated liebert usvs

by Götz Golla

Module: check_mk Branch: master Commit: 9d416955fcdca002d7881be3e36c09f10c4bde79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d416955fcdca0… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 19 14:49:37 2013 +0200 intergrated liebert usvs --- checks/ups_bat_temp | 3 ++- checks/ups_capacity | 4 +++- checks/ups_in_freq | 4 +++- checks/ups_in_voltage | 4 +++- checks/ups_out_load | 4 +++- checks/ups_out_voltage | 4 +++- checks/ups_power | 4 +++- 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 2ad9ae4..b3be01e 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -57,7 +57,8 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] \ + [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", + ".1.3.6.1.4.1.476.1.42" ] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), } diff --git a/checks/ups_capacity b/checks/ups_capacity index c064d42..1389b7f 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -76,5 +76,7 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index cc28636..4f98db0 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -57,5 +57,7 @@ check_info['ups_in_freq'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] \ + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 17c1445..b864245 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -56,5 +56,7 @@ check_info['ups_in_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index f7318e5..9f93411 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,5 +56,7 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 60694af..b964e21 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -56,5 +56,7 @@ check_info['ups_out_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_power b/checks/ups_power index 27e7f40..0ae1818 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,5 +60,7 @@ check_info['ups_power'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.4.1.476.1.42" ] }

10 years, 10 months

Check_MK Git: check_mk: check_bi_local.py: ignore http_proxy

by Andreas Boesl

Module: check_mk Branch: master Commit: 88224d4831cfc9a853d4c5f33162e652be405256 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88224d4831cfc9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 19 14:46:24 2013 +0200 check_bi_local.py: ignore http_proxy --- doc/treasures/check_bi_local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py index 5a6868c..1081008 100755 --- a/doc/treasures/check_bi_local.py +++ b/doc/treasures/check_bi_local.py @@ -63,7 +63,7 @@ url = 'http://%slocalhost/%scheck_mk/view.py?view_name=aggr_summary&output_forma (logininfo, url_prefix) try: - command = "curl --silent %s '%s'" % (opts, url) + command = "curl --noproxy localhost --silent %s '%s'" % (opts, url) output = os.popen(command).read() data = eval(output) except:

10 years, 10 months

Check_MK Git: check_mk: ups self tests finished

by Götz Golla

Module: check_mk Branch: master Commit: 0d288c65702c14c54cb740df0c8ee1b853d473a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d288c65702c14… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 19 13:02:30 2013 +0200 ups self tests finished --- checks/apc_symmetra | 10 +++--- checks/apc_symmetra_test | 63 +++++++--------------------------- checks/ups_test | 15 ++++---- web/plugins/wato/check_parameters.py | 32 ++++++++--------- 4 files changed, 42 insertions(+), 78 deletions(-) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 1dda539..7172e3b 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -44,7 +44,7 @@ # levels refer to the apc_symentra group which has 6 values, # only the first four are needed in this test # the others belong to the apc_symmetra_test check -apc_default_levels = ( 95, 40, 1, 220, 0, 0 ) +apc_default_levels = ( 95, 40, 1, 220 ) def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ @@ -53,7 +53,7 @@ def check_apc(item, params, info): = [ saveint(x) for x in info[0][:9] ] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 - crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params[0:4] + crit_capacity, crit_batt_temp, crit_batt_curr, crit_voltage = params single_states = [] @@ -72,8 +72,9 @@ def check_apc(item, params, info): 6:"software bypass", 7:"off", 8:"rebooting", 9:"switched bypass", 10:"hardware failure bypass", 11:"sleeping until power return", 12:"on smart trim" } - calib_text = { 1:"", 2:"/calibration invalid", 3:"/calibration in progress" } + calib_text = { 1:"", 2:" (calibration invalid)", 3:" (calibration in progress)" } infotxt = "output status: %s%s" % (status_text.get(BasicOutputStatus), calib_text.get(AdvTestCalibrationResults)) + # during calibration test is OK if BasicOutputStatus not in [2, 4, 12] and AdvTestCalibrationResults != 3: state = 2 infotxt += "(!!)" @@ -124,7 +125,8 @@ def check_apc(item, params, info): # RunTimeRemaining formatiert == "26:00.00" hrs = int(RunTimeRemaining) / 3600 mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) - single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), ("runtime", RunTimeRemaining/60)) ) + single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), + ("runtime", RunTimeRemaining/60)) ) # create summary state worst_state = max([x[0] for x in single_states]) diff --git a/checks/apc_symmetra_test b/checks/apc_symmetra_test index e9597e7..3b18dca 100644 --- a/checks/apc_symmetra_test +++ b/checks/apc_symmetra_test @@ -40,7 +40,7 @@ # DESCRIPTION # "The results of the last UPS diagnostics test performed." # ::= { upsAdvTest 3 } - + # PowerNet-MIB::upsAdvTestLastDiagnosticsDate .1.3.6.1.4.1.318.1.1.1.7.2.4 # upsAdvTestLastDiagnosticsDate OBJECT-TYPE # SYNTAX DisplayString @@ -50,55 +50,19 @@ # "The date the last UPS diagnostics test was performed in # mm/dd/yy format." # ::= { upsAdvTest 4 } -# - -# PowerNet-MIB::upsAdvTestCalibrationResults .1.3.6.1.4.1.318.1.1.1.7.2.6 -# upsAdvTestCalibrationResults OBJECT-TYPE -# SYNTAX INTEGER { -# ok(1), -# invalidTest(2), -# calibrationInProgress(3) -# } -# ACCESS read-only -# STATUS mandatory -# DESCRIPTION -# "The results of the last runtime calibration. -# -# Value ok(1) means a successful runtime calibration. -# -# Value invalidTest(2) indicates last calibration did -# not take place since the battery capacity was below -# 100%. -# -# Value calibrationInProgress(3) means a calibration -# is occurring now. " -# ::= { upsAdvTest 6 } - -# PowerNet-MIB::upsAdvTestCalibrationDate .1.3.6.1.4.1.318.1.1.1.7.2.7 -# upsAdvTestCalibrationDate OBJECT-TYPE -# SYNTAX DisplayString -# ACCESS read-only -# STATUS mandatory -# DESCRIPTION -# "The date the last UPS runtime calibration was -# performed in mm/dd/yy format." -# ::= { upsAdvTest 7 } - - - -# levels refer to the apc_symentra group which has 6 values, -# only the last two are needed in this test -# the others belong to the apc_symmetra check +# import datetime -apc_test_default_levels = ( 0, 0, 0, 0, 0, 0 ) +ups_test_default = ( 0, 0 ) def check_apc_test(item, params, info): - warn, crit = params[4:] + warn, crit = params + if not info: + return 3, "Data Missing" line = info[0] - DiagnosticsResults, CalibrationResults = map(saveint, line[0:2]) - LastDiagnosticsDate, TestCalibrationDate = line[2:4] + DiagnosticsResults = saveint(line[0]) + LastDiagnosticsDate = line[1] month, day, year = map(saveint, LastDiagnosticsDate.split('/')) last_diag_date = datetime.date( year, month, day) @@ -108,7 +72,6 @@ def check_apc_test(item, params, info): dwarn = datetime.timedelta(days=warn) diagnostic_status_text = { 1:"OK", 2:"failed", 3:"invalid", 4:"in progress" } - calibration_status_text = { 1:"OK", 2:"invalid", 3:"in progress" } state = 0 diag_label = "" @@ -133,16 +96,16 @@ def check_apc_test(item, params, info): return (state, ResultsDetail ) def inventory_apc_test(info): - if len(info) > 0: - return [(None, "apc_test_default_levels")] + if info: + return [(None, "ups_test_default")] check_info['apc_symmetra_test'] = { "inventory_function" : inventory_apc_test, "check_function" : check_apc_test, - "service_description" : "APC Symmetra Test Status", + "service_description" : "Self Test", "has_perfdata" : False, - "group" : "apc_symentra", + "group" : "ups_test", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), - "snmp_info" : (".1.3.6.1.4.1.318.1.1.1.7.2", [ 3,6,4,7 ] ) + "snmp_info" : (".1.3.6.1.4.1.318.1.1.1.7.2", [ 3,4 ] ) } diff --git a/checks/ups_test b/checks/ups_test index e36a881..f08c89b 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -89,14 +89,16 @@ # TestResultsSummary is noTestsInitiated(6), # upsTestElapsedTime has the value 0." -ups_test_default = (None, None ) +ups_test_default = ( 0, 0 ) def inventory_ups_test(info): - if len(info) > 0: + if info: return [ (None, "ups_test_default") ] def check_ups_test(item, params, info): warn, crit = params + if not info: + return 3, "Data Missing" line = info[0] ResultsSummary, StartTime, ElapsedTime = map(saveint, line[:-1]) ElapsedTime = ElapsedTime/100 @@ -112,22 +114,21 @@ def check_ups_test(item, params, info): state_label = "(!)" time_label = "" - if crit and ElapsedTime >= crit: + if crit and ElapsedTime >= crit*86400: state = 2 time_label = "(!!)" - elif warn and ElapsedTime >= warn: + elif warn and ElapsedTime >= warn*86400: state = max(state, 1) time_label = "(!)" ResultsDetail = "%s%s Time elapsed since test: %s%s" % (line[-1], state_label, etime, time_label) - #perf = [ ( "ElapsedTime", ElapsedTime, warn, crit) ] - return (state, ResultsDetail ) + return state, ResultsDetail check_info['ups_test'] = { "inventory_function" : inventory_ups_test, "check_function" : check_ups_test, - "service_description" : "UPS Test", + "service_description" : "Self Test", "has_perfdata" : False, "group" : "ups_test", "snmp_info" : ( ".1.3.6.1.2.1.33.1.7", [3,5,6,4 ] ), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c2862e3..7d66bf3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -705,8 +705,20 @@ register_check_parameters( Tuple( title = _("Time since last UPS selftest"), elements = [ - Age(title = _("Warning if above")), - Age(title = _("Critical if above")), + Integer( + title = _("Warning Level for time since last self test"), + help = _("Warning Level for time since last diagnostic test of the device. " + "For a value of 0 the warning level will not be used"), + unit = _("days"), + default_value = 0, + ), + Integer( + title = _("Critical Level for time since last self test"), + help = _("Critical Level for time since last diagnostic test of the device. " + "For a value of 0 the critical level will not be used"), + unit = _("days"), + default_value = 0, + ), ] ), None, @@ -2878,7 +2890,7 @@ register_check_parameters( ) register_check_parameters( - subgroup_os, + subgroup_environment, "apc_symentra", _("APC Symmetra Checks"), Tuple( @@ -2907,20 +2919,6 @@ register_check_parameters( unit = _("V"), default_value = 220, ), - Integer( - title = _("Warning Level for time since last diagnostic test"), - help = _("Warning Level for time since last diagnostic test of the device. " - "For a value of 0 the warning level will not be used"), - unit = _("days"), - default_value = 0, - ), - Integer( - title = _("Critical Level for time since last diagnostic test"), - help = _("Critical Level for time since last diagnostic test of the device. " - "For a value of 0 the critical level will not be used"), - unit = _("days"), - default_value = 0, - ), ] ), None,

10 years, 10 months

Check_MK Git: check_mk: wording fixes

by Götz Golla

Module: check_mk Branch: master Commit: 0fff0cb74cf677b6ebeb298333e352ad5404ee85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fff0cb74cf677… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 19 10:32:02 2013 +0200 wording fixes --- web/htdocs/wato.py | 2 +- web/plugins/views/availability.py | 4 ++-- web/plugins/wato/check_parameters.py | 14 +++++++------- web/plugins/wato/globals_notification.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4d489e..cce26d6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12965,7 +12965,7 @@ def mode_bi_edit_rule(phase): ( "params", ListOfStrings( title = _("Parameters"), - help = _("Parameters are used in order to make rules more flexible. The must " + help = _("Parameters are used in order to make rules more flexible. They must " "be named like variables in programming languages. For example you can " "make your rule have the two parameters <tt>HOST</tt> and <tt>INST</tt>. " "When calling the rule - from an aggergation or a higher level rule - " diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index df09db3..d546309 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -213,8 +213,8 @@ avoption_entries = [ ListChoice( title = _("Aggregations"), choices = [ - ( "min", _("minimal duration" )), - ( "max", _("maximal duration" )), + ( "min", _("minimum duration" )), + ( "max", _("maximum duration" )), ( "avg", _("average duration" )), ( "cnt", _("count" )), ] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fe107ca..c2862e3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -293,7 +293,7 @@ register_rule(group + '/' + subgroup_inventory, ('descr', TextAscii( title = _('Service Description'), help = _('<p>The service description may contain one or more occurances of <tt>%s</tt>. If you do this, then the pattern must be a regular ' - 'expression and be prefixed with ~. For each %s in the description, the expression has to contain one "group". A group ' + 'expression and be prefixed with ~. For each <tt>%s</tt> in the description, the expression has to contain one "group". A group ' 'is a subexpression enclosed in brackets, for example <tt>(.*)</tt> or <tt>([a-zA-Z]+)</tt> or <tt>(...)</tt>. When the inventory finds a process ' 'matching the pattern, it will substitute all such groups with the actual values when creating the check. That way one ' 'rule can create several checks on a host.</p>' @@ -1222,7 +1222,7 @@ register_check_parameters( ( "remote_port", Integer(title = _("Remote port number"), minvalue = 1, maxvalue = 65535, )), ( "min_states", Tuple( - title = _("Number of minimum connections or listeners"), + title = _("Minimum number of connections or listeners"), elements = [ Integer(title = _("Warning if above")), Integer(title = _("Critical if above")), @@ -1231,7 +1231,7 @@ register_check_parameters( ), ( "max_states", Tuple( - title = _("Number of maximum connections or listeners"), + title = _("Maximum number of connections or listeners"), elements = [ Integer(title = _("Warning if above")), Integer(title = _("Critical if above")), @@ -1450,9 +1450,9 @@ register_check_parameters( ( "assumed_speed_in", OptionalDropdownChoice( title = _("Assumed input speed"), - help = _("If the automatic detection of the incoming link speed does not work " + help = _("If the automatic detection of the link speed does not work " "or the switch's capabilities are throttled because of the network setup " - "you can set the assummend incoming speed here."), + "you can set the assumed speed here."), choices = [ ( None, _("ignore speed") ), ( 10000000, "10 MBit/s" ), @@ -1469,9 +1469,9 @@ register_check_parameters( ( "assumed_speed_out", OptionalDropdownChoice( title = _("Assumed output speed"), - help = _("If the automatic detection of the outgoing speed does not work " + help = _("If the automatic detection of the link speed does not work " "or the switch's capabilities are throttled because of the network setup " - "you can set the assummend outgoing speed here."), + "you can set the assumed speed here."), choices = [ ( None, _("ignore speed") ), ( 10000000, "10 MBit/s" ), diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 9b9950f..d0bc461 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -33,8 +33,8 @@ register_configvar(group, "notification_logging", DropdownChoice( title = _("Debug notifications"), - help = _("When notification debugging is on, then in the notification logfile " - "in <tt>%s</tt> additional information will be logged." % + help = _("When notification debugging is on, additional information will be " + "logged in the notification logfile <tt>%s</tt>." % (defaults.var_dir + "/notify/notify.log")), choices = [ ( 0, _("No logging")),

10 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013