Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64518 discussions

Check_MK Git: check_mk: veeam_jobs: internal code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: e1fef4e9bcca0563ff91f27290622f902d9a96b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1fef4e9bcca05… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 3 11:18:22 2013 +0100 veeam_jobs: internal code cleanup --- checks/veeam_jobs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 30e1538..a9bfa98 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -24,21 +24,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# <<<veeam_jobs:sep(9) >>> +# BACKUP_RIS Backup Stopped Success 27.10.2013 22:00:17 27.10.2013 22:06:12 +# BACKUP_R43-local_HXWH44 Backup Stopped Success 26.10.2013 18:00:20 26.10.2013 18:46:03 +# BACKUP_R43-Pool4_HXWH44 Backup Stopped Failed 26.10.2013 23:13:13 27.10.2013 00:51:17 +# BACKUP_R43-Pool3_HXWH44 Backup Stopped Failed 27.10.2013 02:59:29 27.10.2013 08:59:51 +# REPL_KNESXIDMZ Replica Stopped Success 27.10.2013 44:00:01 27.10.2013 44:44:26 +# BACKUP_KNESXI Backup Stopped Success 28.10.2013 05:00:04 28.10.2013 05:32:15 +# BACKUP_KNESXit Backup Stopped Success 26.10.2013 22:30:02 27.10.2013 02:37:30 +# BACKUP_R43-Pool5_HXWH44 Backup Stopped Success 27.10.2013 23:00:00 27.10.2013 23:04:53 +# BACKUP_R43-Pool2_HXWH44 Backup Stopped Failed 27.10.2013 02:37:45 27.10.2013 02:45:35 + def inventory_veeam_jobs(info): return [ (x[0], None) for x in info ] -def check_veeam_jobs(item, params, info): +def check_veeam_jobs(item, _no_params, info): for line in info: if line[0] == item: if line[3] == "Success": state = 0 - elif line[2] =="Working": + elif line[2] == "Working": state = 0 - if len(line) == 8: - line.pop(7) - if len(line) == 7: - line.pop(6) + line = line[:6] elif line[3] == "Failed": state = 2 elif line[2] == "Stopped" and line[3] == "Warning": @@ -46,17 +54,13 @@ def check_veeam_jobs(item, params, info): else: state = 3 infotxt = "Result: %s, " % line[3] - line.pop(3) - line.pop(0) - infotxt += ", ".join(map(str,line) ) - return (state, infotxt ) + infotxt += ", ".join(line[1:3] + line[4:]) + return (state, infotxt) - return 3, "item not found in agent output" + return 3, "No such job found" check_info["veeam_jobs"] = { 'check_function': check_veeam_jobs, 'inventory_function': inventory_veeam_jobs, - 'service_description': 'VEEAM Job', - 'has_perfdata': False, + 'service_description': 'VEEAM Job %s', } -

10 years, 10 months

Check_MK Git: check_mk: FIX tsm_sessions: fixed invalid check output during backups

by Andreas Boesl

Module: check_mk Branch: master Commit: a4314bf73188d342951017a9aaff3cbd8e089390 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4314bf73188d3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 3 11:14:50 2013 +0100 FIX tsm_sessions: fixed invalid check output during backups The check was unable to handle agent data where no client_name was set. This could happen during a backup process. --- .werks/237 | 9 +++++++++ ChangeLog | 1 + checks/tsm_sessions | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/237 b/.werks/237 new file mode 100644 index 0000000..02a097b --- /dev/null +++ b/.werks/237 @@ -0,0 +1,9 @@ +Title: tsm_sessions: fixed invalid check output during backups +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1386065416 +Class: fix + +The check was unable to handle agent data where no client_name was set. +This could happen during a backup process. diff --git a/ChangeLog b/ChangeLog index 2c1ecd9..130bdf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 0012 FIX: Solaris Agent: fixed broken fileinfo section... * 0297 FIX: mk-job is now also usable on CentOS 5+... * 0298 FIX: win_dhcp_pools: Fixed wrong percentage calculation + * 0237 FIX: tsm_sessions: fixed invalid check output during backups... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/tsm_sessions b/checks/tsm_sessions index c13af28..b3d45b0 100644 --- a/checks/tsm_sessions +++ b/checks/tsm_sessions @@ -36,7 +36,11 @@ def check_tsm_sessions(item, params, info): state = 0 warn, crit = params count = 0 - for sid, client_name, proc_state, wait in info: + for entry in info: + if len(entry) == 4: + sid, client_name, proc_state, wait = entry + else: + sid, proc_state, wait = entry if proc_state in ['RecvW', 'MediaW']: wait = saveint(wait) if wait >= crit:

10 years, 10 months

Check_MK Git: check_mk: veeam_jobs: now more stable when stop time is missing from agent output

by Götz Golla

Module: check_mk Branch: master Commit: 58855bc9866e3f464d249676e78908212326b29a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58855bc9866e3f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Dec 3 10:25:52 2013 +0100 veeam_jobs: now more stable when stop time is missing from agent output --- checks/veeam_jobs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/veeam_jobs b/checks/veeam_jobs index 4ed1698..30e1538 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -35,8 +35,10 @@ def check_veeam_jobs(item, params, info): state = 0 elif line[2] =="Working": state = 0 - line.pop(7) - line.pop(6) + if len(line) == 8: + line.pop(7) + if len(line) == 7: + line.pop(6) elif line[3] == "Failed": state = 2 elif line[2] == "Stopped" and line[3] == "Warning":

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1086

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a8fd59512a095d90ad39ae12b683d543031ace9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a8fd59512a095… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 3 10:13:19 2013 +0100 Updated bug entries #1086 --- .bugs/1086 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/1086 b/.bugs/1086 new file mode 100644 index 0000000..b248248 --- /dev/null +++ b/.bugs/1086 @@ -0,0 +1,13 @@ +Title: Exception in views when EC views are missing +Component: multisite +State: open +Date: 2013-12-03 10:12:05 +Targetversion: future +Class: bug + +When you enabled the Event Console, modify an EC view and afterwards +disabled the EC again, then the views the modified views base on +are missing - and also the columns and filters. This leads to exceptions +in other views. + +Solution: validate views, catch exceptions.

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed summary computation in availability when grouping is used

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ece55eda82a354da7b5e39bf8d99de8a7b830dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ece55eda82a35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 2 17:17:27 2013 +0100 FIX Fixed summary computation in availability when grouping is used In the availability view the summary line was computed wrong in cased you had more than one group (e.g. by grouping after the service group). That has been fixed. --- .werks/15 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/15 b/.werks/15 new file mode 100644 index 0000000..9e70185 --- /dev/null +++ b/.werks/15 @@ -0,0 +1,11 @@ +Title: Fixed summary computation in availability when grouping is used +Level: 1 +Component: reporting +Version: 1.2.3i7 +Date: 1386000955 +Class: fix + +In the availability view the summary line was computed wrong in cased +you had more than one group (e.g. by grouping after the service +group). That has been fixed. + diff --git a/ChangeLog b/ChangeLog index 976b175..2c1ecd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 0056 New concept of service periods in availability reporting... * 0002 You can now annotate events in the availability reporting... * 0014 FIX: Fix styling of tables: always use complete width... + * 0015 FIX: Fixed summary computation in availability when grouping is used... Event Console: * 0026 FIX: snmptd_mkevent.py: fixed crash on startup diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 540deea..3e0b68c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1240,7 +1240,7 @@ def render_availability_group(group_title, range_title, group_id, availability, continue number = summary.get(sid, 0) if show_summary == "average" or avoptions["timeformat"].startswith("percentage"): - number /= len(availability) + number /= len(group_availability) if avoptions["timeformat"].startswith("percentage"): number *= considered_duration if not number: @@ -1256,7 +1256,7 @@ def render_availability_group(group_title, range_title, group_id, availability, if aggr == "cnt": count = summary_counts.get(sid, 0) if show_summary == "average": - count = float(count) / len(availability) + count = float(count) / len(group_availability) text = "%.2f" % count else: text = str(count)

10 years, 10 months

Check_MK Git: check_mk: FIX Fix styling of tables: always use complete width

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fc5c8bba0eddc4cd7ecf8bc7cdf0d9dbe957c8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc5c8bba0eddc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 2 17:10:59 2013 +0100 FIX Fix styling of tables: always use complete width This is important of you have a view with more than one group. --- .werks/14 | 8 ++++++++ ChangeLog | 1 + web/htdocs/views.css | 2 +- web/plugins/views/availability.py | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/14 b/.werks/14 new file mode 100644 index 0000000..86eb7ea --- /dev/null +++ b/.werks/14 @@ -0,0 +1,8 @@ +Title: Fix styling of tables: always use complete width +Level: 1 +Component: reporting +Version: 1.2.3i7 +Date: 1386000623 +Class: fix + +This is important of you have a view with more than one group. diff --git a/ChangeLog b/ChangeLog index 58f3a9a..7117899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ * 0055 Allow grouping by host, host group or service group... * 0056 New concept of service periods in availability reporting... * 0002 You can now annotate events in the availability reporting... + * 0014 FIX: Fix styling of tables: always use complete width... Event Console: * 0026 FIX: snmptd_mkevent.py: fixed crash on startup diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 802faf5..473e2a5 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -482,7 +482,7 @@ table.views td.buttons { /* Availability */ table.data.availability { - width: auto; + width: 100%; } table.data.availability td.number { diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 23eca6e..540deea 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1198,7 +1198,7 @@ def render_availability_group(group_title, range_title, group_id, availability, # Apply visual availability levels (render OK in yellow/red, if too low) if number and av_levels and sid in [ "ok", "up" ]: css = "state%d" % check_av_levels(number, av_levels, considered_duration) - table.cell(sname, render_number(number, considered_duration), css="number " + css, help=help) + table.cell(sname, render_number(number, considered_duration), css="narrow number " + css, help=help) # Statistics? x_cnt, x_min, x_max = statistics.get(sid, (None, None, None))

10 years, 10 months

Check_MK Git: check_mk: FIX win_dhcp_pools: Fixed wrong percentage calculation

by Lars Michelsen

Module: check_mk Branch: master Commit: 44d990da92543d8fbd9056505f99335eb401cd29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44d990da92543d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 16:43:54 2013 +0100 FIX win_dhcp_pools: Fixed wrong percentage calculation --- .werks/298 | 8 ++++++++ ChangeLog | 1 + checks/win_dhcp_pools | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/298 b/.werks/298 new file mode 100644 index 0000000..3ebfd53 --- /dev/null +++ b/.werks/298 @@ -0,0 +1,8 @@ +Title: win_dhcp_pools: Fixed wrong percentage calculation +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385999012 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 55d4232..f874883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ * 0293 FIX: esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now * 0012 FIX: Solaris Agent: fixed broken fileinfo section... * 0297 FIX: mk-job is now also usable on CentOS 5+... + * 0298 FIX: win_dhcp_pools: Fixed wrong percentage calculation Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 20d60a4..5b4a1f0 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -123,8 +123,8 @@ def check_win_dhcp_pools(item, params, info): if size == 0: return (3, "DHCP Pool contains no IP addresses / is deactivated") - if free > 0: - perc_free = 100 * size / free + if size > 0: + perc_free = 100.0 * free / size else: perc_free = 0

10 years, 10 months

Check_MK Git: check_mk: FIX mk-job is now also usable on CentOS 5+

by Lars Michelsen

Module: check_mk Branch: master Commit: bc25ccb41e8e906f200925ceb65c05c3a7930e99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc25ccb41e8e90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 16:32:18 2013 +0100 FIX mk-job is now also usable on CentOS 5+ The mk-job script failed with an error on CentOS 5+ systems, because the /usr/bin/time command does not support the "--quiet" option. This option seems to be useless when writing to a file, therefor we removed this option now. --- .werks/297 | 11 +++++++++++ ChangeLog | 1 + agents/mk-job | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/297 b/.werks/297 new file mode 100644 index 0000000..5e67b30 --- /dev/null +++ b/.werks/297 @@ -0,0 +1,11 @@ +Title: mk-job is now also usable on CentOS 5+ +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385998226 +Class: fix + +The mk-job script failed with an error on CentOS 5+ systems, +because the /usr/bin/time command does not support the "--quiet" +option. This option seems to be useless when writing to a file, +therefor we removed this option now. diff --git a/ChangeLog b/ChangeLog index 1e84fab..55d4232 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 0290 FIX: winperf_processor mem.win: Handling no/empty agent responses correctly now... * 0293 FIX: esx_vsphere_counters_ramdisk_sizes: Handles ram disk "ibmscratch" by default now * 0012 FIX: Solaris Agent: fixed broken fileinfo section... + * 0297 FIX: mk-job is now also usable on CentOS 5+... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/agents/mk-job b/agents/mk-job index 22c1914..e1df542 100755 --- a/agents/mk-job +++ b/agents/mk-job @@ -54,7 +54,7 @@ if ! type $1 >/dev/null 2>&1; then fi date +"start_time %s" > "$OUTPUT_PATH/.$IDENT.running" -/usr/bin/time -o "$OUTPUT_PATH/.$IDENT.running" --quiet --append \ +/usr/bin/time -o "$OUTPUT_PATH/.$IDENT.running" --append \ -f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads %I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches %c\nvol_context_switches %w" $@ RC=$? mv "$OUTPUT_PATH/.$IDENT.running" "$OUTPUT_PATH/$IDENT"

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed moving of snapins while in scrolled sidebar

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ef74cbebf6964cebe2a6c47a58377ac1806faa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ef74cbebf6964… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 14:35:55 2013 +0100 FIX Fixed moving of snapins while in scrolled sidebar Release 1.2.3i2 introduced a bug where a snapin was flipping several pixels above the current mouse position when moving a snapin while the sidebar is scrolled down. --- .werks/296 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/296 b/.werks/296 new file mode 100644 index 0000000..3332c6e --- /dev/null +++ b/.werks/296 @@ -0,0 +1,10 @@ +Title: Fixed moving of snapins while in scrolled sidebar +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1385991237 +Class: fix + +Release 1.2.3i2 introduced a bug where a snapin was flipping +several pixels above the current mouse position when moving +a snapin while the sidebar is scrolled down. diff --git a/ChangeLog b/ChangeLog index 83018ec..1e84fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 0006 FIX: Checkboxes for hosts/services were missing on modified views... * 0284 FIX: Context help toggled on/off randomly... * 0285 FIX: Fixed bookmarking of absolute URLs or PNP/NagVis URLs in sidebar snapin... + * 0296 FIX: Fixed moving of snapins while in scrolled sidebar... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 62f57d9..270bb2a 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -160,8 +160,7 @@ function snapinDrag(event) { // Drag the snapin snapinDragging.style.position = 'absolute'; var newTop = event.clientY - snapinOffset[0] - snapinScrollTop; - /*if (weAreIEF__k) - newTop += document.getElementById('side_content').scrollTop;*/ + newTop += document.getElementById('side_content').scrollTop; snapinDragging.style.top = newTop + 'px'; snapinDragging.style.left = (event.clientX - snapinOffset[1]) + 'px'; snapinDragging.style.zIndex = 200; @@ -284,7 +283,8 @@ function getSnapinList() { } function getSnapinCoords(obj) { - var snapinTop = snapinDragging.offsetTop + document.getElementById('side_content').scrollTop; + var snapinTop = snapinDragging.offsetTop; + // + document.getElementById('side_content').scrollTop; var bottomOffset = obj.offsetTop + obj.clientHeight - snapinTop; if (bottomOffset < 0)

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed problem with new created tag groups with "/" in title

by Lars Michelsen

Module: check_mk Branch: master Commit: e251be4eac6a05596da462448c7666381c08a5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e251be4eac6a05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 14:08:17 2013 +0100 FIX Fixed problem with new created tag groups with "/" in title If you used <tt>/</tt> chars in the tag group titles before, the text before the first <tt>/</tt> was moved from the title to the topic field. This was not intended. This has been fixed now. However, there is still some issue with this: If you have existing tag groups with slashes in their title, the same problem will happen. Thist must be fixed by hand for the moment. --- .werks/295 | 15 +++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/295 b/.werks/295 new file mode 100644 index 0000000..cfe493d --- /dev/null +++ b/.werks/295 @@ -0,0 +1,15 @@ +Title: Fixed problem with new created tag groups with "/" in title +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1385989575 +Class: fix + +If you used <tt>/</tt> chars in the tag group titles before, the text before +the first <tt>/</tt> was moved from the title to the topic field. This was not +intended. This has been fixed now. + +However, there is still some issue with this: If you have existing tag groups with +slashes in their title, the same problem will happen. Thist must be fixed by hand +for the moment. + diff --git a/ChangeLog b/ChangeLog index 1fdb323..39f356b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 0220 FIX: Added HTML escaping to several global settings attributes... * 0234 FIX: Improved handling of interface inventory states / types... * 0289 FIX: Renamed "Hosts & Folders" page to "Hosts" + * 0295 FIX: Fixed problem with new created tag groups with "/" in title... Notifications: * 0005 Added notification script for sending SMS via mobilant.com... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6a7f783..8de73ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10071,8 +10071,9 @@ def mode_edit_hosttag(phase): raise MKUserError("title", _("Please specify a title for your host tag group.")) topic = forms.get_input(vs_topic, "topic") - if topic != '': - title = '%s/%s' % (topic, title) + # always put at least "/" as prefix to the title, the title + # will then be split by the first "/' in future + title = '%s/%s' % (topic, title) new_choices = forms.get_input(vs_choices, "choices") have_none_tag = False

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits