Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4543 FIX cisco_cpu: Fixed too restrictive service discovery

by Marcel Arentz

Module: check_mk Branch: master Commit: c3a4e34bed01c1f2d9276a938ad2d21eacbb5b6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a4e34bed01c1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 16 15:33:04 2017 +0100 4543 FIX cisco_cpu: Fixed too restrictive service discovery Change-Id: I4533b7a434c360674cb91ec67e06ccea165daab1 --- .werks/4543 | 10 ++++++++++ checks/cisco_cpu | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4543 b/.werks/4543 new file mode 100644 index 0000000..4c933b1 --- /dev/null +++ b/.werks/4543 @@ -0,0 +1,10 @@ +Title: cisco_cpu: Fixed too restrictive service discovery +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489674722 +Class: fix + + diff --git a/checks/cisco_cpu b/checks/cisco_cpu index a911b70..8f5040b 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -31,7 +31,7 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): if info and \ - info[0][0].isdigit() and \ + info[0][0].isdigit() or \ info[0][1].isdigit(): return [( None, 'cisco_cpu_default_levels') ]

7 years, 3 months

4543 FIX cisco_cpu: Fixed too restrictive service discovery

by Marcel Arentz

Module: check_mk Branch: master Commit: cd7576fb3789ca98139be1b3f1820ddd99e80190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd7576fb3789ca… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 16 15:33:04 2017 +0100 4543 FIX cisco_cpu: Fixed too restrictive service discovery Change-Id: I4533b7a434c360674cb91ec67e06ccea165daab1 --- checks/cisco_cpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 8f5040b..4fc92d2 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -31,8 +31,8 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): if info and \ - info[0][0].isdigit() or \ - info[0][1].isdigit(): + (info[0][0].isdigit() or \ + info[0][1].isdigit()): return [( None, 'cisco_cpu_default_levels') ] def check_cisco_cpu(item, params, info):

7 years, 3 months

Simplify Logfile constructor.

by Sven Panne

Module: check_mk Branch: master Commit: 30f61fb6666968d846cb0e6833c74a8cd7b34093 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30f61fb6666968… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 16 13:28:00 2017 +0100 Simplify Logfile constructor. Change-Id: I548b20b99eaafdd8244c49585aa9dba20dcbc2e9 --- livestatus/src/LogCache.cc | 2 +- livestatus/src/Logfile.cc | 39 +++++++++++++++++++++------------------ livestatus/src/Logfile.h | 4 ++-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 5f06de6..e4f653f 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -102,7 +102,7 @@ void LogCache::updateLogfileIndex() { } void LogCache::scanLogfile(const fs::path &path, bool watch) { - auto logfile = new Logfile(_mc, logger(), path, watch); + auto logfile = new Logfile(_mc, path, watch); time_t since = logfile->since(); if (since != 0) { // make sure that no entry with that 'since' is existing yet. diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index a1fc530..f100180 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -31,6 +31,7 @@ #include "LogCache.h" #include "LogEntry.h" #include "Logger.h" +#include "MonitoringCore.h" #include "Query.h" #ifdef CMC @@ -52,7 +53,7 @@ using std::vector; extern unsigned long g_max_lines_per_logfile; -Logfile::Logfile(MonitoringCore *mc, Logger *logger, fs::path path, bool watch) +Logfile::Logfile(MonitoringCore *mc, fs::path path, bool watch) : _mc(mc) , _path(std::move(path)) , _since(0) @@ -62,12 +63,11 @@ Logfile::Logfile(MonitoringCore *mc, Logger *logger, fs::path path, bool watch) #ifdef CMC , _world(nullptr) #endif - , _logger(logger) , _logclasses_read(0) { ifstream is(_path, ios::binary); if (!is) { generic_error ge("cannot open logfile " + _path.string()); - Informational(_logger) << ge; + Informational(logger()) << ge; return; } @@ -78,8 +78,8 @@ Logfile::Logfile(MonitoringCore *mc, Logger *logger, fs::path path, bool watch) } if (line[0] != '[' || line[11] != ']') { - Informational(_logger) << "ignoring logfile '" << _path - << "': does not begin with '[123456789] '"; + Informational(logger()) << "ignoring logfile '" << _path + << "': does not begin with '[123456789] '"; return; } @@ -111,7 +111,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, if (_watch) { file = fopen(_path.c_str(), "r"); if (file == nullptr) { - Informational(_logger) << "cannot open logfile '" << _path << "'"; + Informational(logger()) << "cannot open logfile '" << _path << "'"; return; } // If we read this file for the first time, we initialize @@ -144,7 +144,7 @@ void Logfile::load(LogCache *logcache, time_t since, time_t until, file = fopen(_path.c_str(), "r"); if (file == nullptr) { generic_error ge("cannot open logfile " + _path.string()); - Informational(_logger) << ge; + Informational(logger()) << ge; return; } @@ -160,9 +160,9 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, LogCache *logcache, vector<char> linebuffer(65536); while (fgets(&linebuffer[0], linebuffer.size(), file) != nullptr) { if (_lineno >= g_max_lines_per_logfile) { - Error(_logger) << "more than " << g_max_lines_per_logfile - << " lines in " << this->_path - << ", ignoring the rest!"; + Error(logger()) << "more than " << g_max_lines_per_logfile + << " lines in " << this->_path + << ", ignoring the rest!"; return; } _lineno++; @@ -206,7 +206,8 @@ bool Logfile::processLogLine(uint32_t lineno, const char *linebuffer, uint64_t key = makeKey(entry->_time, entry->_lineno); if (_entries.find(key) != _entries.end()) { // this should never happen. The lineno must be unique! - Error(_logger) << "strange duplicate logfile line " << entry->_complete; + Error(logger()) << "strange duplicate logfile line " + << entry->_complete; return false; } _entries.emplace(key, entry.release()); @@ -275,8 +276,8 @@ void Logfile::updateReferences() { for (auto &entry : _entries) { num += entry.second->updateReferences(_mc); } - Notice(_logger) << "updated " << num << " log cache references of " - << _path << " to new world."; + Notice(logger()) << "updated " << num << " log cache references of " + << _path << " to new world."; _world = g_live_world; } #endif @@ -288,7 +289,7 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { ifstream is(_path, ios::binary | ios::ate); if (!is) { generic_error ge("cannot open logfile " + _path.string()); - Warning(_logger) << ge; + Warning(logger()) << ge; return result; } @@ -296,7 +297,7 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { is.seekg(0, ios::beg); if (!is) { generic_error ge("cannot determine size of " + _path.string()); - Warning(_logger) << ge; + Warning(logger()) << ge; return result; } auto size = end - is.tellg(); @@ -305,8 +306,8 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { // Remember: Zeroes at both ends, so we need a bit more space. result = make_unique<vector<char>>(size + 2); } catch (bad_alloc &) { - Warning(_logger) << "cannot allocate " << size << " byte buffer for " - << _path; + Warning(logger()) << "cannot allocate " << size << " byte buffer for " + << _path; return result; } @@ -314,9 +315,11 @@ unique_ptr<vector<char>> Logfile::readIntoBuffer() { if (!is) { generic_error ge("cannot open read " + to_string(size) + " byted from " + _path.string()); - Warning(_logger) << ge; + Warning(logger()) << ge; } return result; } #endif + +Logger *Logfile::logger() const { return _mc->loggerLivestatus(); } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index bfad0b1..2d1f403 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -60,10 +60,9 @@ private: #ifdef CMC World *_world; // CMC: world our references point into #endif - Logger *const _logger; public: - Logfile(MonitoringCore *mc, Logger *logger, fs::path path, bool watch); + Logfile(MonitoringCore *mc, fs::path path, bool watch); ~Logfile(); std::string path() { return _path; } @@ -96,6 +95,7 @@ private: time_t until, unsigned logclasses); bool processLogLine(uint32_t, const char *linebuffer, unsigned); uint64_t makeKey(time_t, unsigned); + Logger *logger() const; }; #endif // Logfile_h

7 years, 3 months

Move Command handling to our abstraction layer, vastly simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: e6dadacfb1f72c7e0177061a665e61ff808eec58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6dadacfb1f72c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 16 09:33:20 2017 +0100 Move Command handling to our abstraction layer, vastly simplifying things. Change-Id: I81bff65c780d7932790cc0f8a6b6e14f6cf96b7d --- livestatus/src/CommandsHolder.h | 44 -------------------------------- livestatus/src/CommandsHolderNagios.cc | 46 ---------------------------------- livestatus/src/CommandsHolderNagios.h | 39 ---------------------------- livestatus/src/LogCache.cc | 6 ++--- livestatus/src/LogCache.h | 5 +--- livestatus/src/LogEntry.cc | 10 ++++---- livestatus/src/LogEntry.h | 9 +++---- livestatus/src/Logfile.cc | 9 +++---- livestatus/src/Logfile.h | 9 +++---- livestatus/src/Makefile.am | 1 - livestatus/src/MonitoringCore.h | 9 +++++++ livestatus/src/Store.cc | 4 +-- livestatus/src/Store.h | 4 --- livestatus/src/TableCommands.cc | 14 ++++------- livestatus/src/TableCommands.h | 6 +---- livestatus/src/module.cc | 17 +++++++++++++ 16 files changed, 54 insertions(+), 178 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6dadacfb1…

7 years, 3 months

CME: Added configuration of customer to Event Console rules and rule packs

by Lars Michelsen

Module: check_mk Branch: master Commit: ee0488e59bc62fb114a273ef32195b516f0ff557 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee0488e59bc62f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 16 09:31:59 2017 +0100 CME: Added configuration of customer to Event Console rules and rule packs Change-Id: I63ab85c15d4e06e9933b8396fbe7b0ec677a97ab --- web/plugins/wato/mkeventd.py | 149 +++++++++++++++++++++++++++---------------- 1 file changed, 94 insertions(+), 55 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 4d2ee18..81db875 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -251,37 +251,39 @@ class RuleState(CascadingDropdown): ] CascadingDropdown.__init__(self, choices = choices, **kwargs) -vs_mkeventd_rule_pack = Dictionary( - title = _("Rule pack properties"), - render = "form", + +def vs_mkeventd_rule_pack(): elements = [ - ( "id", - ID( + ("id", ID( title = _("Rule pack ID"), help = _("A unique ID of this rule pack."), allow_empty = False, size = 12, )), - ( "title", - TextUnicode( - title = _("Title"), - help = _("A descriptive title for this rule pack"), - allow_empty = False, - size = 64, - ) - ), - ( "disabled", - Checkbox( - title = _("Disable"), - label = _("Currently disable execution of all rules in the pack"), - ) - ), - ], - optional_keys = False, -) + ("title", TextUnicode( + title = _("Title"), + help = _("A descriptive title for this rule pack"), + allow_empty = False, + size = 64, + )), + ("disabled", Checkbox( + title = _("Disable"), + label = _("Currently disable execution of all rules in the pack"), + )), + ] -vs_mkeventd_rule = Dictionary( - title = _("Rule Properties"), + if cmk.is_managed_edition(): + elements += managed.customer_choice_element(deflt=managed.SCOPE_GLOBAL) + + return Dictionary( + title = _("Rule pack properties"), + render = "form", + elements = elements, + optional_keys = ["customer"], + ) + + +def vs_mkeventd_rule(rule_pack): elements = [ ( "id", ID( @@ -291,8 +293,23 @@ vs_mkeventd_rule = Dictionary( allow_empty = False, size = 12, )), - ] + rule_option_elements() + - [ + ] + rule_option_elements() + + if cmk.is_managed_edition(): + if "customer" in rule_pack: + # Enforced by rule pack + elements += [ + ("customer", FixedValue( + rule_pack["customer"], + title = _("Customer"), + totext = "%s (%s)" % (managed.get_customer_name_by_id(rule_pack["customer"]), + _("Set by rule pack")), + )), + ] + else: + elements += managed.customer_choice_element() + + elements += [ ( "drop", DropdownChoice( title = _("Rule type"), @@ -807,22 +824,26 @@ vs_mkeventd_rule = Dictionary( attrencode = True, ) ), - ], - optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "match_host", "match_ipaddress", "match_application", "match_timeperiod", - "set_text", "set_host", "set_application", "set_comment", - "set_contact", "cancel_priority", "cancel_application", "match_ok", "contact_groups", ], - headers = [ - ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled" ] ), - ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", - "match_sl", "match_ok", "cancel_priority", "cancel_application", "match_timeperiod", "invert_matching" ]), - ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), - ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), - ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), - ], - render = "form", - form_narrow = True, -) + ] + + return Dictionary( + title = _("Rule Properties"), + elements = elements, + optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", + "match_facility", "match_sl", "match_host", "match_ipaddress", "match_application", "match_timeperiod", + "set_text", "set_host", "set_application", "set_comment", + "set_contact", "cancel_priority", "cancel_application", "match_ok", "contact_groups", ], + headers = [ + ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled", "customer" ] ), + ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", + "match_sl", "match_ok", "cancel_priority", "cancel_application", "match_timeperiod", "invert_matching" ]), + ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), + ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), + ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), + ], + render = "form", + form_narrow = True, + ) # VS for simulating an even vs_mkeventd_event = Dictionary( @@ -1169,8 +1190,14 @@ def mode_mkeventd_rule_packs(phase): table.cell(_("ID"), rule_pack["id"]) table.cell(_("Title"), html.attrencode(rule_pack["title"])) - table.cell(_("Rules"), css="number") - html.write('<a href="%s">%d</a>' % (rules_url, len(rule_pack["rules"]))) + + if cmk.is_managed_edition(): + table.cell(_("Customer")) + if "customer" in rule_pack: + html.write_text(managed.get_customer_name(rule_pack)) + + table.cell(_("Rules"), + html.render_a("%d" % len(rule_pack["rules"]), href=rules_url), css="number") hits = rule_pack.get('hits') table.cell(_("Hits"), hits != None and hits or '', css="number") @@ -1336,7 +1363,16 @@ def mode_mkeventd_rules(phase): (", ".join(rule["contact_groups"]["groups"]) or _("(none)")), "contactgroups") - table.cell(_("ID"), '<a href="%s">%s</a>' % (edit_url, rule["id"])) + table.cell(_("ID"), html.render_a(rule["id"], edit_url)) + + if cmk.is_managed_edition(): + table.cell(_("Customer")) + if "customer" in rule_pack: + html.write_text("%s (%s)" % + (managed.get_customer_name(rule_pack), _("Set by rule pack"))) + else: + html.write_text(managed.get_customer_name(rule)) + if rule.get("drop"): table.cell(_("State"), css="state statep nowrap") @@ -1437,7 +1473,8 @@ def mode_mkeventd_edit_rule_pack(phase): mkeventd_changes_button() if edit_nr >= 0: rule_pack_id = rule_packs[edit_nr]["id"] - html.context_button(_("Edit Rules"), html.makeuri([("mode", "mkeventd_rules"), ("rule_pack", rule_pack_id)]), "mkeventd_rules") + html.context_button(_("Edit Rules"), + html.makeuri([("mode", "mkeventd_rules"),("rule_pack", rule_pack_id)]), "mkeventd_rules") return if new: @@ -1445,10 +1482,11 @@ def mode_mkeventd_edit_rule_pack(phase): ### rule_pack = {} ### rule_pack.update(rule_packs[clone_nr]) ### else: - rule_pack = { "rules" : [], } + rule_pack = { "rules" : [], } else: rule_pack = rule_packs[edit_nr] + vs = vs_mkeventd_rule_pack() if phase == "action": if not html.check_transaction(): @@ -1459,8 +1497,8 @@ def mode_mkeventd_edit_rule_pack(phase): else: existing_rules = [] - rule_pack = vs_mkeventd_rule_pack.from_html_vars("rule_pack") - vs_mkeventd_rule_pack.validate_value(rule_pack, "rule_pack") + rule_pack = vs.from_html_vars("rule_pack") + vs.validate_value(rule_pack, "rule_pack") rule_pack["rules"] = existing_rules new_id = rule_pack["id"] @@ -1485,8 +1523,8 @@ def mode_mkeventd_edit_rule_pack(phase): html.begin_form("rule_pack") - vs_mkeventd_rule_pack.render_input("rule_pack", rule_pack) - vs_mkeventd_rule_pack.set_focus("rule_pack") + vs.render_input("rule_pack", rule_pack) + vs.set_focus("rule_pack") html.button("save", _("Save")) html.hidden_fields() html.end_form() @@ -1520,6 +1558,7 @@ def mode_mkeventd_edit_rule(phase): rules = rule_pack["rules"] + vs = vs_mkeventd_rule(rule_pack) edit_nr = int(html.var("edit", -1)) # missing -> new rule clone_nr = int(html.var("clone", -1)) # Only needed in 'new' mode @@ -1557,8 +1596,8 @@ def mode_mkeventd_edit_rule(phase): if not new: old_id = rule["id"] - rule = vs_mkeventd_rule.from_html_vars("rule") - vs_mkeventd_rule.validate_value(rule, "rule") + rule = vs.from_html_vars("rule") + vs.validate_value(rule, "rule") if not new and old_id != rule["id"]: raise MKUserError("rule_p_id", _("It is not allowed to change the ID of an existing rule.")) @@ -1619,8 +1658,8 @@ def mode_mkeventd_edit_rule(phase): html.begin_form("rule") - vs_mkeventd_rule.render_input("rule", rule) - vs_mkeventd_rule.set_focus("rule") + vs.render_input("rule", rule) + vs.set_focus("rule") html.button("save", _("Save")) html.hidden_fields() html.end_form()

7 years, 3 months

CME: Event simulator now handles customers

by Lars Michelsen

Module: check_mk Branch: master Commit: eaa07d1a147bda8b3565d78b1a5f230647339c68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa07d1a147bda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 16 09:58:26 2017 +0100 CME: Event simulator now handles customers Change-Id: Iee039d09e5d8bb6fac101a9451e64eb4ab6debfd --- web/htdocs/mkeventd.py | 22 +++++++++++++++++++--- web/plugins/wato/mkeventd.py | 9 +++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/web/htdocs/mkeventd.py b/web/htdocs/mkeventd.py index 5cc4292..3226e7d 100644 --- a/web/htdocs/mkeventd.py +++ b/web/htdocs/mkeventd.py @@ -31,6 +31,10 @@ import sites from lib import * import cmk.paths +if cmk.is_managed_edition(): + import managed +else: + managed = None # ASN1 MIB source directory candidates. Non existing dirs are ok. # Please sync these paths with htdocs/mkeventd.py @@ -292,8 +296,8 @@ def get_stats_per_site(only_sites, stats_keys): # here. But it does not make sense to query the live eventd here since it # does not know anything about the currently configured but not yet activated # rules. And also we do not want to have shared code. -def event_rule_matches(rule, event): - result = event_rule_matches_non_inverted(rule, event) +def event_rule_matches(rule_pack, rule, event): + result = event_rule_matches_non_inverted(rule_pack, rule, event) if rule.get("invert_matching"): if type(result) == tuple: return _("The rule would match, but matching is inverted.") @@ -303,7 +307,7 @@ def event_rule_matches(rule, event): return result -def event_rule_matches_non_inverted(rule, event): +def event_rule_matches_non_inverted(rule_pack, rule, event): if False == match_ipv4_network(rule.get("match_ipaddress", "0.0.0.0/0"), event["ipaddress"]): return _("The source IP address does not match.") @@ -362,6 +366,18 @@ def event_rule_matches_non_inverted(rule, event): if reason: return reason + if cmk.is_managed_edition(): + import managed + if "customer" in rule_pack: + rule_customer_id = rule_pack["customer"] + else: + rule_customer_id = rule.get("customer", managed.SCOPE_GLOBAL) + + site_customer_id = managed.get_customer_id(config.sites[event["site"]]) + + if rule_customer_id != managed.SCOPE_GLOBAL and site_customer_id != rule_customer_id: + return _("Wrong customer") + if match_groups == True: match_groups = () # no matching groups return False, match_groups diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 81db875..060bfd9 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1150,7 +1150,7 @@ def mode_mkeventd_rule_packs(phase): skips = 0 for rule in rule_pack["rules"]: - result = mkeventd.event_rule_matches(rule, event) + result = mkeventd.event_rule_matches(rule_pack, rule, event) if type(result) == tuple: cancelling, groups = result @@ -1336,7 +1336,7 @@ def mode_mkeventd_rules(phase): if rule.get("disabled"): html.icon(_("This rule is currently disabled and will not be applied"), "disabled") elif event: - result = mkeventd.event_rule_matches(rule, event) + result = mkeventd.event_rule_matches(rule_pack, rule, event) if type(result) != tuple: html.icon(_("Rule does not match: %s") % result, "rulenmatch") else: @@ -1639,6 +1639,11 @@ def mode_mkeventd_edit_rule(phase): num_repl, num_groups)) num_repl -= 1 + if cmk.is_managed_edition() and "customer" in rule_pack: + try: + del rule["customer"] + except KeyError: + pass if new and clone_nr >= 0: rules[clone_nr:clone_nr] = [ rule ]

7 years, 3 months

4500 Graph designer: Hex codes can now be inserted into color picker manually

by Lars Michelsen

Module: check_mk Branch: master Commit: aebc6727f245d39e3e300cfcd4d95ad66668b790 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aebc6727f245d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 15 14:05:46 2017 +0100 4500 Graph designer: Hex codes can now be inserted into color picker manually You can now either choose the color from the picker area or insert it into the new hex color input field. Change-Id: I294c8359bad39ada492b4b96839033fc48b53c9d --- .werks/4500 | 11 +++++++++++ web/htdocs/check_mk.css | 10 ++++++++++ web/htdocs/js/checkmk.js | 15 +++++++++++++++ web/htdocs/valuespec.py | 24 +++++++++++++++++------- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/.werks/4500 b/.werks/4500 new file mode 100644 index 0000000..0234899 --- /dev/null +++ b/.werks/4500 @@ -0,0 +1,11 @@ +Title: Graph designer: Hex codes can now be inserted into color picker manually +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1489583045 +Class: feature + +You can now either choose the color from the picker area or insert it into +the new hex color input field. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 6e3f3c7..11a89dc 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -733,6 +733,16 @@ table.data td .cp-preview { background-color: black; } +.cp-input { + float: left; + margin-top: 2px; +} + +.cp-input input { + margin-left: 2px; + width: 106px; +} + div.popup_trigger.colorpicker .popup_menu { top: 17px; left: 26px; diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 86e716a..454d594 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2500,6 +2500,21 @@ function vs_autocomplete_close(input_id) popup.parentNode.removeChild(popup); } + +var vs_color_pickers = []; + +function vs_update_color_picker(varprefix, hex, update_picker) { + if (!/^#[0-9A-F]{6}$/i.test(hex)) + return; // skip invalid/unhandled colors + + document.getElementById(varprefix + "_input").value = hex; + document.getElementById(varprefix + "_value").value = hex; + document.getElementById(varprefix + "_preview").style.backgroundColor = hex; + + if (update_picker) + vs_color_pickers[varprefix].setHex(hex); +} + //#. //# .-Help Toggle--------------------------------------------------------. //# | _ _ _ _____ _ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ef175a4..e277b0b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4196,15 +4196,26 @@ class Color(ValueSpec): class_="cp-preview", style="background-color:%s" % value) + + # TODO(rh): Please take a look at this hard coded HTML # FIXME: Rendering with HTML class causes bug in html popup_trigger function. # Reason is HTML class and the escaping. - menu_content = "<div id=\"%s_picker\" class=\"cp-small\"></div>" % varprefix + menu_content = "<div id=\"%s_picker\" class=\"cp-small\"></div>" % varprefix + menu_content += "<div class=\"cp-input\">" \ + "%s" \ + "<input id=\"%s_input\" type=\"text\"></input></div>" % \ + (_("Hex color:"), varprefix) + menu_content += "<script language=\"javascript\">" \ - "ColorPicker(document.getElementById(\"%s_picker\")," \ - " function(hex, hsv, rgb) {" \ - " document.getElementById(\"%s_value\").value = hex;" \ - " document.getElementById(\"%s_preview\").style.backgroundColor = hex;" \ - "}).setHex(\"%s\");</script>" % (varprefix, varprefix, varprefix, value) + "vs_color_pickers[\"%s\"] = ColorPicker(document.getElementById(\"%s_picker\")," \ + " function(hex, hsv, rgb) { vs_update_color_picker(\"%s\", hex, false); }" \ + ");" \ + "document.getElementById(\"%s_input\").oninput = function() { " \ + " vs_update_color_picker(\"%s\", this.value, true); " \ + "};" \ + "vs_update_color_picker(\"%s\", \"%s\", true);" \ + "</script>" % \ + (varprefix, varprefix, varprefix, varprefix, varprefix, varprefix, value) html.popup_trigger(indicator, varprefix + '_popup', menu_content=menu_content, @@ -4212,7 +4223,6 @@ class Color(ValueSpec): onclose=self._on_change) - def from_html_vars(self, varprefix): color = html.var(varprefix + '_value') if color == '':

7 years, 3 months

Added MonitoringCore::impl().

by Sven Panne

Module: check_mk Branch: master Commit: 582c3d3ae8058cc3966727f5641ab183a193b567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=582c3d3ae8058c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 15 13:40:49 2017 +0100 Added MonitoringCore::impl(). This effectively acts as an escape hatch to access the underlying implementation. While this is not particularly nice and should die in the long run, it is very handy in the meantime, reducing the need for parameter passing quite a bite. Note that even the C++ standard library has similar hacks, e.g. std::thread::native_handle(): Change-Id: I47ff2650da2e2e6abac845adf1a7487e60712325 --- livestatus/src/MonitoringCore.h | 9 +++++++++ livestatus/src/Store.cc | 20 ++++++++++---------- livestatus/src/Store.h | 16 +++++++++------- livestatus/src/TableCommands.cc | 4 ++-- livestatus/src/TableCommands.h | 2 +- livestatus/src/TableComments.cc | 15 ++++++++------- livestatus/src/TableComments.h | 13 ++++++------- livestatus/src/TableDowntimes.cc | 15 ++++++++------- livestatus/src/TableDowntimes.h | 13 ++++++------- livestatus/src/TableEventConsoleEvents.cc | 30 +++++++++++++----------------- livestatus/src/TableEventConsoleEvents.h | 26 +++++++++++++------------- livestatus/src/TableEventConsoleHistory.cc | 26 +++++++++++--------------- livestatus/src/TableEventConsoleHistory.h | 10 +++++----- livestatus/src/TableHosts.cc | 16 ++++++++-------- livestatus/src/TableHosts.h | 29 +++++++++++++++-------------- livestatus/src/TableHostsByGroup.cc | 8 ++++---- livestatus/src/TableHostsByGroup.h | 13 ++++++------- livestatus/src/TableLog.cc | 21 +++++++-------------- livestatus/src/TableLog.h | 13 +++++++------ livestatus/src/TableServices.cc | 20 ++++++++++---------- livestatus/src/TableServices.h | 30 +++++++++++++++--------------- livestatus/src/TableServicesByGroup.cc | 8 ++++---- livestatus/src/TableServicesByGroup.h | 13 ++++++------- livestatus/src/TableServicesByHostGroup.cc | 8 ++++---- livestatus/src/TableServicesByHostGroup.h | 13 ++++++------- livestatus/src/TableStateHistory.cc | 22 +++++++--------------- livestatus/src/TableStateHistory.h | 12 +++++------- livestatus/src/TableStatus.h | 8 -------- livestatus/src/module.cc | 2 ++ 29 files changed, 207 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=582c3d3ae8…

7 years, 3 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: bdbefb3240d305303f5644104c48e199e7c8f882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdbefb3240d305… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 15 13:18:22 2017 +0100 Minor code cleanup Change-Id: I24f0056a2023922cede7b06b113ea378602b0d1c --- checks/heartbeat_crm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index e1742cd..e3ff61d 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -196,6 +196,16 @@ check_info["heartbeat_crm"] = { } +#. +# .--Resources-----------------------------------------------------------. +# | ____ | +# | | _ \ ___ ___ ___ _ _ _ __ ___ ___ ___ | +# | | |_) / _ \/ __|/ _ \| | | | '__/ __/ _ \/ __| | +# | | _ < __/\__ \ (_) | |_| | | | (_| __/\__ \ | +# | |_| \_\___||___/\___/ \__,_|_| \___\___||___/ | +# | | +# '----------------------------------------------------------------------' + def heartbeat_crm_parse_resources(info): blockStart = False resources = {} @@ -248,16 +258,6 @@ def heartbeat_crm_parse_resources(info): return resources -#. -# .--Resources-----------------------------------------------------------. -# | ____ | -# | | _ \ ___ ___ ___ _ _ _ __ ___ ___ ___ | -# | | |_) / _ \/ __|/ _ \| | | | '__/ __/ _ \/ __| | -# | | _ < __/\__ \ (_) | |_| | | | (_| __/\__ \ | -# | |_| \_\___||___/\___/ \__,_|_| \___\___||___/ | -# | | -# '----------------------------------------------------------------------' - def inventory_heartbeat_crm_resources(info): # Full list of resources: # Resource Group: group_slapmaster

7 years, 3 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0a693ea70ebae96465d34628ae995c043752c622 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a693ea70ebae9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 15 13:17:07 2017 +0100 Minor code cleanup Change-Id: I48460d404663e9e733f5aa8a958559a2eb9518c6 --- checks/heartbeat_crm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index a12380e..e1742cd 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -106,9 +106,8 @@ def heartbeat_crm_parse_general(info): # | | |___| _ <| | | | | # | \____|_| \_\_| |_| | # | | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------' + def inventory_heartbeat_crm(info): # Use these lines to gather the inventory and perform this check: # ============ @@ -135,6 +134,7 @@ def inventory_heartbeat_crm(info): params['dc'] = dc return [(None, params)] + def check_heartbeat_crm(item, params, info): if len(info) > 0: if info[0][0].lower().startswith("critical"):

7 years, 3 months

← Newer
1
...
11
12
13
14
15
16
17
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017