Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64597 discussions

Check_MK Git: check_mk: Implement hard BI states also for hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: a89beb79681fce1d2a618ec69fa61b1b5a5b99c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a89beb79681fce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 10 13:16:57 2014 +0100 Implement hard BI states also for hosts --- web/htdocs/bi.py | 16 +++++++++++----- web/htdocs/wato.py | 4 ++-- web/plugins/views/inventory.py | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index af38cc4..313a596 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1016,7 +1016,7 @@ def execute_leaf_node(node, status_info, use_hard_states): status = status_info.get((site, host)) if status == None: return ({ "state" : MISSING, "output" : _("Host %s not found") % host}, None, node) - host_state, host_output, service_state = status + host_state, host_hard_state, host_output, service_state = status # Get state assumption from user if service: @@ -1048,7 +1048,11 @@ def execute_leaf_node(node, status_info, use_hard_states): return ({"state":MISSING, "output": _("This host has no such service")}, None, node) else: - aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN, -1:PENDING}[host_state] + if use_hard_states: + st = host_hard_state + else: + st = host_state + aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN, -1:PENDING}[st] state = {"state":aggr_state, "output" : host_output} if state_assumption != None: assumed_state = {"state": state_assumption, @@ -1116,7 +1120,7 @@ def get_status_info(required_hosts): html.live.set_auth_domain('bi') data = html.live.query( "GET hosts\n" - "Columns: name state plugin_output services_with_fullstate\n" + "Columns: name state hard_state plugin_output services_with_fullstate\n" + filter) html.live.set_auth_domain('read') tuples += [((site, e[0]), e[1:]) for e in data] @@ -1127,7 +1131,7 @@ def get_status_info(required_hosts): # hosts but with a livestatus filter header and a list of columns # that need to be fetched in any case def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True): - columns = [ "name", "state", "plugin_output", "services_with_fullstate", "parents" ] + add_columns + columns = [ "name", "state", "hard_state", "plugin_output", "services_with_fullstate", "parents" ] + add_columns html.live.set_only_sites(only_sites) html.live.set_prepend_site(True) @@ -1136,7 +1140,6 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc query += "Columns: " + (" ".join(columns)) + "\n" query += filter_header - if config.debug_livestatus_queries \ and html.output_format == "html" and 'W' in html.display_options: html.write('<div class="livestatus message" onmouseover="this.style.display=\'none\';">' @@ -1787,6 +1790,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam row = rows_by_host[sitehost] status_info[sitehost] = [ row["state"], + row["hard_state"], row["plugin_output"], row["services_with_fullstate"] ] if status_info == None: @@ -1795,6 +1799,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam aggrs = g_user_cache["host_aggregations"].get((site, host), []) status_info = { (site, host) : [ hostrow["state"], + hostrow["hard_state"], hostrow["plugin_output"], hostrow["services_with_fullstate"] ] } @@ -1811,6 +1816,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam if this_row: status_info[(site, host)] = [ this_row['state'], + this_row['hard_state'], this_row['plugin_output'], this_row['services_with_fullstate'], ] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b366051..71e246b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15212,10 +15212,10 @@ def convert_aggregation_to_bi(aggr): conv = (aggr["groups"],) node = convert_node_to_bi(aggr["node"]) convaggr = conv + node - if aggr["disabled"]: - convaggr = (bi_constants["DISABLED"],) + convaggr if aggr["hard_states"]: convaggr = (bi_constants["HARD_STATES"],) + convaggr + if aggr["disabled"]: + convaggr = (bi_constants["DISABLED"],) + convaggr return convaggr # Not in global context, so that l10n will happen again diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 3d22f79..01ba452 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -779,7 +779,7 @@ def declare_swpacs_columns(name, title, sortfunc): multisite_painters[column] = { "title" : _("Package") + " " + title, "short" : title, - "columns" : [], + "columns" : [ "invswpac_name" ], "paint" : lambda row: ("", row.get(column)), "sorter" : column, }

10 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2104

by Andreas Boesl

Module: check_mk Branch: master Commit: 93354f293035dd8ae444ee8190f8be389158e644 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93354f293035dd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 10 13:10:15 2014 +0100 Updated bug entries #2104 --- .bugs/2104 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.bugs/2104 b/.bugs/2104 new file mode 100644 index 0000000..9040e87 --- /dev/null +++ b/.bugs/2104 @@ -0,0 +1,21 @@ +Title: creating core config: check if used timeperiod actually exists +Component: core +State: open +Date: 2014-03-10 13:03:53 +Targetversion: 1.2.5i1 +Class: bug + +On creating the configuration for the core, there is now validation if +a timeperiod used in any rules is actually defined. This causes a crash +in the cmc and a config validation error for the nagios core. + +Example: +1) Create timeperiod named officehours + +2) Manually add this (incorrect) timeperiod in main.mk +# Note: office-hours vs. officehours + +extra_service_conf['notification_period'] = [ + ( 'office-hours', [], ALL_HOSTS, ALL_SERVICES ), +] + extra_service_conf['notification_period'] +

10 years, 7 months

Check_MK Git: check_mk: Udated Werk 721 again

by Mathias Kettner

Module: check_mk Branch: master Commit: bc678889231a53e00e07197aef2b53fc53a98c0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc678889231a53… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 10 12:55:57 2014 +0100 Udated Werk 721 again --- .werks/721 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/721 b/.werks/721 index d193c51..eed27a4 100644 --- a/.werks/721 +++ b/.werks/721 @@ -20,10 +20,10 @@ host_aggregations += [ ] F-: -Note 1: Hard state only make sense if you have changed the Maximum +Note 1: Hard states only make sense if you have changed the Maximum Number of Check Attempts of a host or service from the default value of 1 to a higher value. If you have set the number of attempts to three -then the hard state of service remained OK until the service has been checked +the hard state of service remaines OK until the service has been checked three times in a row with a non-OK state. Note 2: Please make sure that all of your monitoring sites are

10 years, 7 months

Check_MK Git: check_mk: Udated Werk 721

by Mathias Kettner

Module: check_mk Branch: master Commit: 52b311628b25866c4811a086ba53a7c0c515ceb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b311628b2586… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 10 12:55:09 2014 +0100 Udated Werk 721 --- .werks/721 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.werks/721 b/.werks/721 index 199c034..d193c51 100644 --- a/.werks/721 +++ b/.werks/721 @@ -5,7 +5,7 @@ Version: 1.2.5i1 Date: 1394452012 Class: feature -Check_MK BI is now able to base the computation of the state of an BI aggregate +Check_MK BI is now able to base the computation of the state of a BI aggregate on hard states of hosts and services. This is a new option at the top level of a BI aggregate. In WATO this is a new check box in each aggregation called Base state computation on hard states. @@ -20,6 +20,12 @@ host_aggregations += [ ] F-: -Note: Please make sure that all of your monitoring sites are +Note 1: Hard state only make sense if you have changed the Maximum +Number of Check Attempts of a host or service from the default value +of 1 to a higher value. If you have set the number of attempts to three +then the hard state of service remained OK until the service has been checked +three times in a row with a non-OK state. + +Note 2: Please make sure that all of your monitoring sites are updated to the same Check_MK version as your Multisite server. This new BI features needs an up-to-date Livestatus implementation.

10 years, 7 months

Check_MK Git: check_mk: Use hard states in BI aggregates

by Mathias Kettner

Module: check_mk Branch: master Commit: 03e1b1c2a6d23129e77d141080c84ded7d083939 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e1b1c2a6d231… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 10 12:51:05 2014 +0100 Use hard states in BI aggregates Check_MK BI is now able to base the computation of the state of an BI aggregate on hard states of hosts and services. This is a new option at the top level of a BI aggregate. In WATO this is a new check box in each aggregation called Base state computation on hard states. When you edit your BI aggregates with a text editor then simply prefix your aggregation entries with the keyword <tt>HARD_STATES</tt>. Here is an example: F+:etc/check_mk/multisite.d/mybi.mk host_aggregations += [ ( HARD_STATES, 'Hosts', FOREACH_HOST, ['tcp'], ALL_HOSTS, 'host', ['$1$']), ] F-: Note: Please make sure that all of your monitoring sites are updated to the same Check_MK version as your Multisite server. This new BI features needs an up-to-date Livestatus implementation. --- .werks/721 | 25 ++++++++++++++++++++++ ChangeLog | 1 + livestatus/src/ServicelistColumn.cc | 12 +++++++++++ livestatus/src/TableHosts.cc | 3 +++ web/htdocs/bi.py | 40 +++++++++++++++++++++++------------ web/htdocs/config.py | 1 + web/htdocs/wato.py | 20 ++++++++++++++++++ 7 files changed, 88 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=03e1b1c2a6…

10 years, 7 months

Check_MK Git: check_mk: Fixed typo in WATO text

by Mathias Kettner

Module: check_mk Branch: master Commit: 433142d513419590adc95af2907d5e116dd48cb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=433142d5134195… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:58:21 2014 +0100 Fixed typo in WATO text --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e166303..aef7bf4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7374,7 +7374,7 @@ def FolderChoice(**kwargs): def vs_notification_bulkby(): return ListChoice( - title = _("Createseparate notification bulks based on"), + title = _("Create separate notification bulks based on"), choices = [ ( "folder", _("Folder") ), ( "host", _("Host") ),

10 years, 7 months

Check_MK Git: check_mk: New bulk notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 7da0ed7ee159f7fe838f37066f7b646c9ae077b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da0ed7ee159f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:28:21 2014 +0100 New bulk notifications The new rule based notifications now also support a new feature called Bulk Notifications. The idea is to send multiple notifications, that are created within a short time frame, within one email and not as separate emails. This can help in situations where due to some general problem dozends of notifications would happen in a sort time. Also it can be used in order to create something similar to mailing list digests: you can get informed about all problems once a day. Please refer to the <a href="http://mathias-kettner.com/checkmk_rbn.html">online documentation</a> for details. --- .werks/713 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/713 b/.werks/713 new file mode 100644 index 0000000..632199f --- /dev/null +++ b/.werks/713 @@ -0,0 +1,13 @@ +Title: New bulk notifications +Level: 3 +Component: notifications +Version: 1.2.5i1 +Date: 1394187887 +Class: feature + +The new rule based notifications now also support a new feature called Bulk Notifications. The +idea is to send multiple notifications, that are created within a short time frame, within one email and +not as separate emails. This can help in situations where due to some general problem dozends of +notifications would happen in a sort time. Also it can be used in order to create something similar +to mailing list digests: you can get informed about all problems once a day. Please refer to the +<a href="http://mathias-kettner.com/checkmk_rbn.html">online documentation</a> for details. diff --git a/ChangeLog b/ChangeLog index 5559426..024f8fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -313,6 +313,7 @@ * 0362 sms: now searching PATH for sendsms and smssend commands... * 0684 New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP... * 0711 New rules based notifications... + * 0713 New bulk notifications... * 0108 FIX: Prevent service notification on host alerts... * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... * 0133 FIX: Fixed mkeventd notification plugin...

10 years, 7 months

Check_MK Git: check_mk: Fix bulk notifications: would call non-bulk, too

by Mathias Kettner

Module: check_mk Branch: master Commit: 6350f2b4ef62bfe7e535f724fd8da4340d6a79b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6350f2b4ef62bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:14:04 2014 +0100 Fix bulk notifications: would call non-bulk, too --- modules/notify.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index bc30f0f..aae996d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -479,7 +479,8 @@ def notify_rulebased(raw_context, analyse=False): do_bulk_notify(contact, plugin, params, plugin_context, bulk) elif notification_spooling: create_spoolfile({"context": plugin_context, "plugin": plugin}) - call_notification_script(plugin, plugin_context) + else: + call_notification_script(plugin, plugin_context) except Exception, e: if opt_debug: @@ -862,7 +863,8 @@ def notify_flexible(raw_context, notification_table): if notification_spooling: create_spoolfile({"context": plugin_context, "plugin": plugin}) - call_notification_script(plugin, plugin_context) + else: + call_notification_script(plugin, plugin_context) # may return # 0 : everything fine -> proceed @@ -1392,6 +1394,12 @@ def notify_bulk(dirname, uuids): for varname, value in context.items(): bulk_context.append("%s=%s\n" % (varname, value)) + # Do not forget to add this to the monitoring log. We create + # a single entry for each notification contained in the bulk. + # It is important later to have this precise information. + plugin_name = "bulk " + (plugin or "plain email") + core_notification_log(plugin_name, context) + parameter_context = [ "PARAMETERS=" + " ".join(old_params) + "\n" ] for nr, param in enumerate(old_params): parameter_context.append("PARAMETER_%d=%s\n" % (nr + 1, param))

10 years, 7 months

Check_MK Git: check_mk: Notifications: added actual notifications to monitoring history

by Mathias Kettner

Module: check_mk Branch: master Commit: 26629e69a30a91e879f950dc9e670a4cb9e52a8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26629e69a30a91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 7 11:00:29 2014 +0100 Notifications: added actual notifications to monitoring history --- modules/notify.py | 88 ++++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 1 + web/plugins/views/builtin.py | 5 +++ web/plugins/views/painters.py | 6 +++ 4 files changed, 77 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26629e69a3…

10 years, 7 months

Check_MK Git: check_mk: BI: Added option ignore stataes to worst/ best aggregation functions (only internal atm)

by Lars Michelsen

Module: check_mk Branch: master Commit: c11a9c8455f62e016e50fba21c3dec6288907490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c11a9c8455f62e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 7 09:05:14 2014 +0100 BI: Added option ignore stataes to worst/best aggregation functions (only internal atm) --- web/htdocs/bi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 0e2063c..1ac5558 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1202,8 +1202,8 @@ def x_best_state(l, x): return ll[n-1][1] -def aggr_nth_state(nodelist, n, worst_state): - states = [ i[0]["state"] for i in nodelist ] +def aggr_nth_state(nodelist, n, worst_state, ignore_states = None): + states = [ i[0]["state"] for i in nodelist if not ignore_states or i[0]["state"] not in ignore_states ] state = x_best_state(states, n) # limit to worst state @@ -1212,11 +1212,11 @@ def aggr_nth_state(nodelist, n, worst_state): return { "state" : state, "output" : "" } -def aggr_worst(nodes, n = 1, worst_state = CRIT): - return aggr_nth_state(nodes, -int(n), int(worst_state)) +def aggr_worst(nodes, n = 1, worst_state = CRIT, ignore_states = None): + return aggr_nth_state(nodes, -int(n), int(worst_state), ignore_states) -def aggr_best(nodes, n = 1, worst_state = CRIT): - return aggr_nth_state(nodes, int(n), int(worst_state)) +def aggr_best(nodes, n = 1, worst_state = CRIT, ignore_states = None): + return aggr_nth_state(nodes, int(n), int(worst_state), ignore_states) config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best

10 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits