Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2652 FIX jolokia_metrics: better handling of situation where agent does not respond

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ffe03be169f44eba027e6273122541110aa78f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ffe03be169f44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 14 15:18:26 2015 +0200 #2652 FIX jolokia_metrics: better handling of situation where agent does not respond In case the Jolokia agent cannot be queried the Check_MK services does not any longer complain about missing agent sections. Instead on the main service of the instance goes CRIT and all other services will be skipped and become stale. This avoids bogus notifcations. --- .werks/2652 | 12 ++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 20 +++++++------ checks/jolokia_metrics | 68 ++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 88 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7ffe03be16…

8 years, 11 months

Add of new bug

by Sven Rueß

Module: check_mk Branch: master Commit: b69814241601c422ef762423766d6453a83e1e9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b69814241601c4… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Oct 14 15:00:56 2015 +0200 Add of new bug --- .bugs/2389 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2389 b/.bugs/2389 new file mode 100644 index 0000000..f6d37b7 --- /dev/null +++ b/.bugs/2389 @@ -0,0 +1,10 @@ +Title: Logout problem after site copy +Component: multisite +State: open +Date: 2015-10-14 14:56:27 +Targetversion: 1.2.6 +Class: bug + +If one monitoring sites is copied with omd cp, the logout will not work. +After the successful login in one of the sites you can use the other one. +If you do a logout in one sites you are automatically logged in again.

8 years, 11 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 71a8cf8f549ecbb98e0970a40c8e3f813fd89ead URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71a8cf8f549ecb… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Oct 14 14:56:18 2015 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 08caff8..bb74fd5 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2389 +2390

8 years, 11 months

upated werk

by Andreas Boesl

Module: check_mk Branch: master Commit: 1eb532a1bf825c4b308a40442a2c8bc9a37b6df4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb532a1bf825c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 14 14:54:20 2015 +0200 upated werk --- .werks/2434 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.werks/2434 b/.werks/2434 index 72312ce..1a7ea6f 100644 --- a/.werks/2434 +++ b/.werks/2434 @@ -20,25 +20,25 @@ supported NetApp mode. <table> <tr><th>Check</th><th>Description</th><th>7Mode</th><th>Cluster-Mode</th></tr> <tr> <td>netapp_api_aggr</td> <td>Used space and trend of aggregations</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_cluster</td> <td>Cluster status</td> <td>X</td> <td></td></tr> +<tr> <td>netapp_api_volumes</td> <td>Used space an trend of volumes. Able to record detailed performance data for each protocol</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_info</td> <td>Displays NetApp version</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_cpu</td> <td>CPU utilization of nodes</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_cpu.utilization</td> <td>CPU utilization for 7Mode filer</td> <td>X</td> <td></td></tr> +<tr> <td>netapp_api_cluster</td> <td>Cluster status</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_cpu.nvram_bat</td> <td>NVRAM battery status</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_disk.summary</td> <td>Disk summary check. Includes total raw capacity and info about broken/spare ratio</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_fan</td> <td>Fan status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_fcp</td> <td>Fibrechannel interfaces traffic and latency</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_if</td> <td>Ethernet interfaces</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_protocol</td> <td>Read OPS / Write OPS for each protocol (nfs, nfsv4, cifs, fcp, iscsci)</td> <td>X</td> <td></td></tr> +<tr> <td>netapp_api_temp</td> <td>Temperature sensors, grouped by shelf</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_psu</td> <td>Power supplies</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_fan</td> <td>Fan status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_snapvault</td> <td>Snapvault Lag-time</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_status</td> <td>Diagnosis status</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_temp</td> <td>Temperature sensors, grouped by shelf</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_info</td> <td>Displays NetApp version</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_vf_stats.traffic</td> <td>vFiler traffic (Read/Write OPS, Net-Data Send/Recv, Read/Write Bytes)</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_stats</td> <td>CPU utilization of vFilers</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_status</td> <td>vFiler status, e.g running</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vs_status</td> <td>vServer status, e.g running</td> <td></td> <td>X</td></tr> -<tr> <td>netapp_api_volumes</td> <td>Used space an trend of volumes. Able to record detailed performance data for each protocol</td> <td></td> <td></td></tr> <tr> <td>netapp_api_vs_traffic</td> <td>vServer Traffic Summary Ethernet Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.fcp</td> <td>vServer Traffic Summary Fibrechannel Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.cifs</td> <td>vServer Traffic Summary Cifs</td> <td></td> <td>X</td></tr>

8 years, 11 months

add missing manpage

by Andreas Boesl

Module: check_mk Branch: master Commit: 8be26206769e19e028648628f9f0690bdf1ab973 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8be26206769e19… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 14 14:52:21 2015 +0200 add missing manpage --- checkman/netapp_api_vs_traffic.nfsv4 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/checkman/netapp_api_vs_traffic.nfsv4 b/checkman/netapp_api_vs_traffic.nfsv4 new file mode 100644 index 0000000..5241094 --- /dev/null +++ b/checkman/netapp_api_vs_traffic.nfsv4 @@ -0,0 +1,14 @@ +title: NetApp Filer: vServer Traffic Summary NFSv4 +agents: netapp +catalog: hw/storagehw/netapp +license: GPL +distribution: check_mk +description: + This check monitors the summary of all NFSv4 traffic used by a vServer. + It is always {OK}. + +inventory: + Creates one check per vServer + +perfdata: + Read/Write OPS

8 years, 11 months

#2434 NetApp monitoring: Cluster-Mode is now supported,

by Andreas Boesl

changes in existing 7Mode checks Message-ID: <561e4fd1.+qmoBA8o/6afJlro%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b6df187a2348e264761c92c283f8f2cd8ea85d8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6df187a2348e2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 14 14:49:04 2015 +0200 #2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks This update enables to monitor NetApp Filers running in Cluster-Mode. The new <i>agent_netapp</i> is able to automatically detect whether the filer is running in 7Mode or Cluster-Mode, so you only have to configure the credentials in the datasource rule as usual. Some of the existing 7Mode checks have been adjusted. Overall there are now less summary checks available (e.g. fan, temperature, psu). You need to do a service discovery on each NetApp filer. The following table shows the list of available checks and the currently supported NetApp mode. <table> <tr><th>Check</th><th>Description</th><th>7Mode</th><th>Cluster-Mode</th></tr> <tr> <td>netapp_api_aggr</td> <td>Used space and trend of aggregations</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_cluster</td> <td>Cluster status</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_cpu</td> <td>CPU utilization of nodes</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_cpu.utilization</td> <td>CPU utilization for 7Mode filer</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_cpu.nvram_bat</td> <td>NVRAM battery status</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_disk.summary</td> <td>Disk summary check. Includes total raw capacity and info about broken/spare ratio</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_fan</td> <td>Fan status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_fcp</td> <td>Fibrechannel interfaces traffic and latency</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_if</td> <td>Ethernet interfaces</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_protocol</td> <td>Read OPS / Write OPS for each protocol (nfs, nfsv4, cifs, fcp, iscsci)</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_psu</td> <td>Power supplies</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_snapvault</td> <td>Snapvault Lag-time</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_status</td> <td>Diagnosis status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_temp</td> <td>Temperature sensors, grouped by shelf</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_info</td> <td>Displays NetApp version</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_vf_stats.traffic</td> <td>vFiler traffic (Read/Write OPS, Net-Data Send/Recv, Read/Write Bytes)</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_stats</td> <td>CPU utilization of vFilers</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_status</td> <td>vFiler status, e.g running</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vs_status</td> <td>vServer status, e.g running</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_volumes</td> <td>Used space an trend of volumes. Able to record detailed performance data for each protocol</td> <td></td> <td></td></tr> <tr> <td>netapp_api_vs_traffic</td> <td>vServer Traffic Summary Ethernet Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.fcp</td> <td>vServer Traffic Summary Fibrechannel Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.cifs</td> <td>vServer Traffic Summary Cifs</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.iscsi</td> <td>vServer Traffic Summary ISCSI</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.nfsv3</td> <td>vServer Traffic Summary nfsv3</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.nfsv4</td> <td>vServer Traffic Summary nfsv4</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.nfsv4_1</td> <td>vServer Traffic Summary nfsv4.1</td> <td></td> <td>X</td></tr> </table> --- .werks/2434 | 49 ++ ChangeLog | 2 + agents/special/agent_netapp | 940 ++++++++++++++-------- checkman/netapp_api_cluster | 4 +- checkman/netapp_api_cpu | 16 + checkman/netapp_api_cpu.nvram_bat | 18 + checkman/netapp_api_cpu.utilization | 4 +- checkman/netapp_api_disk.summary | 3 +- checkman/netapp_api_fan | 10 +- checkman/netapp_api_fcp | 16 + checkman/{netapp_api_version => netapp_api_info} | 0 checkman/netapp_api_protocol | 2 +- checkman/netapp_api_psu | 13 +- checkman/netapp_api_snapvault | 15 + checkman/netapp_api_status | 2 +- checkman/netapp_api_temp | 12 +- checkman/netapp_api_vf_stats | 17 + checkman/netapp_api_vf_status | 6 +- checkman/netapp_api_vs_status | 13 + checkman/netapp_api_vs_traffic | 14 + checkman/netapp_api_vs_traffic.cifs | 14 + checkman/netapp_api_vs_traffic.fcp | 14 + checkman/netapp_api_vs_traffic.iscsi | 14 + checkman/netapp_api_vs_traffic.nfs | 14 + checkman/netapp_api_vs_traffic.nfsv3 | 14 + checkman/netapp_api_vs_traffic.nfsv4_1 | 14 + checks/agent_netapp | 4 + checks/netapp_api.include | 38 +- checks/netapp_api_aggr | 20 +- checks/netapp_api_cluster | 24 +- checks/netapp_api_cpu | 106 ++- checks/netapp_api_disk | 44 +- checks/netapp_api_fan | 51 +- checks/netapp_api_fcp | 173 ++++ checks/netapp_api_if | 62 +- checks/{netapp_api_version => netapp_api_info} | 28 +- checks/netapp_api_protocol | 46 +- checks/netapp_api_psu | 44 +- checks/netapp_api_snapvault | 64 ++ checks/netapp_api_status | 7 +- checks/netapp_api_temp | 59 +- checks/netapp_api_vf_stats | 34 +- checks/netapp_api_vf_status | 6 +- checks/netapp_api_volumes | 57 +- checks/netapp_api_vs_status | 51 ++ checks/netapp_api_vs_traffic | 184 +++++ web/plugins/wato/check_parameters.py | 90 +++ web/plugins/wato/datasource_programs.py | 47 +- 48 files changed, 1755 insertions(+), 724 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6df187a23…

8 years, 11 months

The host diagnose is now using the primary IP address family of a host ( either IPv4 or IPv6)

by Lars Michelsen

Module: check_mk Branch: master Commit: 9146c3d892adc6dd09e589914bc3e89acdab6d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9146c3d892adc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 14 14:18:07 2015 +0200 The host diagnose is now using the primary IP address family of a host (either IPv4 or IPv6) --- .werks/2674 | 1 - modules/automation.py | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.werks/2674 b/.werks/2674 index 561aa69..2ad124f 100644 --- a/.werks/2674 +++ b/.werks/2674 @@ -41,7 +41,6 @@ components in the Check_MK environment left which need to be extended to be full compatible with IPv6. Some of them are: LI: Parent scanning (check_mk --scan-parents) -LI: WATO - Host-Diagnose LI: WATO - Most active checks LI: Event Console LI: Notification Forwarding diff --git a/modules/automation.py b/modules/automation.py index 0690e29..bcdfa15 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -568,13 +568,16 @@ def automation_diag_host(args): if not ipaddress: try: - ipaddress = lookup_ipv4_address(hostname) + ipaddress = lookup_ip_address(hostname) except: raise MKGeneralException("Cannot resolve hostname %s into IP address" % hostname) + ipv6_primary = is_ipv6_primary(hostname) + try: if test == 'ping': - p = subprocess.Popen('ping -A -i 0.2 -c 2 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) + base_cmd = ipv6_primary and "ping6" or "ping" + p = subprocess.Popen('%s -A -i 0.2 -c 2 -W 5 %s 2>&1' % (base_cmd, ipaddress), shell = True, stdout = subprocess.PIPE) response = p.stdout.read() return (p.wait(), response) @@ -592,7 +595,8 @@ def automation_diag_host(args): if not traceroute_prog: return 1, "Cannot find binary <tt>traceroute</tt>." else: - p = subprocess.Popen('traceroute -n %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) + family_flag = ipv6_primary and "-6" or "-4" + p = subprocess.Popen('traceroute %s -n %s 2>&1' % (family_flag, ipaddress), shell = True, stdout = subprocess.PIPE) response = p.stdout.read() return (p.wait(), response)

8 years, 11 months

Do not let duplicate hosts fail config generation anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: db20975bd9c77ac7bad7701f60b56cb648f6ff04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db20975bd9c77a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 14 14:06:05 2015 +0200 Do not let duplicate hosts fail config generation anymore This just works for CMC --- modules/automation.py | 10 ++++++++-- modules/check_mk.py | 26 +++++++++++++++++++------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 0690e29..739705e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -45,7 +45,7 @@ def do_automation(cmd, args): elif cmd == "notification-get-bulks": result = automation_get_bulks(args) else: - read_config_files() + read_config_files(validate_hosts=False) if cmd == "try-inventory": result = automation_try_discovery(args) elif cmd == "inventory": @@ -408,10 +408,16 @@ def automation_restart(job = "restart", use_rushd = True): try: if monitoring_core == "nagios": create_nagios_config(file(objects_file, "w")) - configuration_warnings = None # not supported + configuration_warnings = [] # not supported else: configuration_warnings = do_create_cmc_config(opt_cmc_relfilename, use_rushd = use_rushd) + duplicates = duplicate_hosts() + if duplicates: + configuration_warnings.append( + "The following host names have duplicates: %s. " + "This might lead to invalid/incomplete monitoring for these hosts." % ", ".join(duplicates)) + if "do_bake_agents" in globals() and bake_agents_on_restart: do_bake_agents() diff --git a/modules/check_mk.py b/modules/check_mk.py index d20f98e..d4f42fc 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1536,6 +1536,18 @@ def all_configured_hosts(): def all_active_hosts(): return all_active_realhosts() + all_active_clusters() +def duplicate_hosts(): + # Sanity check for duplicate hostnames + seen_hostnames = set([]) + duplicates = set([]) + for hostname in all_active_hosts(): + if hostname in seen_hostnames: + duplicates.add(hostname) + else: + seen_hostnames.add(hostname) + return sorted(list(duplicates)) + + # Returns a list of all host names to be handled by this site # hosts of other sitest or disabled hosts are excluded all_hosts_untagged = None @@ -5764,6 +5776,7 @@ def marks_hosts_with_path(old, all, filename): if host not in old: host_paths[host] = path + # Helper functions that determines the sort order of the # configuration files. The following two rules are implemented: # 1. *.mk files in the same directory will be read @@ -5779,12 +5792,14 @@ def cmp_config_paths(a, b): cmp(len(pa), len(pb)) or \ cmp(pa, pb) + # Abort after an error, but only in interactive mode. def interactive_abort(error): if sys.stdout.isatty() or opt_interactive: sys.stderr.write(error + "\n") sys.exit(1) + def read_config_files(with_conf_d=True, validate_hosts=True): global vars_before_config, final_mk, local_mk, checks @@ -5845,13 +5860,10 @@ def read_config_files(with_conf_d=True, validate_hosts=True): collect_hosttags() if validate_hosts: - # Sanity check for duplicate hostnames - seen_hostnames = set([]) - for hostname in all_active_hosts(): - if hostname in seen_hostnames: - sys.stderr.write("Error in configuration: duplicate host '%s'\n" % hostname) - sys.exit(3) - seen_hostnames.add(hostname) + duplicates = duplicate_hosts() + if duplicates: + sys.stderr.write("Error in configuration: duplicate hosts: %s\n" % ", ".join(duplicates)) + sys.exit(3) # Add WATO-configured explicit checks to (possibly empty) checks # statically defined in checks.

8 years, 11 months

#2651 Do not allow adding of duplicate hosts anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: 19bf583cc28c4424fd74a658ebf6586d46e0ad24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19bf583cc28c44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 14 14:05:04 2015 +0200 #2651 Do not allow adding of duplicate hosts anymore WATO now makes sure that you cannot add a host with a name that already exists in some folder anymore. That avoids problems when later activating changes (where duplicate hosts are not allowed anyway). Note: In previous versions you <i>could</i> have created a host with the same name on different sites. This is not possible anymore. --- .werks/2651 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 12 ++++++++++++ 3 files changed, 26 insertions(+) diff --git a/.werks/2651 b/.werks/2651 new file mode 100644 index 0000000..bce6b4a --- /dev/null +++ b/.werks/2651 @@ -0,0 +1,13 @@ +Title: Do not allow adding of duplicate hosts anymore +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1444824195 +Class: feature + +WATO now makes sure that you cannot add a host with a name that already +exists in some folder anymore. That avoids problems when later activating +changes (where duplicate hosts are not allowed anyway). Note: In previous +versions you <i>could</i> have created a host with the same name on different +sites. This is not possible anymore. diff --git a/ChangeLog b/ChangeLog index 96903d4..8f6bb12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -290,6 +290,7 @@ * 2486 Remove special handling for non-distributed-setups in WATO... * 2487 Remove dangerous <i>Factory Reset</i> button... * 2649 Bulk renaming of hosts in WATO... + * 2651 Do not allow adding of duplicate hosts anymore... * 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/web/htdocs/wato.py b/web/htdocs/wato.py index 451ede8..dd4ca21 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2104,6 +2104,7 @@ def mode_edithost(phase, new, cluster): go_to_diag = html.var("diag_host") if html.check_transaction(): if new: + validate_host_uniqueness(hostname) add_hosts_to_folder(g_folder, {hostname: host}) else: update_hosts_in_folder(g_folder, {hostname: {"set": host}}) @@ -19818,6 +19819,17 @@ def validate_all_hosts(hostnames, force_all = False): else: return {} + +def validate_host_uniqueness(host_name): + for existing_host_name, existing_host in collect_hosts(g_root_folder).items(): + if existing_host_name == host_name: + folder = existing_host[".folder"] + folder_name = get_folder_aliaspath(folder) + folder_url = html.makeuri_contextless([("mode", "folder"), ("folder", folder[".path"])]) + raise MKUserError("host", _('A host with the name <b><tt>%s</tt></b> already ' + 'exists in the folder <a href="%s">%s</a>.') % + (host_name, folder_url, folder_name)) + #. # .--Helpers-------------------------------------------------------------. # | _ _ _ |

8 years, 11 months

oracle_diva_csm: no longer crashes on missing fields and now uses user supplied actor names instead of internal id

by Sebastian Herbord

Module: check_mk Branch: master Commit: c0ae5c580d96c45cd57a74f78c9a51aaa588f32a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ae5c580d96c4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 14 10:54:34 2015 +0200 oracle_diva_csm: no longer crashes on missing fields and now uses user supplied actor names instead of internal id It appears that under unknown circumstances, potentially due to an outdated firmware, the device didn't (reliably?) provide some oids. Therefore it makes sense to gracefully handle that case. --- checks/oracle_diva_csm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/checks/oracle_diva_csm b/checks/oracle_diva_csm index a9a791f..c7ee3e4 100644 --- a/checks/oracle_diva_csm +++ b/checks/oracle_diva_csm @@ -92,7 +92,7 @@ check_info['oracle_diva_csm'] = { "service_description" : "DIVA Status %s", "snmp_info" : [ ( ".1.3.6.1.4.1.110901.1.2.1.1.1", [ '1', '2' ] ), # lib status ( ".1.3.6.1.4.1.110901.1.2.2.1.1", [ '3.1', '8.1' ] ), # drive status - ( ".1.3.6.1.4.1.110901.1.3.1.1", [ '1', '4' ] ), # actor status + ( ".1.3.6.1.4.1.110901.1.3.1.1", [ '2', '4' ] ), # actor status ( ".1.3.6.1.4.1.110901.1.4", [ '1' ] ), # archive status ( ".1.3.6.1.4.1.110901.1.4", [ '2', # object count '4', # remaining size @@ -146,13 +146,14 @@ def inventory_oracle_diva_csm_objects(info): def check_oracle_diva_csm_objects(item, params, info): GB = 1024 * 1024 * 1024 - object_count, remaining_size, total_size = map(int, info[4][0]) + if len(info) > 4 and len(info[4]) > 0: + object_count, remaining_size, total_size = map(int, info[4][0]) - infotext = "managed objects: %s, remaining size: %s GB of %s GB" % (object_count, remaining_size, total_size) + infotext = "managed objects: %s, remaining size: %s GB of %s GB" % (object_count, remaining_size, total_size) - return 0, infotext, [("managed_object_count", object_count), - ("storage_used", (total_size - remaining_size) * GB, - None, None, 0, total_size * GB)] + return 0, infotext, [("managed_object_count", object_count), + ("storage_used", (total_size - remaining_size) * GB, + None, None, 0, total_size * GB)] check_info['oracle_diva_csm.objects'] = { @@ -182,17 +183,18 @@ def inventory_oracle_diva_csm_tapes(info): def check_oracle_diva_csm_tapes(item, params, info): - blank_tapes = int(info[5][0][0]) - warn, crit = params - state = blank_tapes <= crit and 2 \ - or blank_tapes <= warn and 1 \ - or 0 - - infotext = "blank tapes %d" % blank_tapes - if state > 0: - infotext += " (warn/crit at %d/%d)" % (warn, crit) - - return state, infotext, [("tapes_free", blank_tapes)] + if len(info) > 5 and len(info[5]) > 0 and len(info[5][0]) > 0: + blank_tapes = int(info[5][0][0]) + warn, crit = params + state = blank_tapes <= crit and 2 \ + or blank_tapes <= warn and 1 \ + or 0 + + infotext = "blank tapes %d" % blank_tapes + if state > 0: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + + return state, infotext, [("tapes_free", blank_tapes)] check_info['oracle_diva_csm.tapes'] = {

8 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
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