Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2666 FIX Fix search for global configuration variables: ignore case now

by Mathias Kettner

Module: check_mk Branch: master Commit: 32dd233a2c72974e2afe1462fad2addda83bbc7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32dd233a2c7297… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 12:05:09 2015 +0200 #2666 FIX Fix search for global configuration variables: ignore case now --- .werks/2666 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/2666 b/.werks/2666 new file mode 100644 index 0000000..77e4d55 --- /dev/null +++ b/.werks/2666 @@ -0,0 +1,9 @@ +Title: Fix search for global configuration variables: ignore case now +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1445508288 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d0fab2e..08f5149 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,9 @@ * 2686 FIX: Fixed showing graphs for cluster ping services * 2687 FIX: Quicksearch: Improved error handling + WATO: + * 2666 FIX: Fix search for global configuration variables: ignore case now + HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2475af1..1082fdc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8312,11 +8312,11 @@ def render_global_configuration_variables(default_values, current_settings, show help_text = valuespec.help() or '' title_text = valuespec.title() - if search and search not in groupname \ - and search not in domain \ - and search not in varname \ - and search not in help_text \ - and search not in title_text: + if search and search not in groupname.lower() \ + and search not in domain.lower() \ + and search not in varname \ + and search not in help_text.lower() \ + and search not in title_text.lower(): continue # skip variable when search is performed and nothing matches at_least_one_painted = True

8 years, 8 months

#2688 mssql agent plugin can now handle clustered MSSQL instances

by Lars Michelsen

Module: check_mk Branch: master Commit: 633714f1bc12fdad5f12384c482813abd777b54a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=633714f1bc12fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 11:57:19 2015 +0200 #2688 mssql agent plugin can now handle clustered MSSQL instances --- .werks/2688 | 9 ++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 44 +++++++++++++++++++++++++++++++------- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.werks/2688 b/.werks/2688 new file mode 100644 index 0000000..df8dc64 --- /dev/null +++ b/.werks/2688 @@ -0,0 +1,9 @@ +Title: mssql agent plugin can now handle clustered MSSQL instances +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445507809 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d0fab2e..b87a66e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 2695 hp_msa_disk, hp_msa_volume: these checks now report more information about disks and volumes of a HP MSA 2040 Storage System * 2663 knuerr_rms_temp: switch to new generic temperature logic, allow e.g. lower levels... NOTE: Please refer to the migration notes! + * 2688 mssql agent plugin can now handle clustered MSSQL instances * 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/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 95d68bb..89baa8e 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -29,7 +29,8 @@ Option Explicit -Dim WMI, FSO, SHO, prop, instId, instIdx, instVersion, instIds, instName, output +Dim WMI, FSO, SHO, items, objItem, prop, instId, instIdx, instVersion +Dim instIds, instName, output, isClustered Dim WMIservice, colRunningServices, objService, cfg_dir, cfg_file, hostname WScript.Timeout = 10 @@ -72,6 +73,26 @@ Function readIniFile(path) Set readIniFile = parsed End Function +' Detect whether or not the script is called in a clustered environment. +' Saves the virtual server names of the DB instances +Set instServers = CreateObject("Scripting.Dictionary") +On Error Resume Next +Set WMI = GetObject("WINMGMTS:\\.\root\mscluster") +Set items = WMI.execQuery("SELECT Name, Status, State, Type, PrivateProperties " & _ + "FROM MsCluster_Resource WHERE Type = 'SQL Server'") +For Each objItem in items + instName = objItem.PrivateProperties.InstanceName + instServers(instName) = objItem.PrivateProperties.VirtualServerName +Next + +If Err.Number <> 0 Then + Err.Clear() + isClustered = FALSE +Else + isClustered = TRUE +End If +On Error Goto 0 + ' Dummy empty output. ' Contains timeout error if this scripts runtime exceeds the timeout WScript.echo "<<<mssql_versions>>>" @@ -111,7 +132,8 @@ For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " "SQLServiceType = 1 AND PropertyName = 'VERSION'") - Set colRunningServices = WMIservice.ExecQuery("SELECT State FROM Win32_Service WHERE Name = '" & prop.ServiceName & "'") + Set colRunningServices = WMIservice.ExecQuery("SELECT State FROM Win32_Service " & _ + "WHERE Name = '" & prop.ServiceName & "'") instId = Replace(prop.ServiceName, "$", "__") instVersion = prop.PropertyStrValue instIdx = Replace(instId, "__", "_") @@ -136,9 +158,6 @@ Set CONN = CreateObject("ADODB.Connection") Set RS = CreateObject("ADODB.Recordset") CONN.Provider = "sqloledb" -' Select a special DB -'CONN.Properties("Initial Catalog").Value = "test123" - ' Loop all found server instances and connect to them ' In my tests only the connect using the "named instance" string worked For Each instId In instIds.Keys @@ -175,10 +194,19 @@ For Each instId In instIds.Keys End If ' In case of instance name "MSSQLSERVER" always use (local) as connect string - If instName = "MSSQLSERVER" Then - CONN.Properties("Data Source").Value = "(local)" + If Not isClustered Then + If instName = "MSSQLSERVER" Then + CONN.Properties("Data Source").Value = "(local)" + Else + CONN.Properties("Data Source").Value = hostname & "\" & instName + End If Else - CONN.Properties("Data Source").Value = hostname & "\" & instName + ' In case the instance name is "MSSQLSERVER" always use the virtual server name + If instName = "MSSQLSERVER" Then + CONN.Properties("Data Source").Value = instServers(instName) + Else + CONN.Properties("Data Source").Value = instServers(instName) & "\" & instName + End If End If CONN.Open

8 years, 8 months

Fixed typo in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: cc60108b12c3214c16d4efc1e961144c01f30ace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc60108b12c321… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 11:26:01 2015 +0200 Fixed typo in help text --- web/plugins/wato/globals_notification.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 81234d3..ad05e57 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -99,7 +99,7 @@ register_configvar(group, forth = lambda x: x == 0 and 1 or x, # transform deprecated value 0 (no logging) to 1 title = _("Notification log level"), help = _("You can configure the notification mechanism to log more details about " - "the notifications into the notification log. These information are logged " + "the notifications into the notification log. This information are logged " "into the file <tt>%s</tt>") % site_neutral_path(defaults.log_dir + "/notify.log"), ), domain = "check_mk")

8 years, 8 months

#2687 FIX Quicksearch: Improved error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: ba03b00a0da23595f6483a74a63828600a08283c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba03b00a0da235… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 10:56:36 2015 +0200 #2687 FIX Quicksearch: Improved error handling --- .werks/2687 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 18 ++++++++++-------- web/plugins/sidebar/search.py | 4 ++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.werks/2687 b/.werks/2687 new file mode 100644 index 0000000..0a7768d --- /dev/null +++ b/.werks/2687 @@ -0,0 +1,10 @@ +Title: Quicksearch: Improved error handling +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445504158 + + diff --git a/ChangeLog b/ChangeLog index ed339b9..d0fab2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 2696 FIX: Fixed broken perfometer for update checks * 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs... * 2686 FIX: Fixed showing graphs for cluster ping services + * 2687 FIX: Quicksearch: Improved error handling HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ba03c8d..edc1bdf 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -717,7 +717,7 @@ def to_regex(s): re.compile(s) except re.error: raise MKGeneralException(_('You search statement is not valid. You need to provide a regular ' - 'expression (regex). For example you need to e use <tt>\\\\</tt> instead of <tt>\\</tt> ' + 'expression (regex). For example you need to use <tt>\\\\</tt> instead of <tt>\\</tt> ' 'if you like to search for a single backslash.')) return s @@ -996,17 +996,19 @@ def ajax_search(): if not q: return - data, used_filters = process_search(q) - if not data: - return - try: + data, used_filters = process_search(q) + if not data: + return + render_search_results(used_filters, data) + except MKException, e: + html.show_error(e) except Exception, e: - html.write("error") + if config.debug: + raise import traceback - html.write(traceback.format_exc()) - html.write(repr(e)) + html.show_error(traceback.format_exc()) def search_open(): diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 6e60dab..a1475e1 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -94,6 +94,10 @@ sidebar_snapins["search"] = { background-color: #BFBFBF; } +#mk_search_results div.error { + padding: 2px; +} + """ }

8 years, 8 months

#2686 FIX Fixed showing graphs for cluster ping services

by Lars Michelsen

Module: check_mk Branch: master Commit: e7059584d2432282903f14b54ac77fcf21b0117b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7059584d24322… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 10:27:38 2015 +0200 #2686 FIX Fixed showing graphs for cluster ping services --- .werks/2686 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/2686 b/.werks/2686 new file mode 100644 index 0000000..5f8b260 --- /dev/null +++ b/.werks/2686 @@ -0,0 +1,10 @@ +Title: Fixed showing graphs for cluster ping services +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445502435 + + diff --git a/ChangeLog b/ChangeLog index 7cb6ec1..ed339b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 2435 FIX: New graphing system: fixed broken graphs for iSCSI checks... * 2696 FIX: Fixed broken perfometer for update checks * 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs... + * 2686 FIX: Fixed showing graphs for cluster ping services HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f80bdea..a7db95f 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2639,6 +2639,13 @@ check_metrics["check-mk-ping"] = { "rta" : { "scale" : m } } +check_metrics["check-mk-ping-cluster"] = { + "~.*rta": { "name" : "rta" }, + "~.*pl": { "name" : "pl" }, + "~.*rtmax": { "name" : "rtmax" }, + "~.*rtmin": { "name" : "rtmin" }, +} + check_metrics["check_mk_active-mail_loop"] = { "duration" : { "name": "mails_received_time" } }

8 years, 8 months

#2685 FIX LDAP: Fixed failing synchronization when migrating some old configs

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f1c156ab43bc082e7836b86b1879a4c5ca5a785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f1c156ab43bc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 09:04:35 2015 +0200 #2685 FIX LDAP: Fixed failing synchronization when migrating some old configs When updating from previous Check_MK versions having an LDAP configuration, it might happen that errors like "Invalid scope specified: subtree" occur. --- .werks/2685 | 11 +++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 7 ++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/2685 b/.werks/2685 new file mode 100644 index 0000000..6bf2176 --- /dev/null +++ b/.werks/2685 @@ -0,0 +1,11 @@ +Title: LDAP: Fixed failing synchronization when migrating some old configs +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445497370 + +When updating from previous Check_MK versions having an LDAP configuration, +it might happen that errors like "Invalid scope specified: subtree" occur. diff --git a/ChangeLog b/ChangeLog index 3e37b81..7cb6ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 2680 FIX: LDAP: Fixed exception when syncing groups using configurations from previous versions... * 2435 FIX: New graphing system: fixed broken graphs for iSCSI checks... * 2696 FIX: Fixed broken perfometer for update checks + * 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs... HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index adf36dd..90b7012 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -434,7 +434,7 @@ class LDAPUserConnector(UserConnector): return results - def ldap_search(self, base, filt='(objectclass=*)', columns=[], scope='subtree'): + def ldap_search(self, base, filt='(objectclass=*)', columns=[], scope='sub'): self.log('LDAP_SEARCH "%s" "%s" "%s" "%r"' % (base, scope, filt, columns)) start_time = time.time() @@ -499,7 +499,8 @@ class LDAPUserConnector(UserConnector): def ldap_get_scope(self, scope): - if scope == 'sub': + # Had "subtree" in Check_MK for several weeks. Better be compatible to both definitions. + if scope in [ 'sub', 'subtree' ]: return ldap.SCOPE_SUBTREE elif scope == 'base': return ldap.SCOPE_BASE @@ -791,7 +792,7 @@ class LDAPUserConnector(UserConnector): 'directory_type' : getattr(config, 'ldap_connection', {}).get('type', 'ad'), 'user_id_umlauts': 'keep', 'user_dn' : '', - 'user_scope' : 'subtree', + 'user_scope' : 'sub', } old_connection_cfg = getattr(config, 'ldap_connection', {})

8 years, 8 months

#2684 Added icons for downloading agent data / walks of hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ed552328c89d3789cf14c49e5151e1792274210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ed552328c89d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 22 08:57:39 2015 +0200 #2684 Added icons for downloading agent data / walks of hosts Created two new icons which can be used to download the agent output of a host (equals to cmk -d [hostname]) and one for downloading the SNMP walk of a host (equals to cmk --snmpwalk [hostname]). --- .werks/2684 | 11 ++++++ ChangeLog | 1 + modules/automation.py | 24 ++++++++++++ modules/check_mk.py | 44 ++++++++++++---------- web/htdocs/html_mod_python.py | 3 ++ web/htdocs/images/icon_agent_output.png | Bin 0 -> 2130 bytes web/htdocs/wato.py | 54 +++++++++++++++++++++++++++ web/plugins/icons/builtin.py | 2 - web/plugins/icons/wato.py | 61 +++++++++++++++++++++++++++++-- web/plugins/pages/shipped.py | 1 + web/plugins/pages/wato.py | 1 + 11 files changed, 178 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1ed552328c…

8 years, 8 months

New style graphs are working in dashlets now

by Lars Michelsen

Module: check_mk Branch: master Commit: d39c710c2d2ecedd0d23970d5822c7f9c9e6725e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39c710c2d2ece… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 21 15:32:26 2015 +0200 New style graphs are working in dashlets now --- web/htdocs/dashboard.css | 2 +- web/htdocs/dashboard.py | 5 ++ web/htdocs/metrics.py | 71 ++++++++++++++++++++++---- web/plugins/dashboard/dashlets.py | 101 +++++++++++++++++++++++++++++++++---- 4 files changed, 159 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d39c710c2d…

8 years, 8 months

#1296 FIX aix_memory: Check can now handle systems without swap partition

by Bastian Kuhn

Module: check_mk Branch: master Commit: 52621ae0d8f2edde54037699d9800afb441ab1d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52621ae0d8f2ed… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 21 14:52:33 2015 +0200 #1296 FIX aix_memory: Check can now handle systems without swap partition --- .werks/1296 | 9 +++++++++ ChangeLog | 1 + checks/aix_memory | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/1296 b/.werks/1296 new file mode 100644 index 0000000..e551668 --- /dev/null +++ b/.werks/1296 @@ -0,0 +1,9 @@ +Title: aix_memory: Check can now handle systems without swap partition +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1445431924 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 41eadc9..8244b66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 2683 FIX: Fixed exceptions occuring in some ps checks... * 2662 FIX: windows agent: fixed inventory running every time when ipv6 was activated... * 2697 FIX: hp_msa_controller.io, hp_msa_disk.io, hp_msa_volume.io: fixed broken I/O calculation + * 1296 FIX: aix_memory: Check can now handle systems without swap partition Multisite: * 2680 FIX: LDAP: Fixed exception when syncing groups using configurations from previous versions... diff --git a/checks/aix_memory b/checks/aix_memory index 7e5a38f..1c8a8e1 100644 --- a/checks/aix_memory +++ b/checks/aix_memory @@ -57,6 +57,9 @@ # output from /proc/meminfo. AIX speaks of 4k pages while Linux of kilobytes. def parse_aix_memory(info): parsed = {} + # In case that the system dont have swap configured + parsed["SwapTotal"] = 0 + parsed["SwapFree"] = 0 for line in info: if line[0] == "allocated": # Swap space parsed["SwapTotal"] = int(line[2]) * 4

8 years, 8 months

Cleaned up mousewheel event handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f0343b904cfcf0aeb4fcaac02d2f081218ff7cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f0343b904cfcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 21 14:00:49 2015 +0200 Cleaned up mousewheel event handling --- web/htdocs/js/checkmk.js | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 13195b3..8467141 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -199,6 +199,10 @@ function rad(g) { return (g * 360 / 100 * Math.PI) / 180; } +// Returns timestamp in seconds incl. subseconds as decimal +function time() { + return (new Date()).getTime() / 1000; +} // simple implementation of function default arguments when // using objects as function parameters. Example: @@ -2157,18 +2161,41 @@ function view_toggle_form(oButton, idForm) { add_class(oButton, down); } -function init_optiondial(id) { +function wheel_event_name() +{ + if ("onwheel" in window) + return "wheel"; + else if (weAreFirefox) + return "DOMMouseScroll"; + else + return "mousewheel"; +} + +function wheel_event_delta(event) +{ + return event.deltaY ? event.deltaY + : event.detail ? event.detail * (-120) + : event.wheelDelta; +} + +function init_optiondial(id) +{ var container = document.getElementById(id); make_unselectable(container); - - var eventname = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel" - add_event_handler(eventname, optiondial_wheel, container); + add_event_handler(wheel_event_name(), optiondial_wheel, container); } var g_dial_direction = 1; +var g_last_optiondial = null; function optiondial_wheel(event) { event = event || window.event; - var delta = event.detail ? event.detail * (-120) : event.wheelDelta; + var delta = wheel_event_delta(event); + + // allow updates every 100ms + if (g_last_optiondial > time() - 0.1) { + return prevent_default_events(event); + } + g_last_optiondial = time(); var container = getTarget(event); if (event.nodeType == 3) // defeat Safari bug

8 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015