Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Fixed possible exception during dashlet editing

by Lars Michelsen

Module: check_mk Branch: master Commit: b8ddb786b2319d87099730e2847f7c1bc5ec39d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8ddb786b2319d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 08:55:33 2014 +0100 Fixed possible exception during dashlet editing --- web/htdocs/dashboard.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 466947f..1181048 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -378,6 +378,7 @@ def render_dashboard(name): url = dashlet.get("url", "dashboard_dashlet.py?name="+name+"&id="+ str(nr)) refresh = dashlet.get("refresh", dashlet_type.get("refresh")) if refresh: + action = None if 'on_refresh' in dashlet_type: try: action = 'function() {%s}' % dashlet_type['on_refresh'](nr, dashlet) @@ -389,7 +390,9 @@ def render_dashboard(name): else: # FIXME: remove add_wato_folder_to_url action = '"%s"' % add_wato_folder_to_url(url, wato_folder) # url to dashboard_dashlet.py - refresh_dashlets.append('[%d, %d, %s]' % (nr, refresh, action)) + + if action: + refresh_dashlets.append('[%d, %d, %s]' % (nr, refresh, action)) # Update the dashlets context with the dashboard global context when there are

9 years, 9 months

Check_MK Git: check_mk: Fixed encoding exception in "add to visual" menu on host pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 71e3bf8d889a87d6aa7753e9714343014815ab7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e3bf8d889a87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 08:51:37 2014 +0100 Fixed encoding exception in "add to visual" menu on host pages --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d0c0b16..3d72fff 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -887,7 +887,7 @@ class html: if self.myfile == "view": mode_name = self.var('mode') == "availability" and "availability" or "view" - encoded_vars = self.attrencode([ (k, v != None and v or '') for k,v in self.page_context.items() ]) + encoded_vars = self.attrencode([ (k, v != None and str(v) or '') for k,v in self.page_context.items() ]) h += '<div class="visualadd"><a class="visualadd" href="javascript:void(0)" ' \ 'onclick="toggle_add_to_visual(event, this, \'%s\', %s, {\'name\': \'%s\'})">' \ '<img class=statusicon src="images/status_add_dashlet.png" title="%s"></a></div>\n' % \

9 years, 9 months

Check_MK Git: check_mk: Fixed jsonp layout

by Lars Michelsen

Module: check_mk Branch: master Commit: cae1ee721b1298d3189dfdbc2846ad44872c39f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cae1ee721b1298… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 08:22:07 2014 +0100 Fixed jsonp layout --- web/plugins/views/webservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 753c8f1..71c0bf8 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -122,7 +122,7 @@ multisite_layouts["json"] = { } def render_jsonp(rows, view, group_painters, painters, num_columns, show_checkboxes): - html.write("parseJSON(\n"); + html.write("%s(\n" % html.var('jsonp')); render_json(rows, view, group_painters, painters, num_columns, show_checkboxes) html.write(");\n");

9 years, 9 months

Check_MK Git: check_mk: #1739 FIX lnx_thermal: Be more compatible to thermal devices which report no "type"

by Lars Michelsen

Module: check_mk Branch: master Commit: 85e499e696cc5b59d6388313d8dc326caf6c4515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e499e696cc5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 08:46:56 2014 +0100 #1739 FIX lnx_thermal: Be more compatible to thermal devices which report no "type" --- .werks/1739 | 9 +++++++++ ChangeLog | 1 + checks/lnx_thermal | 13 +++++++++++++ 3 files changed, 23 insertions(+) diff --git a/.werks/1739 b/.werks/1739 new file mode 100644 index 0000000..74c4ad9 --- /dev/null +++ b/.werks/1739 @@ -0,0 +1,9 @@ +Title: lnx_thermal: Be more compatible to thermal devices which report no "type" +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418283980 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d4f200b..1e284e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 1737 FIX: mk_sap: Working around garbled SAP state file when multiple instances were running parallel * 1738 FIX: oracle_instance: Be compatible to old oracle agent outputs * 1751 FIX: winperf_ts_sessions: try to fix invalid number of active and inactive sessions... + * 1739 FIX: lnx_thermal: Be more compatible to thermal devices which report no "type" Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 22ad645..ba0edcd 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -31,6 +31,10 @@ # <<<lnx_thermal>>> # thermal_zone0 enabled acpitz 47000 90000 critical 79000 passive +# <<<lnx_thermal>>> +# thermal_zone0 enabled acpitz 38000 98000 critical +# thermal_zone1 pkg-temp-0 44000 0 passive 0 passive + def inventory_lnx_thermal(info): return [ (l[0].replace('thermal_zone', ''), None) for l in info ] @@ -41,6 +45,15 @@ def check_lnx_thermal(item, params, info): state = 0 tp_reached = [] + # Some devices report an empty value for the 3rd field (type). Trying to fix those lines. + # -> thermal_zone1 pkg-temp-0 44000 0 passive 0 passive + try: + int(line[2]) + int(line[3]) + line = line[:2] + [''] + line[2:] + except: + pass # -> regular line + # convert values from millidegree cur = int(line[3]) / 1000

9 years, 9 months

Check_MK Git: check_mk: Fixed order of painters in host and service related list views

by Lars Michelsen

Module: check_mk Branch: master Commit: 413e8e22ad58ead924cea8faef8b36b99bd477cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413e8e22ad58ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 08:19:48 2014 +0100 Fixed order of painters in host and service related list views --- web/plugins/views/builtin.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1cfbb79..68f230d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -36,9 +36,8 @@ service_view_painters = [ ] # Same as list of services, but extended by the hostname -host_service_view_painters = [ - ('host', 'host') -] + service_view_painters +host_service_view_painters = service_view_painters +host_service_view_painters.insert(1, ('host', 'host')) multisite_builtin_views.update({ 'allhosts': {'browser_reload': 30,

9 years, 9 months

Check_MK Git: check_mk: minor spelling fix in WATO host setup

by Götz Golla

Module: check_mk Branch: master Commit: 4ba206383f35bc4a71ee057f57da2f392c09ffdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ba206383f35bc… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Dec 10 17:52:44 2014 +0100 minor spelling fix in WATO host setup --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4867850..3dc1f00 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5940,7 +5940,7 @@ class ContactGroupsAttribute(Attribute): html.write(' <a href="%s">%s</a><br>' % (make_link([("mode", "edit_contact_group"), ("edit", name)]), group['alias'] and group['alias'] or name)) html.write("<hr>") if is_host: - html.checkbox(self._name + "_use", value["use"], label = _("Add these contact groups the host")) + html.checkbox(self._name + "_use", value["use"], label = _("Add these contact groups to host")) else: html.checkbox(self._name + "_recurse_perms", value["recurse_perms"], label = _("Give these groups also <b>permission on all subfolders</b>")) html.write("<hr>")

9 years, 9 months

Check_MK Git: check_mk: #1757 Check SSH can now be configured in WATO

by Bastian Kuhn

Module: check_mk Branch: master Commit: 40ebf27c6dca5c7d2d6ae44ccd562c989bb5849e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40ebf27c6dca5c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 10 16:44:01 2014 +0100 #1757 Check SSH can now be configured in WATO --- .werks/1757 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/1757 b/.werks/1757 new file mode 100644 index 0000000..80ae386 --- /dev/null +++ b/.werks/1757 @@ -0,0 +1,9 @@ +Title: Check SSH can now be configured in WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418226215 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d4f200b..5bc2be0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 1726 Move variable data of Linux/UNIX agents to /var/lib/check_mk_agent... NOTE: Please refer to the migration notes! * 1734 check_sql: Added support for DB2 (thanks to Troels Arvin) + * 1757 Check SSH can now be configured in WATO * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices...

9 years, 9 months

Check_MK Git: check_mk: Added check_ssh in WATO

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3f8fc8fdd836433b1602dd4e31ff88f968381226 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f8fc8fdd83643… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 10 16:43:17 2014 +0100 Added check_ssh in WATO --- checkman/check_ssh | 16 +++++++++++++ checks/check_ssh | 48 +++++++++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 30 +++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/checkman/check_ssh b/checkman/check_ssh new file mode 100644 index 0000000..7b0460b --- /dev/null +++ b/checkman/check_ssh @@ -0,0 +1,16 @@ +title: SSH Service (Ping) +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This performs an active check to connect to a ssh service. + + It optional can check the protocol version or the program version. + + Returns {CRIT} if the connection isn't possible. + + This check can be configured by Wato. + +perfdata: + One value: The connection time. diff --git a/checks/check_ssh b/checks/check_ssh new file mode 100644 index 0000000..d96b9b3 --- /dev/null +++ b/checks/check_ssh @@ -0,0 +1,48 @@ +#!/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- +# ails. 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. + +def check_ssh_arguments(params): + args = [] + if 'timeout' in params: + args.append("-t " + str(params['timeout'])) + if 'port' in params: + args.append("-p " + str(params['port'])) + if 'remote_version' in params: + args.append("-r " + quote_shell_string(params['remote_version'])) + if 'remote_protocol' in params: + args.append("-P " + quote_shell_string(params['remote_protocol'])) + + args.append("$HOSTADDRESS$") + + return " ".join(args) + +active_check_info['ssh'] = { + "command_line" : '$USER1$/check_ssh $ARG1$', + "argument_function" : check_ssh_arguments, + "service_description" : lambda args: "SSH", + "has_perfdata" : True, +} + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 31083e7..a513b92 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -70,6 +70,36 @@ check_icmp_params = [ )), ] +register_rule(group, + "active_checks:ssh", + Dictionary( + title = _("Check SSH service"), + help = _("This rulset allow you to configure a SSH check for a host"), + elements = [ + ("port", + Integer( + title = _("Port number to be used"), + default_value = 22), + ), + ("timeout", + Integer( + title = _("Connection timeout"), + help = _("Seconds before connection times out"), + default_value = 10), + ), + ("remote_version", + TextAscii( + title = _("Remote Version"), + help = _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"), + )), + ("remote_protocol", + TextAscii( + title = _("Remote Protocol"), + help = _("Warn if protocol doesn't match expected protocol version (ex: 2.0)"), + )), + ] + ), + match="all") register_rule(group, "active_checks:icmp",

9 years, 9 months

Check_MK Git: check_mk: Reserved 1 Werk IDS

by Bastian Kuhn

Module: check_mk Branch: master Commit: 619509982d0f5845e801caf7d5c28f7107c8f119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619509982d0f58… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 10 16:42:32 2014 +0100 Reserved 1 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 16ed94b..11ad811 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1757 +1758

9 years, 9 months

Check_MK Git: check_mk: mk_sap: Fixed wrong var p\ath

by Lars Michelsen

Module: check_mk Branch: master Commit: 45ed9d6c3c811f539299bd90b1d1794d7b6fa40b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45ed9d6c3c811f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 10 08:29:18 2014 +0100 mk_sap: Fixed wrong var p\ath --- agents/plugins/mk_sap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 2d46d75..e780c29 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -109,7 +109,7 @@ SKIP_MTCLASSES = [ ] MK_CONFDIR = os.getenv("MK_CONFDIR") or "/etc/check_mk" -MK_VARDIR = os.getenv("MK_VARDIR") or "/var/lib/check_mk" +MK_VARDIR = os.getenv("MK_VARDIR") or "/var/lib/check_mk_agent" STATE_FILE = MK_VARDIR + '/sap.state' state_file_changed = False

9 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014