Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 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: 4a5ecddaa0f90034ca9c8fec84a07855b3e21516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a5ecddaa0f900… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 12:47:23 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0883

by Mathias Kettner

Module: check_mk Branch: master Commit: 611250a95109ab629ba0ac63505cce55585d68d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611250a95109ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 12:47:21 2012 +0100 Updated bug entries #0883 --- .bugs/883 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/883 b/.bugs/883 new file mode 100644 index 0000000..0c7b394 --- /dev/null +++ b/.bugs/883 @@ -0,0 +1,11 @@ +Title: Handle gracefully missing sidebar snapins +Component: multisite +State: open +Date: 2012-12-11 12:45:52 +Targetversion: 1.2.0 +Class: bug + +If via replication user settings are put onto a remote server +that cannot display all configured sidebar snapins then the +sidebar cannot be displayed. Fix: silently ignore missing +sidebar snapins.

11 years, 9 months

Check_MK Git: check_mk: plesk_backups: Fixed initialisation of status_txt var

by Lars Michelsen

Module: check_mk Branch: master Commit: 262a9179b38b3bab5e44220fb5084649c7bddd9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262a9179b38b3b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 12:34:48 2012 +0100 plesk_backups: Fixed initialisation of status_txt var --- checks/plesk_backups | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/plesk_backups b/checks/plesk_backups index 9616485..ebb838d 100644 --- a/checks/plesk_backups +++ b/checks/plesk_backups @@ -82,13 +82,14 @@ def check_plesk_backups(item, params, info): elif age_seconds > params['backup_age'][0]: status = max(status, 1) status_txt = ' (!)' - + backup_time = time.strftime("%c", time.localtime(timestamp)) output.append('Age: %s (%dd %02d:%02d:%02d)%s' % (backup_time, days, hours, minutes, seconds, status_txt)) perfdata.append(('last_backup_age', age_seconds, warn, crit)) # 3. check total size of directory above configured threshold + status_txt = '' warn, crit = None, None if 'total_size' in params: warn, crit = params['total_size'] @@ -100,11 +101,11 @@ def check_plesk_backups(item, params, info): status_txt = ' (!)' output.append('Total Size: %s%s' % (get_bytes_human_readable(total_size), status_txt)) perfdata.append(('total_size', total_size)) - + return (status, 'OK - %s' % ', '.join(output), perfdata) return (3, 'UNKNOWN - Domain not found') - + check_info['plesk_backups'] = { 'check_function': check_plesk_backups,

11 years, 9 months

Check_MK Git: check_mk: fixed calculation of total backup space size

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ae3f4673d7e2583bf417f276397bd965dc680b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ae3f4673d7e25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 12:30:41 2012 +0100 fixed calculation of total backup space size --- agents/plugins/plesk_backups | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/agents/plugins/plesk_backups b/agents/plugins/plesk_backups index 3775dd4..6a1964d 100755 --- a/agents/plugins/plesk_backups +++ b/agents/plugins/plesk_backups @@ -83,13 +83,16 @@ for domain, p in domains.iteritems(): # Zeilen holen files = [] - ftp.retrlines('LIST', callback = files.append) + ftp.retrlines( + 'LIST %s' % p['backup_ftp_settingdirectory'], + callback = files.append + ) # example line: # -rw----r-- 1 b091045 cust 13660160 Dec 3 01:50 bla_v8_bla-v8.bla0.net_1212030250.tar - + # Zeilen formatieren last_backup = None - backups = [] + backups = [] for line in files: parts = line.split() if parts[-1].endswith('.tar'): @@ -104,8 +107,25 @@ for domain, p in domains.iteritems(): output.append('%s 5' % domain) # Keine Sicherungen vorhanden continue - # Alle Backups zusammenrechnen - total_size = sum([ b[2] for b in backups ]) + # Get total size of all files on FTP + f = [] + def get_size(base_dir, l = None): + if l and l.split()[-1] in ['.', '..']: + return 0 + + size = 0 + if not l or l[0] == 'd': + subdir = l and '/' + l.split()[-1] or '' + dir_files = [] + ftp.retrlines('LIST %s%s' % (base_dir, subdir), + callback = dir_files.append + ) + for line in dir_files: + size += get_size('%s%s' % (base_dir, subdir), line) + else: + size += int(l.split()[-5]) + return size + total_size = get_size('') output.append('%s 0 %s %d %d' % (domain, last_backup[1].strftime('%s'), last_backup[2], total_size))

11 years, 9 months

Check_MK Git: check_mk: Added first basic plesk checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 07124ca7e9481780824298395042ab69955e55c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07124ca7e94817… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 12:03:58 2012 +0100 Added first basic plesk checks * Add: plesk_domains - List domains configured in plesk installations * Add: plesk_backups - Monitor backup spaces configured for domains in plesk --- ChangeLog | 2 + agents/plugins/plesk_backups | 117 ++++++++++++++++++++++++++++++++++ agents/plugins/plesk_domains | 27 ++++++++ checks/plesk_backups | 115 +++++++++++++++++++++++++++++++++ checks/plesk_domains | 36 ++++++++++ web/plugins/wato/check_parameters.py | 46 +++++++++++++ 6 files changed, 343 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=07124ca7e9…

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 4482a7576e5d2b7c1f63e7fb455bca23a7ca922d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4482a7576e5d2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 09:48:50 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: FIX: Fixed changing own password when notifications are disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 84ee98f0e2ce83bf7549741dcd311d1ece918bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84ee98f0e2ce83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 09:48:42 2012 +0100 FIX: Fixed changing own password when notifications are disabled --- ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f16bd6..0adb5ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * Use pprint when writing global settings (makes files more readable) * New script for settings/removing downtimes: doc/treasures/downtime * New option when setting host downtimes for also including child hosts + * FIX: Fixed changing own password when notifications are disabled WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4215894..d25fd5d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11178,7 +11178,8 @@ def page_user_profile(): # load the new language load_language(config.get_language()) - if config.may('general.edit_notifications'): + user = users.get(config.user_id) + if config.may('general.edit_notifications') and user.get("notifications_enabled"): value = forms.get_input(vs_notification_method, "notification_method") users[config.user_id]["notification_method"] = value

11 years, 9 months

Check_MK Git: check_mk: FIX: Persisting changing of folder titles when only the title has changed

by Lars Michelsen

Module: check_mk Branch: master Commit: d480298428743f9e468e49e1790ccbef99734d29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d480298428743f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 09:43:54 2012 +0100 FIX: Persisting changing of folder titles when only the title has changed --- ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5abaf5f..7f16bd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ WATO: * FIX: Fixed generated manual check definitions for checks without items like ntp_time and tcp_conn_stats + * FIX: Persisting changing of folder titles when only the title has changed Event Console: * FIX: fix exception in rules that use facility local7 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 720f7aa..4215894 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1693,6 +1693,7 @@ def mode_editfolder(phase, new): title = html.var_utf8("title") if not title: raise MKUserError("title", _("Please supply a title.")) + title_changed = not new and title != g_folder.get('title', '') # OS filename if new: @@ -1750,7 +1751,7 @@ def mode_editfolder(phase, new): g_folder["title"] = title - if attributes_changed: + if attributes_changed or title_changed: mark_affected_sites_dirty(g_folder) g_folder["attributes"] = attributes

11 years, 9 months

Check_MK Git: check_mk: Fixed .f12 helper in OMD

by Mathias Kettner

Module: check_mk Branch: master Commit: b45512fe0418b2f1f41453b7926a4b8fa37e5174 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b45512fe0418b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 08:48:36 2012 +0100 Fixed .f12 helper in OMD --- mkeventd/omd/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/omd/.f12 b/mkeventd/omd/.f12 index 152c690..afe5a5b 100644 --- a/mkeventd/omd/.f12 +++ b/mkeventd/omd/.f12 @@ -12,7 +12,7 @@ cp -r web bin lib checks src $DIRNAME tar cvzf $DIRNAME.tar.gz --exclude=.git* --exclude=.f12 --exclude=.*.swp $DIRNAME # Integrate into CMK+OMD -OMD=../cmk-omd/packages/mkeventd +OMD=../../cmk-omd/packages/mkeventd mkdir -p $OMD cp -v $DIRNAME.tar.gz $OMD sed "s/^VERSION = .*/VERSION = $VERSION/" omd/Makefile > $OMD/Makefile

11 years, 9 months

Check_MK Git: check_mk: FIX: zfsget: fix exception on snapshot volumes

by Mathias Kettner

Module: check_mk Branch: master Commit: 438daff35357fef70715913ff09f675269ac854a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438daff35357fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 08:24:48 2012 +0100 FIX: zfsget: fix exception on snapshot volumes --- ChangeLog | 1 + checks/zfsget | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30c344a..4a96c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * Add: check to monitor the summary status of HP EML tape libraries * Add: apc_rackpdu_status - monitor the power consumption on APC rack PDUs * Add: sym_brightmail_queues - monitor the queue levels on Symantec Brightmail mail scanners. + * FIX: zfsget: fix exception on snapshot volumes (where available is '-') Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/checks/zfsget b/checks/zfsget index fa5f8c2..0ed6f93 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -41,16 +41,16 @@ def parse_zfsget(info): def mb(x): - return int(x) / (1024.0 * 1024) + return saveint(x) / (1024.0 * 1024) - entries = {} + entries = [] entry = None last_name = None for line in info: name, what, value = line[:3] if last_name != name: if entry: - entries[entry["mountpoint"]] = entry + entries.append(entry) entry = {} last_name = name if what in ["used", "available"]: @@ -58,25 +58,28 @@ def parse_zfsget(info): elif what == "quota": if value not in [ '0', '-' ]: entry[what] = mb(value) - elif what in [ 'mountpoint', 'type' ]: + elif what in [ 'mountpoint', 'type', 'name' ]: entry[what] = value if entry: - entries[entry["mountpoint"]] = entry + entries.append(entry) - for mountpoint, entry in entries.items(): - if entry["type"] == 'volume': - del entries[mountpoint] - entry["is_pool"] = '/' not in name - return entries + parsed = {} + for entry in entries: + if entry["mountpoint"] != '-': + entry["is_pool"] = '/' not in name + parsed[entry["mountpoint"]] = entry + return parsed def inventory_zfsget(info): mplist = [] - for mountpoint in parse_zfsget(info): + parsed = parse_zfsget(info) + for mountpoint, properties in parsed.items(): if mountpoint not in inventory_df_exclude_mountpoints: - mplist.append(mountpoint) + if True or properties["available"] != 0: + mplist.append(mountpoint) return df_inventory(mplist)

11 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012