Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

added bugreport for useless timespecific parameters option in man pages

by Marcel Arentz

Module: check_mk Branch: master Commit: c354c18452f676f3cffc70b88a3c39b8e304c733 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c354c18452f676… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Oct 13 10:36:14 2017 +0200 added bugreport for useless timespecific parameters option in man pages Change-Id: I68e6115e749ccf82a34ae99bf96b4cbbb3b5a9a7 --- .bugs/2972 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2972 b/.bugs/2972 new file mode 100644 index 0000000..323de09 --- /dev/null +++ b/.bugs/2972 @@ -0,0 +1,8 @@ +Title: Timespecific parameters in manpage of a check plugin +Component: checks +State: open +Date: 2017-10-13 10:34:17 +Targetversion: 1.5.0 +Class: nastiness + +The option "Enable timespecific timeperiods" does appear on man pages which contains examples for parameters.

7 years

Fixed angle brackets in manpage

by Marcel Arentz

Module: check_mk Branch: master Commit: 46a0b5198e165eb54d758852dedfb3c27008da1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46a0b5198e165e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Oct 13 10:32:02 2017 +0200 Fixed angle brackets in manpage Change-Id: I6582e6c33a3e4ca185090d38e7714ea622d085d1 --- checkman/local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/local b/checkman/local index 5c9814f..8cbe76d 100644 --- a/checkman/local +++ b/checkman/local @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This check type processes the output of the checks the - agent sends in the {<<<local>>>} section. Local checks are + agent sends in the {<<&ltlocal&gt>>} section. Local checks are implemented by scripts or programs running on the target hosts. Please refer to the online documentation details about how to write those check scripts.

7 years

5225 apache_status: Change autodetection logic of agent plugin to include a process multiple times if it listens on multiple ports

by Konstantin Büttner

Module: check_mk Branch: master Commit: 97926f2f41b648f67213f17746b9534757702395 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97926f2f41b648… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 13 10:03:53 2017 +0200 5225 apache_status: Change autodetection logic of agent plugin to include a process multiple times if it listens on multiple ports Change-Id: Iac3d0557ed60ef6c5326051653b6f1d80ef5f5ec --- .werks/5225 | 10 ++++++++++ agents/plugins/apache_status | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.werks/5225 b/.werks/5225 new file mode 100644 index 0000000..ab7f931 --- /dev/null +++ b/.werks/5225 @@ -0,0 +1,10 @@ +Title: apache_status: Change autodetection logic of agent plugin to include a process multiple times if it listens on multiple ports +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507881782 +Class: feature + + diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index d92f15d..c97e8bc 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -65,7 +65,6 @@ if os.path.exists(config_file): def try_detect_servers(): - pids = [] results = [] for line in os.popen('netstat -tlnp 2>/dev/null').readlines(): @@ -88,11 +87,6 @@ def try_detect_servers(): if proc not in procs: continue - # Add only the first found port of a single server process - if pid in pids: - continue - pids.append(pid) - address, port = parts[3].rsplit(':', 1) port = int(port)

7 years

5394 FIX agent_ucs_bladecenter: Fixed broken agent since 1.4.0p14 (#5233)

by Lars Michelsen

Module: check_mk Branch: master Commit: ce0f3a0e92a253b5dcae722fd23fdc350f0d9801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce0f3a0e92a253… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 13 09:48:39 2017 +0200 5394 FIX agent_ucs_bladecenter: Fixed broken agent since 1.4.0p14 (#5233) Change-Id: I4178ad282e78d4f57570ebfa63a0921aa0ef2351 --- .werks/5394 | 11 +++++++++++ agents/special/agent_ucs_bladecenter | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5394 b/.werks/5394 new file mode 100644 index 0000000..84a71ed --- /dev/null +++ b/.werks/5394 @@ -0,0 +1,11 @@ +Title: agent_ucs_bladecenter: Fixed broken agent since 1.4.0p14 (#5233) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1507880858 + + diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 8bc678f..085a7a7 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -106,9 +106,9 @@ class Server: if params is None: params = {} - cookies = {} if self.cookie: - cookies.update({"cookie": self.cookie}) + # Beware: This is no HTTP cookie. Just a shared secret between the server and the client. + params.update({"cookie": self.cookie}) payload = payload % params if opt_debug: @@ -119,7 +119,7 @@ class Server: "Content-Type": 'text/xml; charset="utf-8"' } - response = self.session_handle.post("https://%s/nuova" % self.netloc, headers = headers, cookies = cookies) + response = self.session_handle.post("https://%s/nuova" % self.netloc, headers=headers, data=payload) data = response.text if opt_debug: sys.stderr.write("<==== %s\n" % data)

7 years

5224 check_http: Support verbose output

by Konstantin Büttner

Module: check_mk Branch: master Commit: 09e3cfb2f83920c6ad7a0949c058f9f564a9b31b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09e3cfb2f83920… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 12 16:24:10 2017 +0200 5224 check_http: Support verbose output This allows to use the -v option of the classic check_http active check. This will extend the long output of the plugin by header and body information. Change-Id: I6f2322cec77023e3950fbf848754fac4ade2b516 --- .werks/5224 | 11 +++++++++++ checks/check_http | 3 +++ web/plugins/wato/active_checks.py | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/.werks/5224 b/.werks/5224 new file mode 100644 index 0000000..1416eb4 --- /dev/null +++ b/.werks/5224 @@ -0,0 +1,11 @@ +Title: check_http: Support verbose output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507818178 +Class: feature + +This allows to use the -v option of the classic check_http active check. +This will extend the long output of the plugin by header and body information. diff --git a/checks/check_http b/checks/check_http index 44f1a62..aaa6e27 100644 --- a/checks/check_http +++ b/checks/check_http @@ -28,6 +28,9 @@ def check_http_arguments(params): description, settings = params args = [] + if "verbose" in settings: + args += [ "-v" ] + if "vhost" in settings: args += [ "-H", settings["vhost"] ] diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 520bfce..ce015c6 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1142,6 +1142,11 @@ register_rule(group, "like the connect time, header time, time till first byte received and the " "transfer time."), )), + ( "verbose", FixedValue( + value=True, + title=_("Verbose output"), + totext=_("Give verbose output"), + )), ] ),

7 years

5343 Bulk import for custom attributes of hosts

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 09dd1f47ef115b1d9c15d9629500be2f02393ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09dd1f47ef115b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 12 14:55:52 2017 +0200 5343 Bulk import for custom attributes of hosts Adds the possibility to import custom attributes of hosts with bulk imports. Change-Id: I83b3a2ba6577feb7909308d70cf15751fcc6ae06 --- .werks/5343 | 10 ++++++++++ web/htdocs/wato.py | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/.werks/5343 b/.werks/5343 new file mode 100644 index 0000000..ccd1a98 --- /dev/null +++ b/.werks/5343 @@ -0,0 +1,10 @@ +Title: Bulk import for custom attributes of hosts +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507812901 +Class: feature + +Adds the possibility to import custom attributes of hosts with bulk imports. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fda2f9c..5bc3204 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3830,6 +3830,11 @@ class ModeBulkImport(WatoMode): for entry in configured_host_tags(): attributes.append(("tag_" + entry[0], _("Tag: %s") % entry[1])) + # Add custom attributes + for entry in load_custom_attrs()['host']: + name = entry['name'] + attributes.append((name, _("Custom variable: %s") % name)) + return attributes

7 years

5340 netapp_api_luns: make read-only configurable

by Tom Baerwinkel

Module: check_mk Branch: master Commit: af979ec79429482a8c04bc8abc607d7282c250ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af979ec7942948… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 12 10:38:20 2017 +0200 5340 netapp_api_luns: make read-only configurable The expected output of Netapp LUNs can now be configured via the existing WATO rule. Change-Id: Ife7290375bcdcdf649124463e7014df8b59df308 --- .werks/5340 | 11 +++++++++++ checks/netapp_api_luns | 7 +++++-- web/plugins/wato/check_parameters.py | 8 ++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/5340 b/.werks/5340 new file mode 100644 index 0000000..041b47c --- /dev/null +++ b/.werks/5340 @@ -0,0 +1,11 @@ +Title: netapp_api_luns: make read-only configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507797378 +Class: feature + +The expected output of the read-only options of Netapp +LUNs can now be configured via the existing WATO rule. diff --git a/checks/netapp_api_luns b/checks/netapp_api_luns index 29ff29b..8c37527 100644 --- a/checks/netapp_api_luns +++ b/checks/netapp_api_luns @@ -31,6 +31,7 @@ factory_settings["netapp_api_luns_default_levels"] = { "levels" : (80.0, 90.0), # warn/crit in percent "trend_range" : 24, "trend_perfdata" : True, # do send performance data for trends + "read_only" : False, } def inventory_netapp_api_luns(parsed): @@ -47,8 +48,10 @@ def check_netapp_api_luns(item, params, parsed): if lun.get("online") != "true": yield 2, "LUN is offline" - if lun.get("read-only") != "false": - yield 1, "read-only is %s" % lun.get("read-only") + read_only = lun.get("read-only") == "true" + if read_only != params.get("read_only"): + expected = str(params.get("read_only")).lower() + yield 1, "read-only is %s (expected: %s)" % (lun.get("read-only"), expected) mega = 1024.0 * 1024.0 size_total = int(lun.get("size")) / mega diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 63e50e9..9957480 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -12022,6 +12022,14 @@ register_check_parameters( title = _("Trend performance data"), label = _("Enable generation of performance data from trends")) ), + ( "read_only", + Checkbox( + title = _("LUN is read-only"), + help = _("Display a warning if a LUN is not read-only. Without " + "this setting a warning will be displayed if a LUN is " + "read-only."), + label = _("Enable")) + ), ] ), TextAscii(title = _("LUN name")),

7 years

Fixed call of already removed method

by Lars Michelsen

Module: check_mk Branch: master Commit: 1731efaf080d44d4a8c6ec98c2ef84c060c772b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1731efaf080d44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 12 15:15:03 2017 +0200 Fixed call of already removed method Change-Id: I7766368d49e0c041f76b2cd7a7eee33803649108 --- web/htdocs/html_mod_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 923f131..16d16f4 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -206,7 +206,7 @@ class html_mod_python(htmllib.html): except IOError, e: # Catch writing problems to client, prevent additional writes self.io_error = True - self.log('%s' % e) + logger.debug('%s' % e) def get_button_counts(self): return config.user.load_file("buttoncounts", {})

7 years

"Add to" visual/pagetype gets more info about graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 69ad9c41aedae232398cf96be438eddd2f5a1fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69ad9c41aedae2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 12 15:29:07 2017 +0200 "Add to" visual/pagetype gets more info about graphs * CSV export of graphs respects the current graph data range now * When adding a graph to a visual (dashboard, report) or pagetype (graph collection, custom graph) the grah tells the "add to" function now more than the graph specification. The function could now also use the data range somehow. However, the new information are currently not used by the "add to" functions. Change-Id: I3953685117e565927bd157bba3c6e64a3762654c --- web/htdocs/dashboard.py | 21 ++++++++++++--------- web/htdocs/js/checkmk.js | 3 ++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 24cfed1..145935e 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -1296,33 +1296,36 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): return if dashlet_type == "pnpgraph": - # Context will always be None here, but the graph_identification (in params) + # Context will always be None here, but the specification (in params) # will contain it. Transform the data to the format needed by the dashlets. # Example: # params = [ 'template', {'service_description': 'CPU load', 'site': 'mysite', # 'graph_index': 0, 'host_name': 'server123'}]) - graph_identification = params[1] - if params[0] == "template": + specification = params["definition"]["specification"] + if specification[0] == "template": context = { - "host" : graph_identification["host_name"] + "host" : specification[1]["host_name"] } - if graph_identification.get("service_description") != "_HOST_": - context["service"] = graph_identification["service_description"] + if specification[1].get("service_description") != "_HOST_": + context["service"] = specification[1]["service_description"] params = { - "source" : graph_identification["graph_index"] + 1 + "source" : specification[1]["graph_index"] + 1 } - elif params[0] == "custom": + elif specification[0] == "custom": # Override the dashlet type here. It would be better to get the # correct dashlet type from the menu. But this does not seem to # be a trivial change. dashlet_type = "custom_graph" context = {} params = { - "custom_graph": params[1], + "custom_graph": specification[1], } + else: + raise MKGeneralException(_("Invalid graph type '%s'") % specification[0]) + load_dashboards(lock=True) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 33b35d6..1790116 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -3265,7 +3265,8 @@ function pagetype_add_to_container(page_type, page_name) function graph_export() { var request = { - "specification": popup_data[2] + "specification": popup_data[2]["definition"]["specification"], + "data_range": popup_data[2]["data_range"], }; location.href = "graph_export.py?request=" + encodeURIComponent(JSON.stringify(request)); }

7 years

Win-agent build: fix versions, improve cleanup etc

by Jukka Aro

Module: check_mk Branch: master Commit: f2e856648da4047483d173de4ab3422ef14a4383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2e856648da404… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 12 13:35:42 2017 +0200 Win-agent build: fix versions, improve cleanup etc * Increment build_version only when sources have changed. * Fix setversion target (NEW_VERSION variable was not passed to chroot). * Use CLEANFILES for cleaning up stuff. * Correct dependencies in Makefile.am. Change-Id: Ib3ce7b4b7b67e4313499536b763f9e26e65b0f08 --- agents/windows/Makefile.am | 36 ++++++++++++++++++------------------ agents/windows/do-chroot | 4 +++- agents/windows/make-agent | 5 ++++- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 7c17ac4..adcbfdd 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -12,21 +12,17 @@ check_mk_agent_LDADD = check_mk_agent.res $(LD_COMMON) wmitest_LDADD = $(LD_COMMON) -# A left-over generated rc file in parent dir may disturb the build process. -clean_check_mk_agent_rc: - rm -f ../check_mk_agent.rc +build_version: $(check_mk_agent_SOURCES:.cc=.o) + echo $$(( $$(cat $(VPATH)/build_version) + 1 )) > $(VPATH)/build_version -check_mk_agent.rc: - BUILD_VERSION=$$(( $$(cat ../build_version) + 1 )) ; \ - echo $$BUILD_VERSION > ../build_version ; \ - ln -s ../check_mk_agent.ico check_mk_agent.ico ; \ +check_mk_agent.rc: $(VPATH)/check_mk_agent.rc.in build_version sed -e "s/%VERSION%/$(VERSION)/g" \ -e "s/%YEAR%/$$(date +%Y)/g" \ - -e "s/%BUILD_VERSION%/$$BUILD_VERSION/g" \ - ../check_mk_agent.rc.in > check_mk_agent.rc + -e "s/%BUILD_VERSION%/$$(cat $(VPATH)/build_version)/g" $< > $@ -check_mk_agent.res: check_mk_agent.rc | clean_check_mk_agent_rc - $(WINDRES) $^ -O coff -o $@ +check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico + cp $(VPATH)/check_mk_agent.ico check_mk_agent.ico + $(WINDRES) $< -O coff -o $@ check_mk_agent_SOURCES = \ Configurable.cc \ @@ -51,7 +47,6 @@ check_mk_agent_SOURCES = \ Thread.cc \ WinApi.cc \ check_mk_agent.cc \ - check_mk_agent.rc \ stringutil.cc \ types.cc \ win_error.cc \ @@ -78,11 +73,16 @@ check_mk_agent_SOURCES = \ wmitest_SOURCES = wmitest.cc stringutil.cc WinApi.cc wmiHelper.cc -clean-local: - -rm -f check_mk_agent.* - -rm -f $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ - $(patsubst %$(EXEEXT),%-64$(EXEEXT),$(addprefix $(bindir)/,$(bin_PROGRAMS))) \ - $(patsubst %$(EXEEXT),%.msi,$(addprefix $(bindir)/,$(bin_PROGRAMS))) +CLEANFILES = \ + *.ico *.res *.rc config.* stamp-* Makefile \ + sections/.dirstamp \ + $$(find .deps/ sections/.deps -type f) \ + $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ + $(patsubst %$(EXEEXT),%-64$(EXEEXT),$(addprefix $(bindir)/,$(bin_PROGRAMS))) \ + $(patsubst %$(EXEEXT),%.msi,$(addprefix $(bindir)/,$(bin_PROGRAMS))) setversion: - sed -i 's/^AC_INIT.*/AC_INIT([Check_MK Windows Agent], ['"$(NEW_VERSION)"'], [feedback(a)check-mk.org])/' ../configure.ac + package="Check_MK Windows Agent" ; \ + mail=feedback(a)check-mk.org ; \ + sed -i "s/^AC_INIT.*/AC_INIT([$$package], [$(NEW_VERSION)], [$$mail])/" \ + $(VPATH)/configure.ac diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index 560e020..0135be2 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -41,7 +41,9 @@ if [ ! -e $CHROOT_PATH/$CHROOT_BUILD_DIR/Makefile ] ; then fi if [ -n "$CMD" ] ; then - chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME bash -c "$CMD" + chroot $CHROOT_PATH \ + /usr/bin/env CHROOTNAME=$CHROOTNAME NEW_VERSION=$NEW_VERSION \ + bash -c "$CMD" else chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME bash -l fi diff --git a/agents/windows/make-agent b/agents/windows/make-agent index fb30f39..c53ae80 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -63,7 +63,10 @@ fi [[ $njobs -le 0 ]] && njobs=1 # Ensure one core after arithmetic division. # Build the Windows agent within chroot by calling the 'build-agent' script. -sudo CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR ./do-chroot \ +sudo CHROOT_PATH=$CHROOT_PATH \ + CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR \ + NEW_VERSION=$NEW_VERSION \ + ./do-chroot \ "$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets" EXIT_CODE=$?

7 years

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017