Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: Logwatch: Catch another hard SATA controller error by default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1fd5498272d941ebe5bd2dbeeb13c8ec19764d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1fd5498272d94… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 6 13:17:10 2012 +0200 Logwatch: Catch another hard SATA controller error by default --- agents/logwatch.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index cba8c7c..95e8f4b 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -38,6 +38,7 @@ I mdadm.*: Rebuild.*event detected W mdadm\[ W ata.*hard resetting link + W ata.*soft reset failed (.*FIS failed) /var/log/syslog /var/log/kern.log C panic

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85884c6fe9e3912a3e7517ee9a8c336b5f8a44bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85884c6fe9e391… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 6 13:17:28 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 12 months

Check_MK Git: check_mk: Fix creation of nagios directories

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60da7c3bedd18be08b1b8f44f201792fa2c20652 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60da7c3bedd18b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:43:42 2012 +0200 Fix creation of nagios directories --- web/htdocs/lib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 1304038..5030383 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -63,7 +63,7 @@ class MKInternalError(Exception): # and make it writable for the group def make_nagios_directory(path): if not os.path.exists(path): - parent_dir, lastpart = path.rsplit('/', 1) + parent_dir, lastpart = path.rstrip('/').rsplit('/', 1) make_nagios_directory(parent_dir) try: os.mkdir(path)

11 years, 12 months

Check_MK Git: check_mk: FIX: remove refresh information on non-refreshable pages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb662a1a48fe52955b2c0a85cc6665618dbd4e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb662a1a48fe52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:37:10 2012 +0200 FIX: remove refresh information on non-refreshable pages --- web/htdocs/htmllib.py | 5 +++-- web/htdocs/pages.css | 5 +++++ web/htdocs/views.css | 4 ---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index deffebd..4de2a71 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -850,8 +850,9 @@ class html: if self.req.header_sent: self.bottom_focuscode() corner_text = "" - corner_text += '<div id=foot_refresh>%s</div>' % \ - _("refresh: <div id=foot_refresh_time>%s</div> secs") % self.browser_reload + corner_text += '<div style="display: %s" id=foot_refresh>%s</div>' % ( + (self.browser_reload and "inline-block" or "none", + _("refresh: <div id=foot_refresh_time>%s</div> secs") % self.browser_reload)) if self.render_headfoot: si = self.render_status_icons() self.write("<table class=footer><tr>" diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 501ef80..cf547fc 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -161,6 +161,11 @@ body.main table.footer img.statusicon { top: -3px; } +div#foot_refresh, div#foot_refresh_time { + display: inline-block; +} + + /*-------------------------------------------------------------------------. | ____ _ _ _ _ _ | | / ___|___ _ __ | |_ _____ _| |_| (_)_ __ | | _____ | diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 56c0cb7..60ce869 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -32,10 +32,6 @@ body.main.dashlet { padding: 0px; } -div#foot_refresh, div#foot_refresh_time { - display: inline-block; -} - /*-------------------------------------------------------------------------. | _____ _ ___ ___ _ _ | | |_ _|_ _| |__ ___ ( _ ) / _ \ _ __ | |_(_) ___ _ __ ___ |

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 22920a4425d361154dc74d6c9e86ea27cf589752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22920a4425d361… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 11:37:12 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 12 months

Check_MK Git: check_mk: mssql_backup: Fixed problems with datetime/ timezone calculations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dacd77491a84c67bc2e46f577cd82bddacf66a0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dacd77491a84c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 6 09:53:54 2012 +0200 mssql_backup: Fixed problems with datetime/timezone calculations --- ChangeLog | 2 ++ agents/windows/plugins/mssql.vbs | 2 +- checks/mssql_backup | 11 +++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bfcfa3..8cdad1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.0p3: + Checks & Agents: + * mssql_backup: Fixed problems with datetime/timezone calculations BI: * Great speed up of rule compilation in large environments diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index c2dc35c..faceb6f 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -144,7 +144,7 @@ For Each instId In instIds.Keys Dim lastBackupDate wscript.echo "<<<mssql_backup>>>" For Each dbName in dbNames.Keys - RS.open "SELECT DATEDIFF(s, '19700101', MAX(backup_finish_date)) AS last_backup_date " & _ + RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date " & _ "FROM msdb.dbo.backupset " & _ "WHERE database_name = '" & dbName & "'", CONN Do While Not RS.Eof diff --git a/checks/mssql_backup b/checks/mssql_backup index 75f5679..2f5f363 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -24,7 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import datetime +import datetime, time +import pytz #<<<mssql_backup>>> #MSSQL_SQLEXPRESS test123 1331207325 @@ -38,14 +39,12 @@ def inventory_mssql_backup(info): def check_mssql_backup(item, params, info): for line in info: - inst, tablespace, last_backup_timestamp = line + inst, tablespace, last_backup_date, last_backup_time = line if item == inst + ' ' + tablespace: - last_backup_timestamp = int(last_backup_timestamp) - dt = datetime.datetime.fromtimestamp(last_backup_timestamp) + dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[0:5]) state = 0 - now = datetime.datetime.now() - sec_ago = int(now.strftime('%s')) - last_backup_timestamp + sec_ago = (datetime.datetime.now() - dt).seconds if params is not None: if sec_ago >= params[1]:

11 years, 12 months

Check_MK Git: check_mk: HP-UX: Check HP-UX tunables ( as per Cristian Calins original check)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aed22d8fe7fb80c229e376e2c2120374be182d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aed22d8fe7fb8… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Jul 5 18:12:56 2012 +0200 HP-UX: Check HP-UX tunables (as per Cristian Calins original check) --- checks/hpux_tunables | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/checks/hpux_tunables b/checks/hpux_tunables new file mode 100644 index 0000000..c0acc76 --- /dev/null +++ b/checks/hpux_tunables @@ -0,0 +1,141 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + + +# These are default levels for the most critical limits. +# If they trigger, the admin SHOULD act. +hpux_tunables_nproc_default_levels = (90.0, 96.0) +hpux_tunables_nkthread_default_levels = (80.0, 85.0) + +# Example output: +# <<<hpux_tunables:sep(58)>>> +# Tunable: dbc_max_pct +# Usage: 0 +# Setting: 1 +# Percentage: 0.0 +# +# Tunable: maxdsiz +# Usage: 176676864 +# Setting: 1073741824 +# Percentage: 16.5 + + + +def parse_hpux_tunables(info): + parsed = {} + for line in info: + if "Tunable" in line[0]: + key = line[1].strip() + elif "Usage" in line[0]: + usage = saveint(line[1]) + elif "Setting" in line[0]: + threshold = saveint(line[1]) + parsed[key] = (usage, threshold) + return parsed + + +def inventory_hpux_tunables(info, hpux_tunable): + if hpux_tunable in parse_hpux_tunables(info): + if hpux_tunable == "nproc": + return [( None, "hpux_tunables_nproc_default_levels")] + elif hpux_tunable == "nkthread": + return [( None, "hpux_tunables_nkthread_default_levels")] + else: + return [(None, None)] + + +def check_hpux_tunables(item, params, info, hpux_tunable, thingname): + + parsed = parse_hpux_tunables(info) + + if hpux_tunable not in parsed: + return (3, "UNKNOWN - tunable not found in agent output") + + usage, threshold = parsed[hpux_tunable] + mimi = float(threshold) / 100 + pct = float(usage) / mimi + + state = 0 + + if params: + warn, crit = params + if float(crit) < pct: + state = 2 + elif float(warn) < pct: + state = 1 + perfdata = [ (thingname, usage, threshold, warn * mimi, crit * mimi) ] + else: + perfdata = [ (thingname, usage, threshold, '', '') ] + + return (state, nagios_state_names[state] + \ + " - %.2f%% used" % pct + state * "!" + " (%d/%d %s) " % (usage, threshold, thingname), perfdata) + + + +check_info["hpux_tunables.nkthread"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "nkthread", "threads"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "nkthread"), + "service_description" : "Number of threads", + "has_perfdata" : True, +} + +check_info["hpux_tunables.nproc"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "nproc", "processes"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "nproc"), + "service_description" : "Number of processes", + "has_perfdata" : True, +} + +check_info["hpux_tunables.maxfiles_lim"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "maxfiles_lim", "files"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "maxfiles_lim"), + "service_description" : "Number of open files", + "has_perfdata" : True, +} + +check_info["hpux_tunables.semmni"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "semmni", "semaphore ids"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "semmni"), + "service_description" : "Number of IPC Semaphore IDs", + "has_perfdata" : True, +} + +check_info["hpux_tunables.shmseg"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "shmseg", "segments"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "shmseg"), + "service_description" : "Number of shared memory segments", + "has_perfdata" : True, +} + +check_info["hpux_tunables.semmns"] = { + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "semmns", "entries"), + "inventory_function" : lambda i: inventory_hpux_tunables(i, "semmns"), + "service_description" : "Number of IPC Semaphores", + "has_perfdata" : True, +} + +# There is no check for nfile, systems that support kcusage don't have the +# limit anymore (AFAIR)

11 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0783

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 76afb81142d601d93667bc9358634702d1cd8491 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76afb81142d601… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 5 16:14:07 2012 +0200 Updated bug entries #0783 --- .bugs/783 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/783 b/.bugs/783 new file mode 100644 index 0000000..823b2d7 --- /dev/null +++ b/.bugs/783 @@ -0,0 +1,9 @@ +Title: Plugin output in BI does not honor (!) and (!!) +Component: bi +State: open +Date: 2012-07-05 16:13:24 +Targetversion: 1.2.0 +Class: nastiness + +In the normal views we see a nice [WARN] or [CRIT] here. +In BI there is missing this markup.

11 years, 12 months

Check_MK Git: check_mk: Make sure parent directories are always created

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d8da409537f212ccd0361a0c2923c08400db808 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d8da409537f21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 5 17:18:07 2012 +0200 Make sure parent directories are always created --- web/htdocs/lib.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f1298fc..f227ecf 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -63,6 +63,8 @@ class MKInternalError(Exception): # and make it writable for the group def make_nagios_directory(path): if not os.path.exists(path): + parent_dir, lastpart = path.rsplit('/', 1) + make_nagios_directory(parent_dir) try: os.mkdir(path) gid = grp.getgrnam(defaults.www_group).gr_gid

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f021f1cef3575e3e802f41e75f1b42b9fa8bef03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f021f1cef3575e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 5 17:19:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012