Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: cb7b8c10e7a018ecc5e866eea84e430e456aed5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb7b8c10e7a018… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:43:08 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: fixed syntax error in debug output

by Andreas Boesl

Module: check_mk Branch: master Commit: 73b224a849213d619f566f0413ee5a7dee4a9d92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b224a849213d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 14:41:46 2013 +0100 fixed syntax error in debug output --- doc/treasures/mknotifyd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index bdb101f..f94fd89 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -215,7 +215,7 @@ class TcpServer: client_socket, addr_info = s.accept() client_data = client_socket.recv(8192) if opt_verbose > 1: - verbose("Received notification %d from %s" % ( handled_connection, pprint.pformat(addr_info), 2)) + verbose("Received notification %d from %s" % ( handled_connections, pprint.pformat(addr_info)), 2) handled_connections = handled_connections + 1 try:

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: c321513d8a34026943d788b3a573da85e2d6016e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c321513d8a3402… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 14:42:05 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0905

by Lars Michelsen

Module: check_mk Branch: master Commit: f1cc4783efa188308bf66a2ddfe336368c624c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cc4783efa188… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:03:27 2013 +0100 Updated bug entries #0905 --- .bugs/905 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/905 b/.bugs/905 index de05983..bdb8103 100644 --- a/.bugs/905 +++ b/.bugs/905 @@ -1,9 +1,9 @@ Title: We need an option to make "expect messages" based on subregexes possible Component: ec -State: open +Class: feature +State: done Date: 2013-01-31 11:18:44 Targetversion: 1.2.2 -Class: feature For example, when having several logentries which are sent regularly, like @@ -31,3 +31,6 @@ autoamtisch eine neue EC-Regel direkt vor der Generator-Regel ein, die dann auf den speziellen Host wartet. Danach muss die EC neu geladen werden. Frage ist, ob das aus einer Aktion heraus sauber geht. Wahrscheinlich ja. + +2013-02-12 13:40:26: changed state open -> done +solved.

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed several minor IE7 related layout bugs

by Lars Michelsen

Module: check_mk Branch: master Commit: eeb36e184fb1e792c2a1ea64812f9c3913041b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeb36e184fb1e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:26:42 2013 +0100 FIX: Fixed several minor IE7 related layout bugs --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 2 +- web/htdocs/status.css | 1 + web/htdocs/wato.css | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb04c54..3186c56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ Event Console: * FIX: Fixed exception when logging actions exectuted by mkeventd + Multisite: + * FIX: Fixed several minor IE7 related layout bugs + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9803702..da03f6d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -859,7 +859,7 @@ class html: self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % (_("Reloading..."), title)) - self.write('<td width=240 class=right>%s   %s' % + self.write('<td style="min-width:240px" class=right>%s   %s' % (login_text, time.strftime("%H:%M"))) try: self.help_visible = config.load_user_file("help", False) # cache for later usage diff --git a/web/htdocs/status.css b/web/htdocs/status.css index ed94ca2..25282da 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -172,6 +172,7 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; + display: block; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index bd08270..bef2134 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -69,6 +69,12 @@ Boston, MA 02110-1301 USA. width: 1px; } +.wato table.data td.buttons, +.wato table.data td.buttons a, +.wato table.data td.buttons img { + white-space: nowrap; +} + .wato th.right { border-right-style: none; border-radius: 0px 4px 0px 0px;

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: 61432da98631d65df9b58df0eea822ec106612dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61432da98631d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:27:04 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: check_parameters.py: fixed description of oracle_tablespaces

by Andreas Boesl

Module: check_mk Branch: master Commit: 424387330c428d3e5de2547e96700a2beab3fb1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424387330c428d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 13:15:52 2013 +0100 check_parameters.py: fixed description of oracle_tablespaces --- web/plugins/wato/check_parameters.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6d76227..c4273ef 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1418,7 +1418,7 @@ checkgroups.append(( elements = [ ( "levels", Alternative( - title = _("Total Memory Levels"), + title = _("Total tablespace size"), elements = [ Tuple( title = _("Percentage levels of free maximum space"), @@ -1461,7 +1461,8 @@ checkgroups.append(( help = _(""))), ]), TextAscii( - title = _("Service descriptions"), + 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 pengt.TEMP"), allow_empty = False), None))

11 years, 7 months

Check_MK Git: check_mk: fixed merge conflict artifacts

by Andreas Boesl

Module: check_mk Branch: master Commit: 9f90a27cf4ba8456a27b6681e2baed785d00b4a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f90a27cf4ba84… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 13:08:06 2013 +0100 fixed merge conflict artifacts --- checks/oracle_tablespaces | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 2cf3093..273fa0f 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -154,18 +154,9 @@ def check_oracle_tablespaces(item, params, info): increment_size = 0 free_space = 0 -<<<<<<< HEAD # Conversion of old autochecks params if type(params) == tuple: params = { "autoextend" : params[0], "levels" : params[1:] } -======= - if type(params) == tuple: - autoext, warn, crit = params - else: - autoext = params["autoextend"] - warn, crit = params["levels"] - # TODO: magic ->>>>>>> mknotifyd update autoext = params.get("autoextend") uses_default_increment = False @@ -271,12 +262,8 @@ check_info['oracle_tablespaces'] = { "check_function" : check_oracle_tablespaces, "inventory_function" : inventory_oracle_tablespaces, "has_perfdata" : True, -<<<<<<< HEAD "group" : "oracle_tablespaces", "default_levels_variable" : "oracle_tablespaces_default_levels", "includes" : [ "oracle.include" ] -======= -# "default_levels_variable" : "oracle_tablespaces_default_levels" ->>>>>>> mknotifyd update } check_config_variables.append("oracle_tablespaces_check_default_increment")

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: 62dd9099b2dd5b556bdc1b971b4d463191b065e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62dd9099b2dd5b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 13:08:11 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

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: ecacace7a4aa0f8abcc630a3205cb629fc07e542 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecacace7a4aa0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 12:08:34 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
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