Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

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: b5cdd2baeccd5230acfc9610ef0ddf180319a6f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5cdd2baeccd52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 21 19:02:13 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 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: be5f32a9996e0c30103dbfc27ed38d96d9a48a2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5f32a9996e0c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jan 20 23:58:41 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: doc/opt/benchmark: Update script and include results.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 995ce8cce99d17d85a41f04bc22945f280c3158a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=995ce8cce99d17… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jan 20 23:57:41 2012 +0100 doc/opt/benchmark: Update script and include results. --- doc/opt/benchmark/bench.cfg | 16 ++++++++++++++-- doc/opt/benchmark/cmkbench.sh | 12 ++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg index ba53018..54d3632 100644 --- a/doc/opt/benchmark/bench.cfg +++ b/doc/opt/benchmark/bench.cfg @@ -5,7 +5,19 @@ _pingonly="yes" _livecheck="yes" _livecheck_helpers=30 _central="zentrale" -_sites=6 -_hosts=800 +_sites=12 +_hosts=1800 _pnp="off" _delay_precompile=False + + +# E5640 stats pingonly, livecheck +# Sites: 6H800 = 4800serv/s 80host/s 4890live/s - sched rate: 8080/s +# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s ScheduledCheck/s +# E5640 ~30% 6 800 4800 80 4890 8080 +# E5640 ~30% 12 400 4800 80 4880 8080 +# E5640 ~40% 6 1600 9650 160 9819 16160 +# E5640 ~35% 3 3200 9220 160 9500 16160 +# E5640 ~50% 3 6400 8000 320 8100 32000 +# E5640 ~90% 12 1600 17500 320 17800 +# diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index a1e5336..7849db6 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -167,11 +167,19 @@ EOF cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk extra_service_conf["normal_check_interval"] = [ - ( "0.01", ALL_HOSTS, [ "Ping" ] ), +# ( "0.0166", ALL_HOSTS, [ "Dummy" ] ), + ( "0.0166", ALL_HOSTS, [ "Ping" ] ), ] legacy_checks += [ - (( "check-mk-ping", "Ping", True), ALL_HOSTS), +# (( "check-mk-vapor", "Dummy", True), ALL_HOSTS), + (( "check-mk-ping", "Ping", True), ALL_HOSTS), ] +extra_nagios_conf += r""" +define command { + command_name check-mk-vapor + command_line /usr/bin/printf OK +} +""" ZXY if [ $pingonly = "no" ]; then

12 years, 5 months

Check_MK Git: check_mk: Allow ColumnHeaders on after Stats: queries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5ccc6124246b1230d532e04962781f9087d499d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ccc6124246b12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 20 16:43:35 2012 +0100 Allow ColumnHeaders on after Stats: queries --- ChangeLog | 6 ++++++ livestatus/src/Query.cc | 30 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bae1265..b7bd8d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,12 @@ * improve doc/treasures/check_bi_local.py: local check that creates Nagios services out of BI aggregates + Livestatus: + * ColumnHeaders: on is now able to switch column header on even if Stats: + headers are used. Artifical header names stats_1, stats_2, etc. are + begin used. Important: Use "ColumnHeaders: on" after Columns: and + after Stats:. + 1.1.13i2: Core, Setup, etc.: * cmk -I: accept host tags and cluster names diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 31a9640..b004a13 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -427,6 +427,10 @@ void Query::parseStatsLine(char *line) else stats_col = new StatsColumn(column, 0, operation); _stats_columns.push_back(stats_col); + + /* Default to old behaviour: do not output column headers if we + do Stats queries */ + _show_column_headers = false; } @@ -717,18 +721,40 @@ void Query::start() _stats_aggregators[i] = _stats_columns[i]->createAggregator(); } } - else if (_show_column_headers) + + if (_show_column_headers) { outputDatasetBegin(); + bool first = true; + for (_columns_t::iterator it = _columns.begin(); it != _columns.end(); ++it) { - if (it != _columns.begin()) + if (first) + first = false; + else outputFieldSeparator(); Column *column = *it; outputString(column->name()); } + + // Output dummy headers for stats columns + int col = 1; + char colheader[32]; + for (_stats_columns_t::iterator it = _stats_columns.begin(); + it != _stats_columns.end(); + ++it) + { + if (first) + first = false; + else + outputFieldSeparator(); + snprintf(colheader, 32, "stats_%d", col); + outputString(colheader); + col ++; + } + outputDatasetEnd(); _need_ds_separator = true; }

12 years, 5 months

Check_MK Git: check_mk: added missing icon for validation error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11817b1626f270e09fd788a3dfabddeb5ca92b4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11817b1626f270… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 20 16:07:09 2012 +0100 added missing icon for validation error --- web/htdocs/images/icon_validation_error.png | Bin 0 -> 3259 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_validation_error.png b/web/htdocs/images/icon_validation_error.png new file mode 100644 index 0000000..b11a7b6 Binary files /dev/null and b/web/htdocs/images/icon_validation_error.png differ

12 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: 903a05e7b22e0a97a615e4eb109454384f85e6a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=903a05e7b22e0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 20 16:06:51 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: global host validator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec21a24facfd34ff362f96f3f02a07225f8cc639 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec21a24facfd34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 20 16:06:49 2012 +0100 WATO: global host validator --- web/htdocs/htmllib.py | 5 +++- web/htdocs/wato.css | 17 +++++++++++- web/htdocs/wato.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 89 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 58399cd..d045b1b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -324,9 +324,12 @@ class html: # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) def icon(self, help, icon): - self.write('<img class=icon title="%s" src="images/icon_%s.png">' % ( + self.write('<img align=absmiddle class=icon title="%s" src="images/icon_%s.png">' % ( help, icon)) + def empty_icon(self): + self.write('<img class=icon src="images/trans.png">') + def icon_button(self, url, help, icon): self.write('<a href="%s">' '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 62de082..296c666 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -199,6 +199,21 @@ Boston, MA 02110-1301 USA. margin-bottom: 2px; } +/* host validation error */ +table.validationerror { + width: 100%; +} + +table.validationerror td.img { + width: 68px; +} + +table.validationerror img { + margin-left: 5px; + margin-top: 10px; + margin-right: 15px; +} + /* Path to current folder at top of screen */ .wato div.folderpath { margin-bottom: 10px; @@ -248,7 +263,7 @@ Boston, MA 02110-1301 USA. margin-top: 10px; margin-bottom: 10px; padding: 5px 8px; - width: 800px; + width: 834px; -moz-border-radius: 3px; background-image: url("images/form_background.png"); background-repeat: repeat; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a202235..71ecbde 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1182,7 +1182,15 @@ def show_hosts(folder): html.write("</td>\n") # Hostname with link to details page (edit host) - html.write('<td><a href="%s">%s</a></td>\n' % (edit_url, hostname)) + html.write('<td>') + errors = validate_host(host) + if errors: + msg = _("Warning: This host has an invalid configuration: ") + msg += ", ".join(errors) + html.icon(msg, "validation_error") + html.write(" ") + html.write('<a href="%s">%s</a></td>\n' % (edit_url, hostname)) + # Am I authorized? auth = check_host_permissions(hostname, False) @@ -1728,16 +1736,34 @@ def mode_edithost(phase, new): save_folder_and_hosts(g_folder) call_hook_hosts_changed(g_folder) reload_hosts(g_folder) - if new: + + errors = validate_host(g_folder[".hosts"][hostname]) + if errors: # keep on this page if host does not validate + return + elif new: return go_to_services and "firstinventory" or "folder" else: return go_to_services and "inventory" or "folder" - else: if new: render_folder_path() + # Show outcome of host validation + errors = validate_host(host) + if errors: + html.write("<div class=info>") + html.write('<table class=validationerror border=0 cellspacing=0 cellpadding=0><tr><td class=img>') + html.write('<img src="images/icon_validation_error.png"></td><td>') + html.write('<p><h3>%s</h3><ul>%s</ul></p>' % + (_("Warning: This host has an invalid configuration!"), + "".join(["<li>%s</li>" % error for error in errors]))) + + if html.form_submitted(): + html.write("<br><b>%s</b>" % _("Your changes have been saved nevertheless.")) + + html.write("</td></tr></table></div>") + html.begin_form("edithost") html.write('<table class="form nomargin">\n') @@ -2643,6 +2669,14 @@ def mode_changelog(phase): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") elif phase == "action": + defective_hosts = validate_all_hosts() + if defective_hosts: + raise MKUserError(None, _("You cannot activate changes while some hosts have " + "an invalid configuration: ") + ", ".join( + [ '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hn)]), hn) + for hn in defective_hosts ])) + + sitestatus_do_async_replication = False # see below if html.has_var("_siteaction"): config.need_permission("wato.activate") @@ -9443,6 +9477,38 @@ def call_hook_roles_saved(roles): if hook_registered('roles-saved'): call_hooks("roles-saved", roles) +# This hook is called in order to determine if a host has a 'valid' +# configuration. It used used for displaying warning symbols in the +# host list and in the host detail view. +def validate_host(host): + if hook_registered('validate-host'): + errors = [] + eff = effective_attributes(host, host[".folder"]) + for hk in g_hooks.get('validate-host', []): + try: + hk(eff) + except MKUserError, e: + errors.append(e.message) + return errors + else: + return [] + +def validate_all_hosts(): + if hook_registered('validate-host'): + hosts = collect_hosts(g_root_folder) + defective_hosts = [] + for hn, eff in hosts.iteritems(): + for hk in g_hooks.get('validate-host', []): + try: + hk(eff) + except MKUserError, e: + defective_hosts.append(hn) + break # reason not interesting here + defective_hosts.sort() + return defective_hosts + else: + return [] + #. # .-Helpers--------------------------------------------------------------.

12 years, 5 months

Check_MK Git: check_mk: WATO: Only showing wato folder filter when at least one folder exists; Only showing context button when at least one host/ folder is defined in wato

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b4f2b357aa0f6462c4b590195e5a7030e0e1dff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b4f2b357aa0f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 15:06:05 2012 +0100 WATO: Only showing wato folder filter when at least one folder exists; Only showing context button when at least one host/folder is defined in wato --- .bugs/492 | 7 +++++-- web/htdocs/views.py | 3 ++- web/htdocs/wato.py | 20 +++++++++++++++++++- web/plugins/views/wato.py | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.bugs/492 b/.bugs/492 index c93291c..f9b2f15 100644 --- a/.bugs/492 +++ b/.bugs/492 @@ -1,11 +1,14 @@ Title: Hide WATO filter if no WATO is used Component: multisite +State: done +Class: feature Benefit: 1 -State: open Cost: 1 Date: 2011-12-13 16:46:00 Targetversion: future -Class: feature If you have no folders defined then the WATO filter is useless and should not appear in the filter form. + +2012-01-20 15:05:26: changed state open -> done +Added check if at least one folder exists in the root folder diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1a665f7..9f1d56e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1640,7 +1640,8 @@ def show_context_links(thisview, active_filters): if html.has_var("host") \ and config.wato_enabled \ and config.may("wato.use") \ - and (config.may("wato.hosts") or config.may("wato.seeall")): + and (config.may("wato.hosts") or config.may("wato.seeall")) \ + and wato.using_wato_hosts(): host = html.var("host") if host: url = wato.api.link_to_host(host) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a0df5b0..2d73959 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -863,7 +863,6 @@ def mode_folder(phase): "be used to navigate in the status GUI. Attributes can be inherited along the " "paths of that tree. The usage of folders is optional."))]) - def prepare_folder_info(): declare_host_tag_attributes() # create attributes out of tag definitions declare_site_attribute() # create attribute for distributed WATO @@ -9467,6 +9466,25 @@ def call_hook_roles_saved(roles): # | Functions needed at various places | # '----------------------------------------------------------------------' +# Returns true when at least one folder is defined in WATO +def have_folders(): + root_folder = load_folder(root_dir) + if len(root_folder[".folders"]) > 0: + return True + return False + +# Returns true if at least one host or folder exists in the wato root +def using_wato_hosts(): + root_folder = load_folder(root_dir) + if len(root_folder[".folders"]) > 0: + return True + + load_hosts(root_folder) + if len(root_folder[".hosts"]) > 0: + return True + + return False + def host_status_button(hostname, viewname): html.context_button(_("Status"), "view.py?" + htmllib.urlencode_vars([ diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index e684c19..367e12f 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -33,7 +33,7 @@ class FilterWatoFile(Filter): self.last_wato_data_update = None def available(self): - return config.wato_enabled + return config.wato_enabled and wato.have_folders() def load_wato_data(self): self.tree = wato.api.get_folder_tree()

12 years, 5 months

Check_MK Git: check_mk: Added optional site filter to some more views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a8da1f81e79007acafe52c09a57d995dfedac9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a8da1f81e7900… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 15:45:37 2012 +0100 Added optional site filter to some more views --- web/plugins/views/builtin.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index d07eba8..c8bd2d9 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -145,7 +145,8 @@ multisite_builtin_views.update({ 'svcstate', 'opthostgroup', 'output', - 'service_is_flapping'], + 'service_is_flapping', + 'siteopt'], 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], @@ -374,7 +375,7 @@ multisite_builtin_views.update({ ('perfometer', None)], 'play_sounds': False, 'public': True, - 'show_filters': ['hostregex', 'svcstate'], + 'show_filters': ['hostregex', 'svcstate','siteopt'], 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], @@ -1018,7 +1019,8 @@ multisite_builtin_views.update({ 'output', 'service_is_flapping', 'svc_last_state_change', - 'svc_last_check'], + 'svc_last_check', + 'siteopt'], 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], @@ -1367,7 +1369,7 @@ multisite_builtin_views.update({ ('host_state', None)], 'play_sounds': False, 'public': True, - 'show_filters': [], + 'show_filters': ['siteopt'], 'sorters': [], 'title': _('All hosts (tiled)'), 'topic': _('Hosts')}, @@ -1513,7 +1515,7 @@ multisite_builtin_views.update({ ('svc_check_age', None)], 'play_sounds': False, 'public': True, - 'show_filters': ['svc_last_state_change', 'svcstate'], + 'show_filters': ['svc_last_state_change', 'svcstate', 'siteopt'], 'sorters': [('stateage', True)], 'title': _('Recently changed services'), 'topic': _('Services')},

12 years, 5 months

Check_MK Git: check_mk: Hiding site filter in multisite views in single site setups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a82d6e925f6a88f4b7dc67209529b925fc56b27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a82d6e925f6a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 20 15:54:16 2012 +0100 Hiding site filter in multisite views in single site setups --- ChangeLog | 1 + web/htdocs/views.py | 31 ++++++++++++++++++++++--------- web/plugins/views/filters.py | 3 +++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f17220..bae1265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * New painter for normal and retry check interval (added to detail views) * Site filter shows "(local)" in case of non multi-site setup * Made "wato folder" columns sortable + * Hiding site filter in multisite views in single site setups * FIX: Fixed auth problem when following logwatch icon links while using the form based auth * FIX: Fix problem with Umlaut in contact alias diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9f1d56e..899e887 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -108,15 +108,20 @@ def show_filter_form(is_open, filters): s.sort() col = 0 for sort_index, title, f in s: - if col == 0: - html.write("<tr>") - html.write("<td class=legend>%s</td>" % title) - html.write("<td class=content>") - f.display() - html.write("</td>") - if col == config.filter_columns - 1: - html.write("</tr>\n") - col = (col + 1) % config.filter_columns + if not f.visible(): + html.write('<div style="display:none">') + f.display() + html.write('</div>') + else: + if col == 0: + html.write("<tr>") + html.write("<td class=legend>%s</td>" % title) + html.write("<td class=content>") + f.display() + html.write("</td>") + if col == config.filter_columns - 1: + html.write("</tr>\n") + col = (col + 1) % config.filter_columns if col == 1: html.write("<td class=legend></td>\n<td class=content></td></tr>\n") html.write('<tr><td class="legend button" colspan=%d>' % (config.filter_columns * 2)) @@ -191,6 +196,14 @@ class Filter: def available(self): return True + # Some filters can be invisible. This is useful to hide filters which have always + # the same value but can not be removed using available() because the value needs + # to be set during runtime. + # A good example is the "site" filter which does not need to be available to the + # user in single site setups. + def visible(self): + return True + def display(self): raise MKInternalError("Incomplete implementation of filter %s '%s': missing display()" % \ (self.name, self.title)) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index aac424e..e8e59b4 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -325,6 +325,9 @@ class FilterSite(Filter): Filter.__init__(self, name, _("Site"), None, ["site"], []) self.enforce = enforce + def visible(self): + return config.is_multisite() + def display(self): site_selector(html, "site", self.enforce)

12 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012