Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

Start experimental lib module cmk.render

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ca251e0d43e95e815463e90f07ef50ebc9dbcfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca251e0d43e95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 15:09:39 2016 +0200 Start experimental lib module cmk.render --- lib/{fmt.py => render.py} | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/fmt.py b/lib/render.py similarity index 69% rename from lib/fmt.py rename to lib/render.py index adfafd8..2f31f7b 100644 --- a/lib/fmt.py +++ b/lib/render.py @@ -23,3 +23,24 @@ # 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. + +"""This module contains functions that transform Python values into +text representations optimized for human beings - with optional localization. +The resulting strings are not ment to be parsed into values again later. They +are just for optical output purposes.""" + +# THIS IS STILL EXPERIMENTAL + +import time + +# TODO: Clean this up one day by using the way recommended by gettext. +# (See https://docs.python.org/2/library/gettext.html). For this we +# need the path to the locale files here. +try: + _ +except NameError: + _ = lambda x: x # Fake i18n when not available + + +def date(timestamp): + return time.strftime("%Y-%m-%d", time.localtime(timestamp))

8 years, 1 month

Fix layout problem in sortable/searchable tables without header

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e7e4c76d646494c55474d8f12c743e9f6af4d66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e7e4c76d64649… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 13:29:06 2016 +0200 Fix layout problem in sortable/searchable tables without header --- web/htdocs/table.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index edc2cb3..27a28d9 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -282,6 +282,8 @@ def end(): if first_col: first_col = False if actions_enabled: + if not header: + header = " " # Fixes layout problem with white triangle if actions_visible: state = '0' help = _('Hide table actions')

8 years, 1 month

fixed dumb werk title

by Lars Michelsen

Module: check_mk Branch: master Commit: e0c6f0405b6c5f1d06ef76d4f17cae21d0c74671 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c6f0405b6c5f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 7 10:50:34 2016 +0200 fixed dumb werk title --- .werks/3590 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3590 b/.werks/3590 index ebfd76a..2536fc1 100644 --- a/.werks/3590 +++ b/.werks/3590 @@ -1,4 +1,4 @@ -Title: mssql.vbs: Completely removed plugin output +Title: mssql.vbs: Completely removed plugin timeout Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 8da0093..e3233eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -261,7 +261,7 @@ * 3633 FIX: check_sql: minor cleanup in active check_sql, fixed performance data handling * 3540 FIX: Fixed exception on reading cachefiles... * 3541 FIX: esx_vsphere_hostsystem.state: no longer crashes when data is missing... - * 3590 FIX: mssql.vbs: Completely removed plugin output... + * 3590 FIX: mssql.vbs: Completely removed plugin timeout... Multisite: * 3187 notification view: new filter for log command via regex

8 years, 1 month

3590 FIX mssql.vbs: Completely removed plugin output

by Lars Michelsen

Module: check_mk Branch: master Commit: e9c8344f24e18bbfca433ab13048896f2e77cdc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9c8344f24e18b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 7 10:48:29 2016 +0200 3590 FIX mssql.vbs: Completely removed plugin output The timeout / async handling of agent plugins should be handled in the agent configuration. --- .werks/3590 | 11 +++++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 6 ------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.werks/3590 b/.werks/3590 new file mode 100644 index 0000000..ebfd76a --- /dev/null +++ b/.werks/3590 @@ -0,0 +1,11 @@ +Title: mssql.vbs: Completely removed plugin output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465289261 + +The timeout / async handling of agent plugins should be handled in +the agent configuration. diff --git a/ChangeLog b/ChangeLog index 9fcc98d..8da0093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -261,6 +261,7 @@ * 3633 FIX: check_sql: minor cleanup in active check_sql, fixed performance data handling * 3540 FIX: Fixed exception on reading cachefiles... * 3541 FIX: esx_vsphere_hostsystem.state: no longer crashes when data is missing... + * 3590 FIX: mssql.vbs: Completely removed plugin output... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index b3932ad..75052df 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -36,12 +36,6 @@ Dim cfg_dir, cfg_file, hostname Const HKLM = &H80000002 -' Don't make this timeout too low. We saw the "sp_spaceused" stored procedure -' to sometimes come back instantly but sometimes it takes several seconds to -' come back. If this is needed to be changed, please make it configurable using -' the plugins mssql*.ini config files. -WScript.Timeout = 30 - ' Directory of all database instance names Set instances = CreateObject("Scripting.Dictionary") Set FSO = CreateObject("Scripting.FileSystemObject")

8 years, 1 month

Added deprecation warning to setup.sh

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b9a19a56b6e7ae910a32df70a79f1356bb22a54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b9a19a56b6e7a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 10:41:35 2016 +0200 Added deprecation warning to setup.sh --- scripts/setup.sh | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index c3b7029..19155c2 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -165,16 +165,7 @@ ask_title () } if [ -z "$YES" ] ; then cat <<EOF - - - - - - - - - - +[H[2J [1;44;37m ____ _ _ __ __ _ __ [0m [1;44;37m / ___| |__ ___ ___| | __ | \/ | |/ / [0m [1;44;37m | | | '_ \ / _ \/ __| |/ / | |\/| | ' / [0m @@ -182,8 +173,45 @@ if [ -z "$YES" ] ; then cat <<EOF [1;44;37m \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ [0m [1;44;37m |_____| [0m [1;44;37m [0m -[1;45;37m Check_MK setup $(printf "%32s" Version:' '$VERSION) [0m +[1;45;37m Check_MK manual setup $(printf "%32s" Version:' '$VERSION) [0m +[1;41;33m [0m +[1;41;33m WARNING [0m +[1;41;33m [0m +[1;41;37m The manual setup of Check_MK via ./setup.sh is deprecated and will [0m +[1;41;37m not be maintained any longer in future. We recommend using the [0m +[1;41;37m Check_MK Raw Edition packages. These have many advantages: [0m +[1;41;37m [0m +[1;41;37m - Very easy installation via a single RPM/DEB package [0m +[1;41;37m - Contains fully integrated complete monitoring environment [0m +[1;41;37m - Does not need installation of Nagios, PNP4Nagios or plugins [0m +[1;41;37m - Supports multiple versions of Check_MK at the same time [0m +[1;41;37m - Supports multiple monitoring instances on one server [0m +[1;41;37m - Actively maintainained by the Check_MK project [0m +[1;41;37m [0m +[1;44;37m [0m +[1;44;37m You can download the Check_MK Raw Edition for free here: [0m +[1;44;33m [0m +[1;44;36m http://mathias-kettner.com/download [0m +[1;44;37m [0m +[1;44;37m Installation instructions are here: [0m +[1;44;37m [0m +[1;44;36m http://mathias-kettner.com/cms_introduction_packages.html [0m +[1;44;37m [0m + +EOF + +echo -n "Are you sure you want to proceed with manual setup [no]? " +if [ "$YES" != yes ] +then + read YESNO + [ "${YESNO:0:1}" = y -o "${YESNO:0:1}" = Y ] || { + echo "Aborted." + exit + } +fi +clear +cat << EOF Welcome to Check_MK. This setup will install Check_MK into user defined directories. If you run this script as root, installation paths below

8 years, 1 month

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 70902335dade3624f2f33397ef30099e8f9d4a7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70902335dade36… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jun 7 10:17:18 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AndingFilter.h | 2 +- livestatus/src/CustomVarsFilter.h | 2 +- livestatus/src/DynamicLogwatchFileColumn.h | 2 +- livestatus/src/Logger.h | 2 +- livestatus/src/NegatingFilter.h | 2 +- livestatus/src/StringColumnFilter.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index bd2facb..80c209d 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -40,7 +40,7 @@ protected: public: AndingFilter() {} - ~AndingFilter(); + virtual ~AndingFilter(); bool isAndingFilter() { return true; } void addSubfilter(Filter *); Filter *stealLastSubfiler(); diff --git a/livestatus/src/CustomVarsFilter.h b/livestatus/src/CustomVarsFilter.h index 7be3c86..9eca9c4 100644 --- a/livestatus/src/CustomVarsFilter.h +++ b/livestatus/src/CustomVarsFilter.h @@ -43,7 +43,7 @@ class CustomVarsFilter : public Filter { public: CustomVarsFilter(CustomVarsColumn *column, int opid, char *value); - ~CustomVarsFilter(); + virtual ~CustomVarsFilter(); bool accepts(void *data); }; diff --git a/livestatus/src/DynamicLogwatchFileColumn.h b/livestatus/src/DynamicLogwatchFileColumn.h index 9258489..3002d90 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.h +++ b/livestatus/src/DynamicLogwatchFileColumn.h @@ -35,7 +35,7 @@ public: DynamicLogwatchFileColumn(std::string name, std::string description, int indirect_offset, int extra_offset = -1) : DynamicColumn(name, description, indirect_offset, extra_offset) {} - ~DynamicLogwatchFileColumn() {} + virtual ~DynamicLogwatchFileColumn() {} Column *createColumn(const std::string &name, const std::string &arguments) override; }; diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 9035545..d531b97 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -32,7 +32,7 @@ class Logger { public: explicit Logger(int priority) : _priority(priority) {} - ~Logger() { logger(_priority, "%s", _os.str().c_str()); } + virtual ~Logger() { logger(_priority, "%s", _os.str().c_str()); } template <typename T> std::ostream &operator<<(const T &t) { diff --git a/livestatus/src/NegatingFilter.h b/livestatus/src/NegatingFilter.h index c1b76a3..7e6408f 100644 --- a/livestatus/src/NegatingFilter.h +++ b/livestatus/src/NegatingFilter.h @@ -33,7 +33,7 @@ class NegatingFilter : public Filter { public: explicit NegatingFilter(Filter *filter) : _filter(filter) {} - ~NegatingFilter() { delete _filter; } + virtual ~NegatingFilter() { delete _filter; } bool isNegatingFilter() { return true; } Filter *subfilter() { return _filter; } bool accepts(void *data) { return !_filter->accepts(data); } diff --git a/livestatus/src/StringColumnFilter.h b/livestatus/src/StringColumnFilter.h index 701d2b3..911e02e 100644 --- a/livestatus/src/StringColumnFilter.h +++ b/livestatus/src/StringColumnFilter.h @@ -40,7 +40,7 @@ class StringColumnFilter : public Filter { public: StringColumnFilter(StringColumn *column, int opid, char *value); - ~StringColumnFilter(); + virtual ~StringColumnFilter(); bool accepts(void *data); void *indexFilter(const char *column); };

8 years, 1 month

Fixed color code in skype ipad metric

by Mathias Kettner

Module: check_mk Branch: master Commit: 741ccee43f89915f6efb00ff96f00511f15d1460 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=741ccee43f8991… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 10:15:20 2016 +0200 Fixed color code in skype ipad metric --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 170aac6..d2fc2e3 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3380,7 +3380,7 @@ metric_info["failed_inbound_streams"] = { skype_mobile_devices = [("android", "Android", "33/a"), ("iphone", "iPhone", "42/a"), - ("ipad", "iPad", "45/4")] + ("ipad", "iPad", "45/a")] for device, name, color in skype_mobile_devices: metric_info["active_sessions_%s" % device] = {

8 years, 1 month

3541 FIX esx_vsphere_hostsystem.state: no longer crashes when data is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 6d57ef82922b456f5843a4c7c69dfd7f50d820e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d57ef82922b45… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 7 10:02:19 2016 +0200 3541 FIX esx_vsphere_hostsystem.state: no longer crashes when data is missing Sometimes ESX systems decide not report any data at all. This check no longer crashes when this happens, it simply reports UNKNOWN. An upcoming update will change this behaviour so that the checks will go stale in case the data is missing. --- .werks/3541 | 15 +++++++++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 3 +++ 3 files changed, 19 insertions(+) diff --git a/.werks/3541 b/.werks/3541 new file mode 100644 index 0000000..8485117 --- /dev/null +++ b/.werks/3541 @@ -0,0 +1,15 @@ +Title: esx_vsphere_hostsystem.state: no longer crashes when data is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1465286242 + +Sometimes ESX systems decide not report any data at all. +This check no longer crashes when this happens, it simply reports UNKNOWN. + +An upcoming update will change this behaviour so that the checks will go stale +in case the data is missing. + diff --git a/ChangeLog b/ChangeLog index e3e8e5c..9fcc98d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -260,6 +260,7 @@ * 2238 FIX: postfix_mailq: Fixed incorrect creation of RRDs, Fixed graphs of size and length of queues... * 3633 FIX: check_sql: minor cleanup in active check_sql, fixed performance data handling * 3540 FIX: Fixed exception on reading cachefiles... + * 3541 FIX: esx_vsphere_hostsystem.state: no longer crashes when data is missing... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 11fbf4a..3e88dd5 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -295,6 +295,9 @@ def inventory_esx_vsphere_hostsystem_state(info): def check_esx_vsphere_hostsystem_state(_no_item, _no_params, info): data = esx_vsphere_hostsystem_convert(info) state = 0 + if "overallStatus" not in data: + return + overallStatus = str(data['overallStatus'][0]) if overallStatus == "yellow": state = 1

8 years, 1 month

Tried to fix headrify script a bit; but it is still broken

by Lars Michelsen

Module: check_mk Branch: master Commit: a7c256b3ec4f1c860e0d34c7629fd26bc985ad1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7c256b3ec4f1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 6 20:59:59 2016 +0200 Tried to fix headrify script a bit; but it is still broken --- doc/helpers/headrify | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 6c39ca9..c6e383b 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -26,7 +26,7 @@ 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 +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. @@ -44,8 +44,8 @@ headrify () return fi - if [ "${file##*/}" = README ] ; then - echo "skipping README file." + if [[ "${file##*/}" =~ ^[A-Z]+$ ]]; then + echo "skipping $file. It's a documentation file." return fi @@ -82,7 +82,7 @@ headrify () *.h|*.c|*.cc|*.h.in|*.js) comment="// " ;; *.conf|*.cfg) comment="# " ;; *.spec|Makefile*) comment="# " ;; - *.py|*) comment="# " ; bangpath="#!/usr/bin/python + *.py|*) comment="# " ; bangpath="#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*-"; ;; esac fi @@ -137,8 +137,22 @@ else -name "*.php" -or \ -name "*.sh" -or \ -name "*.spec" \) ; \ - rm -f checks/*~ ; ls checks/* ; echo agents/plugins/* agents/special/* agents/* | tr ' ' \\n | grep -vx agents/waitmax | fgrep -v windows | fgrep -v .exe | fgrep -v windows/plugins ; ls agents/windows/*.cc ; echo agents/windows/Makefile ; } \ - | egrep -v 'livestatus/nagios4?/' | grep -vx '' | \ + rm -f checks/*~ ; ls checks/* ; \ + echo agents/plugins/* agents/special/* agents/* \ + | tr ' ' \\n \ + | grep -vx agents/waitmax \ + | fgrep -v windows \ + | fgrep -v .exe \ + | fgrep -v .deb \ + | fgrep -v .rpm \ + | fgrep -v windows/plugins ; \ + ls agents/windows/*.cc ; + echo agents/windows/Makefile ; + } \ + | egrep -v 'livestatus/nagios4?/' \ + | grep -v 'agents/cfg_examples' \ + | grep -vx '' \ + | \ while read file do headrify "$file" &

8 years, 1 month

Added current sys.path to cmk crash reports

by Lars Michelsen

Module: check_mk Branch: master Commit: cfa44fed87ef20ac0f1c3afc519e1df59cf78ab3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfa44fed87ef20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 6 15:26:11 2016 +0200 Added current sys.path to cmk crash reports --- modules/check_mk_base.py | 1 + web/htdocs/crash_reporting.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f64246f..f2d9189 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1600,6 +1600,7 @@ def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, d "os" : get_os_info(), "version" : check_mk_version, "python_version": sys.version, + "python_paths" : sys.path, "exc_type" : exc_type.__name__, "exc_value" : "%s" % exc_value, "exc_traceback" : traceback.extract_tb(exc_traceback), diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 664794e..9b2b29c 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -281,6 +281,9 @@ def show_crash_report(info): html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(info["exc_traceback"]))) html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Local Variables")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_local_vars(info["local_vars"]))) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Python Module Paths")) + joined_paths = "<br>".join([ html.attrencode(p) for p in info.get("python_paths", [_("Unknown")]) ]) + html.write("<td>%s</td></tr>" % joined_paths) html.write("</table>") @@ -445,6 +448,7 @@ def create_crash_dump_info_file(tar): "os" : get_os_info(), "version" : defaults.check_mk_version, "python_version": sys.version, + "python_paths" : sys.path, "exc_type" : exc_type.__name__, "exc_value" : "%s" % exc_value, "exc_traceback" : traceback.extract_tb(exc_traceback),

8 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016