Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: a23a7ce885d94dec476e5353662ce1c4aba338ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a23a7ce885d94d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 22 14:35:40 2017 +0200 Improved snapshot generation Change-Id: I7f1f8cdd6cd4623d9b0596b1e4386be82a80f90f --- web/htdocs/multitar.py | 274 +++++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/watolib.py | 26 +++-- 2 files changed, 292 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a23a7ce885…

7 years, 2 months

5231 Distributed WATO: Improved site snapshot generation speed, reduces " Activate changes" duration

by Andreas Boesl

Module: check_mk Branch: master Commit: d982bce50d47b2b913e5b2a72d8cc33c91c78614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d982bce50d47b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 28 16:03:56 2017 +0200 5231 Distributed WATO: Improved site snapshot generation speed, reduces "Activate changes" duration Change-Id: I0947bba47dbacf455ed9e8d88b5eb7123a13bff8 --- .werks/5231 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5231 b/.werks/5231 new file mode 100644 index 0000000..cb63c4e --- /dev/null +++ b/.werks/5231 @@ -0,0 +1,11 @@ +Title: Distributed WATO: Improved site snapshot generation speed, reduces "Activate changes" duration +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506607371 + +

7 years, 2 months

Updated werk 5117

by Simon Betz

Module: check_mk Branch: master Commit: 574505e8f1b64ffe467ab04e6b95aee80e5ba6b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=574505e8f1b64f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 28 13:38:54 2017 +0200 Updated werk 5117 Change-Id: Ie877c0825f97e53e81e8e3d12843bc0391e5e465 --- checks/esx_vsphere_vm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index efd3d13..47c9da5 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -471,6 +471,8 @@ def parse_esx_vsphere_vm_mounted_devices(info): data = esx_vsphere_vm_convert(info).get("config.hardware.device", []) parsed = {} for device_data in " ".join(data).split("@@"): + if "|" not in device_data: + continue device_attrs = {} for entry in device_data.split("|"): k, v = entry.split(" ", 1)

7 years, 2 months

5313 FIX Service discovery: Fixed 'Fix all missing/vanished' action: Disabled services were listed below 'Monitored services' after that button click.

by Simon Betz

Module: check_mk Branch: master Commit: fe0358dfc12f50e452ae8a644d4eab89604a1458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe0358dfc12f50… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 28 13:17:38 2017 +0200 5313 FIX Service discovery: Fixed 'Fix all missing/vanished' action: Disabled services were listed below 'Monitored services' after that button click. Change-Id: I3925ea6d2d694ab3ba834ac8d514f8996f2c009a --- .werks/5313 | 11 +++++++++++ web/htdocs/wato.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5313 b/.werks/5313 new file mode 100644 index 0000000..a3d04e0 --- /dev/null +++ b/.werks/5313 @@ -0,0 +1,11 @@ +Title: Service discovery: Fixed 'Fix all missing/vanished' action: Disabled services were listed below 'Monitored services' after that button click. +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506597290 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e504fb7..c95a0bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3026,7 +3026,9 @@ class ModeDiscovery(WatoMode): if self._fixall: if table_source == self.SERVICE_VANISHED: return self.SERVICE_REMOVED - else: + elif table_source == self.SERVICE_IGNORED: + return self.SERVICE_IGNORED + else: #table_source in [self.SERVICE_MONITORED, self.SERVICE_UNDECIDED] return self.SERVICE_MONITORED else: bulk_target = None

7 years, 2 months

added WK5142

by Andreas Boesl

Module: check_mk Branch: master Commit: d1f7f98e3766ef7722843f7387b8fb15aad60df5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1f7f98e3766ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 28 11:29:53 2017 +0200 added WK5142 Change-Id: Iac9225fd55709fb2ea51975ac3047c7395c251d4 --- .werks/5142 | 10 +++ web/htdocs/bi.py | 227 +++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 155 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d1f7f98e37…

7 years, 2 months

New Makefile target for counting the lines of code

by Mathias Kettner

Module: check_mk Branch: master Commit: e0eb7c7d6cfedd7d65b2bf2a6fd5a261cfeef139 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0eb7c7d6cfedd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 28 10:48:49 2017 +0200 New Makefile target for counting the lines of code Change-Id: Ie029ccf7ec8a5e49e5ee1eefd4e5c46b5eb11583 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index d319c35..6e7c6e0 100644 --- a/Makefile +++ b/Makefile @@ -406,6 +406,9 @@ setup: $(MAKE) -C tests setup $(MAKE) -C omd setup +linesofcode: + @wc -l $$(find -type f -name "*.py" -o -name "*.js" -o -name "*.cc" -o -name "*.h" -o -name "*.css" | grep -v openhardwaremonitor | grep -v jquery | grep -v livestatus/src ) | sort -n + ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4

7 years, 2 months

5301 FIX infoblox_dhcp_stats: Fixed crash of graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: 959a864d47c15703c4d6b3f05cc681d8ce840fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=959a864d47c157… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Sep 28 10:14:05 2017 +0200 5301 FIX infoblox_dhcp_stats: Fixed crash of graphs One definition has been missing and led into a crash of the graphs for these services. Change-Id: I86a7787e5a0bda6abbafae7ce48d430a2fb0d2f2 --- .werks/5301 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5301 b/.werks/5301 new file mode 100644 index 0000000..18e8df4 --- /dev/null +++ b/.werks/5301 @@ -0,0 +1,11 @@ +Title: infoblox_dhcp_stats: Fixed crash of graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506586333 +Class: fix + +One definition has been missing and led into a crash of the graphs for +these services. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c5725ae..c55c527 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3843,6 +3843,12 @@ for what, descr, unit, color in [ "color" : color, } +metric_info["dhcp_discovery"] = { + "title" : _("DHCP Discovery messages"), + "unit" : "count", + "color" : "11/a", +} + metric_info["dhcp_requests"] = { "title" : _("DHCP received requests"), "unit" : "count",

7 years, 2 months

5214 FIX Events in tactical overview can now be disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 759c15bf0547abf5eb0eaa3df91ff8fb1d7ff6b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=759c15bf0547ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 09:57:54 2017 +0200 5214 FIX Events in tactical overview can now be disabled A new permission "See events in tactical overview snapin" has been added that can be used to disable the "Events" row in the tactical overview snapin. Change-Id: Idd469a51bbbc69047a123206fa8868ad05c4f238 --- .werks/5214 | 12 ++++++++++++ web/plugins/sidebar/shipped.py | 28 +++++++++++++++++----------- web/plugins/views/mkeventd.py | 6 ++++++ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.werks/5214 b/.werks/5214 new file mode 100644 index 0000000..e5d4122 --- /dev/null +++ b/.werks/5214 @@ -0,0 +1,12 @@ +Title: Events in tactical overview can now be disabled +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506585388 +Class: fix + +A new permission "See events in tactical overview snapin" has been added +that can be used to disable the "Events" row in the tactical overview +snapin. diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 7b80057..03a8467 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -649,13 +649,17 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True, extra_headers=extra_filter_headers) - try: - sites.live().set_auth_domain("ec") - event_data = sites.live().query_summed_stats(event_query) - except livestatus.MKLivestatusNotFoundError: - event_data = [0, 0, 0] - finally: - sites.live().set_auth_domain("read") + + if config.user.may("mkeventd.see_in_tactical_overview"): + try: + sites.live().set_auth_domain("ec") + event_data = sites.live().query_summed_stats(event_query) + except livestatus.MKLivestatusNotFoundError: + event_data = [0, 0, 0] + finally: + sites.live().set_auth_domain("read") + else: + event_data = [0, 0, 0] except livestatus.MKLivestatusNotFoundError: return None, None, None, None @@ -717,8 +721,11 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): ("view_name", "uncheckedsvc"), ], }, - }, - { + } + ] + + if config.user.may("mkeventd.see_in_tactical_overview"): + rows.append({ "what" : "event", "title" : _("Events"), "data" : event_data, @@ -743,8 +750,7 @@ def render_tactical_overview(extra_filter_headers="", extra_url_variables=None): ], "stale" : None, }, - }, - ] + }) html.open_table(class_=["content_center", "tacticaloverview"], cellspacing=2, cellpadding=0, border=0) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index e16e0a5..b2cb4f0 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -135,6 +135,12 @@ if mkeventd_enabled: "and that do not have been assigned specific contact groups to via the event rule."), [ "user", "admin", "guest" ]) + config.declare_permission("mkeventd.see_in_tactical_overview", + _("See events in tactical overview snapin"), + _("Whether or not the user is permitted to see the number of open events in the " + "tactical overview snapin."), + [ "user", "admin", "guest" ]) + multisite_datasources["mkeventd_events"] = { "title" : _("Event Console: Current Events"), "table" : (query_ec_table, ["eventconsoleevents"]),

7 years, 2 months

Use daemon mode for mkeventd threads (like before)

by Lars Michelsen

Module: check_mk Branch: master Commit: 182fdccbb55034142d07ade42d889d8ac871cb1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=182fdccbb55034… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 09:53:31 2017 +0200 Use daemon mode for mkeventd threads (like before) Change-Id: Ib067b25566ea298e9194a50a53bc9ccb882c081e --- bin/mkeventd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index e42d132..6e54faa 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1279,7 +1279,8 @@ class EventServer(threading.Thread): def __init__(self): - super(EventServer, self).__init__(name="EventServer") + # TODO: Change from daemon mode to explicit and clean termination + super(EventServer, self).__init__(name="EventServer", daemon=True) self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -3116,7 +3117,8 @@ class EventServer(threading.Thread): class StatusServer(threading.Thread): def __init__(self): - super(StatusServer, self).__init__(name="StatusServer") + # TODO: Change from daemon mode to explicit and clean termination + super(StatusServer, self).__init__(name="StatusServer", daemon=True) self._socket = None self._tcp_socket = None self._reopen_sockets = False

7 years, 2 months

Fix last commit

by Lars Michelsen

Module: check_mk Branch: master Commit: fc3a74d0e3b1a0255a0b79bbecd0cf8df2b67c17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc3a74d0e3b1a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 28 09:55:27 2017 +0200 Fix last commit Change-Id: I813ac864dc947084f6f7e03a3e42dce1429064b9 --- bin/mkeventd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 6e54faa..7bfebdf 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1279,8 +1279,9 @@ class EventServer(threading.Thread): def __init__(self): + super(EventServer, self).__init__(name="EventServer") # TODO: Change from daemon mode to explicit and clean termination - super(EventServer, self).__init__(name="EventServer", daemon=True) + self.setDaemon(True) self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -3117,8 +3118,9 @@ class EventServer(threading.Thread): class StatusServer(threading.Thread): def __init__(self): + super(StatusServer, self).__init__(name="StatusServer") # TODO: Change from daemon mode to explicit and clean termination - super(StatusServer, self).__init__(name="StatusServer", daemon=True) + self.setDaemon(True) self._socket = None self._tcp_socket = None self._reopen_sockets = False

7 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017