Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: improved wording of error message

by Andreas Boesl

Module: check_mk Branch: master Commit: 00c581e07c290f9cacdd134e697f9f9b6762a5f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00c581e07c290f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 15 10:55:39 2014 +0100 improved wording of error message --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 871fb30..4b47bcd 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -221,7 +221,7 @@ def notify_notify(raw_context, analyse=False): try: complete_raw_context(raw_context) except Exception, e: - notify_log("Mist: %s" % e) + notify_log("Error on completing raw context: %s" % e) if notification_logging >= 2: notify_log("Computed variables:\n"

9 years, 9 months

Check_MK Git: check_mk: spectrum notification plugin: updated trap content

by Andreas Boesl

Module: check_mk Branch: master Commit: b9f56c3a81fc04ec311f1c653b35074f9c5d4f89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9f56c3a81fc04… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 15 10:20:43 2014 +0100 spectrum notification plugin: updated trap content --- notifications/spectrum | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/notifications/spectrum b/notifications/spectrum index 28ea1e2..aa7c6c4 100755 --- a/notifications/spectrum +++ b/notifications/spectrum @@ -28,6 +28,9 @@ import os, subprocess +# Note: This notifcation plugin can only handle service notifications +# Host notifications will fail + def send_trap(oids, target, community): cmd = ["/usr/sbin/snmptrap", '-v', '1', '-c', community, target ] for oid, text in oids.items(): @@ -47,6 +50,12 @@ def main(): context["PARAMETER_COMMUNITY"] = context["PARAMETER_1"] context["PARAMETER_DESTINATION"] = context["PARAMETER_2"] + + complete_service_url = context["MONITORING_HOST"] + if "OMD_SITE" in context: + complete_service_url += "/" + context["OMD_SITE"] + complete_service_url += context['SERVICEURL'] + # adjust these oids to your needs # Note: HOSTCONTACTGROUPNAMES is only available via cmc oids = { @@ -61,7 +70,7 @@ def main(): "1.3.6.1.4.1.13424.10.5.2.1.1.9" : context['SERVICEDESC'], "1.3.6.1.4.1.13424.10.5.2.1.1.10" : 3, #SPECIFIC TRAP (type) NUMBER "1.3.6.1.4.1.13424.10.5.2.1.1.11" : "CNO Digital Lvl2 Support (P3 ET, call xxxxx)", #CALLOUT STRING - "1.3.6.1.4.1.13424.10.5.2.1.1.12" : context['SERVICEURL'], + "1.3.6.1.4.1.13424.10.5.2.1.1.12" : complete_service_url, "1.3.6.1.4.1.13424.10.5.2.1.1.13" : "%s Alarm on host %s" % (context['SERVICEDESC'], context['HOSTNAME']), "1.3.6.1.4.1.13424.10.5.2.1.1.14" : context['SERVICEGROUPNAMES'], }

9 years, 9 months

Check_MK Git: check_mk: Declare painters for PNP graphs as unprintable

by Mathias Kettner

Module: check_mk Branch: master Commit: 43f70e0b3672179c16f1a6d60975654e708ead83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43f70e0b367217… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 14 21:02:05 2014 +0100 Declare painters for PNP graphs as unprintable --- web/plugins/views/painters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index fe896e2..1dfe48c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -716,6 +716,7 @@ multisite_painters["svc_pnpgraph" ] = { "columns" : [ "host_name", "service_description" ], "options" : [ 'pnp_timerange' ], "paint" : lambda row: paint_pnpgraph(row["site"], row["host_name"], row["service_description"]), + "printable" : False, } def paint_check_manpage(row): @@ -1067,7 +1068,8 @@ multisite_painters["host_pnpgraph" ] = { "short" : _("PNP graph"), "columns" : [ "host_name" ], "options" : [ 'pnp_timerange' ], - "paint" : lambda row: paint_pnpgraph(row["site"], row["host_name"]) + "paint" : lambda row: paint_pnpgraph(row["site"], row["host_name"]), + "printable" : False, } def paint_host_black(row):

9 years, 9 months

Check_MK Git: check_mk: Optical improvment when showing exceptions

by Mathias Kettner

Module: check_mk Branch: master Commit: a9a0bb0c699101d349b6f02113a9bc20e8f23e0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9a0bb0c699101… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 14 21:01:45 2014 +0100 Optical improvment when showing exceptions --- web/htdocs/htmllib.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 24bc89a..099768a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -913,7 +913,8 @@ class html: def show_exception(self, e): details = \ - 'Page: ' + self.myfile + '\r\n\r\n' \ + 'Check_MK Version: ' + defaults.check_mk_version + '\r\n' \ + + 'Page: ' + self.myfile + '.py\r\n\r\n' \ + 'GET/POST-Variables:\r\n' \ + '\r\n'.join([ ' '+n+'='+v for n, v in sorted(self.vars.items()) ]) + '\r\n' \ + '\r\n' \ @@ -932,13 +933,15 @@ class html: self.context_button(_("Submit Report"), mailto_url, "email") self.end_context_buttons() - self.show_error("%s: %s" % (_('Internal error'), self.attrencode(e))) + self.write("<div class=error>") + self.write("<b>%s:</b>\n%s<br><br>" %(_('Internal error'), self.attrencode(e))) self.begin_foldable_container("html", "exc_details", False, _("Details")) self.write('<div class=log_output>') self.write("<pre>%s</pre>" % details) self.write('</div>') self.end_foldable_container() + self.write("</div>") def show_error(self, msg): if self.mobile:

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2283

by Lars Michelsen

Module: check_mk Branch: master Commit: 79330929bd9abbf18118e27b71acd61a01e3b77d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79330929bd9abb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 17:27:24 2014 +0100 Updated bug entries #2283 --- .bugs/2283 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2283 b/.bugs/2283 new file mode 100644 index 0000000..2b9ad0d --- /dev/null +++ b/.bugs/2283 @@ -0,0 +1,10 @@ +Title: logwatch: log entries with braces in names can not be shown in logwatch GUI +Component: multisite +State: open +Date: 2014-12-12 17:21:28 +Targetversion: 1.2.5i1 +Class: bug + +Braces are not removed from logwatch stored files. Logwatch-GUI does not handle this difference correctly. +e.g. mk_sap creates such logwatch files +

9 years, 9 months

Check_MK Git: check_mk: #1661 FIX mknotifyd: improved performance when receiving forwarded notifications

by Andreas Boesl

Module: check_mk Branch: master Commit: 0ad179592ce495d849e9c4eca80430f117f270bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ad179592ce495… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 12 17:20:58 2014 +0100 #1661 FIX mknotifyd: improved performance when receiving forwarded notifications --- .werks/1661 | 10 ++++++++++ ChangeLog | 3 +++ doc/treasures/mknotifyd | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1661 b/.werks/1661 new file mode 100644 index 0000000..f85bff2 --- /dev/null +++ b/.werks/1661 @@ -0,0 +1,10 @@ +Title: mknotifyd: improved performance when receiving forwarded notifications +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418401218 + + diff --git a/ChangeLog b/ChangeLog index 634aaa9..f61ded8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ * 1760 Added search form to manual checks page * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks + Notifications: + * 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications + 1.2.6b1: Core & Setup: diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index f549e69..69925b7 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -234,7 +234,7 @@ class TcpServer: handled_connections = 0 # Debug info while not self._should_terminate: - readable = select.select([self._tcp_socket], [], [], 0.5)[0] + readable = select.select([self._tcp_socket], [], [], 0.2)[0] for s in readable: client_data = "" chunk_count = 0 @@ -242,7 +242,7 @@ class TcpServer: from_name = "%s:%s" % addr_info while True: try: - data_ready = select.select([client_socket], [], [], 2)[0] + data_ready = select.select([client_socket], [], [], 0.2)[0] if data_ready: chunk = client_socket.recv(8192) if not chunk:

9 years, 9 months

Check_MK Git: check_mk: #1764 FIX mk_sap: Fixed exception when saving status file

by Lars Michelsen

Module: check_mk Branch: master Commit: af444ca845b2e49788dc2fae8c34f64327efc960 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af444ca845b2e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 16:40:37 2014 +0100 #1764 FIX mk_sap: Fixed exception when saving status file --- .werks/1764 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1764 b/.werks/1764 new file mode 100644 index 0000000..c38f0ff --- /dev/null +++ b/.werks/1764 @@ -0,0 +1,10 @@ +Title: mk_sap: Fixed exception when saving status file +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418398819 + + diff --git a/ChangeLog b/ChangeLog index bc69ab6..3d59140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 1763 FIX: diskstat: Fixed error in config example of manpage * 1755 FIX: cisco_vpn_tunnel: fix exception in case tunnel is not OK * 1756 FIX: agent_ibmsvc: do not abort execution if one of the sections fail + * 1764 FIX: mk_sap: Fixed exception when saving status file Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index e780c29..7303dac 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -487,7 +487,7 @@ try: # Only write the state file once per run. And only when it has been changed if state_file_changed: new_file = STATE_FILE + '.new' - fd = os.open(new_file, os.O_WRONLY | os.o_CREAT) + fd = os.open(new_file, os.O_WRONLY | os.O_CREAT) fcntl.flock(fd, fcntl.LOCK_EX) os.write(fd, repr(states)) os.close(fd)

9 years, 9 months

Check_MK Git: check_mk: #1778 FIX cisco_secure: do not warn for port where port security cannot be enabled

by Mathias Kettner

Module: check_mk Branch: master Commit: f0286782c6b8c21134ce87450a41855da14b03e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0286782c6b8c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 16:20:10 2014 +0100 #1778 FIX cisco_secure: do not warn for port where port security cannot be enabled --- .werks/1778 | 10 ++++++++++ ChangeLog | 1 + checkman/cisco_secure | 12 ++++-------- checks/cisco_secure | 6 +++--- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.werks/1778 b/.werks/1778 new file mode 100644 index 0000000..7b063b1 --- /dev/null +++ b/.werks/1778 @@ -0,0 +1,10 @@ +Title: cisco_secure: do not warn for port where port security cannot be enabled +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418397595 + + diff --git a/ChangeLog b/ChangeLog index bc69ab6..5443180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 1763 FIX: diskstat: Fixed error in config example of manpage * 1755 FIX: cisco_vpn_tunnel: fix exception in case tunnel is not OK * 1756 FIX: agent_ibmsvc: do not abort execution if one of the sections fail + * 1778 FIX: cisco_secure: do not warn for port where port security cannot be enabled Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checkman/cisco_secure b/checkman/cisco_secure index 90ef825..2ee2351 100644 --- a/checkman/cisco_secure +++ b/checkman/cisco_secure @@ -4,13 +4,9 @@ catalog: hw/network/cisco license: GPL distribution: check_mk description: - This check monitors the port Security feature of cisco_switches. It returns a {CRITICAL} state for - each port which is locked due a security isse. If is port security configured but cant be enabled - the check returns {WARNING}. - -item: - None + This check monitors the port Security feature of Cisco Switches. It returns a CRIT state if at + least one port has security violations. If port security is configured but can't be enabled then + no WARN is issued. inventory: - One summary check will be created - + One summary check will be created if for at least one port the port security is enabled. diff --git a/checks/cisco_secure b/checks/cisco_secure index 04317c6..e40f129 100644 --- a/checks/cisco_secure +++ b/checks/cisco_secure @@ -58,11 +58,11 @@ def check_cisco_secure(item, params, parsed): message = "Port %s: %s (Violation Count: %s, Last Mac: %s)" % \ ( name, secure_states[status], violationCount, lastmac ) - # If port cant be enabled and is up - if status == 2 and op_state == 1: + # If port cant be enabled and is up and has violations -> WARN + if status == 2 and op_state == 1 and int(violationCount) > 0: yield 1, message at_least_one_problem = True - # Security issue + # Security issue -> CEIT elif status == 3: yield 2, message at_least_one_problem = True

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6c1995978b359e4161fa445a4b01d959abe4c873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c1995978b359e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 12 16:19:45 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3bc34dd..93752ca 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1778 +1798

9 years, 9 months

Check_MK Git: check_mk: MSI installer is now checked in in git, just like other installers

by Lars Michelsen

Module: check_mk Branch: master Commit: 193bbe2295d2f439774e6e38d1ae6129da29b0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=193bbe2295d2f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 12 16:09:22 2014 +0100 MSI installer is now checked in in git, just like other installers --- agents/windows/.gitignore | 1 - agents/windows/check_mk_agent.msi | Bin 0 -> 622592 bytes 2 files changed, 1 deletion(-) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 2a4714d..1f6815e 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -1,5 +1,4 @@ check_mk.ini -check_mk_agent.msi logstate.txt spool success.log diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi new file mode 100755 index 0000000..1a2f0f0 Binary files /dev/null and b/agents/windows/check_mk_agent.msi differ

9 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014