Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6340 FIX Fixed debian agent package incompatibilities

by Lars Michelsen

Module: check_mk Branch: master Commit: a0e3be0b982280a356f81b1e0b66f107ce76f9ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e3be0b982280… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 10 12:20:26 2018 +0200 6340 FIX Fixed debian agent package incompatibilities The debian agent package shipped with Check_MK (located in share/check_mk/agent/*.deb) was not compatible with older Debian/Ubuntu version because it used xz as compression algorithm for the control files. When trying to install such a package an error like this occurred: dpkg-deb: error: archive 'check-mk-agent_1.4.0p34-1_all.deb' contains not understood data member control.tar.xz, giving up We have now changed the compression of the whole package to gzip which should make the package compatible to such systems again. Change-Id: If20e0de24267356c877d043dd93b02a00a03dd97 --- .werks/6340 | 20 ++++++++++++++++++++ agents/Makefile | 12 +++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/6340 b/.werks/6340 new file mode 100644 index 0000000..05f76b0 --- /dev/null +++ b/.werks/6340 @@ -0,0 +1,20 @@ +Title: Fixed debian agent package incompatibilities +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531217694 + +The debian agent package shipped with Check_MK (located in share/check_mk/agent/*.deb) was +not compatible with older Debian/Ubuntu version because it used xz as compression algorithm +for the control files. + +When trying to install such a package an error like this occurred: + +dpkg-deb: error: archive 'check-mk-agent_1.4.0p34-1_all.deb' contains not understood data member control.tar.xz, giving up + +We have now changed the compression of the whole package to gzip which should make the package +compatible to such systems again. diff --git a/agents/Makefile b/agents/Makefile index 608ac7c..2e5a4ab 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -102,6 +102,9 @@ rpm $(RPM_PACKAGE): rm -rf $(RPM_TOPDIR) $(RPM_BUILDROOT) +# TODO: Replace alien usage. Debian packages should be created just like the bakery does +# Keep in mind that we still need to use gz compression by default for the agent +# packages. deb $(DEB_PACKAGE): $(RPM_PACKAGE) @echo "Sorry. Debian packages currently via alien" rm -f *.deb @@ -113,12 +116,15 @@ deb $(DEB_PACKAGE): $(RPM_PACKAGE) cd deb-unpack && \ ar x ../$$DEB_PKG && \ mkdir ctrl && \ - tar xJf control.tar.xz -C ctrl && \ + tar xf control.tar.* -C ctrl && \ sed -i -e '/^Depends:/d' \ -e 's/^Version:.*/Version: $(VERSION)-1/' \ -e 's/^Maintainer:.*/Maintainer: feedback(a)check-mk.org/' ctrl/control && \ - tar cJf control.tar.xz $(TAROPTS) -C ctrl . && \ - ar r ../$(DEB_PACKAGE) debian-binary control.tar.* data.tar.* + tar czf control.tar.gz $(TAROPTS) -C ctrl . && \ + xz --decompress data.tar.xz && \ + gzip data.tar && \ + ar d ../$(DEB_PACKAGE) data.tar.xz && \ + ar r ../$(DEB_PACKAGE) debian-binary control.tar.gz data.tar.gz rm -rf deb-unpack clean:

6 years, 2 months

CMK-558: Add Werk 5503

by Andreas Umbreit

Module: check_mk Branch: master Commit: 53f3cceeac83d046ad503ee7ce5c2adc1a5defdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53f3cceeac83d0… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Jul 10 08:10:37 2018 +0200 CMK-558: Add Werk 5503 5503 cmk-update-agent: Convenient logging on Linux The Agent Updater now makes use of its logging capabilities more conveniently. Only ERRORs and WARNINGs will be logged to syslog. Additionally, a detailed log will be created at /var/lib/check_mk_agent/cmk-update-agent.log when running as plugin. It will be rotated every 5MB with a maximum of 3 backups. This improves our capabilities for an a-posteriori error analysis. When running cmk-update-agent manually, a logfile can be specified using the -l flag. Change-Id: I0ab5390f3ab5f9d50dbc75ec45c752f5d6235973 --- .werks/5503 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/5503 b/.werks/5503 new file mode 100644 index 0000000..c22df14 --- /dev/null +++ b/.werks/5503 @@ -0,0 +1,19 @@ +Title: cmk-update-agent: Convenient logging on Linux +Level: 1 +Component: agents +Class: feature +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531202616 + +The Agent Updater now makes use of its logging capabilities more conveniently. +Only ERRORs and WARNINGs will be logged to syslog. + +Additionally, a detailed log will be created at /var/lib/check_mk_agent/cmk-update-agent.log +when running as plugin. It will be rotated every 5MB with a maximum of 3 backups. +This improves our capabilities for an a-posteriori error analysis. + +When running cmk-update-agent manually, +a logfile can be specified using the -l flag.

6 years, 2 months

6339 FIX Fixed sorting of subfolders in breadcrump navigation

by Lars Michelsen

Module: check_mk Branch: master Commit: 4495f90b799cdcb8dad074566874687bd267da4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4495f90b799cdc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 10 10:38:32 2018 +0200 6339 FIX Fixed sorting of subfolders in breadcrump navigation Change-Id: I9ce851f7172a90f19d183fcd5a7db31224781f0a --- .werks/6339 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6339 b/.werks/6339 new file mode 100644 index 0000000..d877220 --- /dev/null +++ b/.werks/6339 @@ -0,0 +1,11 @@ +Title: Fixed sorting of subfolders in breadcrump navigation +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531211891 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 94922f3..879179f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1811,7 +1811,7 @@ class CREFolder(BaseFolder): def subfolder_choices(self): choices = [] - for subfolder in self.visible_subfolders().values(): + for subfolder in self.visible_subfolders_sorted_by_title(): choices.append((subfolder.path(), subfolder.title())) return choices

6 years, 2 months

CMK-566: adapt scripts for Agent Updater 32bit Build

by Andreas Umbreit

Module: check_mk Branch: master Commit: 61c86d23e72e4ac7dd761cd3a2c3137b043f61b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c86d23e72e4a… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Mon Jul 9 14:09:34 2018 +0200 CMK-566: adapt scripts for Agent Updater 32bit Build - introduce "-32"-suffix for 32bit-build-specific folders and files - propagate 32-bit-build-switch via env vars - add script "make-agent-updater-32" that sets env vars - default build is still 64bit with no suffix Change-Id: I188137899c4e2b1e19db49310803b6d351820f56 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 04a14c4..94577a1 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ endif fi ; \ done ; \ else \ - for F in $(DIST_ARCHIVE) enterprise/agents/plugins/{build,src} enterprise/agents/windows/{build64,build}; do \ + for F in $(DIST_ARCHIVE) enterprise/agents/plugins/{build,build-32,src} enterprise/agents/windows/{build64,build}; do \ EXCLUDES+=" --exclude $$F" ; \ done ; \ fi ; \

6 years, 2 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 23ae93b25133a1d8295e9f32dcb7b25bdda1afde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23ae93b25133a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 10 08:50:09 2018 +0200 Reserved 20 Werk IDS Change-Id: I1eb16c5ed36dbbe56371d04e97156fb5eaa9fed1 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 97efd5d..ea9ab35 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6339 +6359

6 years, 2 months

6225 FIX Fix key errors in mkeventd.log due to missing default values

by Konstantin Büttner

Module: check_mk Branch: master Commit: 435b3a7e2c08c98f34d0e35c7c972abcd5ba79c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=435b3a7e2c08c9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 9 16:56:17 2018 +0200 6225 FIX Fix key errors in mkeventd.log due to missing default values Change-Id: I694965c4fd10c9a1469aa5e45e35d85245a19ae5 --- .werks/6225 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6225 b/.werks/6225 new file mode 100644 index 0000000..a1b917d --- /dev/null +++ b/.werks/6225 @@ -0,0 +1,11 @@ +Title: Fix key errors in mkeventd.log due to missing default values +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1531148125 + +

6 years, 2 months

Event Console: Add core_host default values to events created from both syslog and SNMP traps

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0b01cd40fc69f4c851cf40c789d67492ae06b2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b01cd40fc69f4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 9 16:50:10 2018 +0200 Event Console: Add core_host default values to events created from both syslog and SNMP traps Change-Id: I4ab766f901ba9921211250364fe03036780dc79a --- cmk/ec/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 583f63c..ab6ab67 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -890,7 +890,8 @@ class EventServer(ECServerThread): 'priority': 5, # notice 'facility': 31, # not used by syslog -> we use this for all traps 'application': application, - 'text': text + 'text': text, + 'core_host' : '', } return event @@ -2024,6 +2025,7 @@ class EventServer(ECServerThread): event = { # address is either None or a tuple of (ipaddress, port) "ipaddress": address and address[0] or "", + "core_host": "", } try: # Variant 1: plain syslog message without priority/facility: @@ -2179,6 +2181,7 @@ class EventServer(ECServerThread): "application": "", "pid": 0, "time": time.time(), + "core_host": "", } if self._config["debug_rules"]:

6 years, 2 months

Event Console: Add host_in_downtime default value to events created from both syslog and SNMP traps

by Konstantin Büttner

Module: check_mk Branch: master Commit: 733354c85d3cb04d3d2255ab57c5f7ac97786c22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=733354c85d3cb0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 9 16:54:57 2018 +0200 Event Console: Add host_in_downtime default value to events created from both syslog and SNMP traps Change-Id: I17860ca9977cb50092ef254054375e830b7ebe70 --- cmk/ec/main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index ab6ab67..01a34ca 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -892,6 +892,7 @@ class EventServer(ECServerThread): 'application': application, 'text': text, 'core_host' : '', + 'host_in_downtime' : False, } return event @@ -2026,6 +2027,7 @@ class EventServer(ECServerThread): # address is either None or a tuple of (ipaddress, port) "ipaddress": address and address[0] or "", "core_host": "", + "host_in_downtime": False, } try: # Variant 1: plain syslog message without priority/facility: @@ -2182,6 +2184,7 @@ class EventServer(ECServerThread): "pid": 0, "time": time.time(), "core_host": "", + "host_in_downtime": False, } if self._config["debug_rules"]:

6 years, 2 months

Fixed a few useless-super-delegation warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 227cdf3d0da4ec2872fc62b9a50e6eb8bf758f99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227cdf3d0da4ec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 9 14:09:25 2018 +0200 Fixed a few useless-super-delegation warnings. Change-Id: I75514983d310385dc70b332578f95214c3b5dd8f --- active_checks/check_mailboxes | 3 +-- cmk_base/core_config.py | 4 ---- cmk_base/core_nagios.py | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/active_checks/check_mailboxes b/active_checks/check_mailboxes index 0fe7af7..d32689d 100755 --- a/active_checks/check_mailboxes +++ b/active_checks/check_mailboxes @@ -88,8 +88,7 @@ class MailList(object): class LoginError(Exception): - def __init__(self, *args, **kwargs): - super(LoginError, self).__init__(*args, **kwargs) + pass class ImapWrapper(object): diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index c179dbe..c06c768 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -44,10 +44,6 @@ class MonitoringCore(object): __metaclass__ = abc.ABCMeta @abc.abstractmethod - def __init__(self): - super(MonitoringCore, self).__init__() - - @abc.abstractmethod def create_config(self): pass diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 933383a..6850f89 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -46,9 +46,6 @@ import cmk_base.check_api_utils as check_api_utils class NagiosCore(core_config.MonitoringCore): - def __init__(self): - super(NagiosCore, self).__init__() - def create_config(self): with file(cmk.paths.nagios_objects_file, "w") as out: create_config(out, None)

6 years, 2 months

Fixed and enabled global-at-module-level warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 4f4854fdfba15b05b01718a8229f369bc07366c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f4854fdfba15b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 9 11:42:47 2018 +0200 Fixed and enabled global-at-module-level warnings. Change-Id: I412a1a180a400fb787ccf658d8bca40ac42ed7a6 --- tests/pylint/pylintrc | 1 - web/htdocs/dashboard.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index b0bd527..2eeb23d 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -32,7 +32,6 @@ disable= eval-used, exec-used, fixme, - global-at-module-level, global-statement, global-variable-undefined, inconsistent-return-statements, diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 02e6ff2..84c6e45 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -839,8 +839,6 @@ def page_create_dashboard(): # | Configures the global settings of a dashboard. | # '----------------------------------------------------------------------' -global vs_dashboard - def page_edit_dashboard(): load_dashboards(lock=html.is_transaction())

6 years, 2 months

← Newer
1
...
34
35
36
37
38
39
40
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018