Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 259712522c85b88c9ed61f3e05dbdb96069e6dc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=259712522c85b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 16:52:18 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Fixed problem with invalid check items for oracle_tablespaces

by Lars Michelsen

Module: check_mk Branch: master Commit: 686352aa1bae4acb7dc9fc69f07c0aed142df315 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=686352aa1bae4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 16:02:11 2013 +0100 Fixed problem with invalid check items for oracle_tablespaces --- checks/oracle_tablespaces | 7 +++++-- web/plugins/wato/check_parameters.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 1ecca0d..04e943d 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -142,7 +142,11 @@ def get_tablespace_levels_in_bytes(size_bytes, params): def check_oracle_tablespaces(item, params, info): - sid, tbsname = item.split('.') + try: + sid, tbsname = item.split('.') + except ValueError: + return (3, 'UNKNOWN - Invalid check item given (must be <SID>.<tablespace>)') + ts_status = None num_files = 0 num_avail = 0 @@ -199,7 +203,6 @@ def check_oracle_tablespaces(item, params, info): if ts_status == None: return (3, "UNKNOWN - Tablespace not found") - infotext = " - %s, size %s, used %s" % \ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1868e5d..f646e6c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1463,6 +1463,7 @@ checkgroups.append(( TextAscii( title = _("Explicit tablespaces"), help = _("Here you can set explicit tablespaces by defining them via SID and the tablespace name, separated by a dot, for example <b>pengt.TEMP</b>"), + regex = '.+\..+', allow_empty = False), None))

11 years, 7 months

Check_MK Git: check_mk: Fixed problem with new oracle_tablespaces parameters with old inventorized tuple format

by Lars Michelsen

Module: check_mk Branch: master Commit: e874f984ab163db08b5e6cc9ed99dbbfc797a1cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e874f984ab163d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 15:55:43 2013 +0100 Fixed problem with new oracle_tablespaces parameters with old inventorized tuple format --- checkman/oracle_tablespaces | 4 ++-- checks/oracle_tablespaces | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 4139c57..6d2162c 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -55,7 +55,7 @@ examples: # of maximum tablespace size and deactivate check of autoextend - oracle_tablespaces_default_levels = { + oracle_tablespaces_defaults = { "levels" : (20.0, 10.0), "autoextend" : None } @@ -106,4 +106,4 @@ oracle_tablespaces_check_default_increment(bool): This setting does not {True}. That way the check will warn if the table space has its increment size set to {1} (the ORACLE default value). -oracle_tablespaces_default_levels(dict): A dictionary with the optional keys mentioned in parameters +oracle_tablespaces_defaults(dict): A dictionary with the optional keys mentioned in parameters diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 273fa0f..1ecca0d 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -55,7 +55,7 @@ # integer: MB. oracle_tablespaces_default_levels = (10.0, 5.0) -factory_settings["oracle_tablespaces_default_levels"] = { +factory_settings["oracle_tablespaces_defaults"] = { "levels" : (10.0, 5.0), "magic_normsize" : 1000, "levels_low" : (0.0, 0.0) @@ -263,7 +263,7 @@ check_info['oracle_tablespaces'] = { "inventory_function" : inventory_oracle_tablespaces, "has_perfdata" : True, "group" : "oracle_tablespaces", - "default_levels_variable" : "oracle_tablespaces_default_levels", + "default_levels_variable" : "oracle_tablespaces_defaults", "includes" : [ "oracle.include" ] } check_config_variables.append("oracle_tablespaces_check_default_increment")

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 096de5cac6756d4f847aa80732e91a47c59801bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=096de5cac6756d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 15:56:02 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: fixed handling notification (plugin) return code

by Andreas Boesl

Module: check_mk Branch: master Commit: a903c0f3c437dc1f71eaf32c70d04157850fe5c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a903c0f3c437dc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 15:34:07 2013 +0100 mknotifyd: fixed handling notification (plugin) return code --- modules/notify.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 8ede4bd..cb52b67 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -265,9 +265,9 @@ def process_context(context, write_into_spoolfile, use_method = None): method = ('flexible', [found_plugin]) if type(method) == tuple and method[0] == 'flexible': - notify_flexible(context, method[1], write_into_spoolfile) + return notify_flexible(context, method[1], write_into_spoolfile) else: - notify_via_email(context, write_into_spoolfile) + return notify_via_email(context, write_into_spoolfile) except Exception, e: notify_log("ERROR: %s\n%s" % (e, format_exception())) sys.stderr.write("ERROR: %s\n" % e)

11 years, 7 months

Check_MK Git: check_mk: check_parameters.py code cleanup

by Andreas Boesl

Module: check_mk Branch: master Commit: 053d9b4d5f1c6181d9f9f3efda5e3531a62fa6e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=053d9b4d5f1c61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 15:02:06 2013 +0100 check_parameters.py code cleanup --- web/plugins/wato/check_parameters.py | 36 ---------------------------------- 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c4273ef..1868e5d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1485,42 +1485,6 @@ checkgroups.append(( allow_empty = False), None)) -#checkgroups.append(( -# subgroup_applications, -# "oracle_tablespaces", -# _("Oracle Tablespaces"), -# Dictionary( -# elements = [ -# ( "levels", -# Alternative( -# title = _("Total Memory Levels"), -# elements = [ -# Tuple( -# title = _("Percentage levels of used space"), -# elements = [ -# Percentage(title = _("Warning at"), label = _("% usage")), -# Percentage(title = _("Critical at"), label = _("% usage")), -# ] -# ), -# Tuple( -# title = _("Absolute free space in MB"), -# elements = [ -# Integer(title = _("Warning lower than"), unit = _("MB")), -# Integer(title = _("Critical lower than"), unit = _("MB")), -# ] -# ) -# ])), -# ( "autoextend", -# Checkbox( -# title = _("Autoextend"), -# label = _("Autoextension is expected") -# help = _(""))), -# -# ]), -# TextAscii( -# title = _("Service descriptions"), -# allow_empty = False), -# None)) checkgroups.append(( subgroup_applications,

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: replace VERSION text, GPL header for mknotifyd

by Andreas Boesl

Module: check_mk Branch: master Commit: cfc94c6b4ab9b388aeaf431652ff094597167c5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfc94c6b4ab9b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 14:52:45 2013 +0100 mknotifyd: replace VERSION text, GPL header for mknotifyd --- Makefile | 1 + doc/treasures/mknotifyd | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7473356..1019346 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,7 @@ setversion: sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' mkeventd/bin/mkeventd ; \ + sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' doc/treasures/mknotifyd ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm *.exe ; make ; cd ../.. ; \ diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 87b7353..042cce2 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -1,7 +1,28 @@ #!/usr/bin/python # encoding: utf-8 - -# TODO: GPL HEADER / mkeventd?? +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. import socket, os, time, sys, getopt, signal, thread, pprint, re, select, subprocess, stat, pickle, uuid

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 514be8c04cae2bd63f384cfc645cd9e2df60d778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=514be8c04cae2b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 14:45:03 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: removed todo comments

by Andreas Boesl

Module: check_mk Branch: master Commit: acc1738540317fbc05ccba5cfe32687bd6f59ce9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acc1738540317f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 14:44:54 2013 +0100 removed todo comments --- doc/treasures/mknotifyd | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index f94fd89..87b7353 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -190,7 +190,6 @@ class TcpServer: self._tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._tcp_socket.bind(("0.0.0.0", listen_port)) - # TODO: listen limit ? self._tcp_socket.listen(200) except: log("Error opening socket.\n%s" % format_exception()) @@ -242,7 +241,6 @@ class TcpServer: client_socket = None except: pass - # TODO: wirklich ohne socket.close() client_socket = None if self._reopen_sockets: log("Reopen tcp socket")

11 years, 7 months

Check_MK Git: check_mk: Fixed another IE7 layout bug

by Lars Michelsen

Module: check_mk Branch: master Commit: 73239c53aea86d349a63d7b93542cd7fc14a7521 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73239c53aea86d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:42:50 2013 +0100 Fixed another IE7 layout bug --- web/htdocs/wato.css | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index bef2134..cf90b4c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -646,9 +646,10 @@ form#form_timeperiod td.vlof_content { } /* main menu */ -.wato div.mainmenu { - display: table-cell; - margin-bottom: 10px; + +form.search { + padding-top: 10px; + clear: both; } .wato div.mainmenu a {

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013