Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6357 FIX Facelift theme: Icon buttons were not using themed buttons

by Lars Michelsen

Module: check_mk Branch: master Commit: 318fcfedda0ed18a430b8fc0c7e8369e79495842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=318fcfedda0ed1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 14:57:12 2018 +0200 6357 FIX Facelift theme: Icon buttons were not using themed buttons The facelift theme was using the classic icons for icon buttons instead of the icons it should use. Change-Id: Ie090f53269243d355c34d04bd5ede17aa80198fe --- .werks/6357 | 12 ++++++++++++ cmk/gui/htmllib.py | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.werks/6357 b/.werks/6357 new file mode 100644 index 0000000..de27a48 --- /dev/null +++ b/.werks/6357 @@ -0,0 +1,12 @@ +Title: Facelift theme: Icon buttons were not using themed buttons +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532169118 + +The facelift theme was using the classic icons for icon buttons instead of +the icons it should use. diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 3d787f9..6365ae0 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2812,6 +2812,25 @@ hy return "images/icons/%s.png" % icon_name + def _detect_themed_image_path(self, img_path): + """Detect whether or not the original file or a themed image should be loaded by the client + + Priority: + 1. In case a theme is active: themes/[img_path] in site local hierarchy + 2. In case a theme is active: themes/[img_path] in standard hierarchy + 3. [img_path] in site local hierarchy + 4. [img_path] in standard hierarchy + """ + + if self._theme and self._theme != "classic": + rel_path = "share/check_mk/web/htdocs/themes/%s/%s" % (self._theme, img_path) + if os.path.exists(cmk.paths.omd_root+"/"+rel_path) or os.path.exists(cmk.paths.omd_root+"/local/"+rel_path): + return "themes/%s/%s" % (self._theme, img_path) + + return img_path + + + def render_icon_button(self, url, help, icon, id=None, onclick=None, style=None, target=None, cssclass=None, ty="button"): @@ -2821,7 +2840,7 @@ hy # TODO: Can we clean this up and move all button_*.png to internal_icons/*.png? if ty == "button": - icon = "images/button_" + icon + ".png" + icon = self._detect_themed_image_path("images/button_" + icon + ".png") icon = HTML(self.render_icon(icon, cssclass="iconbutton"))

6 years, 1 month

test_unreachable_notifications: Add debug output to find out more about failing start situations

by Lars Michelsen

Module: check_mk Branch: master Commit: 2137e30d846f24c7d1434c37a9f4d35e8fc4cb4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2137e30d846f24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 12:42:11 2018 +0200 test_unreachable_notifications: Add debug output to find out more about failing start situations Change-Id: I496147565e7561d43ddb434d4ffbe31d51ccf256 --- tests/testlib/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9f317b0..7a29bce 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -708,6 +708,7 @@ class Site(object): while not self.is_running(): i += 1 if i > 10: + self.execute(["/usr/bin/omd", "status"]).wait() raise Exception("Could not start site %s" % self.id) print("The site %s is not running yet, sleeping... (round %d)" % (self.id, i)) sys.stdout.flush()

6 years, 1 month

Enabled too-many-ancestors and classified the remaining too-FOO-BAR warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 8c7a726b22f2805943c077be7797901fdc35cec8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7a726b22f280… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jul 23 08:56:12 2018 +0200 Enabled too-many-ancestors and classified the remaining too-FOO-BAR warnings. Change-Id: Ie1c67f5d3640cf936afdfb1dc7044476235e5229 --- tests/pylint/pylintrc | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index eb7fea6..0f6834d 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -39,18 +39,6 @@ disable= reimported, relative-import, singleton-comparison, - too-few-public-methods, - too-many-ancestors, - too-many-arguments, - too-many-boolean-expressions, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-nested-blocks, - too-many-public-methods, - too-many-return-statements, - too-many-statements, ungrouped-imports, unidiomatic-typecheck, unsubscriptable-object, @@ -82,6 +70,10 @@ disable= # duplication (introduce new classes, combine methods, etc.) attribute-defined-outside-init, #--------------------------------------------------------------------------- + # We should enable this, at the moment it just means splitting up two + # gigantic functions. + too-many-branches, + #--------------------------------------------------------------------------- # Enabling these warnings would be nice, they are mostly a sign of sloppy # programming practice. In some cases, they can even hide bugs. bare-except, @@ -92,6 +84,20 @@ disable= # probably want to use "include-naming-hint=yes" in the BASIC section. invalid-name, #--------------------------------------------------------------------------- + # Enabling these would be nice, but given the current state of affairs + # (gigantic modules with deeply nested humungous functions/methods), this + # will be a non-trivial amount of work. + too-few-public-methods, + too-many-arguments, + too-many-boolean-expressions, + too-many-instance-attributes, + too-many-lines, + too-many-locals, + too-many-nested-blocks, + too-many-public-methods, + too-many-return-statements, + too-many-statements, + #--------------------------------------------------------------------------- # The warnigns below will probably fixed by YAPF. bad-continuation, bad-indentation,

6 years, 1 month

Fixed a few enabled singleton-comparison warnings and classify the warning itself.

by Sven Panne

6 years, 1 month

6136 check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Now fileinfo section is able to interpret extended globbing patterns

by Simon Betz

Module: check_mk Branch: master Commit: 2470f1811f83fd30818c7869a1bf83b2c06fbd0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2470f1811f83fd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 21 16:08:04 2018 +0200 6136 check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Now fileinfo section is able to interpret extended globbing patterns Change-Id: Ie296410cca4805a70b61af0e7eb1594b941dc3d3 --- .werks/6136 | 10 ++++++++ agents/check_mk_agent.aix | 47 +++++++++++++++++++++++++++++-------- agents/check_mk_agent.linux | 26 +++++++++++++++++---- agents/check_mk_agent.solaris | 54 ++++++++++++++++++++++++++++++------------- checks/fileinfo | 36 ++++++++++++++++++----------- 5 files changed, 131 insertions(+), 42 deletions(-) diff --git a/.werks/6136 b/.werks/6136 new file mode 100644 index 0000000..cf9a3a7 --- /dev/null +++ b/.werks/6136 @@ -0,0 +1,10 @@ +Title: check_mk_agent.aix, check_mk_agent.linux, check_mk_agent.solaris: Now fileinfo section is able to interpret extended globbing patterns +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529590014 +Class: feature + + diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index e820990..2b6b2d1 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -287,27 +287,56 @@ then done fi -# Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then echo '<<<fileinfo:sep(124)>>>' - date +%s - # simulate output of the Linux "stat -c "%n|%s|%Y" command - # TODO: feel free to improve this command. It opens the perl interpreter for every file found... + /usr/bin/perl -e 'print time."\n"' + OLD_IFS=$IFS IFS=' ' + + old_state=$(set +o) + set +f while read -r pattern; do case $pattern in /*) for file in $pattern; do - if [ -f "$file" ]; then - /usr/bin/perl -e 'printf "$_|%s|%s\n", (stat) [7,9] for @ARGV' "$file" - else - echo "$file|missing|`date +%s`" + if [ -d "$file" ]; then + continue + fi + + if [ ! -f "$file" ]; then + # 'date' may be missing on AIX + echo "$file|missing|$(/usr/bin/perl -e 'print time')" + continue + fi + + if [ ! -r "$file" ]; then + # 'date' may be missing on AIX + echo "${file}|not readable|$(/usr/bin/perl -e 'print time')" + continue fi - done ;; + + FILELIST=${FILELIST:+"$FILELIST\n"}"${file}" + done + ;; esac done < "$MK_CONFDIR/fileinfo.cfg" + set +vx; eval "$old_state" IFS=$OLD_IFS + + # Collecting all files and starting perl in one call + # saves a lot of performance. + echo "$FILELIST" | perl -e ' +while (<>) { + my $files = $_; + chomp($files); + foreach my $file (split(/\\n/, $files)) { + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + printf "$file|$size|$mtime|%04o\n", $mode & 07777; + } +} +' fi # powerHA diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4b14d9a..8b7d8c4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -867,21 +867,39 @@ function replace_datevariable() fi } -if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then +if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then echo '<<<fileinfo:sep(124)>>>' date +%s OLD_IFS=$IFS IFS=' ' - (cat $MK_CONFDIR/fileinfo.cfg $MK_CONFDIR/fileinfo.d/* 2>/dev/null) | while read -r pattern; do + old_state=$(set +o) + set +f + (cat "$MK_CONFDIR/fileinfo.cfg" "$MK_CONFDIR/fileinfo.d/*" 2>/dev/null) | while read -r pattern; do case $pattern in /*) pattern=$(replace_datevariable "$pattern") for file in $pattern; do - stat -c "%n|%s|%Y" "$file" 2> /dev/null || echo "$file|missing|$(date +%s)" - done ;; + if [ -d "$file" ]; then + continue + fi + + if [ ! -f "$file" ]; then + echo "$file|missing|$(date +%s)" + continue + fi + + if [ ! -r "$file" ]; then + echo "${file}|not readable|$(date +%s)" + continue + fi + + stat -c "%n|%s|%Y" "$file" + done + ;; esac done + set +vx; eval "$old_state" IFS=$OLD_IFS fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index e5fa784..7afe5b5 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -373,34 +373,56 @@ function replace_datevariable() fi } -if [ -f "$MK_CONFDIR/fileinfo.cfg" ] -then +if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' - # note: patterns in the fileinfo.cfg are resolved inside this loop OLD_IFS=$IFS IFS=' ' + + old_state=$(set +o) + set +f while read -r pattern; do case $pattern in - /*) pattern=`replace_datevariable "$pattern"` - for file in $pattern; do - if [ -f "$file" ]; then - echo "$file" | /usr/bin/perl -e ' - while(my $file = <>) { - $file =~ s/\n$//; - ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, - $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); - print("$file|$size|$mtime\n"); - }' - else - echo "$file|missing|`/usr/bin/perl -e 'print time'`" + /*) for file in $pattern; do + if [ -d "$file" ]; then + continue + fi + + if [ ! -f "$file" ]; then + # 'date' may be missing on Solaris + echo "$file|missing|$(/usr/bin/perl -e 'print time')" + continue + fi + + if [ ! -r "$file" ]; then + # 'date' may be missing on Solaris + echo "${file}|not readable|$(/usr/bin/perl -e 'print time')" + continue fi - done ;; + + FILELIST=${FILELIST:+"$FILELIST\n"}"${file}" + done + ;; esac done < "$MK_CONFDIR/fileinfo.cfg" + set +vx; eval "$old_state" IFS=$OLD_IFS + + # Collecting all files and starting perl in one call + # saves a lot of performance. + echo "$FILELIST" | perl -e ' +while (<>) { + my $files = $_; + chomp($files); + foreach my $file (split(/\\n/, $files)) { + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + printf "$file|$size|$mtime|%04o\n", $mode & 07777; + } +} +' fi # Libelle Business Shadow diff --git a/checks/fileinfo b/checks/fileinfo index 6b28477..f30055f 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -180,6 +180,8 @@ def check_fileinfo(item, params, info): if item == line[0]: if line[1] == "missing": continue + elif line[1] == "not readable": + return 1, "File not readable" state = 0 size = int(line[1]) age = reftime - int(line[2]) @@ -219,17 +221,18 @@ def check_fileinfo_groups(item, params, info): yield 3, "No information sent by agent" return - outof_range_txt = fileinfo_check_timeranges(params) - reftime = None - count_all = 0 - age_oldest = None - age_newest = 0 - size_all = 0 - size_smallest = None - size_largest = 0 - date_inclusion = "" - include_patterns = set([]) - exclude_patterns = set([]) + outof_range_txt = fileinfo_check_timeranges(params) + reftime = None + count_all = 0 + age_oldest = None + age_newest = 0 + size_all = 0 + size_smallest = None + size_largest = 0 + date_inclusion = "" + include_patterns = set() + exclude_patterns = set() + files_not_readable = set() # Start counting values on all files for line in info: @@ -278,8 +281,12 @@ def check_fileinfo_groups(item, params, info): else: excl_match = fnmatch.fnmatch(line[0], exclusion) - if str(line[1]) not in ['missing', ''] and \ - incl_match and not excl_match: + if incl_match and not excl_match: + if str(line[1]) in ['missing', '']: + continue + elif str(line[1]) == "not readable": + files_not_readable.add(str(line[1])) + size = int(line[1]) size_all += size if size_smallest is None: @@ -317,6 +324,9 @@ def check_fileinfo_groups(item, params, info): if date_inclusion: check_definition.append(("Date pattern", "date pattern", date_inclusion, str)) + if files_not_readable: + yield 1, "Files not readable: %s" % ", ".join(files_not_readable) + yield fileinfo_check_function(check_definition, params, outof_range_txt) if include_patterns: yield 0, "\nInclude patterns: %s" % ", ".join(include_patterns)

6 years, 1 month

added new cmk logo on the top right

by Marcel Arentz

Module: check_mk Branch: master Commit: c61d47b1d40dcf8882684c8e63710962eb42297d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c61d47b1d40dcf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jul 23 14:27:15 2018 +0200 added new cmk logo on the top right Change-Id: I64b5694b6af12a7c2933804735cc582f4edeec4a --- web/htdocs/themes/facelift/images/logo_cmk_small.png | Bin 0 -> 807 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/themes/facelift/images/logo_cmk_small.png b/web/htdocs/themes/facelift/images/logo_cmk_small.png new file mode 100644 index 0000000..157dced Binary files /dev/null and b/web/htdocs/themes/facelift/images/logo_cmk_small.png differ

6 years, 1 month

6360 FIX Fixed HTML fragments in global settings titles

by Lars Michelsen

Module: check_mk Branch: master Commit: 3633ffc5c4f2b12da1108b2f66e835540ba8c869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3633ffc5c4f2b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:06:36 2018 +0200 6360 FIX Fixed HTML fragments in global settings titles This regression was introduced with 1.5.0b9. Change-Id: Ie4b24c12773cf806ac79dfb7c2eaf4d829c55205 --- .werks/6360 | 11 +++++++++++ cmk/gui/forms.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6360 b/.werks/6360 new file mode 100644 index 0000000..9e71bc5 --- /dev/null +++ b/.werks/6360 @@ -0,0 +1,11 @@ +Title: Fixed HTML fragments in global settings titles +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532195726 + +This regression was introduced with 1.5.0b9. diff --git a/cmk/gui/forms.py b/cmk/gui/forms.py index 7d49b08..6cd5424 100644 --- a/cmk/gui/forms.py +++ b/cmk/gui/forms.py @@ -277,7 +277,7 @@ def section(title = None, checkbox = None, id = None, simple=False, hide = False if legend: html.open_td(class_=["legend", "simple" if simple else None]) if title: - html.open_div(class_=["title", "withcheckbox" if checkbox else None], title=title) + html.open_div(class_=["title", "withcheckbox" if checkbox else None], title=html.strip_tags(title)) html.write(title) html.span('.'*100, class_="dots") html.close_div()

6 years, 1 month

Increased expected package sizes for facelift theme icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d80781e2872a08dd4b7d8db8c8b0fef1c5f8085 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d80781e2872a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 12:29:51 2018 +0200 Increased expected package sizes for facelift theme icons Change-Id: I0cabfd28e802f39c011b529d1fdd95dad47394ad --- tests/packaging/test_files.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 14b6e3b..261e9e1 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -22,10 +22,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 215*1024*1024), - ("deb", 94*1024*1024, 195*1024*1024), - ("cma", 169*1024*1024, 220*1024*1024), - ("tar.gz", 320*1024*1024, 400*1024*1024), + ("rpm", 119*1024*1024, 220*1024*1024), + ("deb", 94*1024*1024, 200*1024*1024), + ("cma", 169*1024*1024, 225*1024*1024), + ("tar.gz", 320*1024*1024, 405*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

6 years, 1 month

6315 FIX mssql_backup: Fixed missing default levels

by Simon Betz

Module: check_mk Branch: master Commit: aeae56c376a5dcd0b722ed44fec1e7db8a97765f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeae56c376a5dc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 23 10:58:28 2018 +0200 6315 FIX mssql_backup: Fixed missing default levels Change-Id: I1b3a13251dd8c03e2f737df514cadb7e2099701b --- .werks/6315 | 14 ++++++++++++++ checks/mssql_backup | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/6315 b/.werks/6315 new file mode 100644 index 0000000..9945d69 --- /dev/null +++ b/.werks/6315 @@ -0,0 +1,14 @@ +Title: mssql_backup: Fixed missing default levels +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532171572 + +Werk 6143 removed the empty default levels. The consequence was that +all passive checks were gone because the default levels variable name +was unknown to Check_MK und therefore the autochecks could not be read. +This was introduced in Check_MK version in 1.5.0b8. diff --git a/checks/mssql_backup b/checks/mssql_backup index b431173..961dd66 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -47,6 +47,18 @@ # MSSQL_SQL0x msdb 2016-07-11 20:20:07 I +factory_settings["mssql_backup_default_levels"] = { + "database": (None, None), + "database_diff": (None, None), + "log": (None, None), + "file_or_filegroup": (None, None), + "file_diff": (None, None), + "partial": (None, None), + "partial_diff": (None, None), + "unspecific": (None, None), +} + + def parse_mssql_backup(info): def _parse_date_and_time(backup_date, backup_time): try: @@ -150,10 +162,10 @@ def check_mssql_backup(item, params, parsed): check_info['mssql_backup'] = { 'parse_function' : parse_mssql_backup, - 'inventory_function' : inventory_mssql_backup, 'check_function' : check_mssql_backup, - 'default_levels_variable' : 'mssql_backup_default_levels', + 'inventory_function' : inventory_mssql_backup, 'service_description' : 'MSSQL %s Backup', 'has_perfdata' : True, 'group' : 'mssql_backup', + 'default_levels_variable' : 'mssql_backup_default_levels', }

6 years, 1 month

solaris_mem: only discover if info is available

by Moritz Kiemer

Module: check_mk Branch: master Commit: 33c5b05a8408f3cd60700f99f3de8fc2579041c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c5b05a8408f3… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jul 17 14:46:50 2018 +0200 solaris_mem: only discover if info is available Change-Id: I03c36df90612f4985256a185e9d9d4c619ce277b --- checks/solaris_mem | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/solaris_mem b/checks/solaris_mem index 5fc402e..21986da 100644 --- a/checks/solaris_mem +++ b/checks/solaris_mem @@ -68,7 +68,8 @@ def solaris_mem_to_kbytes(s): def inventory_solaris_mem_used(parsed): - return [(None, {})] + if parsed: + return [(None, {})] def check_solaris_mem_used(_no_item, params, parsed):

6 years, 1 month

← Newer
1
...
13
14
15
16
17
18
19
...
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