Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64357 discussions

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

Check_MK Git: check_mk: context_buttons can have a hover title now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4961bc48bed40164adc12dea60d2185c17c0eced URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4961bc48bed401… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 15 10:51:12 2012 +0200 context_buttons can have a hover title now --- web/htdocs/htmllib.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4caab07..1828f83 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -433,7 +433,7 @@ class html: self.write("</td></tr></table>\n") self.context_buttons_open = False - def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None): + def context_button(self, title, url, icon=None, hot=False, id=None, bestof=None, hover_title=''): display = "block" if bestof: counts = config.load_user_file("buttoncounts", {}) @@ -457,6 +457,8 @@ class html: self.context_button_hover_code(hot and "_hot" or "") self.write('>') self.write('<a href="%s"' % url) + if hover_title: + self.write(' title="%s"' % hover_title) if bestof: self.write(' onmousedown="count_context_button(this); document.location=this.href; " ') self.write('>%s</a></div>\n' % title)

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0773

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea66cadd1bc8fc5d931e5b7ac2abe7006521f1be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea66cadd1bc8fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 15:19:26 2012 +0200 Updated bug entries #0773 --- .bugs/773 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/773 b/.bugs/773 new file mode 100644 index 0000000..4456cd4 --- /dev/null +++ b/.bugs/773 @@ -0,0 +1,10 @@ +Title: Available snapins: layout of WATO.Quickaccess garbled +Component: multisite +State: open +Date: 2012-06-14 15:18:42 +Targetversion: 1.2.0 +Class: nastiness + +The changes button overlaps with the icons. But only +in the add snapin dialog. +Some style seems to be missing here...

12 years, 3 months

Check_MK Git: check_mk: check_bi_local.py: fix non-cookie case

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 48b89058bc1029991f733bdda02fd6f6ba8726db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b89058bc1029… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 15:08:20 2012 +0200 check_bi_local.py: fix non-cookie case --- doc/treasures/check_bi_local.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/treasures/check_bi_local.py b/doc/treasures/check_bi_local.py index f0a783a..b911269 100755 --- a/doc/treasures/check_bi_local.py +++ b/doc/treasures/check_bi_local.py @@ -38,6 +38,8 @@ url_prefix = "" # non-OMD installations # HTTP Basic Auth user = "omdadmin" password = "omd" +cookie = None + # Alternatively: Multisite Cookie authentication: # If you are using Cookie base authentication, then # login with your browser and get the cookie content

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0770, #0771, #0772

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90616fc0a7cdb784bca787f3341ca0aa9ff34213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90616fc0a7cdb7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 14 14:57:34 2012 +0200 Updated bug entries #0770, #0771, #0772 --- .bugs/770 | 8 ++++++++ .bugs/771 | 13 +++++++++++++ .bugs/772 | 9 +++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.bugs/770 b/.bugs/770 new file mode 100644 index 0000000..330a9dd --- /dev/null +++ b/.bugs/770 @@ -0,0 +1,8 @@ +Title: View editor: view shown at "Link:" are duplicate +Component: multisite +State: open +Date: 2012-06-14 13:21:44 +Targetversion: 1.2.0 +Class: bug + +The list of views selectable when linking contains duplicates. diff --git a/.bugs/771 b/.bugs/771 new file mode 100644 index 0000000..b342a7a --- /dev/null +++ b/.bugs/771 @@ -0,0 +1,13 @@ +Title: Services in Hosttables: wrong headings +Component: multisite +State: open +Date: 2012-06-14 13:29:43 +Targetversion: 1.2.0 +Class: nastiness + +When adding service columns to host tables the column +headers of those columns should be the service name, +not the title of the painter. The latter one is +for example "Perf-O-Meter". Better would be "CPU load". +(if this is not specified by the user in the first +place). diff --git a/.bugs/772 b/.bugs/772 new file mode 100644 index 0000000..3e7989f --- /dev/null +++ b/.bugs/772 @@ -0,0 +1,9 @@ +Title: Try-Out mode in view editor should not display butons +Component: multisite +State: open +Date: 2012-06-14 14:51:49 +Targetversion: 1.2.0 +Class: nastiness + +When hitting "Try out" in the edit mode of a view then +the buttons for commands etc are shown but shouldn't.

12 years, 3 months

Check_MK Git: check_mk: FIX: set new site dirty is host move due to change of folder attrs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06e797bef439735ad93a510aa86fae3683ed9c40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06e797bef43973… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 13 12:07:04 2012 +0200 FIX: set new site dirty is host move due to change of folder attrs --- .bugs/769 | 7 +++++-- ChangeLog | 2 ++ web/htdocs/wato.py | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.bugs/769 b/.bugs/769 index 85e227c..b155085 100644 --- a/.bugs/769 +++ b/.bugs/769 @@ -1,9 +1,9 @@ Title: Editing folder information does not set site dirty Component: wato -State: open +Class: bug +State: done Date: 2012-06-13 11:43:11 Targetversion: 1.2.0 -Class: bug I did the following: @@ -17,3 +17,6 @@ I did the following: --> Slave site is not being set to dirty. Activate changes leaves you with zero hosts. + +2012-06-13 12:06:34: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index e27dff7..abbc293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ a topic for "Used rules" - a short overview of all non-empty rulesets. * FIX: add missing context help to host details dialog + * FIX: set new site dirty is host move due to change of + folder attributes 1.2.0p1: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 52184dc..35d605f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -496,7 +496,7 @@ 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): - load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) + return load_folder(folder_dir(folder), folder[".name"], folder[".path"], folder.get(".parent")) # Load the information about all folders - except the hosts def load_all_folders(): @@ -1664,13 +1664,15 @@ def mode_editfolder(phase, new): if attributes_changed: mark_affected_sites_dirty(g_folder) g_folder["attributes"] = attributes - mark_affected_sites_dirty(g_folder) # Due to changes in folder/file attributes, host files # might need to be rewritten in order to reflect Changes # in Nagios-relevant attributes. rewrite_config_files_below(g_folder) # due to inherited attributes - reload_folder(g_folder) + save_folder(g_folder) + g_folder = reload_folder(g_folder) + mark_affected_sites_dirty(g_folder) + log_pending(AFFECTED, g_folder, "edit-folder", _("Changed attributes of folder %s") % title) call_hook_hosts_changed(g_folder) @@ -4623,7 +4625,6 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute continue attrname = attr.name() if attrname in without_attributes: - html.debug(without_attributes) continue # e.g. needed to skip ipaddress in CSV-Import # Hide invisible attributes @@ -7003,7 +7004,6 @@ def mark_affected_sites_dirty(folder, hostname=None, sync = True, restart = True # "need_restart" : True, # } # for site_id, site in sites.items(): -# html.debug("ID: " + site_id) # update_replication_status(site_id, changes) def remove_sync_snapshot():

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