Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Small improvement of config generating ( sorting tags of host for easier caching)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a7bec36ff9bc8eb471f6d9f121ec3fa7fa612ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a7bec36ff9bc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 21 12:14:18 2016 +0200 Small improvement of config generating (sorting tags of host for easier caching) --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f50ac70..c82e356 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1291,7 +1291,7 @@ hosttags = {} def collect_hosttags(): for taggedhost in all_hosts + clusters.keys(): parts = taggedhost.split("|") - hosttags[parts[0]] = parts[1:] + hosttags[parts[0]] = sorted(parts[1:]) g_hosttag_taglist_cache = {}

8 years, 2 months

3124 FIX workaround for overrunnig counters in a couple of wmi checks

by Sebastian Herbord

Module: check_mk Branch: master Commit: d907571692a4c09ef05f6b8e0706a059fbfc2f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d907571692a4c0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Apr 21 15:21:03 2016 +0200 3124 FIX workaround for overrunnig counters in a couple of wmi checks Please note that this is just a workaround, it will still produce wrong output at some point. There doesn't seem to be a correct way to work with a wrap in performance counters. --- .werks/3124 | 11 +++++++++++ ChangeLog | 1 + checks/wmi.include | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/3124 b/.werks/3124 new file mode 100644 index 0000000..8735db0 --- /dev/null +++ b/.werks/3124 @@ -0,0 +1,11 @@ +Title: workaround for overrunnig counters in a couple of wmi checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461243484 + +Please note that this is just a workaround, it will still produce wrong output at some point. +There doesn't seem to be a correct way to work with a wrap in performance counters. diff --git a/ChangeLog b/ChangeLog index 3444ad8..29b051d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ NOTE: Please refer to the migration notes! * 3387 FIX: ps: Fixed crash during service discovery on AIX hosts having defunct processes * 3417 FIX: wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions + * 3124 FIX: workaround for overrunnig counters in a couple of wmi checks... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/wmi.include b/checks/wmi.include index 7795213..6dcb798 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -267,11 +267,11 @@ def wmi_yield_raw_counter(table, row, column, label, perfvar, levels=None): [wmi_make_perfvar(perfvar, value, levels)]) -def wmi_calculate_raw_average(table, row, column): +def wmi_calculate_raw_average(table, row, column, factor): if row == "": row = 0 - time_spent_total = int(table.get(row, column)) + measure = int(table.get(row, column)) * factor base = int(table.get(row, column + "_Base")) if base < 0: @@ -283,13 +283,20 @@ def wmi_calculate_raw_average(table, row, column): if base == 0: return 0.0 - return float(time_spent_total) / base + # This is a total counter which can overflow on long-running systems + # (great choice of datatype, microsoft!) + # the following forces the counter into a range of 0.0-1.0, but there is no way to know + # how often the counter overran, so this bay still be wrong + while (base * factor) < measure: + base += 1 << 32 + + return float(measure) / base def wmi_yield_raw_average(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - average = wmi_calculate_raw_average(table, row, column) + average = wmi_calculate_raw_average(table, row, column, 1) return ( wmi_determine_status(average, levels), @@ -301,7 +308,7 @@ def wmi_yield_raw_average(table, row, column, label, perfvar, levels=None): def wmi_yield_raw_fraction(table, row, column, label, perfvar, levels=None): levels = wmi_fix_levels(levels) - average = wmi_calculate_raw_average(table, row, column) * 100 + average = wmi_calculate_raw_average(table, row, column, 100) status = wmi_determine_status(average, levels) return ( @@ -310,6 +317,5 @@ def wmi_yield_raw_fraction(table, row, column, label, perfvar, levels=None): [wmi_make_perfvar(perfvar, average, levels, 0, 100)] ) - #.

8 years, 2 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 64dca2cbc31d2c9aaf2472792336bb3c16949c0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64dca2cbc31d2c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Apr 21 11:49:26 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/TableHosts.h | 11 +++++------ livestatus/src/TableHostsByGroup.h | 7 ++++--- livestatus/src/TableLog.cc | 3 +-- livestatus/src/TableLog.h | 9 +++++---- livestatus/src/TableServices.h | 11 +++++------ livestatus/src/TableServicesByGroup.h | 7 ++++--- livestatus/src/TableServicesByHostGroup.h | 7 ++++--- livestatus/src/TableStateHistory.cc | 4 ++-- livestatus/src/TableStateHistory.h | 8 ++++---- 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/livestatus/src/TableHosts.h b/livestatus/src/TableHosts.h index f50fcaf..c9084f8 100644 --- a/livestatus/src/TableHosts.h +++ b/livestatus/src/TableHosts.h @@ -31,7 +31,8 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -40,13 +41,11 @@ class Query; class TableHosts : public Table { public: #ifdef CMC - TableHosts(const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableHosts(const Notes &downtimes_holder, const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); static void addColumns(Table *, std::string prefix, int indirect_offset, - int extra_offset, - const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + int extra_offset, const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableHosts(const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/TableHostsByGroup.h b/livestatus/src/TableHostsByGroup.h index a0db6e3..c8a9557 100644 --- a/livestatus/src/TableHostsByGroup.h +++ b/livestatus/src/TableHostsByGroup.h @@ -30,7 +30,8 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -39,8 +40,8 @@ class Query; class TableHostsByGroup : public Table { public: #ifdef CMC - TableHostsByGroup(const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableHostsByGroup(const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableHostsByGroup(const DowntimesOrComments &_downtimes_holder, diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 5aea45a..41a1f5a 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -53,8 +53,7 @@ using std::string; TableLog::TableLog(LogCache *log_cache, #ifdef CMC - const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + const Notes &downtimes_holder, const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core #else const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 53c494d..6261712 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -32,7 +32,8 @@ class Column; #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -43,9 +44,9 @@ class Query; class TableLog : public Table { public: #ifdef CMC - TableLog(LogCache *log_cache, const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, - std::recursive_mutex &holder_lock, Core *core); + TableLog(LogCache *log_cache, const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, + Core *core); #else TableLog(LogCache *log_cache, const DowntimesOrComments &downtimes_holder, const DowntimesOrComments &comments_holder); diff --git a/livestatus/src/TableServices.h b/livestatus/src/TableServices.h index 046e388..0aeed18 100644 --- a/livestatus/src/TableServices.h +++ b/livestatus/src/TableServices.h @@ -31,7 +31,8 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -40,13 +41,11 @@ class Query; class TableServices : public Table { public: #ifdef CMC - TableServices(const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableServices(const Notes &downtimes_holder, const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); static void addColumns(Table *, std::string prefix, int indirect_offset, - bool add_hosts, - const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + bool add_hosts, const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableServices(const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/TableServicesByGroup.h b/livestatus/src/TableServicesByGroup.h index aa65f7a..01238e4 100644 --- a/livestatus/src/TableServicesByGroup.h +++ b/livestatus/src/TableServicesByGroup.h @@ -30,7 +30,8 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -39,8 +40,8 @@ class Query; class TableServicesByGroup : public Table { public: #ifdef CMC - TableServicesByGroup(const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableServicesByGroup(const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableServicesByGroup(const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/TableServicesByHostGroup.h b/livestatus/src/TableServicesByHostGroup.h index d59c87a..795b0a0 100644 --- a/livestatus/src/TableServicesByHostGroup.h +++ b/livestatus/src/TableServicesByHostGroup.h @@ -30,7 +30,8 @@ #include "nagios.h" // IWYU pragma: keep #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -39,8 +40,8 @@ class Query; class TableServicesByHostGroup : public Table { public: #ifdef CMC - TableServicesByHostGroup(const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableServicesByHostGroup(const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableServicesByHostGroup(const DowntimesOrComments &downtimes_holder, diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index f738c96..c02a063 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -82,8 +82,8 @@ const char *getCustomVariable(customvariablesmember *cvm, const char *name) { TableStateHistory::TableStateHistory(LogCache *log_cache, #ifdef CMC - const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + const Notes &downtimes_holder, + const Notes &comments_holder, recursive_mutex &holder_lock, Core *core #else const DowntimesOrComments diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 9f0068b..784bb62 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -35,7 +35,8 @@ class Column; #ifdef CMC #include <mutex> -#include "Core.h" +struct Core; +class Notes; #else class DowntimesOrComments; #endif @@ -70,9 +71,8 @@ protected: public: #ifdef CMC - TableStateHistory(LogCache *log_cache, - const Core::_notes_t &downtimes_holder, - const Core::_notes_t &comments_holder, + TableStateHistory(LogCache *log_cache, const Notes &downtimes_holder, + const Notes &comments_holder, std::recursive_mutex &holder_lock, Core *core); #else TableStateHistory(LogCache *log_cache,

8 years, 2 months

changed section header

by Simon Betz

Module: check_mk Branch: master Commit: 4097eb1aa90ef4b1dd4f4cf605c1e57ef6b0cfb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4097eb1aa90ef4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 20 17:40:08 2016 +0200 changed section header --- checks/ipmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ipmi b/checks/ipmi index 63346a3..dd82c50 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -103,7 +103,7 @@ # Fan 1 | 7740.000 | RPM | ok | na | 1720.000 | 1978.000 | na | na | na # Fan 2 | 8557.000 | RPM | ok | na | 1720.000 | 1978.000 | na | na | na # Fan 3 | 7611.000 | RPM | ok | na | 1720.000 | 1978.000 | na | na | na -# <<<ipmi:sep(124)>>> +# <<<ipmi_discrete:sep(124)>>> # PS3 Status | C8h | ok | 10.1 | Presence detected # PS4 Status | C9h | ok | 10.2 | Presence detected # Pwr Unit Stat | 01h | ok | 21.1 |

8 years, 2 months

ipmi now handles extra section

by Simon Betz

Module: check_mk Branch: master Commit: 0ec39360bf818bcaaa6a4450b98d9ca06c9fe566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ec39360bf818b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 20 17:30:32 2016 +0200 ipmi now handles extra section --- agents/check_mk_agent.linux | 2 +- checks/ipmi | 49 ++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index d0bf49c..9ba058a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -403,7 +403,7 @@ if type ipmitool > /dev/null then run_cached -s "ipmi:sep(124)" 300 "waitmax 300 ipmitool sensor list | grep -v 'command failed' | egrep -v '^[^ ]+ na ' | grep -v ' discrete '" # readable discrete sensor states - run_cached -s "ipmi:sep(124)" 300 "waitmax 300 ipmitool sdr elist compact" + run_cached -s "ipmi_discrete:sep(124)" 300 "waitmax 300 ipmitool sdr elist compact" fi diff --git a/checks/ipmi b/checks/ipmi index 2073735..63346a3 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -139,25 +139,29 @@ def ipmi_ignore_entry(name, state, ignored_sensors): def parse_ipmi(info): + ipmi_info, ipmi_discrete_info = info parsed = [] - for line in info: - # Compatible with older check versions - name = line[0].strip().replace(" ", "_") - line = [ name ] + map(lambda x: x.strip(), line[1:]) - - # Discrete sensors have no values - if len(line) <= 5: - state = line[2] - if line[4]: - state += " (%s)" % line[4] - line = [line[0], None, None, state, None, None, None, None, None, None] - - parsed.append(line) + for section in [ ipmi_info, ipmi_discrete_info ]: + if section: + for line in section: + # Compatible with older check versions + name = line[0].strip().replace(" ", "_") + line = [ name ] + map(lambda x: x.strip(), line[1:]) + + # Discrete sensors have no values + if len(line) <= 5: + state = line[2] + if line[4]: + state += " (%s)" % line[4] + line = [line[0], None, None, state, None, None, None, None, None, None] + + parsed.append(line) return parsed def inventory_ipmi(info): + parsed = parse_ipmi(info) summarize = True rules = host_extra_conf(g_hostname, inventory_ipmi_rules) if rules: @@ -165,9 +169,9 @@ def inventory_ipmi(info): # the default for summarize is always true so if either configuration key has been set # to false that setting was changed by the user and needs to override the other - if not ipmi_summarize or not summarize or len(info) == 0: + if not ipmi_summarize or not summarize or len(parsed) == 0: ignored_sensors = ipmi_get_ignored_sensors(g_hostname) - for line in info: + for line in parsed: if not ipmi_ignore_entry(line[0], line[3], ignored_sensors): yield line[0], None else: @@ -175,10 +179,11 @@ def inventory_ipmi(info): def check_ipmi(item, params, info): + parsed = parse_ipmi(info) if item == "Summary": - return check_ipmi_summarized(info, params) + return check_ipmi_summarized(parsed, params) else: - return check_ipmi_detailed(item, info) + return check_ipmi_detailed(item, parsed) def ipmi_format_message(status, val, unit): @@ -194,9 +199,9 @@ def ipmi_format_message(status, val, unit): return infotext -def check_ipmi_detailed(item, info): +def check_ipmi_detailed(item, parsed): for name, val, unit, status, unrec_low, crit_low, \ - warn_low, warn_high, crit_high, unrec_high in info: + warn_low, warn_high, crit_high, unrec_high in parsed: if name == item: if val is not None: @@ -214,7 +219,7 @@ def check_ipmi_detailed(item, info): return state, "Status: %s" % ipmi_format_message(status, val, unit), perfdata -def check_ipmi_summarized(info, params): +def check_ipmi_summarized(parsed, params): worst_status = 0 warn_texts = [] crit_texts = [] @@ -226,7 +231,7 @@ def check_ipmi_summarized(info, params): params['ignored_sensors'] = ipmi_get_ignored_sensors(g_hostname) for name, val, unit, status, unrec_low, crit_low, \ - warn_low, warn_high, crit_high, unrec_high in info: + warn_low, warn_high, crit_high, unrec_high in parsed: # Skip datasets which have no valid data (zero value, no unit and state nc) if val == '0.000' and unit == 'unspecified' and status.startswith('nc'): @@ -291,11 +296,11 @@ check_config_variables.append("ipmi_ignored_sensors") check_info["ipmi"] = { - 'parse_function' : parse_ipmi, 'inventory_function' : inventory_ipmi, 'check_function' : check_ipmi, 'service_description' : 'IPMI Sensor %s', 'has_perfdata' : True, + 'extra_sections' : [ "ipmi_discrete" ], }

8 years, 2 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: e3b6a04280aebb72f97e7e7df2e2c25260d4492e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b6a04280aebb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 20 14:43:14 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/LogCache.cc | 18 ++++++++++-------- livestatus/src/LogCache.h | 9 ++++++++- livestatus/src/MetricsColumn.h | 15 ++++++++++++++- livestatus/src/TableHosts.h | 4 ++-- livestatus/src/TableHostsByGroup.h | 2 +- livestatus/src/TableLog.cc | 19 ++++++++++++++----- livestatus/src/TableLog.h | 5 ++++- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServices.h | 4 ++-- livestatus/src/TableServicesByGroup.h | 2 +- livestatus/src/TableServicesByHostGroup.h | 2 +- livestatus/src/TableStateHistory.cc | 19 ++++++++++++++----- livestatus/src/TableStateHistory.h | 5 ++++- livestatus/src/TableStatus.h | 7 +++++++ 14 files changed, 83 insertions(+), 30 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3b6a04280…

8 years, 2 months

Added new treasure for creating customized Tactical Overview snapins

by Mathias Kettner

Module: check_mk Branch: master Commit: 100bee7558d4c65a7c7188dd0b1417bfbcc93b17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=100bee7558d4c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 13:31:07 2016 +0200 Added new treasure for creating customized Tactical Overview snapins --- doc/treasures/sidebar_tactical_overview.py | 29 ++++++++++++++++++++++ web/plugins/sidebar/shipped.py | 37 ++++++++++++++++------------ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/doc/treasures/sidebar_tactical_overview.py b/doc/treasures/sidebar_tactical_overview.py new file mode 100644 index 0000000..dcaeb7d --- /dev/null +++ b/doc/treasures/sidebar_tactical_overview.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- + +# Put this into local/share/check_mk/web/plugins/sidebar. And you will get +# additional versions of "Tactical Overview" for hosts having a certain +# tag. + +def create_tactical_overview_snapin(title, tag_group, tag_name): + def create_render_function(tag_group, tag_name): + return lambda: render_tactical_overview( + extra_filter_headers = "Filter: host_custom_variables ~ TAGS (^|[ ])%s($|[ ])\n" % tag_name, + extra_url_variables = [ + ( "host_tag_0_grp", tag_group ), + ( "host_tag_0_op", "is" ), + ( "host_tag_0_val", tag_name ), + ]) + + sidebar_snapins["tactical_overview_" + tag_name] = { + "title" : title, + "description" : _("Tactical overview of all hosts with the tag %s") % tag_name, + "refresh" : True, + "render" : create_render_function(tag_group, tag_name), + "allowed" : [ "user", "admin", "guest" ], + "styles" : snapin_tactical_overview_styles, + } + +# Here you declare which copies of the snapin you wnat: +create_tactical_overview_snapin(u"München", "stadt", "muc") +create_tactical_overview_snapin(u"Göttingen", "stadt", "got") diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 941c599..9dbe220 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -549,7 +549,7 @@ table.sitestate td.state { # | | # '----------------------------------------------------------------------' -def render_tactical_overview(): +def render_tactical_overview(extra_filter_headers="", extra_url_variables=[]): host_query = \ "GET hosts\n" \ "Stats: state >= 0\n" \ @@ -560,7 +560,8 @@ def render_tactical_overview(): "Stats: scheduled_downtime_depth = 0\n" \ "Stats: acknowledged = 0\n" \ "StatsAnd: 3\n" \ - "Filter: custom_variable_names < _REALNAME\n" + "Filter: custom_variable_names < _REALNAME\n" + \ + extra_filter_headers service_query = \ "GET services\n" \ @@ -576,9 +577,8 @@ def render_tactical_overview(): "Stats: acknowledged = 0\n" \ "Stats: host_state = 0\n" \ "StatsAnd: 5\n" \ - "Filter: host_custom_variable_names < _REALNAME\n" - - # ACHTUNG: Stats-Filter so anpassen, dass jeder Host gezaehlt wird. + "Filter: host_custom_variable_names < _REALNAME\n" + \ + extra_filter_headers try: hstdata = sites.live().query_summed_stats(host_query) @@ -594,25 +594,21 @@ def render_tactical_overview(): html.write("<tr><th>%s</th><th>%s</th><th>%s</th></tr>\n" % (title, _('Problems'), _('Unhandled'))) html.write("<tr>") - html.write('<td class=total><a target="main" href="view.py?view_name=all%ss">%d</a></td>' % (what, data[0])) + url = html.makeuri_contextless([("view_name", "all" + what + "s")] + extra_url_variables, filename="view.py") + html.write('<td class=total><a target="main" href="%s">%d</a></td>' % (url, data[0])) unhandled = False for value in data[1:]: - href = "view.py?view_name=" + view + url = html.makeuri_contextless([("view_name", view)] + extra_url_variables, filename="view.py") if unhandled: - href += "&is_%s_acknowledged=0" % what - text = link(str(value), href) + url += "&is_%s_acknowledged=0" % what + text = link(str(value), url) html.write('<td class="%s">%s</td>' % (value == 0 and " " or "states prob", text)) unhandled = True html.write("</tr>\n") html.write("</table>\n") -sidebar_snapins["tactical_overview"] = { - "title" : _("Tactical Overview"), - "description" : _("The total number of hosts and service with and without problems"), - "refresh" : True, - "render" : render_tactical_overview, - "allowed" : [ "user", "admin", "guest" ], - "styles" : """ + +snapin_tactical_overview_styles = """ table.tacticaloverview { border-collapse: separate; /** @@ -647,6 +643,15 @@ table.tacticaloverview td.prob { } table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width + + +sidebar_snapins["tactical_overview"] = { + "title" : _("Tactical Overview"), + "description" : _("The total number of hosts and service with and without problems"), + "refresh" : True, + "render" : render_tactical_overview, + "allowed" : [ "user", "admin", "guest" ], + "styles" : snapin_tactical_overview_styles, } #.

8 years, 2 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: fbb7004751efdf5b60f866a98ff05376e85f6e3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbb7004751efdf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 20 13:25:29 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/TableHosts.h | 14 +++++++--- livestatus/src/TableHostsByGroup.h | 9 +++++-- livestatus/src/TableLog.cc | 31 ++++++++++++---------- livestatus/src/TableLog.h | 9 +++++-- livestatus/src/TableServices.h | 14 +++++++--- livestatus/src/TableServicesByGroup.h | 9 +++++-- livestatus/src/TableServicesByHostGroup.h | 9 +++++-- livestatus/src/TableStateHistory.cc | 40 ++++++++++++++++------------- livestatus/src/TableStateHistory.h | 10 ++++++-- 9 files changed, 97 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fbb7004751…

8 years, 2 months

3388 Event Console can now process SNMPv3 traps

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e20ba58bb9fe6c6c5dd6878b1fee380fa349a54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e20ba58bb9fe6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 20 12:02:14 2016 +0200 3388 Event Console can now process SNMPv3 traps The Event Console can now process SNMPv3 traps send with SNMPv3. To be able to receive the traps, you will have to configure the SNMPv3 credentials to be used for decrypting the received traps. This can be done in the Event Console configuration using the option <i>Credentials for processing SNMPv3 traps</i>. For each sending server you need to configure the credentials and the systems engine ID which is normally generated automatically by the SNMP device. Some devices also support setting engine IDs on your own. However, the SNMPv3 specification requires that each SNMP device has it's own unique engine ID. To be able to decrypt the traps you need to configure this engine ID together with the other SNMPv3 credentials for each trap sending device. --- .werks/3388 | 19 +++ ChangeLog | 1 + bin/.f12 | 1 + bin/mkeventd | 189 +++++++++++++++++++++------- web/plugins/wato/check_mk_configuration.py | 117 +++++++++-------- web/plugins/wato/mkeventd.py | 39 ++++++ 6 files changed, 270 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2e20ba58bb…

8 years, 2 months

3418 FIX Do not send host notifications if a service group is required

by Mathias Kettner

Module: check_mk Branch: master Commit: 16986a19974f507e227b7c025745d4b9cebc347b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16986a19974f50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:21:16 2016 +0200 3418 FIX Do not send host notifications if a service group is required If you set a match condition on the service groups then for host notifications this condition was ignored. But a host cannot be in any service group so now if you use this condition then the rule will never match for host notifications. This should be the way that you expect this. --- .werks/3418 | 13 +++++++++++++ ChangeLog | 2 ++ modules/events.py | 8 ++++++-- web/htdocs/wato.py | 3 ++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/3418 b/.werks/3418 new file mode 100644 index 0000000..a7ca4f5 --- /dev/null +++ b/.werks/3418 @@ -0,0 +1,13 @@ +Title: Do not send host notifications if a service group is required +Level: 2 +Component: notifications +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.9i1 +Date: 1461143929 + +If you set a match condition on the service groups then for host notifications +this condition was ignored. But a host cannot be in any service group so now +if you use this condition then the rule will never match for host notifications. +This should be the way that you expect this. diff --git a/ChangeLog b/ChangeLog index 8463214..169d4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -295,6 +295,8 @@ * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way * 3346 FIX: Re-added envelope sender to asciimail/mail notification plugins * 3380 FIX: Fixed graphs in service notifications having spaces in service descriptions + * 3418 FIX: Do not send host notifications if a service group is required... + NOTE: Please refer to the migration notes! BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/modules/events.py b/modules/events.py index 3f90de7..8d34e7d 100644 --- a/modules/events.py +++ b/modules/events.py @@ -332,9 +332,13 @@ def event_match_hosttags(rule, context): def event_match_servicegroups(rule, context): - if context["WHAT"] != "SERVICE": - return required_groups = rule.get("match_servicegroups") + if context["WHAT"] != "SERVICE": + if required_groups: + return "This rule requires membership in a service group, but this is a host notification" + else: + return + if required_groups != None: sgn = context.get("SERVICEGROUPNAMES") if sgn == None: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 40f14c4..187a677 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7212,7 +7212,8 @@ def generic_rule_match_conditions(): ( "match_servicegroups", GroupChoice("service", title = _("Match Service Groups"), - help = _("The service must be in one of the selected service groups"), + help = _("The service must be in one of the selected service groups. For host events this condition " + "never matches as soon as at least one group is selected."), allow_empty = False, ) ),

8 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016