Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Updated some file headers

by Mathias Kettner

Module: check_mk Branch: master Commit: 67ce23ae31254bb916538c1202da338e962d3d24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67ce23ae31254b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:28:32 2013 +0100 Updated some file headers --- agents/plugins/db2_mem.sh | 23 +++++++++++++++++++++++ checks/diskstat.include | 2 +- checks/oracle_tablespaces | 2 +- doc/treasures/wato_host_svc_groups.py | 25 +++++++++++++++++++++++++ pnp-templates/check_mk-diskstat.php | 2 +- web/plugins/wato/datasource_programs.py | 2 +- web/plugins/wato/mknotifyd.py | 2 +- 7 files changed, 53 insertions(+), 5 deletions(-) diff --git a/agents/plugins/db2_mem.sh b/agents/plugins/db2_mem.sh index 0a36931..fe038ca 100644 --- a/agents/plugins/db2_mem.sh +++ b/agents/plugins/db2_mem.sh @@ -1,4 +1,27 @@ #!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. INSTANCES=$(ps -ef | grep db2sysc | awk '{print $1}' | sort -u | grep -v root) diff --git a/checks/diskstat.include b/checks/diskstat.include index 8be1c61..37da609 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 10732f1..9ccba35 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. diff --git a/doc/treasures/wato_host_svc_groups.py b/doc/treasures/wato_host_svc_groups.py index b674ede..f527f2c 100644 --- a/doc/treasures/wato_host_svc_groups.py +++ b/doc/treasures/wato_host_svc_groups.py @@ -1,4 +1,29 @@ #!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + # Author Bastian Kuhn <bk(a)mathias-kettner.de> # Converts a File with host- and/or service groups definitions # into a dict. The output can be used to paste it into the wato/rules.mk diff --git a/pnp-templates/check_mk-diskstat.php b/pnp-templates/check_mk-diskstat.php index 1e02544..f7eb8c6 100644 --- a/pnp-templates/check_mk-diskstat.php +++ b/pnp-templates/check_mk-diskstat.php @@ -6,7 +6,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index e37f70d..73a10b9 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index 45ece53..9732b20 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK.

11 years, 7 months

Check_MK Git: check_mk: Remove some trailing spaces from several files

by Mathias Kettner

11 years, 7 months

Check_MK Git: check_mk: Fixed ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: af005b6aa6ce9580db0162056cdf5774e8f44a9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af005b6aa6ce95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:24:41 2013 +0100 Fixed ChangeLog --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d2bd4..14ffd56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,8 +7,8 @@ * New rule feature: automatically delete after action Checks & Agents: - Add: Memory and Swap for Solaris Agent - Add: Monitoring of ESX (VMware) Hosts + * Add: Memory and Swap for Solaris Agent + * Add: Monitoring of ESX (VMware) Hosts 1.2.2b2:

11 years, 7 months

Check_MK Git: check_mk: FIX: . f12 compile helper installs into correct SITE now

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d028ae53ef4aee13f657ea98b475049801bd974 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d028ae53ef4ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:12:18 2013 +0100 FIX: .f12 compile helper installs into correct SITE now --- web/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/.f12 b/web/.f12 index 5bd8a90..8326daa 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,6 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} -C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) +C=$(sudo cp --preserve=mode -rv * /omd/sites/$SITE/share/check_mk/web/ | wc -l) #C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l) echo "$C files copied" if [ "$SITE" != - ] ; then

11 years, 7 months

Check_MK Git: check_mk: FIX: fix problem where BI-Boxes were invisible if not previously unfolded

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d415d7dfbdd0f96923781cc4a57a0f4a6619110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d415d7dfbdd0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:20:52 2013 +0100 FIX: fix problem where BI-Boxes were invisible if not previously unfolded --- ChangeLog | 2 ++ web/htdocs/bi.py | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb8f06c..76d2bd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ 1.2.2b2: BI: * FIX: fix exception in BI-Boxes views of host groups + * FIX: fix problem where BI-Boxes were invisible if not previously unfolded Event Console: * FIX: support non-Ascii characters in matching expressions. Note: @@ -24,6 +25,7 @@ Multisite: * FIX: Fixed several minor IE7 related layout bugs + * FIX: title of pages was truncated and now isn't anymore * Cleanup form for executing commands on hosts/services WATO: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index efb7609..805342e 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1375,6 +1375,10 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, if is_open == None: is_open = len(path) <= expansion_level + # Make sure that in case of BI Boxes (omit root) the root level is *always* visible + if not is_open and omit_root and len(path) == 1: + is_open = True + h = "" state = tree[0] omit_content = lazy and not is_open

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0413523179e8f340bc8ca7be1cac805d9b27cde1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0413523179e8f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:24:45 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: Fix width of page titles in Multisite views

by Mathias Kettner

Module: check_mk Branch: master Commit: f5da5a52e6fe600039a24c842ea48b37c896ac03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5da5a52e6fe60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 12:12:51 2013 +0100 FIX: Fix width of page titles in Multisite views --- web/htdocs/pages.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 7cbf9af..25c5ca5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -115,6 +115,7 @@ body.main table.header td.heading a:hover { body.main table.header td.right { text-align: right; font-size: 10pt; + width: 1%; }

11 years, 7 months

Check_MK Git: check_mk: Revert "mkeventd: Fixed replacing of contact information for events"

by Lars Michelsen

Module: check_mk Branch: master Commit: a6e4114960561d4463fb700381b406f6e35d10f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6e4114960561d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 11:43:01 2013 +0100 Revert "mkeventd: Fixed replacing of contact information for events" This reverts commit 888fb413a68f60ad5a9b5e58b443272f26e42f4a. --- mkeventd/bin/mkeventd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index ff872ac..7deaf5e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1396,7 +1396,7 @@ class EventServer: event["comment"] = replace_groups(rule["set_comment"], event.get("comment", ""), groups) if "set_application" in rule: event["application"] = replace_groups(rule["set_application"], event["application"], groups) - if "set_contact" in rule: + if "set_contact" in rule and "contact" not in event: event["contact"] = replace_groups(rule["set_contact"], event.get("contact", ""), groups) def parse_monitoring_info(self, line):

11 years, 7 months

Check_MK Git: check_mk: Revert "mkeventd: Fixed replacing of contact information for events"

by Lars Michelsen

Module: check_mk Branch: master Commit: 60f3c1f1d6760ff8a8373b83dfdb5e739d87b734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60f3c1f1d6760f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 11:23:11 2013 +0100 Revert "mkeventd: Fixed replacing of contact information for events" This reverts commit 888fb413a68f60ad5a9b5e58b443272f26e42f4a. --- mkeventd/bin/mkeventd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f8998f4..67ff397 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1415,7 +1415,7 @@ class EventServer: event["comment"] = replace_groups(rule["set_comment"], event.get("comment", ""), groups) if "set_application" in rule: event["application"] = replace_groups(rule["set_application"], event["application"], groups) - if "set_contact" in rule: + if "set_contact" in rule and "contact" not in event: event["contact"] = replace_groups(rule["set_contact"], event.get("contact", ""), groups) def parse_monitoring_info(self, line):

11 years, 7 months

Check_MK Git: check_mk: mkeventd: Easier debugging of script actions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a7f391e306f6135f1eabbcab03226744aa9f4bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a7f391e306f61… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 11:42:27 2013 +0100 mkeventd: Easier debugging of script actions --- mkeventd/bin/mkeventd | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6d4f314..ff872ac 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2327,7 +2327,19 @@ def send_email(to, subject, body): os.popen("mail -s '%s' '%s'" % (shell_escape(subject), shell_escape(to)), "w").write(body) def execute_script(body): - os.popen("/bin/bash", "w").write(body.encode('utf-8')) + p = subprocess.Popen( + body.encode('utf-8'), + shell = True, + executable = '/bin/bash', + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + output = p.stdout.read() + exitcode = p.wait() + + if g_config["debug_rules"]: + if output: + log(' Output: %s' % output) + log(' Exitcode: %d' % exitcode) #.

11 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
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