Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: Fixed spaces in code

by Mathias Kettner

Module: check_mk Branch: master Commit: 2ccc84e718dbd9ed4915ab7af04f106d2db57577 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ccc84e718dbd9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 10 13:26:28 2015 +0200 Fixed spaces in code --- checks/diskstat.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index dce910b..599a640 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -394,7 +394,7 @@ def check_diskstat_dict(item, params, disks): # Throughput for what in "read", "write": - if what+"_throughput" in disk: + if what + "_throughput" in disk: throughput = disk[what + "_throughput"] state, text, extraperf = check_levels(throughput, "disk_" + what + "_throughput", params.get(what), unit = "MB/s", scale = 1048576, statemarkers=False)

9 years, 2 months

Check_MK Git: check_mk: #2373 Skip unmonitored hosts during bulk discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e197d053fd6a90c6a47feb67cf18a88bb3b1260 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e197d053fd6a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 10 11:24:25 2015 +0200 #2373 Skip unmonitored hosts during bulk discovery Hosts that are set to unmonitored (usually using the selection Do not monitor this host in the host tag group Criticality</i) are now being skipped during bulk discovery. This now behaves the same like cmk -I on the command line. --- .werks/2373 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 9 ++++++++- web/htdocs/wato.py | 23 ++++++++++++++++------- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.werks/2373 b/.werks/2373 new file mode 100644 index 0000000..6794068 --- /dev/null +++ b/.werks/2373 @@ -0,0 +1,11 @@ +Title: Skip unmonitored hosts during bulk discovery +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1436520172 +Class: feature + +Hosts that are set to unmonitored (usually using the selection Do not monitor this host +in the host tag group Criticality</i) are now being skipped during bulk discovery. This now behaves +the same like cmk -I on the command line. diff --git a/ChangeLog b/ChangeLog index 3c37aa5..0692a68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 2365 Removed old deprecated notification global options for plain emails... * 2384 SEC: Prevent user passwords from being visible in webserver log on user creation... * 2386 SEC: Fixed possible XSS on WATO rule edit page... + * 2373 Skip unmonitored hosts during bulk discovery... * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner diff --git a/modules/automation.py b/modules/automation.py index 044e6c1..ba2b78e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -106,11 +106,13 @@ def do_automation(cmd, args): output_profile() sys.exit(0) -# Does inventory for *one* host. Possible values for how: +# Does discovery for a list of hosts. Possible values for how: # "new" - find only new services (like -I) # "remove" - remove exceeding services # "fixall" - find new, remove exceeding # "refresh" - drop all services and reinventorize +# Hosts on the list that are offline (unmonitored) will +# be skipped. def automation_discovery(args): # Error sensivity @@ -146,6 +148,11 @@ def automation_discovery(args): for hostname in hostnames: counts.setdefault(hostname, [0, 0, 0, 0]) # added, removed, kept, total + + if hostname not in all_hosts_untagged: + failed_hosts[hostname] = None # means offline + continue # unmonitored host + try: # in "refresh" mode we first need to remove all previously discovered # checks of the host, so that get_host_services() does show us the diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aba0f43..d574472 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3750,6 +3750,8 @@ def mode_bulk_inventory(phase): site_id, folderpath, hostnamesstring = html.var("_item").split("|") hostnames = hostnamesstring.split(";") num_hosts = len(hostnames) + num_skipped_hosts = 0 + num_failed_hosts = 0 folder = g_folders[folderpath] load_hosts(folder) arguments = [how,] + hostnames @@ -3775,22 +3777,28 @@ def mode_bulk_inventory(phase): sum_counts[3] += counts[hostname][3] host = folder[".hosts"][hostname] if hostname in failed_hosts: - result_txt += _("Failed to inventorize %s: %s ") % (hostname, failed_hosts[hostname]) - if not host.get("inventory_failed") and not host.get(".folder", {}).get("_lock_hosts"): - host["inventory_failed"] = True - save_hosts(folder) + reason = failed_hosts[hostname] + if reason == None: + result_txt += _("%s: discovery skipped: host not monitored ") % hostname + num_skipped_hosts += 1 + else: + num_failed_hosts += 1 + result_txt += _("%s: discovery failed: %s ") % (hostname, failed_hosts[hostname]) + if not host.get("inventory_failed") and not host.get(".folder", {}).get("_lock_hosts"): + host["inventory_failed"] = True + save_hosts(folder) else: - result_txt += _("Inventorized %s \n") % hostname + result_txt += _("%s: discovery successful \n") % hostname mark_affected_sites_dirty(folder, hostname, sync=False, restart=True) log_pending(AFFECTED, hostname, "bulk-inventory", - _("Inventorized host: %d added, %d removed, %d kept, %d total services") % + _("Did service discovery on host: %d added, %d removed, %d kept, %d total services") % tuple(counts[hostname])) if "inventory_failed" in host and not host.get(".folder", {}).get("_lock_hosts"): del host["inventory_failed"] save_hosts(folder) # Could be optimized, but difficult here - result = repr([ 'continue', num_hosts, len(failed_hosts) ] + sum_counts) + "\n" + result_txt + result = repr([ 'continue', num_hosts, num_failed_hosts, num_skipped_hosts ] + sum_counts) + "\n" + result_txt except Exception, e: result = repr([ 'failed', num_hosts, num_hosts, 0, 0, 0, 0, ]) + "\n" @@ -3902,6 +3910,7 @@ def mode_bulk_inventory(phase): _("Bulk Service Discovery"), # title [ (_("Total hosts"), 0), (_("Failed hosts"), 0), + (_("Skipped hosts"), 0), (_("Services added"), 0), (_("Services removed"), 0), (_("Services kept"), 0),

9 years, 2 months

Check_MK Git: check_mk: #1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0f7ca13b681a9b0163923c1238a26c489fb669f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f7ca13b681a9b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 10 10:44:03 2015 +0200 #1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission --- .werks/1268 | 9 +++++++++ ChangeLog | 1 + web/plugins/sidebar/wato.py | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.werks/1268 b/.werks/1268 new file mode 100644 index 0000000..5262dcc --- /dev/null +++ b/.werks/1268 @@ -0,0 +1,9 @@ +Title: The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1436517779 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1fafcba..eb38d43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 2390 SEC: Fixed possible XSS issue on views... * 2391 SEC: Auth cookie is using "secure" flag when HTTPS request detected... * 2392 SEC: Auth cookie is always using "httponly" flag... + * 1268 The Snapins "Folders" and "Tree of Folders" can now be used by users without wato permission * 2314 FIX: Availability: fixed exception when grouping by host or service group * 2361 FIX: Fix exception for missing key 'title' in certain cases of older customized views * 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http... diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 0a50ffd..243a2b2 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -124,7 +124,6 @@ def compute_foldertree(): wato_folder = {} if wato.folder_config_exists(wato.root_dir + path): wato_folder = wato.load_folder(wato.root_dir + path, childs = False) - return { 'title': wato_folder.get('title', path.split('/')[-1]), '.path': path, @@ -217,9 +216,6 @@ def render_wato_foldertree(): if not config.wato_enabled: html.write(_("WATO is disabled.")) return False - elif not config.may("wato.use"): - html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) - return False user_folders = compute_foldertree()

9 years, 2 months

Check_MK Git: check_mk: #2400 FIX windows_if.ps1: fixed exception in plugin when a interface team had no members

by Andreas Boesl

Module: check_mk Branch: master Commit: 74ec71cb22d87a29101efa884165222d21d2502e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74ec71cb22d87a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 9 16:27:16 2015 +0200 #2400 FIX windows_if.ps1: fixed exception in plugin when a interface team had no members --- .werks/2400 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/windows_if.ps1 | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2400 b/.werks/2400 new file mode 100644 index 0000000..5cf8ea7 --- /dev/null +++ b/.werks/2400 @@ -0,0 +1,9 @@ +Title: windows_if.ps1: fixed exception in plugin when an interface team had no members +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436451981 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ebb7e6f..254b18f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 1265 FIX: check_mk_agent.aix: Filesystem Section now ignores cdrfs filesystems * 1266 FIX: cisco_mem_asa: Special memory check for cisco asa devices.... NOTE: Please refer to the migration notes! + * 2400 FIX: windows_if.ps1: fixed exception in plugin when an interface team had no members Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/windows/plugins/windows_if.ps1 b/agents/windows/plugins/windows_if.ps1 index 14bdafb..df94e59 100644 --- a/agents/windows/plugins/windows_if.ps1 +++ b/agents/windows/plugins/windows_if.ps1 @@ -14,6 +14,11 @@ if ((([Environment]::OSVersion.Version.Major -eq "6") -and ([Environment]::OSVer Write-Host "[teaming_start]" Write-Host "TeamName`tTeamingMode`tLoadBalancingAlgorithm`tMemberMACAddresses`tMemberNames`tMemberDescriptions`tSpeed`tGUID" foreach ($team in $teams){ + $membermacs = $null + $members = $null + $netinterface = $null + $netspeed = $null + $netguid = $null Write-Host -NoNewline $team.Name`t Write-Host -NoNewline $team.tm`t Write-Host -NoNewline $team.lba`t

9 years, 2 months

Check_MK Git: check_mk: fixed permissions of mk_db2.linux

by Goetz Golla

Module: check_mk Branch: master Commit: 587356becf4310e1d30b8cb69b7407fab0b1ca03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=587356becf4310… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 9 15:24:11 2015 +0200 fixed permissions of mk_db2.linux --- 0 files changed diff --git a/agents/plugins/mk_db2.linux b/agents/plugins/mk_db2.linux old mode 100644 new mode 100755

9 years, 2 months

Check_MK Git: check_mk: #2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks

by Goetz Golla

Module: check_mk Branch: master Commit: efefdc85876a287b7a492c831a5569922fe4f285 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efefdc85876a28… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 9 15:23:06 2015 +0200 #2129 db_ checks: new mk_db2.linux agent supporting the existing db2_ checks --- .werks/2129 | 9 ++ ChangeLog | 1 + agents/plugins/mk_db2.linux | 205 +++++++++++++++++++++++++++++++++++++++++++ checkman/db2_backup | 4 +- checkman/db2_bp_hitratios | 4 +- checkman/db2_connections | 4 +- checkman/db2_counters | 4 +- checkman/db2_logsize | 4 +- checkman/db2_sort_overflow | 4 +- checkman/db2_tablespaces | 4 +- checkman/db2_version | 4 +- 11 files changed, 231 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=efefdc8587…

9 years, 2 months

Check_MK Git: check_mk: #2128 mk_inventory.vbs: inventory plugin for Windows now available as vbs script

by Goetz Golla

Module: check_mk Branch: master Commit: ed2eb6df28e532a3d5ed92b05ef00fccfdf6e709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed2eb6df28e532… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 9 14:50:53 2015 +0200 #2128 mk_inventory.vbs: inventory plugin for Windows now available as vbs script This will be the new recommended default --- .werks/2128 | 9 ++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.vbs | 208 +++++++++++++++++++++++++++++++ inventory/win_reg_uninstall | 16 ++- inventory/win_wmi_software | 6 + 5 files changed, 236 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed2eb6df28…

9 years, 2 months

Check_MK Git: check_mk: pfsense_if: Changed default levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: bfd0b4786343ea5025b3e18967d595815de44648 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd0b4786343ea… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 9 14:24:52 2015 +0200 pfsense_if: Changed default levels --- checks/pfsense_if | 5 +++++ web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/pfsense_if b/checks/pfsense_if index 4d85f33..53dae9a 100644 --- a/checks/pfsense_if +++ b/checks/pfsense_if @@ -24,6 +24,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +factory_settings["pfsense_if_default_levels"] = { + "ipv4_in_blocked" : (100.0, 10000.0), + "average" : 3, +} def parse_pfsense_if(info): parsed = {} @@ -40,6 +44,7 @@ def inventory_pfsense_if(parsed): check_info["pfsense_if"] = { "parse_function" : parse_pfsense_if, "inventory_function" : inventory_pfsense_if, + "default_levels_variable" : "pfsense_if_default_levels", "check_function" : check_firewall_if, "service_description" : "Firewall Interface %s", "snmp_info" : (".1.3.6.1.4.1.12325.1.200.1.8.2.1", [ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e3443df..b5571d8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -301,7 +301,7 @@ register_check_parameters( Levels( title = _("Levels for rate of incoming IPv4 packets blocked"), unit = _("pkts/s"), - default_levels = (85, 90), + default_levels = (100.0, 10000.0), default_difference = (5, 8), default_value = None, ), @@ -312,7 +312,7 @@ register_check_parameters( help = _("When this option is activated then the block rate is being " "averaged before the levels are being applied."), unit = _("min"), - default_value = 15, + default_value = 3, label = _("Compute average over last "), )), ],

9 years, 2 months

Check_MK Git: check_mk: pfsense_counter: Changed default levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: f11ad51c87459b0738a67b4146f83f25cbf31445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f11ad51c87459b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 9 14:11:35 2015 +0200 pfsense_counter: Changed default levels --- checks/pfsense_counter | 9 ++++++--- web/plugins/wato/check_parameters.py | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/checks/pfsense_counter b/checks/pfsense_counter index 39307a4..23b2537 100644 --- a/checks/pfsense_counter +++ b/checks/pfsense_counter @@ -25,9 +25,12 @@ # Boston, MA 02110-1301 USA. factory_settings["pfsense_counter_default_levels"] = { - "badoffset" : (0.1, 10.0), - "short" : (0.1, 10.0), - "memdrop" : (0.001, 10.0), + "badoffset" : (100.0, 10000.0), + "short" : (100.0, 10000.0), + "memdrop" : (100.0, 10000.0), + "normalized" : (100.0, 10000.0), + "fragment" : (100.0, 10000.0), + "average" : 3, } def parse_pfsense_counter(info): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 33e3ea8..e3443df 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -380,7 +380,7 @@ register_check_parameters( "averaged before the levels are being applied. Setting this to zero will " "deactivate averaging."), unit = _("min"), - default_value = 15, + default_value = 3, label = _("Compute average over last "), )), ( "fragment", @@ -388,38 +388,38 @@ register_check_parameters( title = _("Levels for rate of fragmented packets"), elements = [ Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 200.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10000.0), ], )), ( "normalized", Tuple( title = _("Levels for rate of normalized packets"), elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 10.0), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 50.0), + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10000.0), ], )), ( "badoffset", Tuple( title = _("Levels for rate of packets with bad offset"), elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.1), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10000.0), ], )), ( "short", Tuple( title = _("Levels for rate of short packets"), elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.1), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10000.0), ], )), ( "memdrop", Tuple( title = _("Levels for rate of packets dropped due to memory limitations"), elements = [ - Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 0.001), - Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10.0), + Float(title = _("Warning at"), unit = _("pkts/s"), default_value = 100.0), + Float(title = _("Critical at"), unit = _("pkts/s"), default_value = 10000.0), ], )), ],

9 years, 2 months

Check_MK Git: check_mk: netapp_api_vf_status: Modified check to consider the state migrating OK

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8e14db790eae098be27492a0dd56145e36b23a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e14db790eae09… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 9 10:05:26 2015 +0200 netapp_api_vf_status: Modified check to consider the state migrating OK --- checkman/netapp_api_vf_status | 5 +++-- checks/netapp_api_vf_status | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checkman/netapp_api_vf_status b/checkman/netapp_api_vf_status index 39ab79d..ce038dc 100644 --- a/checkman/netapp_api_vf_status +++ b/checkman/netapp_api_vf_status @@ -5,8 +5,9 @@ license: GPL distribution: check_mk description: This check monitors the states of the vFilers of the NetApp Filer. - Possible states are {running}, {stopped}, {inconsistent} or {defunct}. - If vFiler state differs from {running} the check goes {CRIT}. + Possible states are {running}, {stopped}, {inconsistent}, {DR backup}, + {migrating} or {defunct}. If vFiler state is not {running}, + {DR backup} or {migrating} the check goes {CRIT}. inventory: One check is created per vFiler. diff --git a/checks/netapp_api_vf_status b/checks/netapp_api_vf_status index 8ec54e3..3509b83 100644 --- a/checks/netapp_api_vf_status +++ b/checks/netapp_api_vf_status @@ -39,7 +39,7 @@ def check_netapp_api_vf_status(item, _no_params, info): if item not in filer_states: return - state = filer_states[item] not in ["running", "DR backup"] and 2 or 0 + state = filer_states[item] not in ["running", "DR backup", "migrating"] and 2 or 0 return state, "Status is %s" % filer_states[item] check_info["netapp_api_vf_status"] = {

9 years, 2 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015