Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

8701 FIX Fixed broken PDF export of BI aggregation group view

by Lars Michelsen

Module: check_mk Branch: master Commit: 8547d17e28144a905587d1a778d0fa32e3806af1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8547d17e28144a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 11:33:11 2017 +0100 8701 FIX Fixed broken PDF export of BI aggregation group view Change-Id: Ic143b78186a7150ffac242f9618b80cfad6828da --- web/plugins/visuals/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/bi.py b/web/plugins/visuals/bi.py index 9028710..b104bcc 100644 --- a/web/plugins/visuals/bi.py +++ b/web/plugins/visuals/bi.py @@ -29,7 +29,7 @@ import bi class BIGroupFilter(FilterUnicodeFilter): def __init__(self): self.column = "aggr_group" - FilterUnicodeFilter.__init__(self, self.column, _("Aggregation group"), "aggr", [self.column], [self.column]) + FilterUnicodeFilter.__init__(self, self.column, _("Aggregation group"), "aggr_group", [self.column], [self.column]) def variable_settings(self, row): return [ (self.htmlvars[0], row[self.column]) ]

7 years, 7 months

Add new helper function html::render_help()

by Mathias Kettner

Module: check_mk Branch: master Commit: f956a18d40c09c85b9fdb4a0fb76175c1330354c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f956a18d40c09c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 7 11:26:04 2017 +0100 Add new helper function html::render_help() Change-Id: I5a3416c104100f6611b238e24d6269cb5bb46d4f --- web/htdocs/htmllib.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e4de63e..d3678a1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1043,14 +1043,21 @@ class HTMLCheck_MK(HTMLGenerator): # TODO: Add to integration tests!!! - def help(self, text): + def render_help(self, text): if text and text.strip(): self.have_help = True - self.open_div(class_="help", style="display: %s;" % ( - "block" if self.help_visible else "none")) + c = self.render_div( + text.strip(), + class_="help", + style="display: %s;" % ("block" if self.help_visible else "none")) # TODO: Replace with write_text??? - self.write(text.strip()) - self.close_div() + return c + else: + return "" + + + def help(self, text): + self.write(self.render_help(text)) # # HTML form rendering

7 years, 7 months

Add new icons and also help in service discovery page

by Mathias Kettner

Module: check_mk Branch: master Commit: e7120a2558a87294c093a306afbda574df6c5af6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7120a2558a872… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 7 11:26:40 2017 +0100 Add new icons and also help in service discovery page Change-Id: I5a62be02ca5829a6a284a512b5717fee10bf1197 --- web/htdocs/images/icon_disabled_service.png | Bin 0 -> 3010 bytes web/htdocs/images/icon_monitored_service.png | Bin 0 -> 3984 bytes web/htdocs/images/icon_service_to_disabled.png | Bin 3084 -> 3992 bytes web/htdocs/images/icon_service_to_monitored.png | Bin 0 -> 4523 bytes web/htdocs/images/icon_service_to_removed.png | Bin 0 -> 3234 bytes web/htdocs/images/icon_service_to_undecided.png | Bin 0 -> 4075 bytes web/htdocs/images/icon_undecided_service.png | Bin 0 -> 3778 bytes web/htdocs/pages.css | 1 + web/htdocs/wato.py | 101 ++++++++++++++++++------ 9 files changed, 78 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e7120a2558…

7 years, 7 months

4339 FIX fixed AtrributeError in oracle sessions ruleset

by Simon Betz

Module: check_mk Branch: master Commit: 990d8269168b6ada374e2f548b49a92ea0b93b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=990d8269168b6a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 7 10:56:43 2017 +0100 4339 FIX fixed AtrributeError in oracle sessions ruleset Change-Id: Ibb8eb076de0944cdbe869b7f38fe736a3d214bea --- .werks/4339 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4339 b/.werks/4339 new file mode 100644 index 0000000..a4954f7 --- /dev/null +++ b/.werks/4339 @@ -0,0 +1,10 @@ +Title: fixed AtrributeError in oracle sessions ruleset +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486460994 + + diff --git a/ChangeLog b/ChangeLog index e0a26d7..d420aee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... * 4338 FIX: aix_hacmp_resources: fixed state handling * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi + * 4339 FIX: fixed AtrributeError in oracle sessions ruleset Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b7633ca..6e2427b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -9417,7 +9417,7 @@ register_check_parameters( TextAscii( title = _("Database name"), allow_empty = False), - match_type = "dict", + match_type = "first", ) register_check_parameters(

7 years, 7 months

Refactoring htmllib: buttons, hiddenfields and RequestHandler class.

by Roland Halbig

Module: check_mk Branch: master Commit: 907ab77fd8fbc74180d3dfe9dcd3b17b05809d6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=907ab77fd8fbc7… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 1 15:18:36 2017 +0100 Refactoring htmllib: buttons, hiddenfields and RequestHandler class. Change-Id: Ic6ee153e6a6d9bb0f027d6a68366ee020493678d --- tests/test_request_handler.py | 56 +++ tests/web/classes.py | 85 +++- ...rate_integration.py => generate_integration.py} | 39 +- web/htdocs/htmllib.py | 520 +++++++++++---------- 4 files changed, 429 insertions(+), 271 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=907ab77fd8…

7 years, 7 months

4048 FIX Fixed bug in tables: the notification message for reached row limits is visible again

by Roland Halbig

Module: check_mk Branch: master Commit: b34c6fa141d396adf4c359c3df56672125d0a84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34c6fa141d396… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 7 10:03:23 2017 +0100 4048 FIX Fixed bug in tables: the notification message for reached row limits is visible again Change-Id: I1c42b12b97c99b462fa7869185ae11024f6d6f9f --- .werks/4048 | 9 +++++++++ ChangeLog | 1 + web/htdocs/table.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4048 b/.werks/4048 new file mode 100644 index 0000000..41ddc21 --- /dev/null +++ b/.werks/4048 @@ -0,0 +1,9 @@ +Title: Fixed bug in tables: the notification message for reached row limits is visible again +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486458071 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a22e79a..e0a26d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles * 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show context button" options * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin + * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 41838d0..4f5184d 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -174,6 +174,7 @@ def end(): rows, actions_enabled, actions_visible, search_term, user_opts = _evaluate_user_opts(table) # Apply limit after search / sorting etc. + num_rows_unlimited = len(rows) limit = table['limit'] if limit is not None: rows = rows[:limit] @@ -181,7 +182,6 @@ def end(): # Render header _write_table(table, rows, actions_enabled, actions_visible, search_term) - num_rows_unlimited = len(rows) if limit is not None and num_rows_unlimited > limit: html.message(_('This table is limited to show only %d of %d rows. ' 'Click <a href="%s">here</a> to disable the limitation.') %

7 years, 7 months

Handle skeleton files for enterprise edition.

by Sven Panne

Module: check_mk Branch: master Commit: ef713c0b43476c0471f568e43ec207331356f6d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef713c0b43476c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 7 10:03:09 2017 +0100 Handle skeleton files for enterprise edition. Change-Id: I18b234da0a99083f53921aec6e59556187231f30 --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7b0aa11..ace4a12 100644 --- a/Makefile +++ b/Makefile @@ -213,10 +213,13 @@ mk-livestatus-$(VERSION).tar.gz: ifeq ($(ENTERPRISE),yes) dist: cmc-$(VERSION).tar.gz +# We currently fake a package for cmc. Ugly... cmc-$(VERSION).tar.gz: config.h make -C livestatus distclean make -C enterprise/core distclean - tar czf cmc-$(VERSION).tar.gz $(TAROPTS) \ + rm -rf cmc-$(VERSION) + mkdir cmc-$(VERSION) + tar cf - $(TAROPTS) \ aclocal.m4 \ ar-lib \ compile \ @@ -233,7 +236,10 @@ cmc-$(VERSION).tar.gz: config.h configure.ac \ enterprise \ livestatus \ - m4 + m4 | tar xf - -C cmc-$(VERSION) + cd cmc-$(VERSION) && mv enterprise/skel enterprise/skel.permissions . + cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * + rm -rf cmc-$(VERSION) build: config.h $(MAKE) -C enterprise/core -j8

7 years, 7 months

Tests: Changed paths to new enterprise paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b911013b97c12c4115b472248a9cd4f45a565a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b911013b97c12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 09:02:14 2017 +0100 Tests: Changed paths to new enterprise paths Change-Id: I9342effa962dd0296500540fcb889a9ec064f795 --- tests/testlib/pylint_cmk.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 9169692..fd9a6bc 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -26,13 +26,13 @@ def ordered_module_files(): "modules/nagios.py", "modules/automation.py", "modules/inventory.py", - "../cmc/modules/real_time_checks.py", - "../cmc/modules/alert_handling.py", - "../cmc/modules/keepalive.py", - "../cmc/modules/cmc.py", - "../cmc/modules/inline_snmp.py", - "../cmc/modules/agent_bakery.py", - "../cmc/modules/rrd.py", + "enterprise/modules/real_time_checks.py", + "enterprise/modules/alert_handling.py", + "enterprise/modules/keepalive.py", + "enterprise/modules/cmc.py", + "enterprise/modules/inline_snmp.py", + "enterprise/modules/agent_bakery.py", + "enterprise/modules/rrd.py", ] modules = [ os.path.realpath(repo_path() + "/" + p) @@ -49,7 +49,7 @@ def ordered_module_files(): def module_files(): modules = [] for base_path in [ repo_path() + "/modules", - os.path.realpath(repo_path() + "/../cmc/modules") ]: + repo_path() + "/enterprise/modules" ]: modules += [ base_path + "/" + f for f in os.listdir(base_path) if not f.startswith(".") ]

7 years, 7 months

Some cleanups for new service discovery page

by Lars Michelsen

Module: check_mk Branch: master Commit: e271df8ac3c38b3b01b5b67d061b4fdf33d11cec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e271df8ac3c38b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 10:05:35 2017 +0100 Some cleanups for new service discovery page Change-Id: Iecc8d2b0b43bf43e9233484fe38dc7905e008109 --- web/htdocs/htmllib.py | 11 ++- web/htdocs/images/icon_service_to_disabled.png | Bin 0 -> 3084 bytes web/htdocs/images/icon_service_to_enabled.png | Bin 0 -> 2475 bytes web/htdocs/images/icon_service_to_new.png | Bin 0 -> 3779 bytes web/htdocs/wato.py | 131 +++++++++++++++---------- web/htdocs/watolib.py | 17 +--- 6 files changed, 93 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e271df8ac3…

7 years, 7 months

Do not require autotools for building, we support ancient platforms...

by Sven Panne

Module: check_mk Branch: master Commit: b94c886b19f2aa4a0bc6eab41efd9ec9a6b76949 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b94c886b19f2aa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 7 09:44:18 2017 +0100 Do not require autotools for building, we support ancient platforms... Change-Id: I833ac73efc7586c0e71a6cf69124d2020089407f --- Makefile | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 6dbede3..7b0aa11 100644 --- a/Makefile +++ b/Makefile @@ -52,15 +52,7 @@ BEAR := bear M4_DEPS := $(wildcard m4/*) configure.ac CONFIGURE_DEPS := $(M4_DEPS) aclocal.m4 -# File to pack into livestatus-$(VERSION).tar.gz -LIVESTATUS_AUTO := aclocal.m4 ar-lib compile config.guess config.h.in \ - config.sub configure depcomp install-sh missing \ - Makefile.in src/Makefile.in -LIVESTATUS_SOURCES := $(LIVESTATUS_AUTO) configure.ac \ - Makefile.am nagios/README nagios/*.h \ - nagios4/README m4/* nagios4/*.h src/*.{h,cc} \ - src/Makefile.am api/python/{*.py,README} api/perl/* -LIVESTATUS_SRCS := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ +LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ src/{Makefile.am,*.{cc,h}} standalone/config_files.m4 @@ -212,7 +204,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI mk-livestatus-$(VERSION).tar.gz: rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) - tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SRCS) ) | tar xf - -C mk-livestatus-$(VERSION) + tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) | tar xf - -C mk-livestatus-$(VERSION) cp -a configure.ac m4 mk-livestatus-$(VERSION) cd mk-livestatus-$(VERSION) && autoreconf --install --include=m4 && rm -rf autom4te.cache tar czf mk-livestatus-$(VERSION).tar.gz $(TAROPTS) mk-livestatus-$(VERSION) @@ -221,13 +213,27 @@ mk-livestatus-$(VERSION).tar.gz: ifeq ($(ENTERPRISE),yes) dist: cmc-$(VERSION).tar.gz -cmc-$(VERSION).tar.gz: - test -d enterprise && tar czf cmc-$(VERSION).tar.gz $(TAROPTS) \ - Makefile \ - configure.ac \ - enterprise \ - livestatus \ - m4 +cmc-$(VERSION).tar.gz: config.h + make -C livestatus distclean + make -C enterprise/core distclean + tar czf cmc-$(VERSION).tar.gz $(TAROPTS) \ + aclocal.m4 \ + ar-lib \ + compile \ + config.guess \ + config.h.in \ + config.sub \ + configure \ + depcomp \ + install-sh \ + missing \ + stamp-h1 \ + .bugs \ + Makefile \ + configure.ac \ + enterprise \ + livestatus \ + m4 build: config.h $(MAKE) -C enterprise/core -j8 @@ -341,9 +347,7 @@ clean: rm -rf api clang-analyzer compile_commands.json dist.tmp rpm.topdir *.rpm *.deb *.exe \ mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ - precompiled cache web/htdocs/js/*_min.js \ - $(addprefix livestatus/,$(LIVESTATUS_AUTO)) - rm .werks/werks || true + precompiled cache web/htdocs/js/*_min.js .werks/werks find -name "*~" | xargs rm -f mrproper: @@ -367,12 +371,13 @@ setup: librrd-dev \ pngcrush \ slimit +ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac + autoreconf --install --include=m4 -config.status: configure +config.status: ar-lib compile config.guess config.sub install-sh missing depcomp configure if test -f config.status; then \ ./config.status --recheck; \ else \ - autoreconf --install --include=m4; \ ./configure CXXFLAGS="$(CXX_FLAGS)" \ $(shell test -d ../rrdtool/rrdtool-1.5.4/src/.libs && echo LDFLAGS="-L$(realpath ../rrdtool/rrdtool-1.5.4/src/.libs)") \ $(shell test ! -d /usr/include/boost -a -d /usr/include/boost141/boost && echo "CPPFLAGS=-I/usr/include/boost141"); \

7 years, 7 months

← Newer
1
...
30
31
32
33
34
35
36
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017