Checkmk git commits January 2016

checkmk-commits@lists.checkmk.com

9 participants
303 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 087d8a2b15925c0eb882d8185ffff033abac888b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=087d8a2b15925c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 28 11:15:33 2016 +0100 Added valuespec for selecting colors --- web/htdocs/check_mk.css | 54 +++++ web/htdocs/htmllib.py | 9 +- web/htdocs/js/checkmk.js | 40 ++-- web/htdocs/js/colorpicker.js | 445 ++++++++++++++++++++++++++++++++++++++++++ web/htdocs/valuespec.py | 57 ++++++ 5 files changed, 585 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=087d8a2b15…

8 years, 7 months

#2456 palo_alto, palo_alto_sessions: Two new checks for Palo Alto firewalls.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 696a8974b5804dfd5fb46d0703ae58c38cda2bc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696a8974b5804d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 27 19:08:18 2016 +0100 #2456 palo_alto, palo_alto_sessions: Two new checks for Palo Alto firewalls. --- .werks/2456 | 9 ++++ ChangeLog | 1 + checkman/palo_alto | 11 +++++ checkman/palo_alto_sessions | 15 ++++++ checks/palo_alto | 51 ++++++++++++++++++++ checks/palo_alto_sessions | 86 ++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 38 +++++++++++++++ web/plugins/wato/check_parameters.py | 17 +++++++ 8 files changed, 228 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=696a8974b5…

8 years, 7 months

pagetypes: allow custom buttons in list

by Mathias Kettner

Module: check_mk Branch: master Commit: f4488b7dd14e845a96c8ce27bcba4a6111d24465 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4488b7dd14e84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 27 18:28:44 2016 +0100 pagetypes: allow custom buttons in list --- web/htdocs/pagetypes.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 86876f3..1b56ef9 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -678,6 +678,9 @@ class Overridable: config.declare_permission(permname, page.title(), page.description(), ['admin','user','guest']) + @classmethod + def custom_list_buttons(self, instance): + pass @classmethod def page_list(self): @@ -779,9 +782,7 @@ class Overridable: if instance.may_delete(): html.icon_button(instance.delete_url(), _("Delete!"), "delete") - ### # Custom buttons - visual specific - ### if render_custom_buttons: - ### render_custom_buttons(visual_name, visual) + self.custom_list_buttons(instance) # Internal ID of instance (we call that 'name') table.cell(_('ID'), instance.name(), css="narrow")

8 years, 7 months

Cleanup: move table styles from status.css to pages.css

by Mathias Kettner

Module: check_mk Branch: master Commit: 7511a004e8c4d439364452775e8cf223595783c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7511a004e8c4d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 27 18:28:29 2016 +0100 Cleanup: move table styles from status.css to pages.css --- web/htdocs/pages.css | 41 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/status.css | 35 ----------------------------------- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1dfa38c..4ef69ee 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -304,6 +304,47 @@ table.data th:last-child { border-right-style: none; } +table.data tr:nth-child(odd) { background-color: #eee; } +table.data tr:nth-child(even) { background-color: #ddd; } + +table.data td.buttons { + white-space: nowrap; + width: 1%; +} + +table.data td.count { + text-align: right; + font-weight: bold; + font-family: sans-serif; +} + +table.data td.number { + text-align: right; + white-space: nowrap; +} + +table.data td.nobr { + white-space: nowrap; +} + +table.data td.center { + text-align: center; +} + +table.data td.unused { + color: #888; + text-shadow: 1px 1px 0.5px #fff; +} + +td.narrow { + width: 10px; +} +td.wide { + width: 100%; +} + + + /* Two-lined header, for example in WATO: ChangeLog->Site Status */ table.data tr.dualheader th { border-bottom: 1px solid #ccc; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index f74afc1..f69d02c 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -324,48 +324,13 @@ td.goodflag { color: #080; } -table.data td.buttons { - white-space: nowrap; - width: 1%; -} - table.data td.buttons.visuals { width: 75px; } -table.data td.count { - text-align: right; - font-weight: bold; - font-family: sans-serif; -} table.data .state0 *, table.data .state2 *, table.data .state3 * { color: white; } -table.data td.number { - text-align: right; - white-space: nowrap; -} - -table.data td.nobr { - white-space: nowrap; -} - -table.data td.center { - text-align: center; -} - -table.data td.unused { - color: #888; - text-shadow: 1px 1px 0.5px #fff; -} - -td.narrow { - width: 10px; -} -td.wide { - width: 100%; -} - td.icons { white-space: nowrap; width: 1px;

8 years, 7 months

#3035 FIX Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition

by Lars Michelsen

Module: check_mk Branch: master Commit: a364a3f6388c300cefb276a5b8187bdcaf371510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a364a3f6388c30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 17:29:33 2016 +0100 #3035 FIX Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition --- .werks/3035 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 32 +++++++++++++++++++------------- web/plugins/icons/builtin.py | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.werks/3035 b/.werks/3035 new file mode 100644 index 0000000..cb62d77 --- /dev/null +++ b/.werks/3035 @@ -0,0 +1,9 @@ +Title: Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1453912145 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index b128181..38b3966 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 2968 FIX: Closing quicksearch results when moving mouse out of sidebar area * 2969 FIX: Fixed folding of sidebar in Google Chrome * 2970 FIX: Users now allowed to modify the sidebar (e.g. guests) can now not fold snapins anymore + * 3035 FIX: Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 072da4d..c079ce7 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -830,24 +830,30 @@ function hover_graph(site, host_name, service) +'&service='+encodeURIComponent(service)); if (c.indexOf('pnp4nagios') !== -1) { - // fallback to pnp graph handling - var c = get_url_sync(c); - // It is possible that, if using multisite based authentication, pnp sends a 302 redirect - // to the login page which is transparently followed by XmlHttpRequest. There is no chance - // to catch the redirect. So we try to check the response content. If it does not contain - // the expected code, simply display an error message. - if (c.indexOf('/image?') === -1) { - // Error! unexpected response - c = '<div class="error"> ' - + 'ERROR: Received an unexpected response ' - + 'while trying to display the PNP-Graphs. Maybe there is a problem with the ' - + 'authentication.</div>'; - } + // fallback to pnp graph handling (received an URL by the get_url_sync()) + return fetch_pnp_hover_contents(c); } return c; } +function fetch_pnp_hover_contents(url) +{ + var c = get_url_sync(url); + // It is possible that, if using multisite based authentication, pnp sends a 302 redirect + // to the login page which is transparently followed by XmlHttpRequest. There is no chance + // to catch the redirect. So we try to check the response content. If it does not contain + // the expected code, simply display an error message. + if (c.indexOf('/image?') === -1) { + // Error! unexpected response + c = '<div class="error"> ' + + 'ERROR: Received an unexpected response ' + + 'while trying to display the PNP-Graphs. Maybe there is a problem with the ' + + 'authentication.</div>'; + } + return c; +} + //#. //# .-Reschedule---------------------------------------------------------. //# | ____ _ _ _ | diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index e39837a..7f41124 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -356,7 +356,7 @@ def pnp_icon(row, what): if not metrics.cmk_graphs_possible(): # Directly ask PNP for all data, don't try to use the new graph fetching mechanism # to keep the number of single requests low - hover_content_func = 'pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) + hover_content_func = 'fetch_pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) else: hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ (row['site'], row['host_name'], row.get('service_description', '_HOST_').replace("\\", "\\\\"))

8 years, 7 months

#3034 FIX cups_queues: Fixed bug when no user name available for a print job

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a95d3df16ad2223c26bde073e325029619407ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a95d3df16ad22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 15:48:54 2016 +0100 #3034 FIX cups_queues: Fixed bug when no user name available for a print job --- .werks/3034 | 9 +++++++++ ChangeLog | 1 + checks/cups_queues | 12 ++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.werks/3034 b/.werks/3034 new file mode 100644 index 0000000..5c3e9bb --- /dev/null +++ b/.werks/3034 @@ -0,0 +1,9 @@ +Title: cups_queues: Fixed bug when no user name available for a print job +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453906110 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5d9abbf..b128181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -227,6 +227,7 @@ * 2983 FIX: netapp_api_disk: fixed exception when disks were not included in the raid... * 2971 FIX: heartbeat_crm: Is now compatible with more forms of crm_mon output formats * 2972 FIX: df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth + * 3034 FIX: cups_queues: Fixed bug when no user name available for a print job Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cups_queues b/checks/cups_queues index d5131c7..b561269 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -82,20 +82,16 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - # Try to parse different time formats - # Handle case where user names contain spaces - # zam19-113565 Sebastian Hirschdobler 3561472 Fri Jul 31 12:58:01 2015 - time_parts = line[3:] - while saveint(time_parts[0]) > 35: - time_parts = time_parts[1:] - - timestring = ' '.join(time_parts) + # Try to parse different time formats. TODO: Couldn't we run the lpr command + # with some environment var to fixate the date format? try: # Tue Jun 29 09:05:54 2010 + timestring = ' '.join(line[-5:]) parsed = time.strptime(timestring, '%a %b %d %H:%M:%S %Y') except: # Thu 29 Aug 2013 12:41:42 AM CEST + timestring = ' '.join(line[-7:]) parsed = time.strptime(timestring, '%a %d %b %Y %H:%M:%S %p %Z') dt = time.mktime(parsed)

8 years, 7 months

mssql_counters: Added vim foldmarkers

by Konstantin Büttner

Module: check_mk Branch: master Commit: 65b628ce268fa7f3ca213dbfb457c2c791cbbaf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65b628ce268fa7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 27 14:34:49 2016 +0100 mssql_counters: Added vim foldmarkers --- checks/mssql_counters | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 0839949..61dc160 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -69,9 +69,20 @@ def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, inventory.append((mssql_counters_item(line, add_counter_name), dflt)) return inventory -# -# Percentage based values -# +# .--Percentage based values---------------------------------------------. +# | ____ _ | +# | | _ \ ___ _ __ ___ ___ _ __ | |_ __ _ __ _ ___ | +# | | |_) / _ \ '__/ __/ _ \ '_ \| __/ _` |/ _` |/ _ \ | +# | | __/ __/ | | (_| __/ | | | || (_| | (_| | __/ | +# | |_| \___|_| \___\___|_| |_|\__\__,_|\__, |\___| | +# | |___/ | +# | _ _ _ | +# | | |__ __ _ ___ ___ __| | __ ____ _| |_ _ ___ ___ | +# | | '_ \ / _` / __|/ _ \/ _` | \ \ / / _` | | | | |/ _ \/ __| | +# | | |_) | (_| \__ \ __/ (_| | \ V / (_| | | |_| | __/\__ \ | +# | |_.__/ \__,_|___/\___|\__,_| \_/ \__,_|_|\__,_|\___||___/ | +# | | +# '----------------------------------------------------------------------' def check_mssql_counters_perc(item, params, info, perc_w_base = True): counter_name = None @@ -112,9 +123,15 @@ check_info['mssql_counters.cache_hits'] = { 'has_perfdata': True, } -# -# Rates -# +#. +# .--Rates---------------------------------------------------------------. +# | ____ _ | +# | | _ \ __ _| |_ ___ ___ | +# | | |_) / _` | __/ _ \/ __| | +# | | _ < (_| | || __/\__ \ | +# | |_| \_\__,_|\__\___||___/ | +# | | +# '----------------------------------------------------------------------' def check_mssql_counters_transactions(item, params, info): output = [] @@ -201,9 +218,16 @@ check_info['mssql_counters.locks'] = { 'group': 'mssql_counters_locks', } -# -# File Sizes -# + +#. +# .--File Sizes----------------------------------------------------------. +# | _____ _ _ ____ _ | +# | | ___(_) | ___ / ___|(_)_______ ___ | +# | | |_ | | |/ _ \ \___ \| |_ / _ \/ __| | +# | | _| | | | __/ ___) | |/ / __/\__ \ | +# | |_| |_|_|\___| |____/|_/___\___||___/ | +# | | +# '----------------------------------------------------------------------' def check_mssql_file_sizes(item, params, info):

8 years, 7 months

#2972 FIX df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e41714432d8788b71cfce0e931e226afb6f01f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e41714432d878… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 13:50:03 2016 +0100 #2972 FIX df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth --- .werks/2972 | 9 +++++++++ ChangeLog | 1 + checks/df.include | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2972 b/.werks/2972 new file mode 100644 index 0000000..f20e38f --- /dev/null +++ b/.werks/2972 @@ -0,0 +1,9 @@ +Title: df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453898951 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 49f7d06..dc1a5dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -225,6 +225,7 @@ * 2963 FIX: esx_vsphere_datastores: Deal with empty url attribute of datastores * 2983 FIX: netapp_api_disk: fixed exception when disks were not included in the raid... * 2971 FIX: heartbeat_crm: Is now compatible with more forms of crm_mon output formats + * 2972 FIX: df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/df.include b/checks/df.include index 4b81861..90696af 100644 --- a/checks/df.include +++ b/checks/df.include @@ -439,7 +439,11 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved hours_left = space_left / trend * range timeleft = levels.get("trend_timeleft") def format_hours(hours): - if hours > 4 * 7 * 24: # 4 weeks + if hours > 365 * 24: + return "more than a year" + elif hours > 90 * 24: + return "%0d months" % (hours/ (30 * 24)) + elif hours > 4 * 7 * 24: # 4 weeks return "%0d weeks" % (hours/ (7 * 24)) elif hours > 7 * 24: # 1 week return "%0.1f weeks" % (hours/ (7 * 24))

8 years, 7 months

#3033 check_http: Now supporting extended perfdata parameter of the check

by Lars Michelsen

Module: check_mk Branch: master Commit: acea4e576ddec86b98120d996e385af6bc275268 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acea4e576ddec8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 14:24:54 2016 +0100 #3033 check_http: Now supporting extended perfdata parameter of the check --- .werks/3033 | 9 +++++++++ ChangeLog | 1 + checks/check_http | 3 +++ pnp-templates/check_mk_active-http.php | 22 ++++++++++++++++++++++ web/plugins/wato/active_checks.py | 8 ++++++++ 5 files changed, 43 insertions(+) diff --git a/.werks/3033 b/.werks/3033 new file mode 100644 index 0000000..5227f81 --- /dev/null +++ b/.werks/3033 @@ -0,0 +1,9 @@ +Title: check_http: Now supporting extended perfdata parameter of the check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1453901070 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index dc1a5dd..5d9abbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ NOTE: Please refer to the migration notes! * 2938 websphere_mq_channels: check outcome based on channel state is now configurable... * 2832 netscaler_vserver: improved check output for unknown protocols... + * 3033 check_http: Now supporting extended perfdata parameter of the check * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/check_http b/checks/check_http index 85f882d..ba1bc0f 100644 --- a/checks/check_http +++ b/checks/check_http @@ -124,6 +124,9 @@ def check_http_arguments(params): if settings['expect_regex'][2]: args += ' --invert-regex' + if settings.get("extended_perfdata"): + args += ' --extended-perfdata' + if "post_data" in settings: data, content_type = settings["post_data"] args += ' -P %s -T %s' % \ diff --git a/pnp-templates/check_mk_active-http.php b/pnp-templates/check_mk_active-http.php index 6442b57..eaeacc5 100644 --- a/pnp-templates/check_mk_active-http.php +++ b/pnp-templates/check_mk_active-http.php @@ -51,4 +51,26 @@ $def[2] .= "" . "GPRINT:size:AVERAGE:\"%3.0lf Bytes AVERAGE \" " ; +for ( $idx = 3; $idx < count ( $RRDFILE ); $idx++ ) { + preg_match ( "/(?<=_time_)[a-z]*(?=.rrd)/", $RRDFILE[$idx], $matches ); + if ( strtolower ( $matches[0] ) == "ssl" ) { + $ds_name = strtoupper ( $matches[0] ) . " Time"; + } + else { + $ds_name = ucwords ( $matches[0] ) . " Time"; + } + + $opt[$idx] = "-X0 --vertical-label \"" . $ds_name . " (ms)\" --title \"" . $ds_name . " (ms)\" "; + $def[$idx] = "" + . "DEF:var1=" . $RRDFILE[$idx] . ":" . $DS[$idx] . ":MAX " + . "CDEF:ms=var1,1000,* " + . "AREA:ms#66ccff:\"" . $ds_name . " \" " + . "LINE1:ms#000000:\"\" " + . "GPRINT:ms:LAST:\"%3.3lg ms LAST \" " + . "GPRINT:ms:MAX:\"%3.3lg ms MAX \" " + . "GPRINT:ms:AVERAGE:\"%3.3lg ms AVERAGE \" " + ; +} + + ?> diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index b8554f7..517c4bb 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -973,6 +973,14 @@ register_rule(group, "to the checked URL and this clickable."), ) ), + ("extended_perfdata", FixedValue( + value = True, + totext = _("Extended perfdata"), + title = _("Record additional performance data"), + help = _("This option makes the HTTP check produce more detailed performance data values " + "like the connect time, header time, time till first byte received and the " + "transfer time."), + )), ] ),

8 years, 7 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 556ca9533e7c459d66cb3a7c49c2581c017e4cc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=556ca9533e7c45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 27 14:24:27 2016 +0100 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 51e9712..58d3b5c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3033 +3063

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2016