Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

werk: Fixed reading current version after a26b52d8

by Lars Michelsen

Module: check_mk Branch: master Commit: 41d56216339e358b60de4e262f35fe80b853846d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41d56216339e35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 12 07:47:00 2018 +0200 werk: Fixed reading current version after a26b52d8 Change-Id: I36f48bcff8c32b8dd9a556f3967d6ab39287a5e9 --- werk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/werk b/werk index c5840e1..100fe5e 100755 --- a/werk +++ b/werk @@ -106,12 +106,12 @@ def save_last_werkid(id): def load_current_version(): - for line in file("../Makefile"): + for line in file("../defines.make"): if line.startswith("VERSION"): version = line.split("=", 1)[1].strip() return version - bail_out("Failed to read VERSION from Makefile") + bail_out("Failed to read VERSION from defines.make") def check_modified():

6 years, 1 month

Makefile: Move some generic definitions to includable file

by Lars Michelsen

Module: check_mk Branch: master Commit: 56c985d965d423eb0f127e2eadd71a92cab9316f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56c985d965d423… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 3 22:04:21 2018 +0200 Makefile: Move some generic definitions to includable file This is needed for the upcoming container packaging and can also be used by other Makefiles to reduce redundant definitions. Change-Id: Ib165b6a23b7592736ee1cde061f91cd103a9d6cc --- Makefile | 28 ++-------------------------- agents/Makefile | 5 ++--- defines.make | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ omd/Makefile | 1 - omd/Makefile.omd | 18 +++--------------- 5 files changed, 59 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index fe6c04b..bcddb2e 100644 --- a/Makefile +++ b/Makefile @@ -23,32 +23,8 @@ # Boston, MA 02110-1301 USA. # -EDITION := raw -EDITION_SHORT := cre - -ifneq (,$(wildcard enterprise)) -ENTERPRISE := yes -EDITION := enterprise -EDITION_SHORT := cee -else -ENTERPRISE := no -endif - -ifneq (,$(wildcard managed)) -MANAGED := yes -EDITION := managed -EDITION_SHORT := cme -else -MANAGED := no -endif - -VERSION := 1.6.0i1 -DEMO_SUFFIX := -OMD_VERSION := $(VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) +include defines.make -SHELL := /bin/bash -# TODO: Be more strict - Add this: -#SHELL := /bin/bash -e -o pipefail NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin @@ -312,7 +288,7 @@ version: if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi setversion: - sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ + sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" defines.make ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkbackup ; \ sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' cmk/__init__.py bin/mkbench bin/livedump; \ diff --git a/agents/Makefile b/agents/Makefile index 61b5d33..54a94f5 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -22,8 +22,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -SHELL = /bin/bash -VERSION = 1.6.0i1 +include ../defines.make + RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) @@ -54,7 +54,6 @@ waitmax: waitmax.c @echo "Fine. Typing 'make install' as root now will install into /usr/bin" setversion: - sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/' check_mk_agent.openvms ; \ for agent in check_mk_agent.*; do \ if [ "$$agent" != windows -a "$$agent" != plugins -a "$$agent" != hpux ] ; then \ diff --git a/defines.make b/defines.make new file mode 100644 index 0000000..da0b190 --- /dev/null +++ b/defines.make @@ -0,0 +1,52 @@ +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. +# + +EDITION := raw +EDITION_SHORT := cre + +ifneq (,$(wildcard enterprise)) +ENTERPRISE := yes +EDITION := enterprise +EDITION_SHORT := cee +else +ENTERPRISE := no +endif + +ifneq (,$(wildcard managed)) +MANAGED := yes +EDITION := managed +EDITION_SHORT := cme +else +MANAGED := no +endif + +VERSION := 1.6.0i1 +# Will be set to ".demo" by cmk build system when building a demo package +DEMO_SUFFIX := +OMD_VERSION := $(VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) + +SHELL := /bin/bash +# TODO: Be more strict - Add this: +#SHELL := /bin/bash -e -o pipefail diff --git a/omd/Makefile b/omd/Makefile index 1be2c20..f5e52e7 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -289,7 +289,6 @@ alt: setversion: NEW_OMD_VERSION=$(NEW_VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) ; \ if [ -n "$$NEW_OMD_VERSION" ] && [ "$$NEW_OMD_VERSION" != "$(OMD_VERSION)" ]; then \ - sed -ri 's/^(CMK_VERSION[[:space:]]*:= *).*/\1'"$(NEW_VERSION)/" Makefile.omd ; \ sed -ri 's/^(OMD_SERIAL[[:space:]]*= *).*/\1'"$(NEW_SERIAL)/" Makefile.omd ; \ sed -ri 's/^(OMD_VERSION[[:space:]]*= *).*/\1"'"$$NEW_OMD_VERSION"'"/' packages/omd/omd ; \ fi diff --git a/omd/Makefile.omd b/omd/Makefile.omd index 4819e77..570af7f 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -7,24 +7,12 @@ else REPO_PATH := $(abspath ..) endif -PACKAGE_BASE := $(REPO_PATH)/omd/packages +include $(REPO_PATH)/defines.make -EDITION := raw -EDITION_SHORT := cre -ifneq (,$(wildcard $(REPO_PATH)/enterprise)) - EDITION := enterprise - EDITION_SHORT := cee -endif -ifneq (,$(wildcard $(REPO_PATH)/managed)) - EDITION := managed - EDITION_SHORT := cme -endif +PACKAGE_BASE := $(REPO_PATH)/omd/packages -CMK_VERSION := 1.6.0i1 +CMK_VERSION := $(VERSION) OMD_SERIAL := 38 -# Will be set to ".demo" by cmk build system when building a demo package -DEMO_SUFFIX := -OMD_VERSION := $(CMK_VERSION).$(EDITION_SHORT)$(DEMO_SUFFIX) OMD_BASE := /omd OMD_PHYSICAL_BASE := /opt/omd

6 years, 1 month

Don't use globals()/vars() for dictionary-based string formatting.

by Sven Panne

Module: check_mk Branch: master Commit: 02bdf841d65af0771b4565adb6d7d72ba250a9dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02bdf841d65af0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 11 09:10:28 2018 +0200 Don't use globals()/vars() for dictionary-based string formatting. Added spaces around splicing operator on the way, without them things look a bit misleading. Change-Id: Ia4da7f124e2967a9d2e35c2fdee9dfee17eedab2 --- agents/windows/msibuild/msi-update | 5 ++--- checks/netapp_api_fcp | 2 +- cmk/gui/htmllib.py | 2 +- cmk/gui/plugins/metrics/utils.py | 2 +- doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd | 7 ++++++- doc/treasures/get_rrd_cache_stats | 2 +- inventory/solaris_pkginfo | 2 +- inventory/solaris_prtdiag | 2 +- inventory/solaris_psrinfo | 2 +- inventory/solaris_uname | 2 +- omd/packages/omd/omd | 2 +- tests/unit/web/test_table.py | 2 +- 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 9e95dce..30dc5d2 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -227,8 +227,8 @@ try: lcab_files = "" for index, lcab_file in sorted(cabinet_files): - lcab_files += "%(source_dir)s/%(lcab_file)s " % globals() - if os.system("lcab -n %(lcab_files)s %(work_dir)s/product.cab" % globals()) != 0: + lcab_files += "%(source_dir)s/%(lcab_file)s " % {"source_dir": source_dir, "lcab_file": lcab_file} + if os.system("lcab -n %(lcab_files)s %(work_dir)s/product.cab" % {"lcab_files": lcab_files, "work_dir": work_dir}) != 0: bail_out('Fehler!') # Add modified product.cab @@ -243,4 +243,3 @@ except Exception, e: if work_dir and os.path.exists(work_dir): shutil.rmtree(work_dir) bail_out("Error on creating msi file: %s" % str(e)) - diff --git a/checks/netapp_api_fcp b/checks/netapp_api_fcp index 5321a85..744a414 100644 --- a/checks/netapp_api_fcp +++ b/checks/netapp_api_fcp @@ -152,7 +152,7 @@ def parse_netapp_api_fcp(info): for what in ["avg_latency", "avg_read_latency", "avg_write_latency"]: if what in values: - fcp_data[what] = get_rate("%s.%s" %(key, what), now, int(values[what]) / 1000.0) + fcp_data[what] = get_rate("%s.%s" % (key, what), now, int(values[what]) / 1000.0) fcp_interfaces[key] = fcp_data return fcp_interfaces diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index a3c585f..92fe1e6 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -592,7 +592,7 @@ class HTMLGenerator(OutputFunnel): if sep.startswith(';'): v = re.sub(';+', ';', v) - yield ' %s=\"%s\"' %(k, v) + yield ' %s=\"%s\"' % (k, v) for k in options: yield " %s=\'\'" % k diff --git a/cmk/gui/plugins/metrics/utils.py b/cmk/gui/plugins/metrics/utils.py index a49c3fc..0f42dfa 100644 --- a/cmk/gui/plugins/metrics/utils.py +++ b/cmk/gui/plugins/metrics/utils.py @@ -51,7 +51,7 @@ class AutomaticDict(OrderedDict): def append(self, item): - self["%s_%i" %(self._list_identifier, self._item_index)] = item + self["%s_%i" % (self._list_identifier, self._item_index)] = item self._item_index += 1 # TODO: Refactor to plugin_registry structures diff --git a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd index b1ec8bd..9c25f5c 100755 --- a/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd +++ b/doc/treasures/Event_Console/nsca2mkeventd/nsca2mkeventd @@ -45,6 +45,7 @@ def verbose(txt): if opt_verbose: log(txt) + def usage(): sys.stdout.write('''Usage: nsca2mkeventd [OPTIONS] @@ -60,7 +61,11 @@ Default paths: Event Pipe: %(g_pipe_path)s Log file: %(g_logfile_path)s -''' % globals()) +''' % { + "g_eventsocket_path": g_eventsocket_path, + "g_pipe_path": g_pipe_path, + "g_logfile_path": g_logfile_path, +}) #. # .--Daemonize-----------------------------------------------------------. diff --git a/doc/treasures/get_rrd_cache_stats b/doc/treasures/get_rrd_cache_stats index b03e2ef..9b39ec7 100755 --- a/doc/treasures/get_rrd_cache_stats +++ b/doc/treasures/get_rrd_cache_stats @@ -21,7 +21,7 @@ try: stats[key[:len(key)-1]] = int(value) for key, value in stats.items(): - print "%-15s :%15d" %(key, value) + print "%-15s :%15d" % (key, value) except: sys.stderr.write("Unable to retrieve statistics.\n") diff --git a/inventory/solaris_pkginfo b/inventory/solaris_pkginfo index 0196639..a821ed0 100644 --- a/inventory/solaris_pkginfo +++ b/inventory/solaris_pkginfo @@ -72,7 +72,7 @@ def inv_solaris_pkginfo(info): elif key == "NAME": # build a dict for each package initiator = PKGINST # concat solaris pkginst and name to mk inventory name and write to dict - entry = {'name' : "%s - %s" %(pkginst, value) } + entry = {'name' : "%s - %s" % (pkginst, value) } elif key == "INSTDATE": # 'try, except' blog is necessary because date conversion may fail because of non en_US # locale settings on the remote solaris server diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index d67c193..b0f9ce3 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -91,7 +91,7 @@ def inv_solaris_prtdiag(info): if line[0].startswith('OBP'): node = inv_tree("hardware.bios.") bios_info = line[0].split() - node["version"] = "%s %s" %(bios_info[0], bios_info[1]) + node["version"] = "%s %s" % (bios_info[0], bios_info[1]) formated_date = bios_info[2] + bios_info[3] node["date"] = int(time.mktime(time.strptime(formated_date, "%Y/%m/%d%H:%M"))) node["vendor"] = "Oracle" diff --git a/inventory/solaris_psrinfo b/inventory/solaris_psrinfo index 596e1d1..48d0d3c 100644 --- a/inventory/solaris_psrinfo +++ b/inventory/solaris_psrinfo @@ -57,7 +57,7 @@ def inv_solaris_psrinfo(info): node = inv_tree("hardware.cpu.") node["Model"] = info[-1][0] - node["Maximum Speed"] = "%s %s" %(info[-1][-2], info[-1][-1].strip(')') ) + node["Maximum Speed"] = "%s %s" % (info[-1][-2], info[-1][-1].strip(')') ) inv_info['solaris_psrinfo'] = { diff --git a/inventory/solaris_uname b/inventory/solaris_uname index 0080c34..8de342d 100644 --- a/inventory/solaris_uname +++ b/inventory/solaris_uname @@ -32,7 +32,7 @@ def inv_solaris_uname(info): node["vendor"] = "Oracle" node["type"] = solaris_uname["System"] node["version"] = solaris_uname["Release"] - node["name"] = "%s %s" %(solaris_uname["System"],solaris_uname["Release"]) + node["name"] = "%s %s" % (solaris_uname["System"],solaris_uname["Release"]) node["kernel_version"] = solaris_uname["KernelID"] node["hostname"] = solaris_uname["Node"] diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 678afc4..f3efb4e 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -4380,7 +4380,7 @@ def parse_command_options(args, options_spec): sys.stdout.write("Possible options for this command:\n") for llong, sshort, needarg, help in options_spec: args_text = "%s--%s" % (sshort and "-%s," % sshort or "", llong) - sys.stdout.write(" %-15s %3s %s\n" %(args_text, needarg and "ARG" or "", help)) + sys.stdout.write(" %-15s %3s %s\n" % (args_text, needarg and "ARG" or "", help)) sys.exit(0) options = {} diff --git a/tests/unit/web/test_table.py b/tests/unit/web/test_table.py index e0a42dc..ec78c0a 100644 --- a/tests/unit/web/test_table.py +++ b/tests/unit/web/test_table.py @@ -215,5 +215,5 @@ def test_table_cubical(register_builtin_html, monkeypatch, sortable, searchable, limit = len(rows) # Assert data correctness - assert len(data) <= limit, 'Wrong number of rows: Got %s, should be <= %s' %(len(data), limit) + assert len(data) <= limit, 'Wrong number of rows: Got %s, should be <= %s' % (len(data), limit) assert data == rows[:limit], "Incorrect data: %s\n\nVS\n%s" % (data, rows[:limit])

6 years, 1 month

alshdad

by Sven Panne

Module: check_mk Branch: master Commit: aecf15ae90069f6616f697e2d942324dec5c0cff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aecf15ae90069f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 11 15:41:56 2018 +0200 alshdad Change-Id: I5ea8205780df150c2d6523e06d48743673188965 --- checks/arbor_peakflow_tms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/arbor_peakflow_tms b/checks/arbor_peakflow_tms index f2a1192..7a799fe 100644 --- a/checks/arbor_peakflow_tms +++ b/checks/arbor_peakflow_tms @@ -103,7 +103,7 @@ check_info["arbor_peakflow_tms.host_fault"] = { def inventory_peakflow_tms_updates(parsed): - for name, _value in parsed['update'].iteritems(): + for name in parsed['update']: yield name, None

6 years, 1 month

Again: Fixed a few unused-variable warnings.

by Sven Panne

6 years, 1 month

Fixed unused-variable warnings in inventory/. Enable the check there, too.

by Sven Panne

Module: check_mk Branch: master Commit: 2beb2e09212e75dc93643f8ddecc72a7b6f2e4fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2beb2e09212e75… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 11 08:50:19 2018 +0200 Fixed unused-variable warnings in inventory/. Enable the check there, too. Change-Id: Iebce32e0caf5d7ff975e7cc8bcde56ae9f41d3f4 --- inventory/dmidecode | 6 ++---- inventory/esx_vsphere_hostsystem | 3 +-- inventory/fireeye_sys_status | 2 +- inventory/hp_proliant_da_phydrv | 4 ++-- inventory/hp_proliant_mem | 8 ++++---- inventory/lnx_if | 8 ++++---- inventory/mssql_clusters | 1 - inventory/oracle_dataguard_stats | 2 +- inventory/oracle_instance | 4 ++-- inventory/oracle_tablespaces | 20 +++----------------- inventory/perle_chassis | 2 +- inventory/perle_chassis_slots | 2 +- inventory/snmp_os | 2 +- inventory/solaris_pkginfo | 2 +- inventory/win_cpuinfo | 2 -- inventory/win_ip_r | 2 +- inventory/winperf_if | 8 ++++---- tests/pylint/test_pylint.py | 3 +++ 18 files changed, 32 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2beb2e0921…

6 years, 1 month

6560 FIX Editing views: Increased size of unique ID input field

by Lars Michelsen

Module: check_mk Branch: master Commit: 29d0bc936ee31201a71cdb2e04af20da49ac7a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29d0bc936ee312… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 11 09:35:42 2018 +0200 6560 FIX Editing views: Increased size of unique ID input field Change-Id: I5fd2a68fc18a475159fd06dc397c6374ef15edce --- .werks/6560 | 11 +++++++++++ cmk/gui/visuals.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6560 b/.werks/6560 new file mode 100644 index 0000000..7854b00 --- /dev/null +++ b/.werks/6560 @@ -0,0 +1,11 @@ +Title: Editing views: Increased size of unique ID input field +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536651324 + + diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index 5b4c03d..17ef328 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -780,7 +780,9 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, "view will override that (shadowing it)."), regex = '^[a-zA-Z0-9_]+$', regex_error = _('The name of the view may only contain letters, digits and underscores.'), - size = 24, allow_empty = False)), + size = 50, + allow_empty = False) + ), ('title', TextUnicode( title = _('Title') + '<sup>*</sup>', size = 50, allow_empty = False)),

6 years, 1 month

agent_ipmi_sensors: Fixed using wrong params

by Simon Betz

Module: check_mk Branch: master Commit: b723b7bcdd36e30962ece5fe8f99bf3d9e380ea9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b723b7bcdd36e3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 11 09:39:41 2018 +0200 agent_ipmi_sensors: Fixed using wrong params Change-Id: Idda481cb871abdbc8d9e5011d195f300a0173de3 --- agents/special/agent_ipmi_sensors | 5 +++-- checks/agent_ipmi_sensors | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_ipmi_sensors b/agents/special/agent_ipmi_sensors index 4746e9b..12218e2 100755 --- a/agents/special/agent_ipmi_sensors +++ b/agents/special/agent_ipmi_sensors @@ -83,7 +83,8 @@ def parse_data(data, excludes): def agent_ipmi_sensors_main(cmdline_args): short_options = 'u:p:l:D:k:' - long_options = [ 'help', 'debug' + long_options = [ 'help', 'debug', + 'ipmi-command=', 'quiet-cache', 'sdr-cache-recreate', 'interpret-oem-data', 'output-sensor-state', 'ignore-not-available-sensors', 'driver-type=', 'output-sensor-thresholds' ] @@ -175,7 +176,7 @@ def agent_ipmi_sensors_main(cmdline_args): sys.stderr.write("Executing: '%s'\n" % ipmi_cmd_str) errors = [] - for section, (types, excludes) in queries: + for section, (types, excludes) in queries.iteritems(): sys.stdout.write( "<<<ipmi%s:sep(124)>>>\n" % section ) try: try: diff --git a/checks/agent_ipmi_sensors b/checks/agent_ipmi_sensors index c74dc66..7914634 100644 --- a/checks/agent_ipmi_sensors +++ b/checks/agent_ipmi_sensors @@ -31,9 +31,9 @@ def agent_ipmi_sensors_arguments(params, hostname, ipaddress): ipmi_command, options = params args = [ - "-u", quote_shell_string(params["username"]), - "-p", quote_shell_string(params["password"]), - "-l", quote_shell_string(params["privilege_lvl"]), + "-u", quote_shell_string(options["username"]), + "-p", quote_shell_string(options["password"]), + "-l", quote_shell_string(options["privilege_lvl"]), "--ipmi-command", ipmi_command, ] @@ -47,11 +47,12 @@ def agent_ipmi_sensors_arguments(params, hostname, ipaddress): ('--output-sensor-state', "output_sensor_state"), ('--ignore-not-available-sensors', "output_sensor_thresholds"), ('--output-sensor-thresholds', "ignore_not_available_sensors"), ]: - this_param = params.get(what) - if this_param: - args.append( opt ) - if not isinstance(this_param, bool): - args.append( quote_shell_string(this_param) ) + this_opt = options.get(what) + if this_opt is None: + continue + args.append(opt) + if not isinstance(this_opt, bool): + args.append(quote_shell_string(this_opt)) args.append( quote_shell_string(ipaddress) ) return " ".join( args )

6 years, 1 month

Refactored expire valuespec definition

by Lars Michelsen

Module: check_mk Branch: master Commit: 48e7a1f46ee84b55524f7fd6968ad3665a65b77f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48e7a1f46ee84b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 17:45:24 2018 +0200 Refactored expire valuespec definition Change-Id: If1a10e34a1354488d47794523e0f880c3f4761e1 --- cmk/gui/plugins/views/commands.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/views/commands.py b/cmk/gui/plugins/views/commands.py index 73fc782..0cfbc16 100644 --- a/cmk/gui/plugins/views/commands.py +++ b/cmk/gui/plugins/views/commands.py @@ -440,7 +440,7 @@ def command_acknowledgement(cmdtag, spec, row): sendnot = 1 if html.var("_ack_notify") else 0 perscomm = 1 if html.var("_ack_persistent") else 0 - expire_secs = Age().from_html_vars("_ack_expire") + expire_secs = _vs_expire().from_html_vars("_ack_expire") if expire_secs: expire = int(time.time()) + expire_secs expire_text = ";%d" % expire @@ -484,13 +484,21 @@ def render_acknowledgement(): html.checkbox("_ack_persistent", config.view_action_defaults["ack_persistent"], label=_('persistent comment')) html.hr() - Age(display=["days", "hours", "minutes"], label=_("Expire acknowledgement after")).render_input("_ack_expire", 0) + + _vs_expire().render_input("_ack_expire", 0) html.help(_("Note: Expiration of acknowledgements only works when using the Check_MK Micro Core.")) html.hr() html.write_text(_("Comment") + ": ") html.text_input("_ack_comment", size=48, submit="_acknowledge") +def _vs_expire(): + return Age( + display=["days", "hours", "minutes"], + label=_("Expire acknowledgement after") + ) + + register_command_group( ident = "acknowledge", title = _("Acknowledge"),

6 years, 1 month

6558 View actions: Default expiration time can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 997d99a5f1b98cc5ef6ef83eb27bc4cb7a235feb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=997d99a5f1b98c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 17:51:24 2018 +0200 6558 View actions: Default expiration time can now be configured The global setting "View action defaults" can now be used to configure a default expiration time. Please note that once you set a default value other than 0, all acknowledgements created in the future will have an expiration time unless the user changes the expiration time to 0 manually. Change-Id: I64c23ebcc9a75bd456752711a9364e222f65ee6f --- .werks/6558 | 15 +++++++++++++++ cmk/gui/plugins/views/commands.py | 2 +- cmk/gui/plugins/wato/check_mk_configuration.py | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/6558 b/.werks/6558 new file mode 100644 index 0000000..06d0b53 --- /dev/null +++ b/.werks/6558 @@ -0,0 +1,15 @@ +Title: View actions: Default expiration time of acknowledgements can now be configured +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536594441 +Class: feature + +The global setting "View action defaults" can now be used to configure a default +expiration time for acknowledgements. + +Please note that once you set a global default value other than 0, all acknowledgements +created in the future will have an expiration time unless the user overrides the +expiration time with 0 manually when setting an acknowledgement. diff --git a/cmk/gui/plugins/views/commands.py b/cmk/gui/plugins/views/commands.py index 0cfbc16..b7ecc5b 100644 --- a/cmk/gui/plugins/views/commands.py +++ b/cmk/gui/plugins/views/commands.py @@ -485,7 +485,7 @@ def render_acknowledgement(): label=_('persistent comment')) html.hr() - _vs_expire().render_input("_ack_expire", 0) + _vs_expire().render_input("_ack_expire", config.view_action_defaults.get("ack_expire", 0)) html.help(_("Note: Expiration of acknowledgements only works when using the Check_MK Micro Core.")) html.hr() html.write_text(_("Comment") + ": ") diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index fb8df4d..dc57153 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -935,6 +935,11 @@ register_configvar(group, ("ack_persistent", Checkbox( title = _("Persistent comment"), label = _("Enable"), default_value = False, )), + ("ack_expire", Age( + title = _("Expire acknowledgement after"), + display = ["days", "hours", "minutes"], + default_value = 0, + )), ], optional_keys = [], ),

6 years, 1 month

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018