Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: BI: new permission for seeing all objects

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf87fb4fe366ad8f74114f0aceeae004e0ffec3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf87fb4fe366ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 15:24:19 2011 +0200 BI: new permission for seeing all objects --- web/htdocs/bi.py | 117 +++++++++++++++++++++++++------------------- web/htdocs/config.py | 5 +- web/htdocs/index.py | 6 ++- web/htdocs/wato.py | 3 +- web/plugins/sidebar/bi.py | 4 +- web/plugins/views/bi.py | 2 +- 6 files changed, 79 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf87fb4fe3…

13 years, 5 months

Check_MK Git: check_mk: BI: fix index of affected services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36301cd23d5de79a0e84e02ff9b89dee55450d30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36301cd23d5de7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 14:05:23 2011 +0200 BI: fix index of affected services --- web/htdocs/bi.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index e3cd2d1..e892544 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -137,21 +137,24 @@ def compile_forest(): for aggr in new_entries: req_hosts = aggr[0] + # All single-host aggregations looked up per host if len(req_hosts) == 1: host = req_hosts[0] # pair of (site, host) entries = g_host_aggregations.get(host, []) entries.append((group, aggr)) g_host_aggregations[host] = entries + # All aggregations containing a specific host for h in req_hosts: entries = g_affected_hosts.get(h, []) entries.append((group, aggr)) g_affected_hosts[h] = entries + # All aggregations containing a specific service services = find_all_leaves(aggr) for s in services: # triples of site, host, service entries = g_affected_services.get(s, []) - entries.append((group, entry)) + entries.append((group, aggr)) g_affected_services[s] = entries # Remember successful compile in cache

13 years, 5 months

Check_MK Git: check_mk: BI: Implement new rule type "REMAINING"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4b00a53def9fcf002d467ec26779c41037ea7d24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b00a53def9fcf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 18 17:48:59 2011 +0200 BI: Implement new rule type "REMAINING" --- doc/bi-example.mk | 23 +++++++++++++- web/htdocs/bi.py | 82 ++++++++++++++++++++++++++++++++++++++++++++----- web/htdocs/config.py | 2 +- 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/doc/bi-example.mk b/doc/bi-example.mk index e8c2d91..4ac9d6e 100644 --- a/doc/bi-example.mk +++ b/doc/bi-example.mk @@ -13,6 +13,8 @@ aggregation_rules["host"] = ( ( "checkmk", [ "$HOST$" ] ), ( "applications", [ "$HOST$" ] ), ( "logfiles", [ "$HOST$" ] ), + ( "hardware", [ "$HOST$" ] ), + ( "other", [ "$HOST$" ] ), ] ) @@ -41,7 +43,16 @@ aggregation_rules["cpuandmem"] = ( [ "HOST" ], "worst", [ - ( "$HOST$", "CPU|Memory|Kernel" ), + ( "$HOST$", "CPU|Memory|Kernel|Number of threads" ), + ] +) + +aggregation_rules["hardware"] = ( + "Hardware", + [ "HOST" ], + "worst", + [ + ( "$HOST$", "IPMI|RAID" ), ] ) @@ -50,6 +61,7 @@ aggregation_rules["networking"] = ( [ "HOST" ], "worst", [ + ( "$HOST$", "NFS" ), ( FOREACH, "$HOST$", "NIC ([a-z]*).* counters", "nic", [ "$HOST$", "$1$" ] ), ] ) @@ -89,6 +101,15 @@ aggregation_rules["applications"] = ( ] ) +aggregation_rules["other"] = ( + "Other", + [ "HOST" ], + "worst", + [ + ( "$HOST$", REMAINING ), + ] +) + aggregations += [ ( "Hosts", FOREACH, "(.*)", "Check_MK$", "host", ["$1$"] ), ] diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 10932f0..e3cd2d1 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -123,6 +123,11 @@ def compile_forest(): group = entry[0] new_entries = compile_rule_node(entry[1:], 0) + for entry in new_entries: + remove_empty_nodes(entry) + + new_entries = [ e for e in new_entries if len(e[-3]) > 0 ] + # enter new aggregations into dictionary for that group entries = g_aggregation_forest.get(group, []) entries += new_entries @@ -305,10 +310,34 @@ def find_all_leaves(node): entries += find_all_leaves(n) return entries +def remove_empty_nodes(node): + if len(node) == 3: # leaf node + return node + else: + subnodes = node[3] + for i in range(0, len(subnodes)): + remove_empty_nodes(subnodes[i]) + for i in range(0, len(subnodes))[::-1]: + if node_is_empty(subnodes[i]): + del subnodes[i] + +def node_is_empty(node): + if len(node) == 3: + return False # leaf node + else: + return len(node[3]) == 0 + # Precompile one aggregation rule. This outputs a list of trees. # The length of this list is current either 0 or 1 def compile_aggregation_rule(rule, args, lvl = 0): + # When compiling root nodes we essentially create + # complete top-level aggregations. In that case we + # need to deal with REMAINING-entries + if lvl == 0: + global g_remaining_refs + g_remaining_refs = [] + if len(rule) != 4: raise MKConfigError("<h3>Invalid aggregation rule</h1>" "Aggregation rules must contain four elements: description, argument list, " @@ -339,8 +368,21 @@ def compile_aggregation_rule(rule, args, lvl = 0): # Each node can return more than one incarnation (due to regexes in # leaf nodes and FOREACH in rule nodes) - if node[1] == config.HOST_STATE: - new_elements = compile_leaf_node(subst_vars(node[0], arginfo)) + if node[1] in [ config.HOST_STATE, config.REMAINING ]: + new_elements = compile_leaf_node(subst_vars(node[0], arginfo), node[1]) + new_new_elements = [] + for entry in new_elements: + # Postpone: remember reference to list where we need to add + # remaining services of host + if entry[0] == config.REMAINING: + # create unique pointer which we find later + placeholder = ([], (None, None), str(len(g_remaining_refs))) + g_remaining_refs.append((entry[1], elements, placeholder)) + new_new_elements.append(placeholder) + else: + new_new_elements.append(entry) + new_elements = new_new_elements + elif type(node[-1]) != list: new_elements = compile_leaf_node(subst_vars(node[0], arginfo), subst_vars(node[1], arginfo)) else: @@ -351,13 +393,31 @@ def compile_aggregation_rule(rule, args, lvl = 0): elements += new_elements - if len(elements) == 0: - return [] # this aggregation is empty - needed_hosts = set([]) for element in elements: needed_hosts.update(element[0]) - return [ (list(needed_hosts), inst_description, funcname, elements) ] + + aggregation = (list(needed_hosts), inst_description, funcname, elements) + + # Handle REMAINING references, if we are a root node + if lvl == 0: + for hostspec, ref, placeholder in g_remaining_refs: + new_entries = find_remaining_services(hostspec, aggregation) + where_to_put = ref.index(placeholder) + ref[where_to_put:where_to_put+1] = new_entries + + return [ aggregation ] + + +def find_remaining_services(hostspec, aggregation): + tags, all_services = g_services[hostspec] + all_services = set(all_services) + for site, host, service in find_all_leaves(aggregation): + if (site, host) == hostspec: + all_services.discard(service) + remaining = list(all_services) + remaining.sort() + return [ ( [hostspec], hostspec, service ) for service in remaining ] # Reduce [ [ 'linux', 'test' ], ALL_HOSTS, ... ] to [ 'linux|test|@all', ... ] @@ -446,9 +506,13 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): if service_re == config.HOST_STATE: found.append(([(site, hostname)], (site, hostname), config.HOST_STATE)) - for service in services: - if regex(service_re).match(service): - found.append(([(site, hostname)], (site, hostname), service)) + elif service_re == config.REMAINING: + found.append((config.REMAINING, (site, hostname))) + + else: + for service in services: + if regex(service_re).match(service): + found.append(([(site, hostname)], (site, hostname), service)) found.sort() return found diff --git a/web/htdocs/config.py b/web/htdocs/config.py index de72f87..ed5a284 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -457,8 +457,8 @@ host_tags = [] ALL_HOSTS = ['@all'] HOST_STATE = '__HOST_STATE__' -class NEED: pass class FOREACH: pass +class REMAINING: pass aggregation_rules = {} aggregations = [] aggregation_functions = {}

13 years, 5 months

Check_MK Git: check_mk: BI: reengineered rule compilation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85fd729ed271bb316c45bb9800cc98359959be3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85fd729ed271bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 17 18:58:14 2011 +0200 BI: reengineered rule compilation Note: old rule definitions are sligthly incompatible. As soon as the new way is fixed, we will update the documentation. The new way is much clearer and avoid several subtle problems while keeping all possibilities of the old method. --- doc/bi-example-oracle.mk | 85 +++++++++ doc/bi-example.mk | 95 ++++++++++ doc/bi.example | 69 ------- web/htdocs/bi.py | 465 +++++++++++++++------------------------------- web/htdocs/config.py | 1 + 5 files changed, 335 insertions(+), 380 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85fd729ed2…

13 years, 5 months

Check_MK Git: check_mk: smart-plugins: speed up by avoiding three processes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee5d9926047375cb49f6efc399ea7c99c6302c7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee5d9926047375… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 17 10:01:31 2011 +0200 smart-plugins: speed up by avoiding three processes --- agents/plugins/smart | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index eda9307..220fef6 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -5,8 +5,8 @@ if which smartctl > /dev/null 2>&1 ; then echo '<<<smart>>>' for D in /dev/[sh]d[a-z] /dev/[sh]d[a-z][a-z]; do N=${D##*/} - VEND=$(cat /sys/block/$N/device/vendor | tr -d ' ') - MODEL=$(cat /sys/block/$N/device/model | tr ' ' _ | sed 's/_*$//g') + VEND=$(tr -d ' ' < /sys/block/$N/device/vendor) + MODEL=$(sed -e 's/ /_/g' -e 's/_*$//g' < /sys/block/$N/device/model) smartctl -A $D | grep Always | sed "s|^|$D $VEND $MODEL |" - done + done 2>/dev/null fi

13 years, 5 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: 08115f8f14f2fa4fa0528999ac143434969c93c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08115f8f14f2fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 17 09:59:05 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: BI: better error message, when rules are missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be082dc1f13612b0e3562cddd60d32de42641503 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be082dc1f13612… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 15 15:30:29 2011 +0200 BI: better error message, when rules are missing --- web/htdocs/bi.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 3fb867b..0f8b294 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -258,7 +258,12 @@ def compile_aggregation(rule, args, lvl = 0): if node[1] == config.HOST_STATE or type(node[1]) == str: # leaf node new_elements = compile_leaf_node(arginfo, node[0], node[1]) else: - rule = config.aggregation_rules[node[0]] + rule = config.aggregation_rules.get(node[0]) + if not rule: + raise MKConfigError("<h1>Missing rule</h1>" + "The rule '%s' calls the rule <tt>%s</tt>, but that is not defined." % + (description, node[0])) + instargs = compile_args([ instantiate(arg, arginfo)[0] for arg in node[1] ]) new_elements = compile_aggregation(rule, instargs, lvl + 1)

13 years, 5 months

Check_MK Git: check_mk: FIX: ad_replication. bat only generates output on domain controllers now.

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 94bfb0088e995f927f4253b5e3d9da57c9487fa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94bfb0088e995f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 15 16:16:10 2011 +0200 FIX: ad_replication.bat only generates output on domain controllers now. This is useful to prevent checks on non DC hosts which have the admin/support tools and the ad_replication.bat agent plugin installed (Thanks to Alex Greenwood) --- ChangeLog | 2 ++ agents/windows/plugins/ad_replication.bat | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4af0d59..fb18576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,8 @@ * mcdata_fcport: new check for ports of MCData FC Switches * hp_procurve_cpu: add PNP template * hp_procurve_cpu: rename load to utilization, rename service to CPU utilizition + * FIX: ad_replication.bat only generates output on domain controllers now. + This is useful to prevent checks on non DC hosts (Thanks to Alex Greenwood) 1.1.10: Core, Setup, etc.: diff --git a/agents/windows/plugins/ad_replication.bat b/agents/windows/plugins/ad_replication.bat index d41722c..bdaa64a 100644 --- a/agents/windows/plugins/ad_replication.bat +++ b/agents/windows/plugins/ad_replication.bat @@ -15,4 +15,5 @@ REM * REM *** echo ^<^<^<ad_replication^>^>^> -repadmin /showrepl /csv +dsquery server | find /I "CN=%COMPTERNAME%," > nul +if ERRORLEVEL 0 repadmin /showrepl /csv

13 years, 5 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae8e7efbc3041661aaccfa99a62f2ab35f7dc2ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae8e7efbc30416… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 14 19:30:34 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: smart agent plugin: Fixed copy paste error

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9abd69a7aaac017652fffe5e56cb38b822d95f52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9abd69a7aaac01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 14 15:28:07 2011 +0200 smart agent plugin: Fixed copy paste error --- agents/plugins/smart | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index 1e6c2a1..eda9307 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -7,6 +7,6 @@ if which smartctl > /dev/null 2>&1 ; then N=${D##*/} VEND=$(cat /sys/block/$N/device/vendor | tr -d ' ') MODEL=$(cat /sys/block/$N/device/model | tr ' ' _ | sed 's/_*$//g') - smartctl -A $D | grep Always | sed "s|^|$D $VEND $MODEL | tr ' ' _) |" + smartctl -A $D | grep Always | sed "s|^|$D $VEND $MODEL |" done fi

13 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011