Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: 4d7524dadd4ae4fe56f465994cc85341856add67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d7524dadd4ae4… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 1 15:22:44 2017 +0100 Added integration unit test files. Change-Id: Icd39700610993be5fa75f112af0125525f0ed2d6 --- tests/web/unittest_files/body_start.unittest | 14 + .../unittest_files/context_button_test.unittest | 3072 +++++++++ .../unittest_files/default_html_headers.unittest | 5 + tests/web/unittest_files/empty_icon.unittest | 5 + tests/web/unittest_files/header.unittest | 36 + tests/web/unittest_files/html_foot.unittest | 5 + tests/web/unittest_files/html_head.unittest | 38 + tests/web/unittest_files/icon.unittest | 11 + tests/web/unittest_files/icon_button.unittest | 15 + tests/web/unittest_files/icon_select.unittest | 120 + tests/web/unittest_files/javascript.unittest | 7 + tests/web/unittest_files/javascript_file.unittest | 7 + tests/web/unittest_files/play_sound.unittest | 7 + tests/web/unittest_files/popup_trigger.unittest | 720 +++ tests/web/unittest_files/radiobuttons.unittest | 176 + tests/web/unittest_files/render_icon.unittest | 11 + .../web/unittest_files/render_icon_button.unittest | 15 + tests/web/unittest_files/select.unittest | 288 + tests/web/unittest_files/stylesheet.unittest | 7 + tests/web/unittest_files/test_1.unittest | 5 + tests/web/unittest_files/test_2.unittest | 5 + tests/web/unittest_files/test_3.unittest | 144 + tests/web/unittest_files/text_area.unittest | 124 + tests/web/unittest_files/text_input.unittest | 6768 ++++++++++++++++++++ tests/web/unittest_files/top_heading.unittest | 7 + tests/web/unittest_files/top_heading_left.unittest | 7 + .../web/unittest_files/top_heading_right.unittest | 5 + 27 files changed, 11624 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d7524dadd…

7 years, 7 months

4344 FIX lnx_quota: Fixed wrong value calculation and removed performance data

by Sven Rueß

Module: check_mk Branch: master Commit: 1046b6324028a3ba1adb0f3bf2a87f2861467cb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1046b6324028a3… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Feb 1 15:04:40 2017 +0100 4344 FIX lnx_quota: Fixed wrong value calculation and removed performance data Fixed wrong value calculation for filesystem usage. Now the factor 1024 is used. Removed the performance data for the filesystem usage and amount of files. Reasons for this decision: <ul> <li>Graphing system is not able to handle such kind of dynamic performance variables like <ul> <li>group_USERNAME_blocks</li> <li>group_USERNAME_files</li> <li>USERNAME_blocks</li> <li>USERNAME_files</li> </ul></li> <li>Generated graphs use the standard logarithmic scale for painting the filesystem usage. This view is not useful for the user and makes the handling complicated.</li> </ul> The check will work as expected and does not need further user modifications or configurations. Change-Id: I9045a79196acef0900372bcb6d05408a0f2b42b2 --- .werks/4344 | 28 ++++++++++++++++++++++++++++ ChangeLog | 2 ++ checks/lnx_quota | 23 ++++++++++++++++------- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/.werks/4344 b/.werks/4344 new file mode 100644 index 0000000..82d46f4 --- /dev/null +++ b/.werks/4344 @@ -0,0 +1,28 @@ +Title: lnx_quota: Fixed wrong value calculation and removed performance data +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.4.0i4 +Date: 1485955329 + +Fixed wrong value calculation for filesystem usage. Now the factor 1024 +is used. + +Removed the performance data for the filesystem usage and amount of files. + +Reasons for this decision: +<ul> + <li>Graphing system is not able to handle such kind of dynamic performance variables like + <ul> + <li>group_USERNAME_blocks</li> + <li>group_USERNAME_files</li> + <li>USERNAME_blocks</li> + <li>USERNAME_files</li> + </ul></li> + <li>Generated graphs use the standard logarithmic scale for painting the filesystem usage. + This view is not useful for the user and makes the handling complicated.</li> +</ul> + +The check will work as expected and does not need further user modifications or configurations. diff --git a/ChangeLog b/ChangeLog index 2b6ffd9..22fb526 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,8 @@ * 4306 FIX: cisco_fru_power: fixed empty FRU current handling * 4333 FIX: tsm_storage_pools: fixed incomplete data handling * 4343 FIX: apt: Fixed wrong state information of pending updates of normal and security updates... + * 4344 FIX: lnx_quota: Fixed wrong value calculation and removed performance data... + NOTE: Please refer to the migration notes! Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/lnx_quota b/checks/lnx_quota index 9994605..a7f8e85 100644 --- a/checks/lnx_quota +++ b/checks/lnx_quota @@ -69,14 +69,14 @@ def parse_lnx_quota(info): elif fs and mode and len(line) == 10: # new table entry for quota - parsed[fs][mode][line[0]] = map(int, line[2:]) + parsed[fs][mode][line[0]] = map(lambda x: int(x)*1024, line[2:5]) + map(int, line[5:]) return parsed def lnx_quota_limit_check(mode, what, user, used, soft, hard, grace): fmt = lambda value, what: what == 'files' and '%d' % value \ - or get_bytes_human_readable(value*1000, 1000) + or get_bytes_human_readable(value) if mode == 'usr': txt = 'User %s' % user @@ -123,7 +123,7 @@ def inventory_lnx_quota(parsed): def check_lnx_quota(item, params, parsed): - perfdata = [] + #perfdata = [] if item not in parsed: yield 3, 'Quota info not found for this filesystem' @@ -149,14 +149,23 @@ def check_lnx_quota(item, params, parsed): state, txt = lnx_quota_limit_check(thing, what, user, used, soft, hard, grace) - perfdata.append(('%s%s_%s' % (perf_prefix, user, what), - used*1000, soft*1000, hard*1000, 0, hard*1000)) + # Performance data was removed, because the graphing system is not + # able to handle such kind of dynamic performance data. Performance + # variables were named like group_USERNAME_blocks, group_USERNAME_files, + # USERNAME_blocks or USERNAME_files and can appear and disappear in the + # configuration. + # Additional the graphs show the performance data like filesystem usage + # in the standard logarithmic scale which is not a useful view for the user. + #perfdata.append(('%s%s_%s' % (perf_prefix, user, what), + # used, soft, hard, 0, hard)) if txt: at_least_one_problematic = True - yield state, (txt + ', '), perfdata + yield state, (txt + ', ') + #yield state, (txt + ', '), perfdata else: - yield state, None, perfdata + yield state, None + #yield state, None, perfdata if not at_least_one_problematic: yield 0, 'All %s within quota limits' % name

7 years, 7 months

Moved configure.ac to top level.

by Sven Panne

Module: check_mk Branch: master Commit: 5c26c769ba0d71946c069ece47c09409e5a33b95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c26c769ba0d71… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 14:59:09 2017 +0100 Moved configure.ac to top level. Change-Id: I93fcb3cf0d1ac2b7ae8ebd842e5a589ae46bff2b --- .gitignore | 45 ++++++++++++++++---------- livestatus/configure.ac => configure.ac | 11 +++++-- livestatus/.gitignore | 15 --------- livestatus/src/Makefile.am | 1 + {livestatus/m4 => m4}/ax_boost_asio.m4 | 0 {livestatus/m4 => m4}/ax_boost_base.m4 | 0 {livestatus/m4 => m4}/ax_cxx_compile_stdcxx.m4 | 0 7 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 8ca719b..5ab6e0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,40 @@ -*kate-swp -.ropeproject -.*.swp -.*.swo *.pyc +*kate-swp *~ +.*.swo +.*.swp +.DS_Store +.bugs/.last +.bugs/.my_ids +.cache +.directory +.metadata +.ropeproject +RemoteSystemsTempFiles +aclocal.m4 api +ar-lib +autom4te.cache/ check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ +compile compile_commands.json +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure cppcheck-result.xml +depcomp +install-sh +missing mk-livestatus-*.tar.gz mkeventd-*.tar.gz -check-mk-*.exe -var/ -.bugs/.my_ids -.bugs/.last -check-mk-agent-*.exe -check-mk-agent-*.exe -check-mk-agent-*.msi -.metadata -RemoteSystemsTempFiles -.directory -.DS_Store -.cache -tags mkeventd/ +stamp-h1 +tags tests/web/data/* +var/ diff --git a/livestatus/configure.ac b/configure.ac similarity index 93% rename from livestatus/configure.ac rename to configure.ac index db0b4ee..93c932d 100644 --- a/livestatus/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ AC_DEFINE_UNQUOTED([BUILD_HOSTNAME], ["`uname -n`"], [name of the build host]) AC_REQUIRE_AUX_FILE([compile]) AC_REQUIRE_AUX_FILE([config.guess]) AC_REQUIRE_AUX_FILE([config.sub]) +AM_CONDITIONAL([ENTERPRISE_OPT], [test -d enterprise]) # Checks for programs. AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) @@ -134,6 +135,12 @@ AC_SUBST(nagios_headers) AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500], [the maximum number of states the regex NFA can have]) -AC_CONFIG_FILES([Makefile - src/Makefile]) +AC_CONFIG_FILES([livestatus/Makefile + livestatus/src/Makefile]) +AM_COND_IF([ENTERPRISE_OPT], + [AC_CONFIG_FILES([enterprise/core/Makefile + enterprise/core/src/Makefile + enterprise/core/src/livestatus/Makefile + enterprise/core/src/checkhelper/Makefile])]) + AC_OUTPUT diff --git a/livestatus/.gitignore b/livestatus/.gitignore index 85fc7c8..0acdced 100644 --- a/livestatus/.gitignore +++ b/livestatus/.gitignore @@ -1,28 +1,13 @@ -aclocal.m4 -ar-lib -autom4te.cache/ -compile -config.h -config.h.in -config.log -config.guess -config.status -config.sub -configure .cproject cscope.files Debug -depcomp GPATH GRTAGS GSYMS GTAGS ID -install-sh Makefile Makefile.in -missing .project -stamp-h1 tags TAGS diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index f4ded8c..8fcabff 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -158,6 +158,7 @@ livestatus_so_SOURCES = \ strutil.cc \ waittriggers.cc +livestatus_so_CPPFLAGS = -I.. livestatus_so_CXXFLAGS = -fPIC livestatus_so_CFLAGS = -fPIC diff --git a/livestatus/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4 similarity index 100% rename from livestatus/m4/ax_boost_asio.m4 rename to m4/ax_boost_asio.m4 diff --git a/livestatus/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 similarity index 100% rename from livestatus/m4/ax_boost_base.m4 rename to m4/ax_boost_base.m4 diff --git a/livestatus/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 similarity index 100% rename from livestatus/m4/ax_cxx_compile_stdcxx.m4 rename to m4/ax_cxx_compile_stdcxx.m4

7 years, 7 months

refactored cmciii: fixed phase subcheck and detects more services

by Simon Betz

Module: check_mk Branch: master Commit: 32f517748e5470c374f939871ef70ed03b139cba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32f517748e5470… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 30 11:02:48 2017 +0100 refactored cmciii: fixed phase subcheck and detects more services Change-Id: Ib4a934644790ef5c7756181318c5273708e8edc4 --- checks/cmciii | 1118 +++++++++++++++++++++------------------------------------ 1 file changed, 414 insertions(+), 704 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=32f517748e…

7 years, 7 months

Simplifications

by Sven Panne

Module: check_mk Branch: master Commit: 1218bd686432d2d14fe2c723c03b15ca60ad5c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1218bd686432d2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 12:11:29 2017 +0100 Simplifications Change-Id: I538329b0a68ecd2554eba9beeacc80500d8b11ef --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b900065..04ccaf2 100644 --- a/Makefile +++ b/Makefile @@ -127,8 +127,7 @@ dist: mk-livestatus precompile-werks $(MAKE) minify-js tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins - tar cf $(DISTNAME)/livestatus.tar $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) - gzip $(DISTNAME)/livestatus.tar + tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls) @@ -167,14 +166,12 @@ dist: mk-livestatus precompile-werks packages: $(MAKE) -C agents packages +# NOTE: Old tar versions (e.g. on CentOS 5) don't have the --transform option, +# so we do things in a slightly complicated way. mk-livestatus: $(addprefix livestatus/,$(LIVESTATUS_AUTO)) rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) - cd livestatus ; tar cf - $(LIVESTATUS_SOURCES) | tar xf - -C ../mk-livestatus-$(VERSION) - mkdir -p mk-livestatus-$(VERSION)/nagios - cp livestatus/nagios/*.h mk-livestatus-$(VERSION)/nagios/ - mkdir -p mk-livestatus-$(VERSION)/nagios4 - cp livestatus/nagios4/*.h mk-livestatus-$(VERSION)/nagios4/ + tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) | tar xf - -C mk-livestatus-$(VERSION) tar czf mk-livestatus-$(VERSION).tar.gz $(TAROPTS) mk-livestatus-$(VERSION) rm -rf mk-livestatus-$(VERSION)

7 years, 7 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 881e4dc7e0943530510085905ccc05e44865c189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=881e4dc7e09435… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Feb 1 12:17:22 2017 +0100 Reserved 1 Werk IDS Change-Id: Iec660314c58a67aeeac9b574c347e508a1daa39f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ef758d2..928819e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4344 +4345

7 years, 7 months

Tests: Simplified things a bit; Changed some cmc related paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 2235882f077bc2aa5b3e46824c92a82d3dfa5472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2235882f077bc2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 12:30:27 2017 +0100 Tests: Simplified things a bit; Changed some cmc related paths Change-Id: I3fc59c05a12058f45bed03d451c874eff13f1b5d --- tests/Makefile | 7 +++---- tests/conftest.py | 10 +--------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 4ea7e68..4b528a2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -31,7 +31,7 @@ test-bandit: # Currently only care about high severity reported issues. Once this is # reached, go and enable the medium/low checks. CMK_DIR="$(realpath ..)" ; \ - CMC_DIR="$(realpath ../../cmc/)" ; \ + ENTERPRISE_DIR="$(realpath ../enterprise)" ; \ bandit \ -c "$$CMK_DIR/bandit.yaml" \ -r \ @@ -40,9 +40,8 @@ test-bandit: "$$CMK_DIR" \ $$(grep -l python "$$CMK_DIR"/bin/*) \ "$$CMK_DIR"/{checks,inventory}/* \ - "$$CMC_DIR" \ - $$(grep -l python "$$CMC_DIR"/bin/*) \ - "$$CMC_DIR"/agents/{plugins,bakery}/* + $$(grep -l python "$$ENTERPRISE_DIR"/bin/*) \ + "$$ENTERPRISE_DIR"/agents/{plugins,bakery}/* test-bandit-ci: diff --git a/tests/conftest.py b/tests/conftest.py index ebb7d16..1666bc6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -12,7 +12,7 @@ def cmk_path(): def cmc_path(): - return os.path.realpath(cmk_path() + "/../cmc") + return os.path.realpath(cmk_path() + "/enterprise") def add_python_paths(): @@ -22,13 +22,6 @@ def add_python_paths(): sys.path.insert(0, cmk_path()) -# Some pre-testing to ensure the developer uses the correct branches in all involved repos -def ensure_equal_branches(): - cmk_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmk_path()).read().strip() - cmc_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmc_path()).read().strip() - - assert cmk_branch == cmc_branch, "Different branches (%s != %s)\n" % (cmk_branch, cmc_branch) - # # Make tests classification possible to only execute in specific environments. # For example only on the CI server. @@ -128,7 +121,6 @@ def _site_id(): # add_python_paths() -ensure_equal_branches() # Session fixtures must be in conftest.py to work properly @pytest.fixture(scope="session", autouse=True)

7 years, 7 months

tests: Load enterprise files from new location

by Lars Michelsen

Module: check_mk Branch: master Commit: 66edefb0257c87934e26ed552c4b7452a6a1e1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66edefb0257c87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 12:26:33 2017 +0100 tests: Load enterprise files from new location Change-Id: I2f3442c0a883f682aaf57b62b866c1a854c3c54a --- tests/testlib/__init__.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index e626014..f3ae0f6 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -34,7 +34,7 @@ def cmk_path(): def cmc_path(): - return os.path.realpath(repo_path() + "/../cmc") + return repo_path() + "/enterprise" # Directory for persisting variable data produced by tests @@ -292,20 +292,23 @@ class Site(object): cmk_path() + "/livestatus", cmk_path() + "/livestatus/api/python", cmk_path() + "/.werks", - - cmc_path() + "/bin", - cmc_path() + "/modules", - cmc_path() + "/cmk_base", - cmc_path() + "/cmk", - cmc_path() + "/web", - cmc_path() + "/alert_handlers", - cmc_path() + "/misc", - cmc_path() + "/core", - cmc_path() + "/agents/bakery", - cmc_path() + "/agents/plugins", - cmc_path() + "/agents", ] + if os.path.exists(cmc_path()): + paths += [ + cmc_path() + "/bin", + cmc_path() + "/modules", + cmc_path() + "/cmk_base", + cmc_path() + "/cmk", + cmc_path() + "/web", + cmc_path() + "/alert_handlers", + cmc_path() + "/misc", + cmc_path() + "/core", + cmc_path() + "/agents/bakery", + cmc_path() + "/agents/plugins", + cmc_path() + "/agents", + ] + for path in paths: if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"..." % path)

7 years, 7 months

ltmain.sh is dead, Jim...

by Sven Panne

Module: check_mk Branch: master Commit: 374ff987a481354aa89a7f6a340716ed979c4b87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=374ff987a48135… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 12:00:20 2017 +0100 ltmain.sh is dead, Jim... Change-Id: I50c7b9014460b35ea23b6045024e402f60503994 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3556928..b900065 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ BEAR := bear LIVESTATUS_AUTO := aclocal.m4 ar-lib compile config.h.in configure depcomp \ install-sh Makefile.in missing src/Makefile.in LIVESTATUS_SOURCES := $(LIVESTATUS_AUTO) config.guess config.sub configure.ac \ - ltmain.sh Makefile.am nagios/README nagios/*.h \ + Makefile.am nagios/README nagios/*.h \ nagios4/README m4/* nagios4/*.h src/*.{h,cc} \ src/Makefile.am api/python/{*.py,README} api/perl/*

7 years, 7 months

Removed unused libtool stuff.

by Sven Panne

Module: check_mk Branch: master Commit: 916446f2c75cdc3882fe77a9ace8533cebed2bc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=916446f2c75cdc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 11:50:11 2017 +0100 Removed unused libtool stuff. Change-Id: I66d04adbb728df4578afc7b4ab522dce38089403 --- livestatus/libtool | 7629 -------------------------------------------------- livestatus/ltmain.sh | 6965 --------------------------------------------- 2 files changed, 14594 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=916446f2c7…

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017