Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 95fdd2f108865f70d1f4869c0648e037f74f8614 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95fdd2f108865f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 7 16:45:19 2016 +0100 cleaned up some linter errors - Add missing referenced but missing methods in base classes. These methods are normally overridden by all subclasses, but should be declared and raising NotImplentedError() to clarify this. - Declare and initialize attributes in constructor Some attributes were set from external and used internally but not declared within the class. --- web/htdocs/watolib.py | 66 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c8373ff..e437022 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -206,6 +206,7 @@ def log_pending(status, linkinfo, what, message, user_id = None): # On each change to the Check_MK configuration mark the agents to be rebuild if 'need_to_bake_agents' in globals(): + # pylint: disable=undefined-variable need_to_bake_agents() # The latter one condition applies to slave sites @@ -317,7 +318,7 @@ class WithPermissions(object): def user_needs_permission(self, user_id, how): - raise NotImplementedError("Subclasses has to implement this!") + raise NotImplementedError() def need_permission(self, how): @@ -369,7 +370,7 @@ class WithPermissionsAndAttributes(WithPermissions): def effective_attributes(self): - raise NotImplementedError("Subclasses has to implement this!") + raise NotImplementedError() def effective_attribute(self, attrname, default_value=None): @@ -397,7 +398,7 @@ class BaseFolder(WithPermissionsAndAttributes): def hosts(self): - raise NotImplementedError("Subclasses has to implement this!") + raise NotImplementedError() def host_names(self): @@ -432,10 +433,18 @@ class BaseFolder(WithPermissionsAndAttributes): return self.parent() != None + def parent(self): + raise NotImplementedError() + + def is_same_as(self, folder): return self == folder or self.path() == folder.path() + def path(self): + raise NotImplementedError() + + def is_current_folder(self): return self.is_same_as(Folder.current()) @@ -472,7 +481,8 @@ class BaseFolder(WithPermissionsAndAttributes): keepvars.append(("mode", "folder")) def render_component(folder): - return '<a href="%s">%s</a>' % (html.makeuri_contextless([("folder", folder.path())] + keepvars), folder.title()) + return '<a href="%s">%s</a>' % (html.makeuri_contextless([ ("folder", folder.path())] + + keepvars), folder.title()) def breadcrump_element_start(end = '', z_index = 0): html.write('<li style="z-index:%d;"><div class="left %s"></div>' % (z_index, end)) @@ -524,6 +534,18 @@ class BaseFolder(WithPermissionsAndAttributes): html.write("</ul></div>\n") + def title(self): + raise NotImplementedError() + + + def has_subfolders(self): + raise NotImplementedError() + + + def subfolder_choices(self): + raise NotImplementedError() + + #. # .--Folder--------------------------------------------------------------. # | _____ _ _ | @@ -1744,6 +1766,10 @@ class SearchFolder(BaseFolder): pass + def has_subfolder(self, name): + return False + + def has_subfolders(self): return False @@ -2164,7 +2190,7 @@ class Host(WithPermissionsAndAttributes): class Attribute: # The constructor stores name and title. If those are - # dynamic than leave them out and override name() and + # dynamic then leave them out and override name() and # title() def __init__(self, name=None, title=None, help=None, default_value=None): self._name = name @@ -2172,6 +2198,15 @@ class Attribute: self._help = help self._default_value = default_value + self._show_in_table = True + self._show_in_folder = True + self._show_in_host_search = False + self._show_in_form = True + self._show_inherited_value = True + self._depends_on_tags = [] + self._depends_on_roles = [] + self._editable = True + # Return the name (= identifier) of the attribute def name(self): return self._name @@ -2223,45 +2258,41 @@ class Attribute: def show_in_host_search(self): return self._show_in_host_search + # Wether or not this attribute can be edited after creation # of the object def editable(self): return self._editable + # Wether it is allowed that a host has no explicit # value here (inherited or direct value). An mandatory # has *no* default value. def is_mandatory(self): return False + # Return information about the user roles we depend on. # The method is usually not overridden, but the variable # _depends_on_roles is set by declare_host_attribute(). def depends_on_roles(self): - try: - return self._depends_on_roles - except: - return [] + return self._depends_on_roles + # Return information about whether or not either the # inherited value or the default value should be shown # for an attribute. # _depends_on_roles is set by declare_host_attribute(). def show_inherited_value(self): - try: - return self._show_inherited_value - except: - return True + return self._show_inherited_value # Return information about the host tags we depend on. # The method is usually not overridden, but the variable # _depends_on_tags is set by declare_host_attribute(). def depends_on_tags(self): - try: - return self._depends_on_tags - except: - return [] + return self._depends_on_tags + # Render HTML input fields displaying the value and # make it editable. If filter == True, then the field @@ -2270,6 +2301,7 @@ class Attribute: def render_input(self, varprefix, value): pass + # Create value from HTML variables. def from_html_vars(self, varprefix): return None

8 years, 6 months

Be consistent in how we use 'using'.

by Sven Panne

Module: check_mk Branch: master Commit: 607ddf7a7b3bf329ad20081ad4f3345477e2f803 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=607ddf7a7b3bf3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 8 08:11:38 2016 +0100 Be consistent in how we use 'using'. --- livestatus/src/waittriggers.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/livestatus/src/waittriggers.cc b/livestatus/src/waittriggers.cc index adc5cb5..62b4205 100644 --- a/livestatus/src/waittriggers.cc +++ b/livestatus/src/waittriggers.cc @@ -29,7 +29,9 @@ #include <mutex> #include <ratio> +using std::chrono::milliseconds; using std::condition_variable; +using std::cv_status; using std::mutex; using std::unique_lock; @@ -131,7 +133,6 @@ void trigger_wait(struct trigger *which) { int trigger_wait_for(struct trigger *which, unsigned ms) { unique_lock<mutex> ul(g_wait_mutex); - return static_cast<int>( - from_trigger(which)->wait_for(ul, std::chrono::milliseconds(ms)) == - std::cv_status::no_timeout); + return static_cast<int>(from_trigger(which)->wait_for( + ul, milliseconds(ms)) == cv_status::no_timeout); }

8 years, 6 months

Remove dead livestatus/mk directory from Makefile.

by Sven Panne

Module: check_mk Branch: master Commit: bf5335eb56d704eb7f2c2b30457d29662b096979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf5335eb56d704… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 8 07:59:37 2016 +0100 Remove dead livestatus/mk directory from Makefile. --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ac25a4b..b55e53b 100644 --- a/Makefile +++ b/Makefile @@ -46,13 +46,13 @@ BEAR := bear-fixed LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ configure.ac ltmain.sh Makefile.am Makefile.in missing \ nagios/README nagios/*.h nagios4/README nagios4/*.h \ - src/*.{h,c,cc} src/mk/*.h src/Makefile.{in,am} \ + src/*.{h,c,cc} src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/* # Files that are checked for trailing spaces HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* \ $$(find -name Makefile) livestatus/src/*.{cc,c,h} \ - livestatus/src/mk/*.h agents/windows/*.cc \ + agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \ @@ -67,7 +67,6 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.c *.h)) \ $(wildcard $(addprefix livestatus/api/c++/,*.cc *.c *.h)) \ $(wildcard $(addprefix livestatus/src/,*.cc *.c *.h)) \ - $(wildcard $(addprefix livestatus/src/mk,*.cc *.c *.h)) \ $(wildcard $(addprefix mkeventd/src/,*.cc *.c *.h)) .PHONY: all analyze check check-binaries check-permissions check-spaces \

8 years, 6 months

3088 rstcli, rstcli.pdisks: new checks to monitor Intel RST raids

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9bfd85a2a8838b72db6e0527f08db7f31b2a2f20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bfd85a2a8838b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Mar 7 17:14:39 2016 +0100 3088 rstcli, rstcli.pdisks: new checks to monitor Intel RST raids --- .werks/3088 | 9 ++ ChangeLog | 1 + agents/windows/plugins/rstcli.bat | 15 ++++ checkman/rstcli | 24 +++++ checkman/rstcli.pdisks | 24 +++++ checks/rstcli | 177 +++++++++++++++++++++++++++++++++++++ 6 files changed, 250 insertions(+) diff --git a/.werks/3088 b/.werks/3088 new file mode 100644 index 0000000..adc41c1 --- /dev/null +++ b/.werks/3088 @@ -0,0 +1,9 @@ +Title: rstcli, rstcli.pdisks: new checks to monitor Intel RST raids +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1457367232 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7bfb212..68956b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 3085 fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls... * 3257 dell_idrac_virtdisks: new check which monitors the virtual disks of a Dell IDrac Device * 3001 fileinfo: now able to configure the checks status if the file is missing + * 3088 rstcli, rstcli.pdisks: new checks to monitor Intel RST raids * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/windows/plugins/rstcli.bat b/agents/windows/plugins/rstcli.bat new file mode 100644 index 0000000..a2c041f --- /dev/null +++ b/agents/windows/plugins/rstcli.bat @@ -0,0 +1,15 @@ +@ECHO off & setlocal EnableDelayedExpansion + +REM customize rstcli to your needs +SET "rstcli=!ProgramFiles!\rstcli\rstcli64.exe" +SET "rstcli_x86=!ProgramFiles!\rstcli\rstcli.exe" + +ECHO ^<^<^<rstcli:sep(58)^>^>^> +IF EXIST !rstcli! ( + !rstcli! --information --volume +) ELSE IF EXIST !rstcli_x86! ( + !rstcli_x86! --information --volume +) ELSE ( + ECHO rstcli not found +) + diff --git a/checkman/rstcli b/checkman/rstcli new file mode 100644 index 0000000..d91faaa --- /dev/null +++ b/checkman/rstcli @@ -0,0 +1,24 @@ +title: Intel Rapid Storage Technologie: State of raid volumes +agents: windows +catalog: os/storage +license: GPL +distribution: check_mk +description: + This check monitors the overall state of raid volumes set up + through Intel Rapid Storage Technologie. + + Due to lack of documentation, this tool will only accept "Normal" as a healthy + state, all others are treated as critical. Please let us know about other states + you encounter. + + For this check to work, the rstcli tool and the matching agent plugin have to + be installed. + + The utility {rstcli} can be downloaded from + {https://downloadcenter.intel.com/download/24310/Intel-Rapid-Storage-Technology-Command-Line-Interface-RST-CLI} + +item: + The name of the raid volume. + +inventory: + One service is created for each volume. diff --git a/checkman/rstcli.pdisks b/checkman/rstcli.pdisks new file mode 100644 index 0000000..1961edc --- /dev/null +++ b/checkman/rstcli.pdisks @@ -0,0 +1,24 @@ +title: Intel Rapid Storage Technologie: State of physical disks in raids +agents: windows +catalog: os/storage +license: GPL +distribution: check_mk +description: + This check monitors the state of the physical disks of a raid set up + through Intel Rapid Storage Technologie. + + Due to lack of documentation, this tool will only accept "Normal" as a healthy + state, all others are treated as critical. Please let us know about other states + you encounter. + + For this check to work, the rstcli tool and the matching agent plugin have to + be installed. + + The utility {rstcli} can be downloaded from + {https://downloadcenter.intel.com/download/24310/Intel-Rapid-Storage-Technology-Command-Line-Interface-RST-CLI} + +item: + A combination of the raid volume and the drive ID within that volume. + +inventory: + One service is created for each disk. diff --git a/checks/rstcli b/checks/rstcli new file mode 100644 index 0000000..4ea3736 --- /dev/null +++ b/checks/rstcli @@ -0,0 +1,177 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + + +# --VOLUME INFORMATION-- +# +# Name: Vol1 +# Raid Level: 1 +# Size: 932 GB +# StripeSize: 64 KB +# Num Disks: 2 +# State: Normal +# System: True +# Initialized: True +# Cache Policy: Off +# +# +# --DISKS IN VOLUME: Vol1 -- +# +# ID: 0-0-0-0 +# Type: Disk +# Disk Type: SATA Disk +# State: Normal +# Size: 932 GB +# Free Size: 0 GB +# System Disk: False +# Usage: Array member +# Serial Number: AB-CDEF123456 +# Model: AB CD EF +# +# ID: 0-1-0-0 +# Type: Disk +# Disk Type: SATA Disk +# State: Normal +# Size: 932 GB +# Free Size: 0 GB +# System Disk: False +# Usage: Array member +# Serial Number: AB-CDEF123457 +# Model: AB CD EF + + +# split output into the --xxx-- sections +def parse_rstcli_sections(info): + current_section = None + for line in info: + if line[0].startswith("--"): + if current_section is not None: + yield current_section + current_section = (":".join(line).strip("-").strip(), []) + else: + if current_section is None: + raise MKGeneralException("error: %s" % " ".join(line)) + current_section[1].append(line) + + yield current_section + + +# interpret the volumes section +def parse_rstcli_volumes(rows): + volumes = {} + current_volume = None + + for row in rows: + if row[0] == "Name": + volumes[row[1].strip()] = current_volume = {} + else: + current_volume[row[0]] = row[1].strip() + + return volumes + + +# interpret the disks section +def parse_rstcli_disks(rows): + disks = [] + current_disk = None + + for row in rows: + if row[0] == "ID": + current_disk = {} + disks.append(current_disk) + + current_disk[row[0]] = row[1].strip() + + return disks + +def parse_rstcli(info): + volumes = {} + + for section in parse_rstcli_sections(info): + if section[0] == "VOLUME INFORMATION": + volumes = parse_rstcli_volumes(section[1]) + elif section[0].startswith("DISKS IN VOLUME"): + volume = section[0].split(":")[1].strip() + volumes[volume]['Disks'] = parse_rstcli_disks(section[1]) + else: + raise MKGeneralException("invalid section in rstcli output: %s" % section[0]) + + return volumes + + +def inventory_rstcli(parsed): + return [(name, None) for name in parsed.keys()] + + +# Help! There is no documentation, what are the possible values? +rstcli_states = { + 'Normal': 0, +} + + +def check_rstcli(item, params, parsed): + if item in parsed: + volume = parsed[item] + return rstcli_states.get(volume['State']), "RAID %s, %d disks (%s), state %s" % \ + (volume['Raid Level'], int(volume['Num Disks']), + volume['Size'], volume['State']) + + +check_info["rstcli"] = { + 'check_function': check_rstcli, + 'inventory_function': inventory_rstcli, + 'parse_function': parse_rstcli, + 'service_description': 'RAID Volume %s', +} + + +def inventory_rstcli_pdisks(parsed): + for key, volume in parsed.iteritems(): + for disk in volume['Disks']: + yield "%s/%s" % (key, disk['ID']), None + + +def check_rstcli_pdisks(item, params, parsed): + reg = regex("(.*)/([0-9\-]*)") + match = reg.match(item) + if match: + return 3, "unsupported item name" + + volume, disk_id = match.group(1), match.group(2) + + disks = parsed.get(volume, {}).get('Disks', []) + for disk in disks: + if disk['ID'] == disk_id: + return rstcli_states.get(disk['State'], 2), \ + "[%s] state %s" % (disk['Serial Number'], disk['State']) + + +check_info["rstcli.pdisks"] = { + 'check_function': check_rstcli_pdisks, + 'inventory_function': inventory_rstcli_pdisks, + 'service_description': 'RAID Disk %s', +} +

8 years, 6 months

Removed compatibility code (sorted is available since 2.4, 2.3 is not supported anymore)

by Lars Michelsen

Module: check_mk Branch: master Commit: 87fd6532b7f9db365c4e18fdfdce5916ae28d593 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87fd6532b7f9db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 7 16:15:37 2016 +0100 Removed compatibility code (sorted is available since 2.4, 2.3 is not supported anymore) --- web/htdocs/lib.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index cfcb124..aa58e0a 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -154,26 +154,19 @@ def write_settings_file(path, content): data = repr(content) create_user_file(path, "w").write(data + "\n") + def remove_user_file(path): path = path.encode("utf-8") if os.path.exists(path): os.remove(path) + def savefloat(f): try: return float(f) except: return 0.0 -# sorted() is not available in all Python versions -try: - sorted -except: - def sorted(l): - a = l[:] - a.sort() - return a - def make_utf8(x): if type(x) == unicode:

8 years, 6 months

3273 FIX Dashboard: The dashboard is now preserving edit/ view state during page reloads

by Lars Michelsen

Module: check_mk Branch: master Commit: 5eeb618a3de893595a8353b4f273fd5ef3b12968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eeb618a3de893… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 7 15:56:42 2016 +0100 3273 FIX Dashboard: The dashboard is now preserving edit/view state during page reloads --- .werks/3273 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 2 +- web/htdocs/js/dashboard.js | 18 +++++++++++++++++- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/.werks/3273 b/.werks/3273 new file mode 100644 index 0000000..b6704e5 --- /dev/null +++ b/.werks/3273 @@ -0,0 +1,10 @@ +Title: Dashboard: The dashboard is now preserving edit/view state during page reloads +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457362576 + + diff --git a/ChangeLog b/ChangeLog index 983fd69..7bfb212 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 3251 FIX: Fix sorting of entries in Views sidebar element * 3230 FIX: Slightly improved popup menu positioning... * 3264 FIX: Fix display of values in graphs that are < 1.0 + * 3273 FIX: Dashboard: The dashboard is now preserving edit/view state during page reloads WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7e301ce..d4471ac 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -626,7 +626,7 @@ function makeuri(addvars, url) { // Add new params for (var key in addvars) { - params.push(key + '=' + addvars[key]); + params.push(encodeURIComponent(key) + '=' + encodeURIComponent(addvars[key])); } return base + '?' + params.join('&') diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 33f85a9..7cbb14f 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -437,8 +437,24 @@ function toggle_dashboard_edit() { // Remove/Add edit=1 parameter from URL to make page reload handling correct // Only a solution for browsers with history.replaceState support. Sadly // we have no F5/reload fix for others... + // + // window.parent is either a reference to the current window (when opened as dedicated page) + // or the whole browser window if opened within a frame. The URL is either directly: + // http://[HOST]/[SITE]/check_mk/dashboard.py?name=main&edit=1 + // or when opened within a frame it is: + // http://[HOST]/[SITE]/check_mk/index.py?start_url=%2F[SITE]%2Fcheck_mk%2Fdas… + // The new URL computation needs to deal with it. if (window.parent.history.replaceState) { - new_url = makeuri({'edit': g_editing ? '1' : '0'}, window.parent.location.href); + var url = window.parent.location.href; + if (url.indexOf("start_url") !== -1) { + var frame_url = decodeURIComponent(getUrlParam("start_url", url)); + frame_url = makeuri({'edit': g_editing ? '1' : '0'}, frame_url); + new_url = makeuri({'start_url': frame_url}, url); + } + else { + new_url = makeuri({'edit': g_editing ? '1' : '0'}, url); + } + window.parent.history.replaceState({}, document.title, new_url); }

8 years, 6 months

3266 FIX check_smtp: when set to IPv6 it used the IPv4 address nevertheless

by Mathias Kettner

Module: check_mk Branch: master Commit: c17461dd7dd5d13c80b97b5cd858fa9c19dda0ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c17461dd7dd5d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 7 14:44:59 2016 +0100 3266 FIX check_smtp: when set to IPv6 it used the IPv4 address nevertheless --- .werks/3266 | 10 ++++++++++ ChangeLog | 1 + checks/check_smtp | 5 ++++- web/plugins/wato/active_checks.py | 16 ++++------------ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.werks/3266 b/.werks/3266 new file mode 100644 index 0000000..8cd1a90 --- /dev/null +++ b/.werks/3266 @@ -0,0 +1,10 @@ +Title: check_smtp: when set to IPv6 it used the IPv4 address nevertheless +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457358264 + + diff --git a/ChangeLog b/ChangeLog index ed12996..983fd69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 3256 FIX: blade_bx_powerfan: fixed wrong levels handling and minor cleanup * 3258 FIX: dell_idrac_disks: fixed disk and component status handling * 3087 FIX: fixed very rare crash in active checks... + * 3266 FIX: check_smtp: when set to IPv6 it used the IPv4 address nevertheless Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/check_smtp b/checks/check_smtp index b38cf83..d03a3af 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -35,11 +35,14 @@ def check_smtp_arguments(params): port = int(settings["port"]) # ValueSpec was broken, convert to int args += ' -p %d' % port + host_address = '$HOSTADDRESS$' if "ip_version" in settings: if settings['ip_version'] == 'ipv4': args += ' -4' + host_address = '$HOST_ADDRESS_4$' else: args += ' -6' + host_address = '$HOST_ADDRESS_6$' for s in settings.get("commands", []): args += ' -C %s' % quote_shell_string(s) @@ -74,7 +77,7 @@ def check_smtp_arguments(params): if 'hostname' in settings: args += ' -H %s' % settings['hostname'] else: - args += ' -H $HOSTADDRESS$' + args += ' -H ' + host_address return args def check_smtp_desc(params): diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index b5d3638..f030ed7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1186,19 +1186,11 @@ register_rule(group, ) ), ( "ip_version", - Alternative( + DropdownChoice( title = _("IP-Version"), - elements = [ - FixedValue( - "ipv4", - totext = "", - title = _("IPv4") - ), - FixedValue( - "ipv6", - totext = "", - title = _("IPv6") - ), + choices = [ + ( "ipv4", _("IPv4") ), + ( "ipv6", _("IPv6") ), ], ), ),

8 years, 6 months

3087 FIX fixed very rare crash in active checks

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7313a5c7bb24b17f631cd19fbf6a24c296a31abc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7313a5c7bb24b1… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Mar 7 14:37:19 2016 +0100 3087 FIX fixed very rare crash in active checks The error caused active check to go into warning state with output "expected a character buffer object" --- .werks/3087 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3087 b/.werks/3087 new file mode 100644 index 0000000..7062290 --- /dev/null +++ b/.werks/3087 @@ -0,0 +1,11 @@ +Title: fixed very rare crash in active checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457357683 + +The error caused active check to go into warning state with output "expected a character buffer +object" diff --git a/ChangeLog b/ChangeLog index d9afd1b..ed12996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 3255 FIX: apc_inrow_temp: fixed wrong discovery handling of available sensors * 3256 FIX: blade_bx_powerfan: fixed wrong levels handling and minor cleanup * 3258 FIX: dell_idrac_disks: fixed disk and component status handling + * 3087 FIX: fixed very rare crash in active checks... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/automation.py b/modules/automation.py index 490a372..adaedb0 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1306,7 +1306,7 @@ def replace_core_macros(hostname, commandline): macros = get_basic_host_macros_from_attributes(hostname, get_host_attributes(hostname)) load_resource_file(macros) for varname, value in macros.items(): - commandline = commandline.replace(varname, value) + commandline = commandline.replace(varname, str(value)) return commandline

8 years, 6 months

Dashboards: new graphs can now be configured to show the graph legend

by Lars Michelsen

Module: check_mk Branch: master Commit: fea2f4e86e3d46f673d85785d6883ab25b2011bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea2f4e86e3d46… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 7 13:39:16 2016 +0100 Dashboards: new graphs can now be configured to show the graph legend --- web/htdocs/metrics.py | 34 +++++++++++++++++++++++++++++----- web/plugins/dashboard/dashlets.py | 18 +++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 10f45dd..941d243 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1383,18 +1383,22 @@ def page_graph_dashlet(): spec = html.var("spec") if not spec: raise MKUserError("spec", _("Missing spec parameter")) - graph_specification = json.loads(html.var("spec")) + render = html.var("render") + if not render: + raise MKUserError("render", _("Missing render parameter")) + custom_graph_render_options = json.loads(html.var("render")) + if cmk_graphs_possible(): - host_service_graph_dashlet_cmk(graph_specification) + host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_options) elif graph_specification[0] == "template": host_service_graph_dashlet_pnp(graph_specification) else: html.write(_("This graph can not be rendered.")) -def host_service_graph_dashlet_cmk(graph_specification): +def host_service_graph_dashlet_cmk(graph_specification, custom_graph_render_options): size = (int(((float(html.var("width")) - 49 - 5)/html_size_per_ex)), int((float(html.var("height")) - 23)/html_size_per_ex)) @@ -1405,7 +1409,7 @@ def host_service_graph_dashlet_cmk(graph_specification): "show_controls" : False, "resizable" : False, } - + graph_render_options.update(custom_graph_render_options) # The timerange is specified in PNP like manner. range_secs = { @@ -1423,7 +1427,27 @@ def host_service_graph_dashlet_cmk(graph_specification): "time_range" : (start_time, end_time), } - html_code = render_graphs_from_specification_html(graph_specification, graph_data_range, graph_render_options) + graph_data_range["step"] = estimate_graph_step_for_html(graph_data_range["time_range"], + graph_render_options) + + try: + graph_definitions = create_graph_definitions_from_specification(graph_specification) + if graph_definitions: + graph_definition = graph_definitions[0] + else: + raise MKGeneralException(_("Failed to calculate a graph definition.")) + except livestatus.MKLivestatusNotFoundError: + html.write("<div class=error>%s</div>" % html.attrencode(_("Cannot reander graphs: cannot fetch data via Livestatus"))) + return + + # When the legend is enabled, we need to reduce the height by the height of the legend to + # make the graph fit into the dashlet area. + if graph_render_options["show_legend"]: + # TODO FIXME: This abstract graph is calulated twice. Once here and once in render_graphs_from_specification_html() + abstract_graph = compute_abstract_graph(graph_definition, graph_data_range, graph_render_options) + graph_render_options["size"] = (size[0], size[1] - graph_legend_height_ex(graph_render_options, abstract_graph)) + + html_code = render_graphs_from_definitions([graph_definition], graph_data_range, graph_render_options) html.write(html_code) diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index d57f95b..61fdad7 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -374,9 +374,12 @@ def dashlet_graph_reload_js(nr, dashlet): "service_description" : service, "graph_index" : dashlet["source"] -1, }) + graph_render_options = { + "show_legend": dashlet.get("show_legend", False), + } - return "dashboard_render_graph(%d, %s, '%s')" % \ - (nr, json.dumps(graph_specification), timerange) + return "dashboard_render_graph(%d, %s, %s, '%s')" % \ + (nr, json.dumps(graph_specification), json.dumps(graph_render_options), timerange) dashlet_types["pnpgraph"] = { @@ -405,6 +408,14 @@ dashlet_types["pnpgraph"] = { default_value = 0, minvalue = 1, )), + ("show_legend", Checkbox( + title = _("Show Legend"), + label = _("Show the legend area of the graph"), + help = _("This option controls whether or not the legend below the graph " + "area should be shown. This option is only used by the new Check_MK " + "graphs which are only available in the Check_MK Enterprise Edition."), + default_value = False, + )), ], "styles": """ .dashlet.pnpgraph .dashlet_inner { @@ -425,7 +436,7 @@ dashlet_types["pnpgraph"] = { "on_refresh" : dashlet_graph_reload_js, "script": """ var dashlet_offsets = {}; -function dashboard_render_graph(nr, graph_specification, timerange) +function dashboard_render_graph(nr, graph_specification, graph_render_options, timerange) { // Get the target size for the graph from the inner dashlet container var inner = document.getElementById('dashlet_inner_' + nr); @@ -433,6 +444,7 @@ function dashboard_render_graph(nr, graph_specification, timerange) var c_h = inner.clientHeight; var post_data = "spec=" + encodeURIComponent(JSON.stringify(graph_specification)) + + "&render=" + encodeURIComponent(JSON.stringify(graph_render_options)) + "&timerange=" + encodeURIComponent(timerange) + "&width=" + c_w + "&height=" + c_h

8 years, 6 months

3265 FIX mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone

by Mathias Kettner

Module: check_mk Branch: master Commit: 15060ef6da96294cabff22e7bf94d2234355c122 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15060ef6da9629… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 7 12:39:21 2016 +0100 3265 FIX mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone --- .werks/3265 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_inventory.solaris | 36 ++++++++++++++++++++--------------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/.werks/3265 b/.werks/3265 new file mode 100644 index 0000000..91582d5 --- /dev/null +++ b/.werks/3265 @@ -0,0 +1,10 @@ +Title: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457350724 + + diff --git a/ChangeLog b/ChangeLog index 3df0ae7..d9afd1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ + * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone 1.2.8b1: diff --git a/agents/plugins/mk_inventory.solaris b/agents/plugins/mk_inventory.solaris index 5f461c5..1674674 100755 --- a/agents/plugins/mk_inventory.solaris +++ b/agents/plugins/mk_inventory.solaris @@ -28,7 +28,11 @@ INTERVAL=14400 FLAGFILE=$MK_VARDIR/mk_inventory.last.$REMOTE -NOW=$(truss /usr/bin/date 2>&1 | grep ^time | awk -F"= " '{print $2}') +if [ `uname -r` = "5.10" ]; then + NOW=$(truss /usr/bin/date 2>&1 | grep ^time | awk -F"= " '{print $2}') +else + NOW=`date +%s` +fi UNTIL=$((NOW + INTERVAL + 600)) #check if flagfile exits @@ -46,15 +50,23 @@ then echo "<<<solaris_uname:sep(61):persist($UNTIL)>>>" uname -X - if type prtdiag > /dev/null; then - echo "<<<solaris_prtdiag:sep(10):persist($UNTIL)>>>" - if type sneep >/dev/null 2>&1; then - SN=$(sneep -t serial) - else - SN=$(smbios -t SMB_TYPE_SYSTEM | grep 'Serial Number:' | awk '{print substr($0, index($0,$3))}') + if zoneadm list | grep -q global + then + if type prtdiag > /dev/null; then + echo "<<<solaris_prtdiag:sep(10):persist($UNTIL)>>>" + if type sneep >/dev/null 2>&1; then + SN=$(sneep -t serial) + else + SN=$(smbios -t SMB_TYPE_SYSTEM | grep 'Serial Number:' | awk '{print substr($0, index($0,$3))}') + fi + echo "SerialNumber: $SN" + prtdiag -v + fi + + if type prtpicl > /dev/null; then + echo "<<<solaris_prtpicl:persist($UNTIL)>>>" + prtpicl -v fi - echo "SerialNumber: $SN" - prtdiag -v fi if type psrinfo > /dev/null; then @@ -62,12 +74,6 @@ then psrinfo -p -v fi - if type prtpicl > /dev/null; then - echo "<<<solaris_prtpicl:persist($UNTIL)>>>" - prtpicl -v - fi - - if type pkginfo >/dev/null ; then echo "<<<solaris_pkginfo:sep(58):persist($UNTIL)>>>" pkginfo -l

8 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016