Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8e991fe62cba3f00cafc85257041f88f978d5a33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e991fe62cba3f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Apr 13 11:24:50 2018 +0200 Cleanup wato.py imports Change-Id: I97b95039fac57203ab09d2ad2546e599d8f8bd5a --- web/htdocs/wato.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a40d298..5cd28ef 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -79,15 +79,34 @@ # | Importing, Permissions, global variables | # `----------------------------------------------------------------------' -import sys, pprint, socket, re, time, datetime, \ - shutil, math, fcntl, random, glob, \ - base64, csv import ast +import base64 +import csv +import datetime +import fcntl +import glob +import json +import math +import multiprocessing +import pprint +import Queue +import random +import re +import shutil +import socket import subprocess +import sys +import time import traceback -import i18n -import config, table, multitar, userdb, weblib, login from hashlib import sha256 + +import i18n +import config +import table +import multitar +import userdb +import weblib +import login from lib import * from log import logger from valuespec import * @@ -96,9 +115,6 @@ import backup import modules as multisite_modules import watolib -import multiprocessing -import Queue - import cmk.paths import cmk.translations import cmk.store as store @@ -114,8 +130,6 @@ if cmk.is_managed_edition(): else: managed = None -import json - g_html_head_open = False display_options = None

6 years, 2 months

Make the classes ModeEditCustomAttr and ModeCustomAttr abstract

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7ceb461f2f9a506300c38337204934bf97a01b8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ceb461f2f9a50… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Apr 13 11:43:00 2018 +0200 Make the classes ModeEditCustomAttr and ModeCustomAttr abstract Change-Id: I0ea2075e07909e1c86d44204544a40ecbab55093 --- web/htdocs/wato.py | 70 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5cd28ef..2ac9a31 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -79,6 +79,7 @@ # | Importing, Permissions, global variables | # `----------------------------------------------------------------------' +import abc import ast import base64 import csv @@ -15600,20 +15601,16 @@ def custom_attr_types(): class ModeEditCustomAttr(WatoMode): + __metaclass__ = abc.ABCMeta + def __init__(self): + # Note: the base class calls _from_vars super(ModeEditCustomAttr, self).__init__() @property - def _type(self): - raise NotImplementedError() - - @property def _attrs(self): return self._all_attrs[self._type] - def _update_config(self): - raise NotImplementedError() - def _from_vars(self): self._name = html.var("edit") # missing -> new custom attr self._new = self._name == None @@ -15632,12 +15629,40 @@ class ModeEditCustomAttr(WatoMode): else: self._attr = {} + @abc.abstractproperty + def _type(self): + raise NotImplementedError() + + @abc.abstractproperty + def _topics(self): + raise NotImplementedError() + + @abc.abstractproperty + def _default_topic(self): + raise NotImplementedError() + + @abc.abstractproperty + def _macro_help(self): + raise NotImplementedError() + + @abc.abstractproperty + def _macro_label(self): + raise NotImplementedError() + + @abc.abstractmethod + def _update_config(self): + raise NotImplementedError() + + @abc.abstractmethod def title(self): raise NotImplementedError() def _add_extra_attrs_from_html_vars(self): pass + def _add_extra_form_sections(self): + pass + def action(self): # TODO: remove subclass specific things specifict things (everything with _type == 'user') if not html.check_transaction(): @@ -15695,25 +15720,6 @@ class ModeEditCustomAttr(WatoMode): return self._type + "_attrs" - @property - def _topics(self): - raise NotImplementedError() - - @property - def _default_topic(self): - raise NotImplementedError() - - @property - def _macro_help(self): - raise NotImplementedError() - - @property - def _macro_label(self): - raise NotImplementedError() - - def _add_extra_form_sections(self): - pass - def page(self): # TODO: remove subclass specific things specifict things (everything with _type == 'user') html.begin_form("attr") @@ -15864,6 +15870,8 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): class ModeCustomAttrs(WatoMode): + __metaclass__ = abc.ABCMeta + def __init__(self): super(ModeCustomAttrs, self).__init__() # TODO: Inappropriate Intimacy: custom host attributes should not now about @@ -15872,16 +15880,18 @@ class ModeCustomAttrs(WatoMode): self._all_attrs = load_custom_attrs_from_mk_file(lock=html.is_transaction()) @property - def _type(self): - raise NotImplementedError() - - @property def _attrs(self): return self._all_attrs[self._type] + @abc.abstractproperty + def _type(self): + raise NotImplementedError() + + @abc.abstractmethod def title(self): raise NotImplementedError() + @abc.abstractmethod def _update_config(self): raise NotImplementedError()

6 years, 2 months

Fix topics in ModeEditCustomAttr

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a6ffcd7e2c7d45e5c6bf812a4fb63f03c8d8959f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6ffcd7e2c7d45… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Apr 13 10:41:38 2018 +0200 Fix topics in ModeEditCustomAttr Change-Id: If051a65944d3a8369b0d488b429b67de150f3716 --- web/htdocs/wato.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c044da..a40d298 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15686,6 +15686,10 @@ class ModeEditCustomAttr(WatoMode): raise NotImplementedError() @property + def _default_topic(self): + raise NotImplementedError() + + @property def _macro_help(self): raise NotImplementedError() @@ -15716,8 +15720,7 @@ class ModeEditCustomAttr(WatoMode): forms.section(_('Topic')) html.help(_('The attribute is added to this section in the edit dialog.')) - # TODO: is deflt set correctly? - html.dropdown('topic', self._topics, deflt=self._attr.get('topic', 'personal')) + html.dropdown('topic', self._topics, deflt=self._attr.get('topic', self._default_topic)) forms.section(_('Help Text') + "<sup>*</sup>") html.help(_('You might want to add some helpful description for the attribute.')) @@ -15768,6 +15771,10 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): ] @property + def _default_topic(self): + return 'personal' + + @property def _macro_help(self): return _('The attribute can be added to the contact definiton in order to use it for notifications.') @@ -15808,11 +15815,16 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): @property def _topics(self): - topics = list(set([ (a[1], a[1]) for a in watolib.all_host_attributes() if a[1] != None ])) - topics.insert(0, (_("Custom attributes"), _("Custom attributes"))) + default = self._default_topic + topics = list(set((a[1], a[1]) for a in watolib.all_host_attributes() if a[1] not in (None, default))) + topics.insert(0, (default, default)) return topics @property + def _default_topic(self): + return _("Custom attributes") + + @property def _macro_help(self): return _("The attribute can be added to the host definition in order to " "use it as monitoring macro in different places, for example "

6 years, 2 months

Windows agent build chroot: Some more output + try to fix hanging build

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fc0521e10a4cc4b9cbd94943df8f972d0e5a8d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fc0521e10a4cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 17:05:43 2018 +0200 Windows agent build chroot: Some more output + try to fix hanging build Change-Id: Ifcb40f0ec17938b3c8383a977bfb6037a60de859 --- agents/windows/make-chroot | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index c084dba..471f5a9 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -5,8 +5,7 @@ set -e DISTRO=bionic -#MIRROR=http://de.archive.ubuntu.com/ubuntu -MIRROR=http://ubuntu.mirror.lrz.de/ubuntu +MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot export LC_ALL=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 @@ -51,8 +50,6 @@ cleanup_chroot # chroot leer machen rm -rf $CHROOT_PATH/* -echo "+ INSTALLING SYSTEM" - package_names=( autoconf automake @@ -121,17 +118,20 @@ package_names=( ) packages=$(IFS=,; echo "${package_names[*]}") +echo "+ INSTALLING SYSTEM (PHASE 1)" + # TODO: Would use --force-check-gpg, but not supported on wheezy (root server) debootstrap \ --components=main,universe \ --include="$packages" \ --arch amd64 $DISTRO $CHROOT_PATH $MIRROR -# Cope with the known bug with libsane1 that wine depends on. -# https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1725928/ -# Need to use --force-overwrite with apt-get. This option cannot be passed -# through debootstrap. -$SCRIPT_DIR/do-chroot 'apt-get -y -o Dpkg::Options::="--force-overwrite" install wine-stable' +echo "+ INSTALLING SYSTEM (PHASE 2)" + +# "Disable" apt privilege dropping in chroot +cat $CHROOT_PATH/etc/passwd +sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd +cat $CHROOT_PATH/etc/passwd # Need to be installed for installation. cat <<EOF > $CHROOT_PATH/etc/fstab @@ -139,14 +139,13 @@ cat <<EOF > $CHROOT_PATH/etc/fstab /dev/sda1 / ext2 rw,noatime,nodiratime,errors=continue 0 1 EOF -# Nun ein kleiner Hack um zu verhindern, dass beim Installieren der Pakete -# die Daemonen der Pakete gestartet werden. Ist nicht dramatisch, erzeugt -# aber doofe Fehlermeldungen. +# Prevent startup of daemons during package installation echo exit 101 > $CHROOT_PATH/usr/sbin/policy-rc.d chmod +x $CHROOT_PATH/usr/sbin/policy-rc.d cp /etc/resolv.conf $CHROOT_PATH/etc/resolv.conf +# Deploy fake hostname binary if [ ! -e $CHROOT_PATH/bin/hostname.bin ] ; then mv $CHROOT_PATH/bin/hostname{,.bin} fi @@ -155,8 +154,15 @@ echo $HOSTNAME EOF chmod +x $CHROOT_PATH/bin/hostname -# Uses debian_chroot, but use it for all distros! -#debian_chroot=\$(hostname) +# Cope with the known bug with libsane1 that wine depends on. +# https://bugs.launchpad.net/ubuntu/+source/sane-backends/+bug/1725928/ +# Need to use --force-overwrite with apt-get. This option cannot be passed +# through debootstrap. +$SCRIPT_DIR/do-chroot 'apt-get -y -o Dpkg::Options::="--force-overwrite" install wine-stable' + +# We need to enable 32bit Wine +$SCRIPT_DIR/do-chroot 'dpkg --add-architecture i386 && apt-get update && apt-get -o Dpkg::Options::="--force-overwrite" -y install wine32' + cat <<EOF > $CHROOT_PATH/root/.bashrc debian_chroot=$(hostname) PS1='\${debian_chroot:+(\$debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\\$ ' @@ -168,12 +174,6 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi -# "Disable" apt privilege dropping in chroot -sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd - -# We need to enable 32bit Wine -$SCRIPT_DIR/do-chroot 'dpkg --add-architecture i386 && apt-get update && apt-get -o Dpkg::Options::="--force-overwrite" -y install wine32' - # Build Google Test and Google Mock $SCRIPT_DIR/do-chroot "$CHROOT_BUILD_DIR/agents/windows/test/build-googletest"

6 years, 2 months

Fixed missing packaging of cmk.cee.liveproxy module

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ec656effda3de08d347e89e42922858368e49e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ec656effda3de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 16:47:29 2018 +0200 Fixed missing packaging of cmk.cee.liveproxy module Change-Id: I1346086400467165f03c1c4052e9b14ab84fef2b --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 64fff7e..84cb29b 100644 --- a/Makefile +++ b/Makefile @@ -240,6 +240,10 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI gzip $(DISTNAME)/bin.tar python -m compileall cmk ; \ tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \ + --exclude "cee" \ + --exclude "cee.py*" \ + --exclude "cme" \ + --exclude "cme.py*" \ cmk/* ; \ rm cmk/*.pyc python -m compileall cmk_base ; \

6 years, 2 months

Fixed semantic errors

by Simon Betz

Module: check_mk Branch: master Commit: b5f50120a6ab046d496ab630299dd4f265fe995c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5f50120a6ab04… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 13 11:48:23 2018 +0200 Fixed semantic errors Change-Id: I3a64e5bbb7f70181f48f0c050a6137300d484e4d --- agents/check_mk_agent.linux | 248 ++++++++++++++++++++++---------------------- 1 file changed, 126 insertions(+), 122 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b5f50120a6…

6 years, 2 months

5990 Event Console search takes "Text to match" into account

by Simon Betz

Module: check_mk Branch: master Commit: b8d22fcbfc1708378df582a2cff45e005a7ced60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8d22fcbfc1708… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 13 13:27:41 2018 +0200 5990 Event Console search takes "Text to match" into account Change-Id: I6f5a321b44a0b77ed99425bab00663f13738bfbe --- .werks/5990 | 10 ++++++++++ web/plugins/wato/mkeventd.py | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5990 b/.werks/5990 new file mode 100644 index 0000000..b9e702e --- /dev/null +++ b/.werks/5990 @@ -0,0 +1,10 @@ +Title: Event Console search takes "Text to match" into account +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523618719 +Class: feature + + diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index a9c7b65..929d43a 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1356,7 +1356,7 @@ def filter_mkeventd_rule_packs(search_expression, rule_packs): found_packs.setdefault(rule_pack["id"], []) for rule in rule_pack.get("rules", []): if search_expression in rule["id"].lower() \ - or search_expression in rule.get("description").lower(): + or search_expression in rule.get("description", "").lower(): found_rules = found_packs.setdefault(rule_pack["id"], []) found_rules.append(rule) return found_packs @@ -1618,7 +1618,8 @@ def filter_mkeventd_rules(search_expression, rule_pack): found_rules = [] for rule in rule_pack.get("rules", []): if search_expression in rule["id"].lower() \ - or search_expression in rule.get("description").lower(): + or search_expression in rule.get("description", "").lower() \ + or search_expression in rule.get("match", "").lower(): found_rules.append(rule) return found_rules

6 years, 2 months

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 3987b6d251155bcfd8e5a4e675d93f72f0430360 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3987b6d251155b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 13 13:01:29 2018 +0200 Fixed typo Change-Id: Ifd426533a2e501a150c3f5001557321e0e8bab72 --- agents/plugins/mk_oracle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 9e56e7d..75b8219 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -807,7 +807,7 @@ set_oraenv () { ORACLE_HOME=$(grep "^${ORACLE_SID}:" <"${ORATAB}" | cut -d":" -f2) if [ -z "${ORACLE_HOME}" ]; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=${ORACLE_SID/%[0-9]/} + ORACLE_SID_SHORT=${ORACLE_SID%/[0-9]/} ORACLE_HOME=$(grep "^${ORACLE_SID_SHORT}:" <"${ORATAB}" | cut -d":" -f2) fi fi

6 years, 2 months

5835 FIX Improve performance of various event console queries.

by Sven Panne

Module: check_mk Branch: master Commit: e4e4f3f3f46ddb31ea259e08ada21dd3f56038f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4e4f3f3f46ddb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 13 11:57:11 2018 +0200 5835 FIX Improve performance of various event console queries. Various event console queries took a very long time, e.g. retrieving the event history of a given host. This could even lead to timeout in the GUI. This was a regression in 1.4.0 compared to 1.2.8 and has been fixed. Change-Id: I357ac3df0a082f3dbfed1e9413596cd4b4a82497 --- .werks/5835 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5835 b/.werks/5835 new file mode 100644 index 0000000..6c04ccd --- /dev/null +++ b/.werks/5835 @@ -0,0 +1,13 @@ +Title: Improve performance of various event console queries. +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523613247 +Class: fix + +Various event console queries took a very long time, e.g. retrieving the +event history of a given host. This could even lead to timeout in the GUI. + +This was a regression in 1.4.0 compared to 1.2.8 and has been fixed.

6 years, 2 months

5962 BI aggregation groups: Group paths can be specified in order to manage aggregations as a virtual tree

by Simon Betz

Module: check_mk Branch: master Commit: 3ec1a2fb3de94bd6538936f1f3301b1d79960098 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ec1a2fb3de94b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Apr 9 16:37:16 2018 +0200 5962 BI aggregation groups: Group paths can be specified in order to manage aggregations as a virtual tree Previously aggregation groups were a flat list of strings. Now you're able to add paths in order to manage these groups as a virtual tree. There's also a new sidebar snapin {BI Aggregation Groups Tree} which displays this tree and a related filter. Change-Id: I8f486d4c12c87fc5e39207dc4ba5c4fca05b587b --- .werks/5962 | 15 ++++++ web/htdocs/bi.py | 121 +++++++++++++++++++++++++++------------------- web/htdocs/valuespec.py | 12 ++++- web/plugins/sidebar/bi.py | 72 ++++++++++++++++++++++++++- web/plugins/visuals/bi.py | 109 ++++++++++++++++++++++++++++++++++++++--- web/plugins/wato/bi.py | 88 ++++++++++++++++++++++----------- 6 files changed, 332 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3ec1a2fb3d…

6 years, 2 months

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018