Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: FIX: Fixed syntax errors in a bunch of man pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a9467e3ebe8106a6e56a712f31d480d5f78b6ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a9467e3ebe810… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 19 08:39:35 2012 +0200 FIX: Fixed syntax errors in a bunch of man pages --- ChangeLog | 1 + checkman/hpux_fchba | 8 -------- checkman/postgres_stat_database.size | 6 +----- checkman/tsm_drives | 10 ---------- checkman/tsm_stagingpools | 12 +++++++----- checkman/tsm_storagepools | 9 +-------- 6 files changed, 10 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7615765..d33cc7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 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 Multisite: diff --git a/checkman/hpux_fchba b/checkman/hpux_fchba index c526d01..70dd1fa 100644 --- a/checkman/hpux_fchba +++ b/checkman/hpux_fchba @@ -26,11 +26,3 @@ inventory: Older {"td"} / {"fcms"} based HBAs are not reported from the agent per default. - -[parameters] - There are no check parameters - - -[perfdata] - No perfdata is returned by the check. - diff --git a/checkman/postgres_stat_database.size b/checkman/postgres_stat_database.size index fe5f6bb..920a005 100644 --- a/checkman/postgres_stat_database.size +++ b/checkman/postgres_stat_database.size @@ -11,9 +11,5 @@ description: inventory: The check generates one item per Database found. - -[configuration] - This check has no configuration. - perfdata: - The check sends performance data for the size of the database. + The the size of the database. diff --git a/checkman/tsm_drives b/checkman/tsm_drives index 655b684..4241a83 100644 --- a/checkman/tsm_drives +++ b/checkman/tsm_drives @@ -14,15 +14,5 @@ description: item: The name of the tape drive. - inventory: The check inventorizes all tape drives as reported by TSM. - - -[parameters] - There are no check parameters - - -[perfdata] - No perfdata is returned by the check. - diff --git a/checkman/tsm_stagingpools b/checkman/tsm_stagingpools index 9d4d461..150599a 100644 --- a/checkman/tsm_stagingpools +++ b/checkman/tsm_stagingpools @@ -21,7 +21,6 @@ description: tapes that still have enough capacity reserve to be considered as free. - item: The name of the staging pool. @@ -29,12 +28,15 @@ item: inventory: The check creates one item per staging pool found. +perfdata: + The number of tapes that are considered free, + the average utilization and the levels for alerting [parameters] tsm_stagingpools_default_levels (dict): - "free_below" - maximum usage of a tape drive to be considered as free -(warn, crit) = Number of free tapes + {"free_below"}: A percentage (float) for the usage below which a tape is considered + to be free. + {"levels"} A pair of integers of levels for warning and critical for the number + of required free tapes -[perfdata] - The check returns the number of tapes that are considered free, the average utilization and the levels for alerting diff --git a/checkman/tsm_storagepools b/checkman/tsm_storagepools index af8701a..aaaf9ab 100644 --- a/checkman/tsm_storagepools +++ b/checkman/tsm_storagepools @@ -10,19 +10,12 @@ description: Since this check is mostly informational it always returns an OK state. - item: The name of the storage pool. - inventory: The check inventorizes all storage pools on the server, independent of their type. - -[parameters] - There are no check parameters - - -[perfdata] +perfdata: The used capacity in Megabytes.

12 years, 3 months

Check_MK Git: check_mk: WATO: fixed topic visibility in editfolder/ bulkedit mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c8b1bdabbbdb27966f81a3f86ac81bcb2feaa9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c8b1bdabbbdb2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 18 22:20:51 2012 +0200 WATO: fixed topic visibility in editfolder/bulkedit mode --- web/htdocs/js/wato.js | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 5bf8df0..f83c5a0 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -186,15 +186,22 @@ function wato_fix_visibility() { } } - var form_edithost = document.getElementById("form_edithost"); - for (var child in form_edithost.childNodes){ - oTr = form_edithost.childNodes[child]; - if (oTr.className == "nform"){ - if( hide_topics.indexOf(oTr.childNodes[0].childNodes[0].textContent) > -1 ) - oTr.style.display = "none"; - else - oTr.style.display = ""; - } + // FIXME: use generic identifier for each form + var available_forms = [ "form_edithost", "form_editfolder", "form_bulkedit" ]; + for ( var try_form in available_forms ){ + var my_form = document.getElementById(available_forms[try_form]); + if (my_form != null) { + for (var child in my_form.childNodes){ + oTr = my_form.childNodes[child]; + if (oTr.className == "nform"){ + if( hide_topics.indexOf(oTr.childNodes[0].childNodes[0].textContent) > -1 ) + oTr.style.display = "none"; + else + oTr.style.display = ""; + } + } + break; + } } }

12 years, 3 months

Check_MK Git: check_mk: Do not paint host icons if data is incomplete

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4429ab509cb9d55a466ba0aad7e5be173ade44f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4429ab509cb9d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 18 16:16:49 2012 +0200 Do not paint host icons if data is incomplete --- web/plugins/views/painters.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b4eb304..c789e38 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -116,11 +116,15 @@ multisite_icons = [] load_web_plugins('icons', globals()) +# Paint column with various icons. The icons use +# a plugin based mechanism so it is possible to +# register own icon "handlers". +# what: either "host" or "service" +# row: the data row of the host or service def paint_icons(what, row): - """ - what: "host" or "service" - row: The livestatus row of the current object - """ + if not row["host_name"]: + return "", ""# Host probably does not exist + custom_vars = dict(zip(row["host_custom_variable_names"], row["host_custom_variable_values"]))

12 years, 3 months

Check_MK Git: check_mk: ValueSpec DropdownChoice: handle yet other case with no choices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf65284f1fe682c63dc2f9a9a8e17d0dec431d41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf65284f1fe682… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 18 16:06:27 2012 +0200 ValueSpec DropdownChoice: handle yet other case with no choices --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2219a3c..775878a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -795,7 +795,7 @@ class DropdownChoice(ValueSpec): val = entry[0] if sel == str(n): return val - return self.choices()[0][0] # can only happen if user garbled URL + return self.default_value() # can only happen if user garbled URL or len(choices) == 0 def validate_datatype(self, value, varprefix): for val, title in self.choices():

12 years, 3 months

Check_MK Git: check_mk: ValueSpec DropdownChoice: handle case with no choices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e87cc61ca704a8459385560fce67943c8237b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e87cc61ca704a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 18 16:04:51 2012 +0200 ValueSpec DropdownChoice: handle case with no choices --- web/htdocs/valuespec.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 76aea43..2219a3c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -757,7 +757,11 @@ class DropdownChoice(ValueSpec): return self._choices() def canonical_value(self): - return self.choices()[0][0] + choices = self.choices() + if len(choices) > 0: + return choices[0][0] + else: + return None def render_input(self, varprefix, value): if self._label: @@ -769,7 +773,9 @@ class DropdownChoice(ValueSpec): options.append((str(n),) + entry[1:]) if entry[0] == value: defval = str(n) - if len(options[0]) == 3: + if len(options) == 0: + html.write(_("There are no options to select from")) + elif len(options[0]) == 3: html.icon_select(varprefix, options, defval) else: html.select(varprefix, options, defval)

12 years, 3 months

Check_MK Git: check_mk: BI: New iterators FOREACH_CHILD and FOREACH_PARENT

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b6a928616d54de94f459cd9da82838eaff26d26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b6a928616d54d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 18 15:03:09 2012 +0200 BI: New iterators FOREACH_CHILD and FOREACH_PARENT --- ChangeLog | 3 +++ web/htdocs/bi.py | 47 +++++++++++++++++++++++++++++++---------------- web/htdocs/config.py | 2 ++ 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index abbc293..7615765 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ * FIX: set new site dirty is host move due to change of folder attributes + BI: + * New iterators FOREACH_CHILD and FOREACH_PARENT + 1.2.0p1: Core: * Added macros $DATE$, $SHORTDATETIME$ and $LONGDATETIME$' to diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 5e04325..ddd3a59 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -109,14 +109,15 @@ def load_services(): services = {} html.live.set_prepend_site(True) html.live.set_auth_domain('bi') - data = html.live.query("GET hosts\nColumns: name custom_variable_names custom_variable_values services\n") + data = html.live.query("GET hosts\n" + "Columns: name custom_variable_names custom_variable_values services childs parents\n") html.live.set_prepend_site(False) html.live.set_auth_domain('read') - for site, host, varnames, values, svcs in data: + for site, host, varnames, values, svcs, childs, parents in data: vars = dict(zip(varnames, values)) tags = vars.get("TAGS", "").split(" ") - services[(site, host)] = (tags, svcs) + services[(site, host)] = (tags, svcs, childs, parents) return services @@ -242,7 +243,11 @@ def compile_rule_node(calllist, lvl): # Execute FOREACH: iterate over matching hosts/services and # for each hit create an argument list where $1$, $2$, ... are # substituted with matched strings. - if calllist[0] in [ config.FOREACH_HOST, config.FOREACH_SERVICE ]: + if calllist[0] in [ + config.FOREACH_HOST, + config.FOREACH_CHILD, + config.FOREACH_PARENT, + config.FOREACH_SERVICE ]: matches = find_matching_services(calllist[0], calllist[1:]) new_elements = [] handled_args = set([]) # avoid duplicate rule incarnations @@ -266,7 +271,7 @@ def find_matching_services(what, calllist): required_tags = [] host_re = calllist[0] - if what == config.FOREACH_HOST: + if what in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: service_re = config.HOST_STATE else: service_re = calllist[1] @@ -277,7 +282,7 @@ def find_matching_services(what, calllist): # TODO: Hier könnte man - wenn der Host bekannt ist, effektiver arbeiten, als # komplett alles durchzugehen. - for (site, hostname), (tags, services) in g_user_cache["services"].items(): + for (site, hostname), (tags, services, childs, parents) in g_user_cache["services"].items(): host_matches = None if not match_host_tags(tags, required_tags): continue @@ -300,13 +305,23 @@ def find_matching_services(what, calllist): host_matches = do_match(anchored, hostname) if host_matches != None: - if service_re == config.HOST_STATE: - matches.add(host_matches) + 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: - for service in services: - svc_matches = do_match(service_re, service) - if svc_matches != None: - matches.add(host_matches + svc_matches) + list_of_matches = [ host_matches ] + + for host_matches in list_of_matches: + if service_re == config.HOST_STATE: + matches.add(host_matches) + else: + for service in services: + svc_matches = do_match(service_re, service) + if svc_matches != None: + matches.add(host_matches + svc_matches) matches = list(matches) matches.sort() @@ -471,11 +486,11 @@ def compile_aggregation_rule(rule, args, lvl = 0): new_elements = new_new_elements elif type(node[-1]) != list: - if node[0] == config.FOREACH_HOST: + if node[0] in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: # Handle case that leaf elements also need to be iterable via FOREACH_HOST # 1: config.FOREACH_HOST # 2: (['waage'], '(.*)') - matches = find_matching_services(config.FOREACH_HOST, node[1:-2]) + matches = find_matching_services(node[0], node[1:-2]) new_elements = [] handled_args = set([]) # avoid duplicate rule incarnations for match in matches: @@ -525,7 +540,7 @@ def compile_aggregation_rule(rule, args, lvl = 0): def find_remaining_services(hostspec, aggregation): - tags, all_services = g_user_cache["services"][hostspec] + tags, all_services, childs, parents = g_user_cache["services"][hostspec] all_services = set(all_services) for site, host, service in find_all_leaves(aggregation): if (site, host) == hostspec: @@ -578,7 +593,7 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): honor_site = SITE_SEP in host_re # TODO: If we already know the host we deal with, we could avoid this loop - for (site, hostname), (tags, services) in g_user_cache["services"].items(): + for (site, hostname), (tags, services, childs, parents) in g_user_cache["services"].items(): # If host ends with '|@all', we need to check host tags instead # of regexes. if host_re.endswith('|@all'): diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 6df6cb4..de1f9a1 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -75,6 +75,8 @@ ALL_HOSTS = '(.*)' HOST_STATE = ('__HOST_STATE__',) HIDDEN = ('__HIDDEN__',) class FOREACH_HOST: pass +class FOREACH_CHILD: pass +class FOREACH_PARENT: pass class FOREACH_SERVICE: pass class REMAINING: pass

12 years, 3 months

Check_MK Git: check_mk: Fixed syntax errors in several man pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a0b37f939c8678391107357e659876ecc056e0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a0b37f939c867… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 18 11:32:46 2012 +0200 Fixed syntax errors in several man pages --- checkman/aix_multipath | 2 -- checkman/akcp_sensor_temp | 2 +- checkman/mysql.innodb_io | 7 ++----- checkman/mysql.sessions | 4 ++-- checkman/mysql_capacity | 15 ++++++--------- checkman/postgres_sessions | 10 ++++------ checkman/postgres_stat_database | 3 --- checkman/solaris_multipath | 2 -- 8 files changed, 15 insertions(+), 30 deletions(-) diff --git a/checkman/aix_multipath b/checkman/aix_multipath index 5eddf62..cc871e5 100644 --- a/checkman/aix_multipath +++ b/checkman/aix_multipath @@ -20,5 +20,3 @@ inventory: One service is created for each LUN that is reported by the lspath utility. -[parameters] -The check does not support parameters. diff --git a/checkman/akcp_sensor_temp b/checkman/akcp_sensor_temp index 09754d4..5880069 100644 --- a/checkman/akcp_sensor_temp +++ b/checkman/akcp_sensor_temp @@ -26,4 +26,4 @@ critical (int): level for critical temperature [configuration] akcp_sensor_temp_defaultlevels (int, int): Default levels. This is -preset to {(28, 32)}. + preset to {(28, 32)}. diff --git a/checkman/mysql.innodb_io b/checkman/mysql.innodb_io index 9a0d00f..ab4267b 100644 --- a/checkman/mysql.innodb_io +++ b/checkman/mysql.innodb_io @@ -14,14 +14,11 @@ description: The configuration of this check is internally done as a "disk check" but presented in as an application monitoring in WATO. + The check is configured like the {diskstat} check for block devices. + inventory: The check generates one item, representing the InnoDB writers for a MySQL Daemon. - -[configuration] - The check is configured like the {diskstat} check for block devices. - - perfdata: The bytes read and written via InnoDB, along with the levels. diff --git a/checkman/mysql.sessions b/checkman/mysql.sessions index b08064f..8063a85 100644 --- a/checkman/mysql.sessions +++ b/checkman/mysql.sessions @@ -17,8 +17,8 @@ inventory: [configuration] - There is no preset level for this service, as the thresholds are dependant - on the application and usage of the MySQL databases. +warn(int): number of sessions at which the check goes warn +crit(int): number of sessions for a critical state perfdata: diff --git a/checkman/mysql_capacity b/checkman/mysql_capacity index 80c4602..4cbda96 100644 --- a/checkman/mysql_capacity +++ b/checkman/mysql_capacity @@ -4,17 +4,14 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check verifies the space used and available for MySQL databases as - returned from MySQL. - -inventory: - The check generates one item per Database found. - Internal MySQL databases are ignored. + This check verifies the space used and available for MySQL databases as + returned from MySQL. + The check is configured like the {df} check for filesystems including trend reporting. -[configuration] - The check is configured like the {df} check for filesystems including trend reporting. - +inventory: + The check generates one item per Database found. + Internal MySQL databases are ignored. perfdata: See {df} man page for performance data. diff --git a/checkman/postgres_sessions b/checkman/postgres_sessions index d415a6f..fb5cec5 100644 --- a/checkman/postgres_sessions +++ b/checkman/postgres_sessions @@ -9,17 +9,15 @@ description: It reports how many sessions there are in total and how many of them are actively querying something. - It allows to set {WARN} and {CRIT} tresholds on any of these parameters. - inventory: The check generates one item for the sessions connected to the PostgreSQL daemon. +perfdata: + The check generates perfdata for the total and running sessions. [configuration] - There is no preset level for this service, as the thresholds are dependant - on the application and usage of the PostgreSQL databases. +warn(int): number of sessions at which the check goes warn +crit(int): number of sessions for a critical state -perfdata: - The check generates perfdata for the total and running sessions. diff --git a/checkman/postgres_stat_database b/checkman/postgres_stat_database index a2c3b87..a09a3eb 100644 --- a/checkman/postgres_stat_database +++ b/checkman/postgres_stat_database @@ -21,9 +21,6 @@ description: inventory: One item is generated per database. - -[configuration] - perfdata: The numbers for disk blocks read, and the number of transactions per transaction type. diff --git a/checkman/solaris_multipath b/checkman/solaris_multipath index 3ceb15f..7d8d094 100644 --- a/checkman/solaris_multipath +++ b/checkman/solaris_multipath @@ -19,5 +19,3 @@ item: inventory: One service is created for each LUN that is reported by mpathadm -[parameters] -The check does not support parameters.

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0774

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c51e843df9313232d8317cf209a9f83f7f9cd693 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c51e843df93132… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 15 13:54:12 2012 +0200 Updated bug entries #0774 --- .bugs/774 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/774 b/.bugs/774 new file mode 100644 index 0000000..ae43041 --- /dev/null +++ b/.bugs/774 @@ -0,0 +1,11 @@ +Title: Option "hide names of configuration variables" works only after switching +Component: wato +State: open +Date: 2012-06-15 13:53:06 +Targetversion: 1.2.0 +Class: bug + +The configuration variable is - per WATO - default off. But +in fact the real default value seems to be True. So +in order to see the variable names you need to toggle +once on and off again.

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: 93b968bfc1f08ee0ae3d45a223d3165f8ea76456 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93b968bfc1f08e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 15 13:54:15 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8e9ec1d31975da767f430e3467b0bc289451563e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e9ec1d31975da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 15 10:51:16 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012