Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: cisco_temp_sensor: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: a1ad2cd3c7d9ce9430f6c7f5d5a3dfcfa220b690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1ad2cd3c7d9ce… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 16:25:08 2014 +0200 cisco_temp_sensor: Now uses temperature.include --- checks/cisco_temp_sensor | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index db91f8e..cb49d6c 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -155,31 +155,18 @@ def check_cisco_temp_sensor(item, params, info): sensors = parse_cisco_temp_sensor(info) for id, descr, sensortype, temp, sensorstate, levels in sensors: if item == descr: - # Use build in levels if no lavels are configured + # Use built in levels if no levels are configured if params: warn, crit = params else: warn, crit = levels[0:2] - infotext = "Temperature is %.1f °C " % temp - levels = " (warn/crit at %.1f/%.1f °C)" % (warn, crit) - perfdata = [ ( "temperature", temp, warn, crit ) ] - state = 0 - if sensorstate == "2": return (3, "Data from sensor currently not available") elif sensorstate == "3": return (3, "Sensor is broken") - if temp >= crit: - state = 2 - infotext += levels - elif temp >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata - - return (3, "Sensor not found in SNMP data") + return check_temperature(temp, (warn, crit)) check_info['cisco_temp_sensor'] = { @@ -210,5 +197,6 @@ check_info['cisco_temp_sensor'] = { 4, # Thresholds ]), ], + "includes" : [ "temperature.include" ] }

9 years, 9 months

Check_MK Git: check_mk: brocade: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 47d013686406b0c44f65cde2a3886681bfca11b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47d013686406b0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 16:24:18 2014 +0200 brocade: Now uses temperature.include --- checks/brocade | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/checks/brocade b/checks/brocade index c9b83d1..e90c9c4 100644 --- a/checks/brocade +++ b/checks/brocade @@ -134,22 +134,10 @@ def inventory_brocade_temp(info): def check_brocade_temp(item, params, info): converted = brocade_sensor_convert(info, "SLOT") - warn, crit = params for snmp_item, name, value in converted: if item == snmp_item: - state = 0 - label = "" - value = saveint(value) - perf = [ ('temp', value, warn, crit) ] - if value >= crit: - state = 2 - label = "(Levels at: %d/%d) %s" % (warn, crit, name) - elif value >= warn: - state = 1 - label = "(Levels at: %d/%d) %s" % (warn, crit, name) + return check_temperature(int(value), params) - return state, "Temperature at %d°C%s " % (value, label), perf - return 3, "Temperature sensor not found" check_info["brocade.temp"] = { "check_function" : check_brocade_temp, @@ -159,4 +147,5 @@ check_info["brocade.temp"] = { "group" : "hw_temperature", "snmp_info" : brocade_info, 'snmp_scan_function' : brocade_scan, + "includes" : [ "temperature.include" ], }

9 years, 9 months

Check_MK Git: check_mk: diskstat: fix for detecting lvm volumes, was broken due to new cluster feature

by Goetz Golla

Module: check_mk Branch: master Commit: d1fa20f453aba9fda19084fe507349e5edfd33e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1fa20f453aba9… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 2 16:17:39 2014 +0200 diskstat: fix for detecting lvm volumes, was broken due to new cluster feature --- checks/diskstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/diskstat b/checks/diskstat index 982e5d4..93ebb88 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -97,7 +97,7 @@ def diskstat_parse_info(info): elif phase == 'dmsetup_info': try: majmin = tuple(map(int, line[2].split(':'))) - if len(line) == 4: + if len(line) == 5: name = "LVM %s" % line[1] else: name = "DM %s" % line[1]

9 years, 9 months

Check_MK Git: check_mk: Fix a few issues with new visuals

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d0b30f4124c741c02884da24c4c81d6ceacebed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d0b30f4124c74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 2 16:11:54 2014 +0200 Fix a few issues with new visuals --- web/htdocs/dashboard.py | 4 +- web/htdocs/default_permissions.py | 4 +- web/htdocs/index.py | 8 +++- web/htdocs/visuals.py | 79 +++++++++++++++++++++++-------------- 4 files changed, 61 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d0b30f412…

9 years, 9 months

Check_MK Git: check_mk: ups_bat_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: ef9687948b908350ec26cdb3dfcdedfff4222b1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef9687948b9083… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 12:12:17 2014 +0200 ups_bat_temp: Now uses temperature.include --- checks/ups_bat_temp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 507ef5f..dcc7827 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -32,22 +32,12 @@ def inventory_ups_bat_temp(info): return [ ( x[0], "ups_bat_temp_default") for x in info ] def check_ups_bat_temp(item, params, info): - warn, crit = params for line in info: if line[0] == item: - power = saveint(line[1]) - perfdata = [ ( "temp", power, warn, crit, 80 ) ] - infotext = "temperature: %d°C , (warn/crit at %d°C/%d°C) " % \ - (power, warn, crit) + status, infotext, perfdata = check_temperature(int(line[1]), params) + perfdatanew = [ perfdata[0] + (80,) ] + return status, infotext, perfdatanew - if power >= crit: - return (2, infotext, perfdata) - elif power >= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) - - return (3, "Temperature %s not found in SNMP output" % item) check_info['ups_bat_temp'] = { "inventory_function" : inventory_ups_bat_temp, @@ -59,5 +49,5 @@ check_info['ups_bat_temp'] = { "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.4.1.705.1.2", ".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.2" ] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), - + "includes" : [ "temperature.include" ], }

9 years, 9 months

Check_MK Git: check_mk: stulz_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 72dfcf48a915902a615624df773c14642e90ca1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72dfcf48a91590… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 12:11:25 2014 +0200 stulz_temp: Now uses temperature.include --- checks/stulz_temp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/checks/stulz_temp b/checks/stulz_temp index 0901655..983b2b2 100644 --- a/checks/stulz_temp +++ b/checks/stulz_temp @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -stulz_temp_default_levels = ( 25, 28 ) +stulz_temp_default_levels = (25, 28) def inventory_stulz_temp(info): return [ (x[0], "stulz_temp_default_levels" ) for x in info ] @@ -32,17 +32,7 @@ def inventory_stulz_temp(info): def check_stulz_temp(item, params, info): for line in info: if line[0] == item: - warn, crit = params - temp = saveint(line[1])/10 - state = 0 - if temp >= crit: - state = 2 - elif temp >= warn: - state = 1 - message = " Current Temperature: %d°C" % temp - perf = [ ('temp', temp, warn, crit ) ] - return state, message, perf - return 3, "No information found about the device" + return check_temperature(int(line[1])/10, params) check_info["stulz_temp"] = { "check_function" : check_stulz_temp, @@ -52,5 +42,6 @@ check_info["stulz_temp"] = { "group" : "room_temperature", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.29462.10", "snmp_info" : ( ".1.3.6.1.4.1.29462.10.2.1.1.1.1.1.1.1.1192", [ OID_END, 1] ), + "includes" : [ "temperature.include" ], }

9 years, 9 months

Check_MK Git: check_mk: sensatronics_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9dd1d6d38c35727162715bc396c117e45abaf08c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd1d6d38c3572… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 12:10:52 2014 +0200 sensatronics_temp: Now uses temperature.include --- checks/sensatronics_temp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/checks/sensatronics_temp b/checks/sensatronics_temp index c467c84..cc89072 100644 --- a/checks/sensatronics_temp +++ b/checks/sensatronics_temp @@ -28,20 +28,12 @@ sensatronics_temp_default_levels = ( 23.0, 25.0 ) def inventory_sensatronics_temp(info): return [ (x[0], sensatronics_temp_default_levels) for x in info if savefloat(x[1]) > 0 ] + def check_sensatronics_temp(item, params, info): for line in info: if line[0] == item: - warn, crit = params - temperatur = savefloat(line[1]) - message = "Temperature: %.2f°C" % temperatur - perf = [ ('temp', temperatur, warn, crit ) ] - if temperatur > crit: - return 2, message, perf - elif temperatur > warn: - return 1, message, perf - return 0, message, perf + return check_temperature(float(line[1]), params) - return 3, "Sensor not found" check_info["sensatronics_temp"] = { "check_function" : check_sensatronics_temp, @@ -56,5 +48,6 @@ check_info["sensatronics_temp"] = { "1.0", #Sensor Name "2.0", #Sensor Value ]), + "includes" : [ "temperature.include" ], }

9 years, 9 months

Check_MK Git: check_mk: rms200_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6839b534656469dbed1979d5591551fe050253a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6839b534656469… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 2 12:10:09 2014 +0200 rms200_temp: Now uses temperature.include --- checks/rms200_temp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/checks/rms200_temp b/checks/rms200_temp index d46a986..f374f01 100644 --- a/checks/rms200_temp +++ b/checks/rms200_temp @@ -24,26 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -rms200_temp_default_levels = ( 25, 28 ) +rms200_temp_default_levels = (25, 28) + def inventory_rms200_temp(info): - return [ (x[0], "rms200_temp_default_levels" ) for x in info if x[2] != '0'] + return [ (x[0], "rms200_temp_default_levels") for x in info if x[2] != '0'] + def check_rms200_temp(item, params, info): for line in info: if line[0] == item: - warn, crit = params - temp = float(line[2])/100 - name = line[1] - state = 0 - if temp >= crit: - state = 2 - elif temp >= warn: - state = 1 - message = "Current Temperature: %.2f °C (%s)" % (temp, name) - perf = [ ('temp', temp, warn, crit ) ] - return state, message, perf - return 3, "No information found about the device" + status, infotext, perfdata = check_temperature(float(line[2])/100, params) + infotext += " (%s)" % line[1] # Name from SNMP data + return status, infotext, perfdata + check_info["rms200_temp"] = { "check_function" : check_rms200_temp, @@ -57,5 +51,6 @@ check_info["rms200_temp"] = { 2, # Name, 5, # Temp ] ), + "includes" : [ "temperature.include" ], }

9 years, 9 months

Check_MK Git: check_mk: fixed sign of outtraffic percentile

by Goetz Golla

Module: check_mk Branch: master Commit: ffb74ae0985e02823466da4e7d65260d1e6081b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffb74ae0985e02… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 2 11:15:07 2014 +0200 fixed sign of outtraffic percentile --- pnp-templates/check_mk-fc_port.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnp-templates/check_mk-fc_port.php b/pnp-templates/check_mk-fc_port.php index 19bac82..662699e 100644 --- a/pnp-templates/check_mk-fc_port.php +++ b/pnp-templates/check_mk-fc_port.php @@ -136,7 +136,7 @@ $def[1] = "GPRINT:outtraffic:LAST:\"%7.1lf %s$unit/s last\" ". "GPRINT:outtraffic:AVERAGE:\"%7.1lf %s$unit/s avg\" ". "GPRINT:outtraffic:MAX:\"%7.1lf %s$unit/s max\\n\" ". - "VDEF:outperc=minusouttraffic,5,PERCENTNAN ". + "VDEF:outperc=outtraffic,5,PERCENTNAN ". "VDEF:outpercmb=minusoutmb,5,PERCENTNAN ". "LINE:outpercmb#00008f:\"95% percentile\" ". "GPRINT:outperc:\"%7.1lf %s$unit/s\\n\" ".

9 years, 9 months

Check_MK Git: check_mk: Make view/dashboard permissions l10nable

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fdc94d44db6b63daf0515a4835baa4735fb5a78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fdc94d44db6b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 2 10:55:24 2014 +0200 Make view/dashboard permissions l10nable --- web/htdocs/dashboard.py | 2 +- web/htdocs/default_permissions.py | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ad67e77..e7d8a15 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -86,7 +86,7 @@ def load_plugins(): board.get("description", ""), config.builtin_role_ids) - # Make sure that custom views also have permissions + # Make sure that custom dashboards also have permissions config.declare_dynamic_permissions(lambda: visuals.declare_custom_permissions('dashboards')) def load_dashboards(): diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 624788a..bc5ac82 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -35,7 +35,6 @@ loaded_with_language = False # | |_| \___|_| |_| |_| |_|_|___/___/_|\___/|_| |_|___/ | # | | # +----------------------------------------------------------------------+ -# | | # | Declare general permissions for Multisite | # '----------------------------------------------------------------------' @@ -57,8 +56,8 @@ def load(): "If combined with 'perform commands' then commands may be done on all objects."), [ "admin", "guest" ]) - declare_visual_permissions('views') - declare_visual_permissions('dashboards') + declare_visual_permissions('views', _("Views")) + declare_visual_permissions('dashboards', _("Dashboards")) config.declare_permission("general.view_option_columns", _("Change view display columns"), @@ -144,23 +143,23 @@ def load(): loaded_with_language = current_language -def declare_visual_permissions(what): +def declare_visual_permissions(what, what_plural): config.declare_permission("general.edit_" + what, - _("Customize %s and use them") % what, - _("Allows to create own %s, customize builtin %s and use them.") % (what, what), + _("Customize %s and use them") % what_plural, + _("Allows to create own %s, customize builtin %s and use them.") % (what_plural, what_plural), [ "admin", "user" ]) config.declare_permission("general.publish_" + what, - _("Publish %s") % what, - _("Make %s visible and usable for other users") % what, + _("Publish %s") % what_plural, + _("Make %s visible and usable for other users") % what_plural, [ "admin", "user" ]) config.declare_permission("general.see_user_" + what, - _("See user %s") % what, - _("Is needed for seeing %s that other users have created.") % what, + _("See user %s") % what_plural, + _("Is needed for seeing %s that other users have created.") % what_plural, [ "admin", "user", "guest" ]) config.declare_permission("general.force_" + what, - _("Modify builtin %s") % what, - _("Make own published %s override builtin %s for all users.") % (what, what), + _("Modify builtin %s") % what_plural, + _("Make own published %s override builtin %s for all users.") % (what_plural, what_plural), [ "admin" ])

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014