Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64357 discussions

Check_MK Git: check_mk: FIX: add service specification to ruleset Delay service notifications

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eaa6e993248679ec3f05c492db94f622c7ffbec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa6e993248679… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 21 11:53:19 2012 +0200 FIX: add service specification to ruleset Delay service notifications --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd1a59a..50581b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * FIX: set new site dirty is host move due to change of folder attributes * FIX: fix exception on unknown value in DropdownChoice + * FIX: add service specification to ruleset Delay service notifications BI: * New iterators FOREACH_CHILD and FOREACH_PARENT diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d81da35..f66b83f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -695,8 +695,8 @@ register_rule(group, help = _("This setting delays notifications about service problems by the " "specified amount of time. If the service is OK again within that " "time, no notification will be sent out."), - ) - ) + ), + itemtype = "service") register_rule(group, "extra_host_conf:notification_interval",

12 years, 3 months

Check_MK Git: check_mk: Removed duplicate colon in bookmark details page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f97e00ea5a3a6fd421251e3d9c53790a0b339c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f97e00ea5a3a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 21 11:27:35 2012 +0200 Removed duplicate colon in bookmark details page --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 6070b47..17b3a01 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1072,7 +1072,7 @@ def page_edit_bookmark(): html.write("<table class=edit_bookmarks>") html.write("<tr><td>%s</td><td>" % _('Title:')) html.text_input("title", size = 50) - html.write("</td></tr><tr><td>%s:</td><td>" % _('URL:')) + html.write("</td></tr><tr><td>%s:</td><td>" % _('URL')) html.text_input("url", size = 50) html.write("</td></tr><tr><td></td><td>") html.button("save", _("Save"))

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0777

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6b1d57ca00dfbe4e06b9d37f609acbfb8708c1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6b1d57ca00dfb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 21 10:49:51 2012 +0200 Updated bug entries #0777 --- .bugs/777 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/777 b/.bugs/777 new file mode 100644 index 0000000..6e8fc98 --- /dev/null +++ b/.bugs/777 @@ -0,0 +1,9 @@ +Title: Role-Editor Permission view: WATO chapter duplicate +Component: wato +State: open +Date: 2012-06-21 10:49:06 +Targetversion: 1.2.0 +Class: bug + +In the role editor the section with the WATO permissions +is displayed twice.

12 years, 3 months

Check_MK Git: check_mk: FIX: fix deletion of all hosts in folder if attributes changed

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd30c01967f5d108c43a53ef117aa7fd4914a20c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd30c01967f5d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 21 10:07:23 2012 +0200 FIX: fix deletion of all hosts in folder if attributes changed --- web/htdocs/wato.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 35d605f..f19a4b2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -496,7 +496,11 @@ def load_folder(dir, name="", path="", parent=None, childs = True): # so that subsequent code has access to the correct folder # meta data (such as .siteid) def reload_folder(folder): - return load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) + have_hosts = ".hosts" in folder + new_folder = load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) + if have_hosts: # hosts were loaded in old folder -> do this again + load_hosts(new_folder) + return new_folder # Load the information about all folders - except the hosts def load_all_folders(): @@ -1671,6 +1675,7 @@ def mode_editfolder(phase, new): rewrite_config_files_below(g_folder) # due to inherited attributes save_folder(g_folder) g_folder = reload_folder(g_folder) + mark_affected_sites_dirty(g_folder) log_pending(AFFECTED, g_folder, "edit-folder",

12 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a64f43f983662d16fbb8810a7d4bbe09d346b774 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a64f43f983662d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 21 10:07:27 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Fix: diskstat catch output from older agents

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e95446f63e166aed71e08cf1c5f7e265945dc26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e95446f63e166… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jun 20 19:14:15 2012 +0200 Fix: diskstat catch output from older agents --- checks/diskstat.include | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index bd093b8..76668f5 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -124,7 +124,7 @@ def check_diskstat_line(this_time, item, params, line): # Do Latency computation if this information is available: if len(line) >= 6: - reads, writes, timems = map(int, line[3:]) + reads, writes, timems = map(int, line[3:6]) ios = reads + writes timedif, ios_per_sec = get_counter(countername + ".ios", this_time, ios) timedif, timems_per_sec = get_counter(countername + ".time", this_time, timems)

12 years, 3 months

Check_MK Git: check_mk: FIX: fix handling of FOREACH_ in leaf nodes ( remove hard coded

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e993aba315e0c9ec1f870f218ffe524263e77d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e993aba315e0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 20 16:30:36 2012 +0200 FIX: fix handling of FOREACH_ in leaf nodes (remove hard coded --- ChangeLog | 2 ++ web/htdocs/bi.py | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaa5596..bd1a59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ BI: * New iterators FOREACH_CHILD and FOREACH_PARENT + * FIX: fix handling of FOREACH_ in leaf nodes (remove hard coded + $HOST$, replace with $1$, $2$, ..., apply argument substitution) 1.2.0p1: Core: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index ddd3a59..1c1be24 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -270,6 +270,9 @@ def find_matching_services(what, calllist): else: required_tags = [] + if len(calllist) == 0: + raise MKConfigError("Invalid syntax in FOREACH_...") + host_re = calllist[0] if what in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: service_re = config.HOST_STATE @@ -306,10 +309,8 @@ def find_matching_services(what, calllist): if host_matches != None: if what == config.FOREACH_CHILD: - html.debug((site, hostname, host_matches, childs)) list_of_matches = [ host_matches + (child,) for child in childs ] if what == config.FOREACH_PARENT: - html.debug((site, hostname, host_matches, parents)) list_of_matches = [ host_matches + (parent,) for parent in parents ] else: list_of_matches = [ host_matches ] @@ -490,18 +491,23 @@ def compile_aggregation_rule(rule, args, lvl = 0): # Handle case that leaf elements also need to be iterable via FOREACH_HOST # 1: config.FOREACH_HOST # 2: (['waage'], '(.*)') - matches = find_matching_services(node[0], node[1:-2]) + calllist = [] + for n in node[1:-2]: + if type(n) in [ str, unicode ]: + n = subst_vars(n, arginfo) + calllist.append(n) + matches = find_matching_services(node[0], calllist) new_elements = [] handled_args = set([]) # avoid duplicate rule incarnations for match in matches: - arginfo = {'HOST': match[0]} - if tuple(args) not in handled_args: - new_elements += compile_leaf_node(subst_vars(node[-2], arginfo), subst_vars(node[-1], arginfo)) - handled_args.add(tuple(args)) + sub_arginfo = dict([(str(n+1), x) for (n,x) in enumerate(match)]) + if tuple(args) + match not in handled_args: + new_elements += compile_leaf_node(subst_vars(node[-2], sub_arginfo), subst_vars(node[-1], sub_arginfo)) + handled_args.add(tuple(args) + match) host_name, service_description = node[-2:] else: - # This is a final leaf node + # This is a plain leaf node with just host/service new_elements = compile_leaf_node(subst_vars(node[0], arginfo), subst_vars(node[1], arginfo)) else: # substitute our arguments in rule arguments

12 years, 3 months

Check_MK Git: check_mk: FIX: fix exception on unknown value in DropdownChoice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e384bdeb21137b656f1216c0d94fa3f867bf78d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e384bdeb21137b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 20 15:18:38 2012 +0200 FIX: fix exception on unknown value in DropdownChoice --- ChangeLog | 1 + web/htdocs/valuespec.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68b8ccf..eaa5596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * FIX: add missing context help to host details dialog * FIX: set new site dirty is host move due to change of folder attributes + * FIX: fix exception on unknown value in DropdownChoice BI: * New iterators FOREACH_CHILD and FOREACH_PARENT diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 775878a..b516e98 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -788,6 +788,7 @@ class DropdownChoice(ValueSpec): return title.split(self._help_separator, 1)[0].strip() else: return title + return _("(other: %s)" % value) def from_html_vars(self, varprefix): sel = html.var(varprefix)

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0776, #0775

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e330b92b64e72b89c9d66d747de2bfb1217dbc11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e330b92b64e72b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 20 15:12:58 2012 +0200 Updated bug entries #0776, #0775 --- .bugs/775 | 8 ++++++++ .bugs/776 | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.bugs/775 b/.bugs/775 new file mode 100644 index 0000000..9d2358d --- /dev/null +++ b/.bugs/775 @@ -0,0 +1,8 @@ +Title: Garbled sorter Service Performance data value number %02d +Component: multisite +State: open +Date: 2012-06-20 14:05:10 +Targetversion: 1.2.0 +Class: nastiness + +One of the sorters has this silly title. What's up here? diff --git a/.bugs/776 b/.bugs/776 new file mode 100644 index 0000000..04bc4c5 --- /dev/null +++ b/.bugs/776 @@ -0,0 +1,16 @@ +Title: Link for Column in view editor shows duplicate views +Component: multisite +State: open +Date: 2012-06-20 14:07:19 +Targetversion: 1.2.0 +Class: nastiness + +When selecting the View to link to in the view editor then +the mobile views are very irritating. + +We could show those only if the current view is a mobile +view. Or better: Prefix all mobile views with "Mobile: " +and put those at the bottom of the ist. + +Also Only show view that have at least on "hide"-Filter. +Views without a context are not useful for linking.

12 years, 3 months

Check_MK Git: check_mk: if_lancom: add SSID to logical WLAN interface names

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0f98b3549fa6606b8e309cd5f0f90fe240544b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f98b3549fa660… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 20 12:09:44 2012 +0200 if_lancom: add SSID to logical WLAN interface names --- ChangeLog | 3 +- checks/if_lancom | 72 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6fa8db..68b8ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 1.2.0p2: Checks & Agents: * FIX: Fixed syntax errors in a bunch of man pages - * if_lancom: silently ignore Logical and Point-To-Point interfaces + * if_lancom: silently ignore Point-To-Point interfaces + * if_lancom: add SSID to logical WLAN interface names Multisite: * Show number of rows and number of selected rows in header line diff --git a/checks/if_lancom b/checks/if_lancom index cf1634d..52c5eef 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -29,23 +29,33 @@ def fix_if_64_highspeed(info): if type(line[3]) == str: # not yet converted line[3] = saveint(line[3]) * 1000000 -def if_lancom_strip_logical(info): +def if_lancom_convert(info): + iftab, ssidtab = info + ssid_dict = dict(ssidtab) new_info = [] - for line in info: - if line[-1].startswith("Logical Network") or \ - line[-1].startswith("Point-2-Point"): + for line in iftab: + if line[20].startswith("Point-2-Point"): continue else: - new_info.append(line[:-1]) + ifName = line[1] + + new_line = line[:-1] + if line[20].startswith("Logical Network"): + new_line[1] += " Logical" + ssid = ssid_dict.get(ifName, "") + if ssid: + new_line[1] += " " + ssid + new_line[1] = new_line[1].strip() + new_info.append(new_line) return new_info def inventory_if_lancom(info): - info = if_lancom_strip_logical(info) + info = if_lancom_convert(info) fix_if_64_highspeed(info) return inventory_if_common(info) def check_if_lancom(item, params, info): - info = if_lancom_strip_logical(info) + info = if_lancom_convert(info) fix_if_64_highspeed(info) return check_if_common(item, params, info) @@ -54,31 +64,33 @@ check_includes['if_lancom'] = [ "if.include" ] checkgroup_of['if_lancom'] = "if" check_default_levels['if_lancom'] = "if_default_levels" -snmp_info['if_lancom'] = \ +snmp_info['if_lancom'] = [ \ ( ".1.3.6.1.2.1", [ - "2.2.1.1", # ifIndex 0 - "31.1.1.1.1", # ifName (LANCOM has no useful information if Descr) - "2.2.1.3", # ifType 2 - "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit - "2.2.1.8", # ifOperStatus 4 - "31.1.1.1.6", # ifHCInOctets 5 - "31.1.1.1.7", # ifHCInUcastPkts 6 - "31.1.1.1.8", # ifHCInMulticastPkts 7 - "31.1.1.1.9", # ifHCInBroadcastPkts 8 - "2.2.1.13", # ifInDiscards 9 - "2.2.1.14", # ifInErrors 10 - "31.1.1.1.10", # ifHCOutOctets 11 - "31.1.1.1.11", # ifHCOutUcastPkts 12 - "31.1.1.1.12", # ifHCOutMulticastPkts 13 - "31.1.1.1.13", # ifHCOutBroadcastPkts 14 - "2.2.1.19", # ifOutDiscards 15 - "2.2.1.20", # ifOutErrors 16 - "2.2.1.21", # ifOutQLen 17 - "31.1.1.1.18", # ifAlias 18 - "2.2.1.6", # ifPhysAddress 19 + "2.2.1.1", # ifIndex 0 + "31.1.1.1.1", # ifName (LANCOM has no useful information if Descr) + "2.2.1.3", # ifType 2 + "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit + "2.2.1.8", # ifOperStatus 4 + "31.1.1.1.6", # ifHCInOctets 5 + "31.1.1.1.7", # ifHCInUcastPkts 6 + "31.1.1.1.8", # ifHCInMulticastPkts 7 + "31.1.1.1.9", # ifHCInBroadcastPkts 8 + "2.2.1.13", # ifInDiscards 9 + "2.2.1.14", # ifInErrors 10 + "31.1.1.1.10", # ifHCOutOctets 11 + "31.1.1.1.11", # ifHCOutUcastPkts 12 + "31.1.1.1.12", # ifHCOutMulticastPkts 13 + "31.1.1.1.13", # ifHCOutBroadcastPkts 14 + "2.2.1.19", # ifOutDiscards 15 + "2.2.1.20", # ifOutErrors 16 + "2.2.1.21", # ifOutQLen 17 + "31.1.1.1.18", # ifAlias 18 + "2.2.1.6", # ifPhysAddress 19 # Used in order to ignore some logical NICs - "2.2.1.2", # ifDescr 1 - ] ) + "2.2.1.2", # ifDescr 20 + ]), + ( ".1.3.6.1.4.1.2356.11.1.3.56.1", [1, 3] ) # LANCOM: SSID 21 + ] # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 snmp_scan_functions['if_lancom'] = \

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits