Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Updated bug entries #2314

by Lars Michelsen

Module: check_mk Branch: master Commit: 0da2b9dce6ec43aca230e7af8042d71abdfc9f43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0da2b9dce6ec43… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 14:31:56 2015 +0200 Updated bug entries #2314 --- .bugs/2314 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/2314 b/.bugs/2314 new file mode 100644 index 0000000..5286d2d --- /dev/null +++ b/.bugs/2314 @@ -0,0 +1,16 @@ +Title: Cleanup json output format of views to use the json module +Component: multisite +State: open +Date: 2015-04-13 14:30:38 +Targetversion: 1.2.7 +Class: cleanup + +We have the simplejson module shipped with OMD now, so we can use + +try: + import simplejson +except ImportError: + import json + +to get the json module which can then be used to encode the +data in json format easily.

9 years, 5 months

Check_MK Git: check_mk: Using json module without fallback now, because simplejson is now shipped with OMD

by Lars Michelsen

Module: check_mk Branch: master Commit: 44997e5af743ff998c180039446748cfe9a5169d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44997e5af743ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 14:32:21 2015 +0200 Using json module without fallback now, because simplejson is now shipped with OMD --- web/htdocs/webapi.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 9d74ec5..35eb977 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -35,6 +35,11 @@ try: except NameError: from sets import Set as set +try: + import simplejson as json +except ImportError: + import json + api_actions = {} loaded_with_language = False @@ -83,20 +88,8 @@ def page_api(): if api_actions[action].get("dont_eval_request"): request_object = html.var("request") else: - eval_function = None request = html.var("request") - - try: - import json - eval_function = json.loads - except ImportError: - eval_function = literal_eval - # modify request so it can be read by literal_eval... - for old, new in [ (": null", ": None"), - (": true", ": True"), - (": false", ": False"), ]: - request = request.replace(old, new) - request_object = eval_function(request) + request_object = json.loads(request) else: request_object = {} @@ -111,8 +104,6 @@ def page_api(): output_format = html.var("output_format", "json") if output_format == "json": - # TODO: implement json alternative for python < 2.5 - import json html.write(json.dumps(response)) else: html.write(repr(response))

9 years, 5 months

Check_MK Git: check_mk: hitachi_nas_volume: no longer assume WARN state if no filesystem size information is available from the device

by Goetz Golla

, Message-ID: <552bb428.hCqALTQVZu9eOxK2%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e31f9a5ac61a62b5c4a18bd6d7f9bcc78c8176f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e31f9a5ac61a62… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Apr 13 14:17:41 2015 +0200 hitachi_nas_volume: no longer assume WARN state if no filesystem size information is available from the device, --- checks/hitachi_hnas_volume | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index 9c822b8..4767704 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -45,8 +45,8 @@ def check_hitachi_hnas_volume(item, params, info): fslist.append((item, size_mb, avail_mb, 0)) status, message, perfdata = df_check_filesystem_list(item, params, fslist) else: - status = 1 - message = "no filesystem size information (!)" + status = 0 + message = "no filesystem size information" perfdata = [] # evaluate volumeStatus

9 years, 5 months

Check_MK Git: check_mk: #2113 hitachi_hnas_drives: new check to determine the overall status of all system drives of Hitachi NAS devices

by Goetz Golla

Module: check_mk Branch: master Commit: 93f175998fbd3600d3621b707dfd81afa6807804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93f175998fbd36… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Apr 13 14:09:43 2015 +0200 #2113 hitachi_hnas_drives: new check to determine the overall status of all system drives of Hitachi NAS devices --- .werks/2113 | 9 ++++++ ChangeLog | 1 + checkman/hitachi_hnas_drives | 22 ++++++++++++++ checks/hitachi_hnas_drives | 67 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/.werks/2113 b/.werks/2113 new file mode 100644 index 0000000..cfb46b4 --- /dev/null +++ b/.werks/2113 @@ -0,0 +1,9 @@ +Title: hitachi_hnas_drives: new check to determine the overall status of all system drives of Hitachi NAS devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1428926934 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d3ad27e..ae36f92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 2112 hitachi_hnas_bossock: new check to monitor number of running Bossock Fibers * 2196 winperf_if: for Windows interfaces show original Windows state names * 2199 livestatus_status: now in addition check master settings of monitoring core... + * 2113 hitachi_hnas_drives: new check to determine the overall status of all system drives of Hitachi NAS devices * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/hitachi_hnas_drives b/checkman/hitachi_hnas_drives new file mode 100644 index 0000000..a279b05 --- /dev/null +++ b/checkman/hitachi_hnas_drives @@ -0,0 +1,22 @@ +title: Hitachi HNAS: Status of System Drives +agents: snmp +catalog: hw/storagehw/hitachi +license: GPL +distribution: check_mk +description: + This check monitors the status of system drives of Hitachi NAS-Devices. + It was tested against Hitachi HNAS Modell 3090 but probably will work + for other HNAS devices using the BlueArc MIB. + + The check works by scanning the SNMP status information of all system drives + as given by the device. It displays the number of drives found in each of the + known states - if it is non-zero. Known states are: "Online", "MBR corrupt", + "Failed and unaccessible", "Not present", "Not accessible by controller", + "Offline", "Initializing", "Formatting", "Unknown", + + All stati except "Online" and "Unknown" trigger a {CRIT} state of + the service. "Online" triggers {OK} and "Unknown" triggers {UNKNOWN} + +inventory: + One check for each device is created. + diff --git a/checks/hitachi_hnas_drives b/checks/hitachi_hnas_drives new file mode 100644 index 0000000..2ca901f --- /dev/null +++ b/checks/hitachi_hnas_drives @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + + +def inventory_hitachi_hnas_drives(info): + if info: + return [(None, None)] + +def parse_hitachi_hnas_drives(info): + parsed = {} + for index, status in info: + parsed.setdefault(status, 0) + parsed[status] += 1 + return parsed + +def check_hitachi_hnas_drives(_no_item, params, info): + status_map = ( + ("Online", 0), + ("MBR corrupt", 2), + ("Failed and unaccessible", 2), + ("Not present", 2), + ("Not accessible by controller", 2), + ("Offline", 2), + ("Initializing", 2), + ("Formatting", 2), + ("Unknown", 3), + ) + for status, count in info.iteritems(): + infotext = "%s: %d" % (status_map[int(status)-1][0], count) + yield status_map[int(status)-1][1], infotext + + +check_info["hitachi_hnas_drives"] = { + "check_function" : check_hitachi_hnas_drives, + "inventory_function" : inventory_hitachi_hnas_drives, + "parse_function" : parse_hitachi_hnas_drives, + "service_description" : "System Drives", + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.3.4.2.1", [ + 1, # sysDriveIndex + 4, # sysDriveStatus + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), +}

9 years, 5 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 80bb08bcc70a4fa3659e711061bb5ffd6a519644 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80bb08bcc70a4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 14:07:24 2015 +0200 Removed debug output --- modules/check_mk.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9a11d12..f8709e2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1534,7 +1534,6 @@ def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, param icon = params.get('icon') if icon: actions.add(icon) - print checkname, checkgroup return list(actions)

9 years, 5 months

Check_MK Git: check_mk: #2176 One custom icon or action can be configured per process/service

by Lars Michelsen

Module: check_mk Branch: master Commit: fa028ced83302927629dfb9c6a79ebbba147764e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa028ced833029… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 14:02:56 2015 +0200 #2176 One custom icon or action can be configured per process/service It is now possible to configure a custom icon or action per process or windows service. This is some sort of shortcut. In case of process inventory, you had to configure two rules: a) a process discovery rule b) a rule to assign an icon to this service With this new feature you can configure the icon to be used for the found process right in the value of a process discovery rule. --- .werks/2176 | 17 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 12 ++++++++-- web/htdocs/wato.py | 26 +++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 35 ++++------------------------ web/plugins/wato/check_parameters.py | 22 +++++++++++++++-- 6 files changed, 78 insertions(+), 35 deletions(-) diff --git a/.werks/2176 b/.werks/2176 new file mode 100644 index 0000000..a2f5fe1 --- /dev/null +++ b/.werks/2176 @@ -0,0 +1,17 @@ +Title: One custom icon or action can be configured per process/service +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1428926372 +Class: feature + +It is now possible to configure a custom icon or action per process or +windows service. This is some sort of shortcut. In case of process +inventory, you had to configure two rules: + +a) a process discovery rule +b) a rule to assign an icon to this service + +With this new feature you can configure the icon to be used for the +found process right in the value of a process discovery rule. diff --git a/ChangeLog b/ChangeLog index 1e9e373..d3ad27e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 1950 ibm_svc_mdisk / disk checks: now able to configure the return state for state and mode of disk... * 1951 check_http: now able to configure warning and critical limit for certificate age... * 2136 Unify headers of Host/Service rules, EC rules and notification rules... + * 2176 One custom icon or action can be configured per process/service... * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/modules/check_mk.py b/modules/check_mk.py index 137b7d0..9a11d12 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1522,12 +1522,20 @@ def host_check_command(hostname, ip, is_clust): value, hostname)) -def icons_and_actions_of(what, hostname, svcdesc = None): +def icons_and_actions_of(what, hostname, svcdesc = None, checkname = None, params = None): if what == 'host': return list(set(host_extra_conf(hostname, host_icons_and_actions))) else: actions = set(service_extra_conf(hostname, svcdesc, service_icons_and_actions)) + # Some WATO rules might register icons on their own + checkgroup = checkgroup_of.get(checkname, checkname) + if checkgroup in [ 'ps', 'services' ]: + icon = params.get('icon') + if icon: + actions.add(icon) + print checkname, checkgroup + return list(actions) @@ -2247,7 +2255,7 @@ define servicedependency { check_interval = value # Add custom user icons and actions - actions = icons_and_actions_of('service', hostname, description) + actions = icons_and_actions_of('service', hostname, description, checkname, params) action_cfg = actions and ' _ACTIONS\t\t\t%s\n' % ','.join(actions) or '' outfile.write("""define service { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0db0141..a631f72 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -18701,6 +18701,32 @@ def rule_option_elements(disabling=True): ] return elements +class UserIconOrAction(DropdownChoice): + def __init__(self, **kwargs): + empty_text = _("In order to be able to choose actions here, you need to " + "<a href=\"%s\">define your own actions</a>.") % \ + "wato.py?mode=edit_configvar&varname=user_icons_and_actions" + + kwargs.update({ + 'choices' : self.list_user_icons_and_actions, + 'allow_empty' : False, + 'empty_text' : empty_text, + 'help' : kwargs.get('help', '') + ' '+empty_text, + }) + DropdownChoice.__init__(self, **kwargs) + + def list_user_icons_and_actions(self): + choices = [] + for key, action in config.user_icons_and_actions.items(): + label = key + if 'title' in action: + label += ' - '+action['title'] + if 'url' in action: + label += ' ('+action['url']+')' + + choices.append((key, label)) + return sorted(choices, key = lambda x: x[1]) + #. # .--Plugins-------------------------------------------------------------. # | ____ _ _ | diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5e7b432..74d89db 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2219,47 +2219,20 @@ register_rule(group, ), itemtype = "service") - -def list_user_icons_and_actions(): - choices = [] - for key, action in config.user_icons_and_actions.items(): - label = key - if 'title' in action: - label += ' - '+action['title'] - if 'url' in action: - label += ' ('+action['url']+')' - - choices.append((key, label)) - return sorted(choices, key = lambda x: x[1]) - -icon_upload_link_txt = \ - _("In order to be able to choose actions here, you need to " - "<a href=\"%s\">define your own actions</a>.") % \ - "wato.py?mode=edit_configvar&varname=user_icons_and_actions" - register_rule(group, "host_icons_and_actions", - DropdownChoice( + UserIconOrAction( title = _("Custom icons or actions for hosts in status GUI"), - help = _("You can assign icons or actions to hosts for the status GUI.") \ - + " " + icon_upload_link_txt, - choices = list_user_icons_and_actions, - allow_empty = False, - empty_text = icon_upload_link_txt, + help = _("You can assign icons or actions to hosts for the status GUI.") ), match = "all", ) - register_rule(group, "service_icons_and_actions", - DropdownChoice( + UserIconOrAction( title = _("Custom icons or actions for services in status GUI"), - help = _("You can assign icons or actions to services for the status GUI.") \ - + " " + icon_upload_link_txt, - choices = list_user_icons_and_actions, - allow_empty = False, - empty_text = icon_upload_link_txt, + help = _("You can assign icons or actions to services for the status GUI."), ), match = "all", itemtype = "service", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e255858..606f2c8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -748,6 +748,10 @@ register_rule(group + '/' + subgroup_inventory, 'create duplicate services with the same description otherwise.</p><p>Windows users are specified by the namespace followed by ' 'the actual user name. For example "\\\\NT AUTHORITY\NETWORK SERVICE" or "\\\\CHKMKTEST\Administrator".</p>'), )), + ('icon', UserIconOrAction( + title = _("Add custom icon or action"), + help = _("You can assign icons or actions to the found services in the status GUI."), + )), ('default_params', Dictionary( title = _("Default parameters for detected services"), @@ -5881,7 +5885,12 @@ register_check_parameters( title = _("State if no entry matches"), default_value = 2, ), - ),] + ), + ('icon', UserIconOrAction( + title = _("Add custom icon or action"), + help = _("You can assign icons or actions to the found services in the status GUI."), + )) + ] ), TextAscii( title = _("Name of the service"), @@ -7676,7 +7685,12 @@ register_check_parameters( _("State and count of processes"), Transform( Dictionary( - elements = process_level_elements, + elements = process_level_elements + [ + ('icon', UserIconOrAction( + title = _("Add custom icon or action"), + help = _("You can assign icons or actions to the found services in the status GUI."), + )) + ] ), forth = ps_convert_from_singlekeys, ), @@ -7745,6 +7759,10 @@ register_check_parameters( match = lambda x: (not x and 2) or (x[0] == '~' and 1 or 0) )), + ('icon', UserIconOrAction( + title = _("Add custom icon or action"), + help = _("You can assign icons or actions to the found services in the status GUI."), + )), ] + process_level_elements, # required_keys = [ "process" ], ),

9 years, 5 months

Check_MK Git: check_mk: New check for icom repeaters (not quite done yet)

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3a20eb0a03d652a1101bcb2877725c2e8d8208aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a20eb0a03d652… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Apr 13 13:21:42 2015 +0200 New check for icom repeaters (not quite done yet) --- checks/icom_repeater | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/checks/icom_repeater b/checks/icom_repeater new file mode 100644 index 0000000..7ce92b9 --- /dev/null +++ b/checks/icom_repeater @@ -0,0 +1,112 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +icom_repeater_info = ( ".1.3.6.1.4.1.2021.8.1", + [ "1", # Index Number + "2", # SNMP item name + "101",]) # SNMP item value + +icom_repeater_scan = lambda oid: False #"fc5000" in oid(".1.3.6.1.2.1.1.1.0").lower() + + +def parse_icom_repeater(info): + parsed = {} + for line in info: + if line[1] == "Temperature": + parsed["temp"] = float(line[2][:-1]) + parsed["temp_devunit"] = line[2][-1].lower() + + elif line[1] == "ESN number": + parsed["esnno"] = line[2] + + elif line[1] == "Repeater operation": + parsed["repop"] = line[2].lower() + + elif line[1] == "Abnormal temperature detection": + if line[2] == "Not detected": + parsed["temp_devstatus"] = 0 + else: + parsed["temp_devstatus"] = 2 + + elif line[1] == "Power-supply voltage": + parsed["ps_voltage"] = float(line[2][:-1]) + + elif line[1] == "Abnormal power-supply voltage detection": + if line[2] == "Not detected": + parsed["ps_volt_devstatus"] = 0 + else: + parsed["ps_volt_devstatus"] = 2 + return parsed + + +def inventory_icom_repeater_temp(parsed): + if "temp" in parsed: + return [ (None, None) ] + + +def check_icom_repeater_temp(_no_item, params, parsed): + return check_temperature(parsed["temp"], params, + dev_unit = parsed["temp_devunit"], + dev_status = parsed["temp_devstatus"]) + + +check_info["icom_repeater.temp"] = { + "inventory_function" : inventory_icom_repeater_temp, + "check_function" : check_icom_repeater_temp, + "service_description" : "Temperature", + "group" : "temperature", + "includes" : [ "temperature.include" ], +} + + + +def inventory_icom_repeater(parsed): + if parsed: + return [(None, None)] + else: + return [] + +def check_icom_repeater(_no_item, _no_params, parsed): + pprint.pprint(parsed) + yield 0, "ESN Number: %s" % parsed["esnno"] + + infotext = "Repeater operation status: %s" % parsed["repop"] + if parsed["repop"] == "off": + yield 2, infotext + elif parsed["repop"] == "on": + yield 0, infotext + else: + yield 3, "Repeater operation status unknown" + +check_info["icom_repeater"] = { + "parse_function" : parse_icom_repeater, + "inventory_function" : inventory_icom_repeater, + "check_function" : check_icom_repeater, + "service_description" : "Repeater info", + "snmp_scan_function" : icom_repeater_scan, + "snmp_info" : icom_repeater_info, +}

9 years, 5 months

Check_MK Git: check_mk: icons and actions now use own config variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 29279017fd348a1dec89af7fa47521bccb2b4ac3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29279017fd348a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 12:30:39 2015 +0200 icons and actions now use own config variable --- modules/check_mk.py | 20 +++++++++-- modules/config.py | 2 ++ web/htdocs/valuespec.py | 19 ++++++++-- web/plugins/wato/check_mk_configuration.py | 52 +++++++++++++--------------- 4 files changed, 60 insertions(+), 33 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index e7c3a6f..137b7d0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1522,6 +1522,14 @@ def host_check_command(hostname, ip, is_clust): value, hostname)) +def icons_and_actions_of(what, hostname, svcdesc = None): + if what == 'host': + return list(set(host_extra_conf(hostname, host_icons_and_actions))) + else: + actions = set(service_extra_conf(hostname, svcdesc, service_icons_and_actions)) + + return list(actions) + def check_icmp_arguments_of(hostname): values = host_extra_conf(hostname, ping_levels) @@ -2094,6 +2102,10 @@ def create_nagios_hostdefs(outfile, hostname): else: alias = make_utf8(alias) + # Add custom user icons and actions + actions = icons_and_actions_of('host', hostname) + if actions: + outfile.write(" _ACTIONS\t\t\t%s\n" % ','.join(actions)) # Custom configuration last -> user may override all other values outfile.write(make_utf8(extra_host_conf_of(hostname))) @@ -2234,16 +2246,20 @@ define servicedependency { if value is not None: check_interval = value + # Add custom user icons and actions + actions = icons_and_actions_of('service', hostname, description) + action_cfg = actions and ' _ACTIONS\t\t\t%s\n' % ','.join(actions) or '' + outfile.write("""define service { use\t\t\t\t%s host_name\t\t\t%s service_description\t\t%s check_interval\t\t%d -%s%s check_command\t\t\tcheck_mk-%s +%s%s%s check_command\t\t\tcheck_mk-%s } """ % ( template, hostname, description, check_interval, logwatch, - extra_service_conf_of(hostname, description), checkname )) + extra_service_conf_of(hostname, description), action_cfg, checkname )) checknames_to_define.add(checkname) have_at_least_one_service = True diff --git a/modules/config.py b/modules/config.py index 7332004..1aad61d 100644 --- a/modules/config.py +++ b/modules/config.py @@ -165,6 +165,8 @@ snmp_check_interval = [] inv_exports = {} # Rulesets for inventory export hooks notification_parameters = {} # Rulesets for parameters of notification scripts use_new_descriptions_for = [] +host_icons_and_actions = [] # Custom user icons / actions to be configured +service_icons_and_actions = [] # Custom user icons / actions to be configured # Rulesets for agent bakery agent_config = {} diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 916248f..6945703 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,6 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# FIXME: Cleanups +# - Consolidate ListChoice and DualListChoice to use the same class +# and rename to better name +# - Consolidate RadioChoice and DropdownChoice to use same class +# and rename to better name +# - Checkbox -> rename to Boolean + import math, os, time, re, sre_constants, urlparse, forms from lib import * @@ -1175,6 +1182,7 @@ class DropdownChoice(ValueSpec): self._label = kwargs.get("label") self._prefix_values = kwargs.get("prefix_values", False) self._sorted = kwargs.get("sorted", False) + self._empty_text = kwargs.get("empty_text", _("There are not defined any elements for this selection yet.")) self._no_preselect = kwargs.get("no_preselect", False) self._no_preselect_value = kwargs.get("no_preselect_value", None) @@ -1213,7 +1221,7 @@ class DropdownChoice(ValueSpec): if entry[0] == value: defval = str(n) if len(options) == 0: - html.write(_("There are no options to select from")) + html.write(self._empty_text) elif len(options[0]) == 3: html.icon_select(varprefix, options, defval) else: @@ -1247,11 +1255,16 @@ class DropdownChoice(ValueSpec): ValueSpec.custom_validate(self, value, varprefix) def validate_datatype(self, value, varprefix): - for val, title in self.choices(): + choices = self.choices() + if not choices and value == None: + return + + for val, title in choices: if val == value: return + raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % - (value, ", ".join([v for (v,t) in self.choices()]))) + (value, ", ".join([v for (v,t) in choices]))) # Special conveniance variant for monitoring states diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 68238d4..5e7b432 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2232,41 +2232,37 @@ def list_user_icons_and_actions(): choices.append((key, label)) return sorted(choices, key = lambda x: x[1]) +icon_upload_link_txt = \ + _("In order to be able to choose actions here, you need to " + "<a href=\"%s\">define your own actions</a>.") % \ + "wato.py?mode=edit_configvar&varname=user_icons_and_actions" register_rule(group, - "extra_host_conf:_ACTIONS", - Transform( - ListChoice( - title = _("Custom icons or actions for hosts in status GUI"), - help = _("You can assign icons or actions to hosts for the status GUI. " - "In order to be able to choose actions here, you need to " - "<a href=\"%s\">define your own actions</a>.") % \ - "wato.py?mode=edit_configvar&varname=user_icons_and_actions", - choices = list_user_icons_and_actions, - allow_empty = False, - ), - forth = lambda x: x.split(','), - back = lambda x: ','.join(x), - ) + "host_icons_and_actions", + DropdownChoice( + title = _("Custom icons or actions for hosts in status GUI"), + help = _("You can assign icons or actions to hosts for the status GUI.") \ + + " " + icon_upload_link_txt, + choices = list_user_icons_and_actions, + allow_empty = False, + empty_text = icon_upload_link_txt, + ), + match = "all", ) register_rule(group, - "extra_service_conf:_ACTIONS", - Transform( - ListChoice( - title = _("Custom icons or actions for services in status GUI"), - help = _("You can assign icons or actions to services for the status GUI. " - "In order to be able to choose actions here, you need to " - "<a href=\"%s\">define your own actions</a>.") % \ - "wato.py?mode=edit_configvar&varname=user_icons_and_actions", - choices = list_user_icons_and_actions, - allow_empty = False, - ), - forth = lambda x: x.split(','), - back = lambda x: x.join(','), + "service_icons_and_actions", + DropdownChoice( + title = _("Custom icons or actions for services in status GUI"), + help = _("You can assign icons or actions to services for the status GUI.") \ + + " " + icon_upload_link_txt, + choices = list_user_icons_and_actions, + allow_empty = False, + empty_text = icon_upload_link_txt, ), - itemtype = "service" + match = "all", + itemtype = "service", )

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0847

by Lars Michelsen

Module: check_mk Branch: master Commit: cdde28bce972b6fda345d4bd125ecfc0257bff64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdde28bce972b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 11:16:34 2015 +0200 Updated bug entries #0847 --- .bugs/847 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/847 b/.bugs/847 index ecafd18..45c997b 100644 --- a/.bugs/847 +++ b/.bugs/847 @@ -2,7 +2,7 @@ Title: the modified version of default report cannot be deleted Component: multisite State: open Date: 2015-03-13 13:06:13 -Targetversion: 1.2.7 +Targetversion: 1.2.6 Class: bug nother report (instant) uses the settings and page layout of this report, so it can not be deleted. In order to be able to delete this report, you need to remove the dependency.

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2313, #0847

by Lars Michelsen

Module: check_mk Branch: master Commit: ddf769cb7636681a1f79bddf13b266e4a0ea7171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf769cb763668… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 13 11:15:58 2015 +0200 Updated bug entries #2313, #0847 --- .bugs/2313 | 7 +++++++ .bugs/847 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.bugs/2313 b/.bugs/2313 new file mode 100644 index 0000000..95cdbd8 --- /dev/null +++ b/.bugs/2313 @@ -0,0 +1,7 @@ +Title: Assign all builtin icons to categories +Component: multisite +State: open +Date: 2015-04-13 11:14:25 +Targetversion: 1.2.7 +Class: todo + diff --git a/.bugs/847 b/.bugs/847 index 45c997b..ecafd18 100644 --- a/.bugs/847 +++ b/.bugs/847 @@ -2,7 +2,7 @@ Title: the modified version of default report cannot be deleted Component: multisite State: open Date: 2015-03-13 13:06:13 -Targetversion: 1.2.6 +Targetversion: 1.2.7 Class: bug nother report (instant) uses the settings and page layout of this report, so it can not be deleted. In order to be able to delete this report, you need to remove the dependency.

9 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015