Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

#2903 Added "Service Level" to event simulation

by Lars Michelsen

Module: check_mk Branch: master Commit: 80706d0666ee89897b046acc17cc8222940fc61b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80706d0666ee89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 20 09:25:47 2016 +0100 #2903 Added "Service Level" to event simulation The service level of a simulated event can now be set in the Event Simulator. --- .werks/2903 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 17 ++++++++++++++--- mkeventd/web/htdocs/mkeventd.py | 19 +++++++++++++++---- mkeventd/web/plugins/wato/mkeventd.py | 7 +++++++ 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.werks/2903 b/.werks/2903 new file mode 100644 index 0000000..df1df49 --- /dev/null +++ b/.werks/2903 @@ -0,0 +1,9 @@ +Title: Added "Service Level" to event simulation +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1453278286 +Class: feature + +The service level of a simulated event can now be set in the Event Simulator. diff --git a/ChangeLog b/ChangeLog index 373c413..0a036c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -272,6 +272,7 @@ Event Console: * 2733 Visibility of Event Console events more flexible now... * 1306 mkeventd: The Recent event history can you be filtered by extended regexes + * 2903 Added "Service Level" to event simulation... * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix search instead of full match)... * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 5e4bb05..088961c 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2238,9 +2238,12 @@ class EventServer: # Variant 6: syslog message without date / host: # <5>SYSTEM_INFO: [WLAN-1] Triggering Background Scan - #Varian 7: logwatch.ec event forwarding + # Variant 7: logwatch.ec event forwarding # <78>@1341847712 Klapprechner /var/log/syslog: message.... + # Variant 7a: Event simulation + # <%PRI%>@%TIMESTAMP%;%SL% %HOSTNAME% %syslogtag%: %msg% + # Variant 8: syslog message from sophos firewall # <84>2015:03:25-12:02:06 gw pluto[7122]: listening for IKE messages @@ -2263,8 +2266,16 @@ class EventServer: event["priority"] = 5 # notice # Variant 7 - if line[0] == '@' and line[11] == ' ': - timestamp, event['host'], line = line.split(' ', 2) + if line[0] == '@' and line[11] in [ ' ', ';' ]: + if line[11] == ' ': + # Variant 7 + timestamp, event['host'], line = line.split(' ', 2) + else: + # Variant 7a + details, event['host'], line = line.split(' ', 2) + timestamp, sl = details.split(';', 1) + event["sl"] = int(sl) + event['time'] = float(timestamp[1:]) event.update(self.parse_syslog_info(line)) diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index a6a0e25..626c769 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -165,11 +165,11 @@ def daemon_running(): # we put hostname|ipaddress into the host name field. The EC # recognizes this and unpacks the data correctly. def send_event(event): - # "<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag% %msg%\n" + # "<%PRI%>@%TIMESTAMP%;%SL% %HOSTNAME% %syslogtag% %msg%\n" prio = (event["facility"] << 3) + event["priority"] - timestamp = time.strftime("%b %d %T", time.localtime()) - rfc = "<%d>%s %s|%s %s: %s\n" % ( - prio, timestamp, event["host"], event["ipaddress"], event["application"], event["text"]) + rfc = "<%d>@%s;%d %s|%s %s: %s\n" % ( + prio, int(time.time()), event["sl"], event["host"], + event["ipaddress"], event["application"], event["text"]) if type(rfc) == unicode: rfc = rfc.encode("utf-8") pipe = file(pipe_path, "w") @@ -269,6 +269,17 @@ def event_rule_matches_non_inverted(rule, event): if p < prio_from or p > prio_to: return _("The syslog priority is not in the required range.") + if "match_sl" in rule: + sl_from, sl_to = rule["match_sl"] + if sl_from > sl_to: + sl_to, sl_from = sl_from, sl_to + p = event.get("sl") + if p == None: + return _("No service level is set in event") + + if p < sl_from or p > sl_to: + return _("Wrong service level %d (need %d..%d)" % (p, sl_from, sl_to)) + if "match_timeperiod" in rule: reason = check_timeperiod(rule["match_timeperiod"]) if reason: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 1882696..491e62a 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -819,6 +819,11 @@ vs_mkeventd_event = Dictionary( default_value = 1, ) ), + ("sl", DropdownChoice( + title = _("Service Level"), + choices = mkeventd.service_levels, + prefix_values = True, + )), ]) @@ -1115,6 +1120,7 @@ def show_event_simulator(): else: return None + def event_simulation_action(): # Validation of input for rule simulation (no further action here) if html.var("simulate") or html.var("_generate"): @@ -1130,6 +1136,7 @@ def event_simulation_action(): rfc = mkeventd.send_event(event) return None, "Test event generated and sent to Event Console.<br><pre>%s</pre>" % rfc + def rule_pack_with_id(rule_packs, rule_pack_id): for nr, entry in enumerate(rule_packs): if entry["id"] == rule_pack_id:

8 years, 8 months

mkeventd: Fixed exception when saving EC config in distributed setups with " replicate ec" activated

by Lars Michelsen

Module: check_mk Branch: master Commit: 28c6330fe79c973a5c756a388549561efbb9572e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28c6330fe79c97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 20 08:53:25 2016 +0100 mkeventd: Fixed exception when saving EC config in distributed setups with "replicate ec" activated --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index f9a56a4..1882696 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1602,7 +1602,7 @@ def log_mkeventd(what, message): at_least_one = False if is_distributed(): for site_id, site in config.sites.items(): - if site.get("replicate_ec") and not site_is_local(site_id): + if site.get("replicate_ec") and not config.site_is_local(site_id): update_replication_status(site_id, { "need_sync" : True }) remove_sync_snapshot(site_id) at_least_one = True

8 years, 8 months

Some const-correctness fixes. More to come...

by Sven Panne

Module: check_mk Branch: master Commit: 46d61d82a1a2e9c0ea6495c2ab7cd89ca68b8c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46d61d82a1a2e9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 20 08:35:04 2016 +0100 Some const-correctness fixes. More to come... --- livestatus/src/HostServiceState.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index 850b5b4..562080f 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -82,8 +82,8 @@ struct HostServiceState { // Pointer to dynamically allocated strings (strdup) that live here. // These pointers are 0, if there is no output (e.g. downtime) char *_log_output; - char *_notification_period; // may be "": -> no period known, we assume "always" - char *_service_period; // may be "": -> no period known, we assume "always" + const char *_notification_period; // may be "": -> no period known, we assume "always" + const char *_service_period; // may be "": -> no period known, we assume "always" host *_host; service *_service; const char *_host_name; // Fallback if host no longer exists

8 years, 8 months

Added vverbose log message about faked system description OID during discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: ddbd5c8d3c731e77da6d5c10344af4ac2bbb785f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddbd5c8d3c731e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 20 08:34:13 2016 +0100 Added vverbose log message about faked system description OID during discovery --- modules/discovery.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/discovery.py b/modules/discovery.py index 7ed492d..adef453 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -638,6 +638,8 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): raise MKSNMPError("Cannot fetch system description OID %s" % sys_descr_oid) else: # Fake OID values to prevent issues with a lot of scan functions + vverbose(" Skipping system description OID " + "(Set .1.3.6.1.2.1.1.1.0 and .1.3.6.1.2.1.1.2.0 to \"\")\n") set_oid_cache(hostname, ".1.3.6.1.2.1.1.1.0", "") set_oid_cache(hostname, ".1.3.6.1.2.1.1.2.0", "")

8 years, 8 months

Remove bogus debug code from bi.py

by Mathias Kettner

Module: check_mk Branch: master Commit: 128d2af912109f0952893a85181c2db2abc7c45a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=128d2af912109f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 16:46:46 2016 +0100 Remove bogus debug code from bi.py --- web/plugins/wato/bi.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 9c5b12c..9b119a3 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1080,11 +1080,6 @@ class ModeBIRules(ModeBI): def page(self): - path = defaults.var_dir + "/foobar" - wert = { u"öms": u"Hälooöⴰⴱⴲⴳⴴⴵⴶ", "x" : range(10), "ö" : "Ja" } - config.write_settings_file(path, wert) - wert2 = eval(file(path).read()) - html.debug((wert, wert2, wert==wert2)) if not self._pack["aggregations"] and not self._pack["rules"]: new_url = self.url_to_pack([("mode", "bi_edit_rule")]) menu_items = [

8 years, 8 months

Updated bug entries #2303

by Mathias Kettner

Module: check_mk Branch: master Commit: 264e1d4a94f3f64f028aa452ed9013397b80417f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=264e1d4a94f3f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 16:28:08 2016 +0100 Updated bug entries #2303 --- .bugs/2303 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/2303 b/.bugs/2303 index 970f728..72f7600 100644 --- a/.bugs/2303 +++ b/.bugs/2303 @@ -2,7 +2,7 @@ Title: heartbeat_crm: parse old output, get at least in warning if unmanaged Component: checks State: open Date: 2015-02-20 15:29:17 -Targetversion: 1.2.8 +Targetversion: future Class: bug There are three example outputs in server-linux-heartbeat-{1,2,3} in our

8 years, 8 months

Updated bug entries #2172, #2303

by Mathias Kettner

Module: check_mk Branch: master Commit: 1dea9a14b760e22af8d63bbc2acc36f6d8a66cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dea9a14b760e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 16:01:06 2016 +0100 Updated bug entries #2172, #2303 --- .bugs/2172 | 7 +++++-- .bugs/2303 | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.bugs/2172 b/.bugs/2172 index eb6926b..e433ba1 100644 --- a/.bugs/2172 +++ b/.bugs/2172 @@ -1,11 +1,14 @@ Title: load_user_file/save_user_file should handle encoding correctly Component: multisite -State: open +Class: bug +State: wontfix Date: 2015-03-04 09:42:59 Targetversion: 1.2.7 -Class: bug Currently in all saved userfiles unicode strings are converted to utf-8 encoding ascii strings. These strings are not converted back to unicode strings during load_user_file(..). All strings with umlauts need to be unicode strings within multisite code. + +2016-01-19 16:00:58: changed state open -> wontfix +The problem was somewhere else. These functions work like a charm diff --git a/.bugs/2303 b/.bugs/2303 index 1c25cd9..970f728 100644 --- a/.bugs/2303 +++ b/.bugs/2303 @@ -2,7 +2,9 @@ Title: heartbeat_crm: parse old output, get at least in warning if unmanaged Component: checks State: open Date: 2015-02-20 15:29:17 -Targetversion: 1.2.7 +Targetversion: 1.2.8 Class: bug -There are three example outputs in server-linux-heartbeat-{1,2,3} in our (MK's) archive. +There are three example outputs in server-linux-heartbeat-{1,2,3} in our +(MK's) archive. in server-linux-heartbeat-2 there are some unmanaged +nodes. Someone who understands this output needs to have a look.

8 years, 8 months

Updated bug entries #2300

by Mathias Kettner

Module: check_mk Branch: master Commit: c65e24f91de3317965c31288754bc3a5ece5463a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c65e24f91de331… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 19 15:49:00 2016 +0100 Updated bug entries #2300 --- .bugs/2300 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2300 b/.bugs/2300 index e6bc8d8..022a50c 100644 --- a/.bugs/2300 +++ b/.bugs/2300 @@ -1,9 +1,9 @@ Title: WATOs check_plugin browser crashes when local man pages dont have a catalog entry Component: wato -State: open +Class: bug +State: done Date: 2015-05-26 14:59:59 Targetversion: future -Class: bug Example output, if lmsensors man page does not contain catalog entry: @@ -12,3 +12,6 @@ Error running check_mk --automation get-check-catalog --. Invalid output from we ERROR: Skipping invalid manpage: lmsensors (Catalog info missing) ({'generic': [{'agents': ['linux', 'windows', 'aix', 'solaris', 'freebsd', 'netbsd', 'openbsd'], 'name': 'local', 'title': 'local: Integrate custom checks via arbitrary scripts on the agent'}, {'agents': ['linux', 'aix', 'solaris', 'hpux', 'macosx', 'netbsd', 'openbsd', 'freebsd'], 'name': 'mrpe', 'title': "MRPE: MK's Remote Plugin Executor"}, {'agents': ['linux', 'windows'], 'name': 'check_mk.only_from', 'title': 'Check IP restriction of Check_MK agent'}], 'app': {'qmail': [{'agents': ['linux'], 'name': 'qmail_stats', 'title': 'Length of the qmail Mailqueue'}], 'pfsense': [{'agents': ['snmp'], 'name': 'pfsense_status', 'title': 'pfSense Status'}, {'agents': ['snmp'], 'name': 'pfsense_if', 'title': 'pfSense Interface'}], 'citrix': [{'agents': ['windows'], 'name': 'citrix_sessions', 'title': 'Citrix Sessions'}, {'agents': ['windows'], 'name': 'citrix_serverload', 'title': 'Citrix Server load (Score)'}, {'agents': ['windows'], 'name': 'citrix_licenses', 'title': 'Citrix licenses'}], 'libelle': [{'agents': ['linux', 'aix', 'solaris', 'hpux'], 'name': 'libelle_business_shadow.process', 'title': 'Libelle Business Shadow: Active Process'}, {'agents': ['linux', 'aix', 'solaris', 'hpux'], 'name': 'libell + +2016-01-19 15:48:58: changed state open -> done +Fixed.

8 years, 8 months

Made StringColumn::getValue const-correct. Added a few missing overrides.

by Sven Panne

Module: check_mk Branch: master Commit: 1694ddc779c6303716c388d6dcc2ee5510f42d70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1694ddc779c630… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 19 11:54:39 2016 +0100 Made StringColumn::getValue const-correct. Added a few missing overrides. --- livestatus/src/ColumnsColumn.cc | 4 ++-- livestatus/src/ColumnsColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.h | 2 +- livestatus/src/CustomVarsExplicitColumn.cc | 4 ++-- livestatus/src/CustomVarsExplicitColumn.h | 2 +- livestatus/src/FixedIntColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/HostlistStateColumn.h | 2 +- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/OffsetStringColumn.cc | 17 +++++------------ livestatus/src/OffsetStringColumn.h | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 8 ++++---- livestatus/src/OffsetTimeperiodColumn.h | 2 +- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/ServicelistStateColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- livestatus/src/StringColumn.h | 2 +- livestatus/src/StringPointerColumn.h | 6 +++--- 19 files changed, 30 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1694ddc779…

8 years, 8 months

Nitpicking: Fixed #include guards.

by Sven Panne

Module: check_mk Branch: master Commit: cd60adfb2206d6ab722abffde90c150bf1085826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd60adfb2206d6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 19 15:50:35 2016 +0100 Nitpicking: Fixed #include guards. --- livestatus/src/DowntimeOrComment.h | 2 +- livestatus/src/pnp4nagios.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 0f6dd22..f616659 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -114,4 +114,4 @@ struct Comment : public DowntimeOrComment explicit Comment(nebstruct_comment_struct *data); }; -#endif // Downtime_h +#endif // DowntimeOrComment_h diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 8fcb61c..e372f87 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -40,4 +40,4 @@ int pnpgraph_present(const std::string& host, std::string rrd_path(const std::string& host, const std::string& service, const std::string& varname); -#endif // pnp4nagios_h +#endif // pnp4nagios_h

8 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016