Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Remove several trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 73f96248342f837adbeb3b9ee5219213b3c3ce06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f96248342f83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 26 16:38:29 2015 +0100 Remove several trailing spaces --- agents/check_mk_agent-1.2.7i1-1.noarch.rpm | Bin 20213 -> 20211 bytes agents/check_mk_agent.freebsd | 4 ++-- agents/check_mk_agent.hpux | 2 +- agents/windows/Makefile | 2 +- checkman/oracle_recovery_status | 8 ++++---- checks/bluecat_dhcp | 6 +++--- checks/cisco_qos | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- pnp-templates/check_mk-mem.linux.php | 4 ++-- web/htdocs/js/dashboard.js | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm index e4e78b3..9374805 100644 Binary files a/agents/check_mk_agent-1.2.7i1-1.noarch.rpm and b/agents/check_mk_agent-1.2.7i1-1.noarch.rpm differ diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b517fbe..d39c600 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -253,11 +253,11 @@ if which MegaCli >/dev/null ; then fi -# OpenVPN Clients. +# OpenVPN Clients. # Correct log location unknown, sed call might also be broken if [ -e /var/log/openvpn/openvpn-status.log ] ; then echo '<<<openvpn_clients:sep(44)>>>' - sed -n -e '/CLIENT LIST/,/ROUTING TABLE/p' < /var/log/openvpn/openvpn-status.log | sed -e 1,3d -e '$d' + sed -n -e '/CLIENT LIST/,/ROUTING TABLE/p' < /var/log/openvpn/openvpn-status.log | sed -e 1,3d -e '$d' fi diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 49b3571..bc426c0 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -58,7 +58,7 @@ echo AgentDirectory: $MK_CONFDIR # modern systems with vxfs only here. The filesystem type is currently # not used by the check anyway. echo '<<<df>>>' -df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" +df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" # Process table: HP-UX does not provide a resident size of processes. # We send a 0 here for RSZ. diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 45b0b0a..5a496b6 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -53,7 +53,7 @@ fix_linebreaks: sed -i 's/\r//' $$F ; \ sed -i 's/$$/\r/' $$F ; \ fi ; \ - done + done # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file diff --git a/checkman/oracle_recovery_status b/checkman/oracle_recovery_status index ee43be4..5f42a03 100644 --- a/checkman/oracle_recovery_status +++ b/checkman/oracle_recovery_status @@ -13,7 +13,7 @@ description: Standard Edition Databases. There is an imporatnt difference between Primary and Standby Database. Primary will only create WARNINGs, when the level of levels is exceeded. A value for CRITICAL is only usable - when the Database is in Physical Standby Mode. + when the Database is in Physical Standby Mode. The 2nd function is the monitoring of datafiles in manual backup mode. This is important for database which are backed up with 'alter database @@ -21,12 +21,12 @@ description: for that backup type. If an end backup is missing and you restart the database you'll unable to open the database. - To prevent such situations, the state of the backup mode could be + To prevent such situations, the state of the backup mode could be monitored. The rule describes the maximum time for an active backup mode for a datafile until a WARN or CRIT is generated. {Important Information} - There is no checkpoint created if a database is in backup mode. It + There is no checkpoint created if a database is in backup mode. It is expected, that the checkpoint time could also reach a configured limit when a backup is running! This is not the case for Backups with RMAN. @@ -48,7 +48,7 @@ parameters (dict): "levels": (int, int) - Maximum time in seconds for warn and crit for the last Checkpoint over all Datafiles. No default value - "backup_age": (int, int) - Maximum time in seconds for warn and crit + "backup_age": (int, int) - Maximum time in seconds for warn and crit for datafiles in Online Backup Mode. inventory: diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index c24564b..527d773 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -45,11 +45,11 @@ def check_bluecat_dhcp(item, params, info): 4 : "currently stopping", 5 : "fault" } - + ok_on_node = False states = {} state = 0 - + # Collect states of nodes for node, oper_state, leases in info: oper_state, leases_sec = map(int, (oper_state, leases)) @@ -65,7 +65,7 @@ def check_bluecat_dhcp(item, params, info): ok_on_node = node # Only needed in cluster: states[node] = {'oper_state' : oper_states[oper_state], 'leases_sec' : leases_sec, 'state' : temp_state } - + # Are we in a Cluster? if len(info) > 1: if ok_on_node: diff --git a/checks/cisco_qos b/checks/cisco_qos index 47e0669..6b515c5 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -267,7 +267,7 @@ def check_cisco_qos(item, params, info): perfdata_avg = [] min_value = ("0", "0.0")[unit == 'bit'] - for name, counter, warn, crit, min_val, max_val in [ + for name, counter, warn, crit, min_val, max_val in [ ( "post", post_b, post_warn, post_crit, min_value, bw), ( "drop", drop_b, drop_warn, drop_crit, min_value, bw), ]: diff --git a/livestatus/src/StatusSpecialIntColumn.h b/livestatus/src/StatusSpecialIntColumn.h index 56b4633..10e45ed 100644 --- a/livestatus/src/StatusSpecialIntColumn.h +++ b/livestatus/src/StatusSpecialIntColumn.h @@ -33,7 +33,7 @@ class StatusSpecialIntColumn : public IntColumn { int _type; public: - StatusSpecialIntColumn(string name, string description, int type) + StatusSpecialIntColumn(string name, string description, int type) : IntColumn(name, description, -1), _type(type) {} int32_t getValue(void *, Query *); }; diff --git a/pnp-templates/check_mk-mem.linux.php b/pnp-templates/check_mk-mem.linux.php index e6e51ee..a633cbe 100644 --- a/pnp-templates/check_mk-mem.linux.php +++ b/pnp-templates/check_mk-mem.linux.php @@ -33,12 +33,12 @@ foreach ($NAME as $i => $n) { $mem_defines[$n] = "DEF:$n=$RRDFILE[$i]:$DS[$i]:MAX "; } -function mem_area($varname, $color, $title, $stacked) +function mem_area($varname, $color, $title, $stacked) { return mem_curve("AREA", $varname, $color, $title, $stacked); } -function mem_line($varname, $color, $title, $stacked) +function mem_line($varname, $color, $title, $stacked) { return mem_curve("LINE1", $varname, $color, $title, $stacked); } diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index f813340..c18c33f 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -543,7 +543,7 @@ function dashlet_toggle_edit(dashlet_obj, edit) { else render_sizer(controls, nr, i, anchor_id, dashlet.h); } - + if (!is_dynamic(dashlet.w) && !is_dynamic(dashlet.h)) render_corner_resizers(controls, nr); }

9 years, 7 months

Check_MK Git: check_mk: #1920 df: Linux filesystem check now supports displaying data reserved for root

by Mathias Kettner

Module: check_mk Branch: master Commit: 21b8c1a200e67c10f397257d14adca057191eb67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b8c1a200e67c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 26 16:36:32 2015 +0100 #1920 df: Linux filesystem check now supports displaying data reserved for root Check_MK accounts space that is reserved for the root user on Linux and Unix as used space. Usually 5% are being reserved for root when a new filesystem is being created. With this new parameter option you can have Check_MK display the current amount of reserved but yet unused space. --- .werks/1920 | 12 +++++ ChangeLog | 2 +- checks/df | 4 +- checks/df.include | 97 +++++++++++++++++++++------------- checks/df_netapp.include | 2 +- checks/df_netscaler | 2 +- checks/emc_datadomain_fs | 2 +- checks/emcvnx_raidgroups | 4 +- checks/esx_vsphere_counters | 2 +- checks/esx_vsphere_datastores | 2 +- checks/fast_lta_silent_cubes | 2 +- checks/fast_lta_volumes | 2 +- checks/hitachi_hnas_span | 2 +- checks/hitachi_hnas_volume | 2 +- checks/hr_fs | 2 +- checks/ibm_svc_mdiskgrp | 2 +- checks/libelle_business_shadow | 2 +- checks/netapp_api_aggr | 2 +- checks/netapp_api_volumes | 2 +- checks/oracle_asm_diskgroup | 2 +- checks/vms_diskstat | 2 +- checks/zfsget | 2 +- pnp-templates/check_mk-df.php | 29 +++++++--- web/plugins/wato/check_parameters.py | 33 ++++++++++++ 24 files changed, 150 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=21b8c1a200…

9 years, 7 months

Check_MK Git: check_mk: doc/treasures: Windows CPU Check who creates one pnp graph by processor

by Bastian Kuhn

Module: check_mk Branch: master Commit: 021f3a8904fc6f14db14a3971a6bf7b131945bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=021f3a8904fc6f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 26 15:34:11 2015 +0100 doc/treasures: Windows CPU Check who creates one pnp graph by processor --- doc/treasures/checks/winperf_processor.single | 79 +++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/doc/treasures/checks/winperf_processor.single b/doc/treasures/checks/winperf_processor.single new file mode 100644 index 0000000..e83781f --- /dev/null +++ b/doc/treasures/checks/winperf_processor.single @@ -0,0 +1,79 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# This Checks creates one PNP Graph for each Processor. +# Just place it in your local/share/check_mk/checks + +winperf_cpu_default_levels = { "levels": ( 101.0, 101.0 ) } + +def inventory_winperf_single(info): + if len(info) <= 1: + return None + + for line in info[1:]: + try: + if line[0] == '-232': + return [(None, "winperf_cpu_default_levels")] + except: + pass + + +# params: levels for warn / crit in percentage +def check_winperf_single(_no_item, params, info): + if not info: + return + this_time = int(float(info[0][0])) + + for line in info[1:]: + if line[0] == '-232': + num_cpus = len(line)-2 + for cpu in range(1, num_cpus): + ticks = int(line[cpu]) + ticks_per_sec = get_rate("winperf_single_"+str(cpu), this_time, ticks) + cpusecs_per_sec = ticks_per_sec / 10000000.0 + used_perc = 100.0 * (1 - cpusecs_per_sec) + + # Due to timeing invariancies the measured level can become > 100%. + # This makes users unhappy, so cut it off. + if used_perc < 0: + used_perc = 0 + elif used_perc > 100: + used_perc = 100 + + #state, infotext, perfdata = check_cpu_single(used_perc, params, this_time) + perfdata = [("CPU%s" % cpu, used_perc)] + infotext = "CPU%s: %d %%" % (cpu, used_perc) + yield 0, infotext, perfdata + + +check_info["winperf_processor.single"] = { + 'check_function': check_winperf_single, + 'inventory_function': inventory_winperf_single, + 'service_description': 'CPU utiliztion single', + 'has_perfdata': True, + 'group': 'cpu_utilization_os', + #'includes': [ "cpu_single.include" ], +}

9 years, 7 months

Check_MK Git: check_mk: bonding.include: Support for speed output

by Bastian Kuhn

Module: check_mk Branch: master Commit: 923a03c8eed0f30bab7357622fa97bbb580926a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=923a03c8eed0f3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 26 15:28:47 2015 +0100 bonding.include: Support for speed output --- checks/bonding.include | 4 +++- checks/windows_os_bonding | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checks/bonding.include b/checks/bonding.include index e84a844..b1fa42d 100644 --- a/checks/bonding.include +++ b/checks/bonding.include @@ -44,9 +44,11 @@ def check_bonding(item, params, parsed): status = parsed[item] if status["status"] not in ("up", "degraded"): return 2, "interface is " + status["status"] - infos = [ "mode: " + status["mode"] ] state = 0 + speed = status.get('speed') + if speed: + infos.append("Speed:" + speed) for eth, slave in status["interfaces"].items(): if "hwaddr" in slave: infos.append("%s/%s %s" % (eth, slave["hwaddr"], slave["status"])) diff --git a/checks/windows_os_bonding b/checks/windows_os_bonding index 07f6130..f20baf1 100644 --- a/checks/windows_os_bonding +++ b/checks/windows_os_bonding @@ -58,6 +58,8 @@ def parse_windows_os_bonding(info): bonds[bond]["mode"] = line[1] elif line[0] == "Status": bonds[bond]["status"] = line[1].lower() + elif line[0] == "Speed": + bonds[bond]["speed"] = line[1] elif line[0] == "Slave Name": slave = line[1] bonds[bond]["interfaces"][slave] = {}

9 years, 7 months

Check_MK Git: check_mk: netapp_api checks: fixed incorrect saveint() / savefloat() calls

by Andreas Boesl

Module: check_mk Branch: master Commit: cc3a627966f5ca2cedc8fa68f0a9ae1b83abd62a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc3a627966f5ca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 26 15:22:53 2015 +0100 netapp_api checks: fixed incorrect saveint() / savefloat() calls --- checks/netapp_api_aggr | 4 ++-- checks/netapp_api_cpu | 4 ++-- checks/netapp_api_disk | 2 +- checks/netapp_api_protocol | 4 ++-- checks/netapp_api_temp | 10 +++++----- checks/netapp_api_vf_stats | 4 ++-- checks/netapp_api_volumes | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/checks/netapp_api_aggr b/checks/netapp_api_aggr index c0e07d3..582894f 100644 --- a/checks/netapp_api_aggr +++ b/checks/netapp_api_aggr @@ -43,8 +43,8 @@ def check_netapp_api_aggr(item, params, parsed): return (3, "Aggregation not found in agent output") mega = 1024.0 * 1024.0 - size_total = saveint(aggr.get("size-total")) / mega - size_avail = saveint(aggr.get("size-available")) / mega + size_total = int(aggr.get("size-total")) / mega + size_avail = int(aggr.get("size-available")) / mega return df_check_filesystem_list(item, params, [(item, size_total, size_avail)]) check_info["netapp_api_aggr"] = { diff --git a/checks/netapp_api_cpu b/checks/netapp_api_cpu index 619b0ba..8f192d9 100644 --- a/checks/netapp_api_cpu +++ b/checks/netapp_api_cpu @@ -39,8 +39,8 @@ def check_netapp_api_cpu_utilization(item, params, info): data = dict([line for line in info if len(line) == 2]) now = time.time() - cpu_busy = saveint(data["cpu_busy"]) - num_cpus = saveint(data["num_processors"]) + cpu_busy = int(data["cpu_busy"]) + num_cpus = int(data["num_processors"]) timedif, ticks_per_sec = get_counter("netapp_api_cpu.utilization", now, cpu_busy) cpusecs_per_sec = ticks_per_sec / 1000000.0 used_perc = 100.0 * cpusecs_per_sec diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index ce96cac..19b154a 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -71,7 +71,7 @@ def check_netapp_api_disk_summary(_no_item, params, info): if disk.get("raid-state") == "partner": continue # Disk belongs to partner - total_space += saveint(disk.get("used-space")) + total_space += int(disk.get("used-space")) if disk.get("raid-state", "") == "broken": broken_disks.append(disk) diff --git a/checks/netapp_api_protocol b/checks/netapp_api_protocol index 28d5a58..5aa6be1 100644 --- a/checks/netapp_api_protocol +++ b/checks/netapp_api_protocol @@ -58,10 +58,10 @@ def check_netapp_api_protocol(item, _no_params, parsed): item = "nfsv3" infotext = "" - now = savefloat(time.time()) + now = time.time() for entry, text in [ ("read_ops", "Read OPS"), ("write_ops", "Write OPS") ]: key = "%s_%s" % (item, entry) - value = saveint(counter_data.get(entry, counter_data.get(key, "0"))) + value = int(counter_data.get(entry, counter_data.get(key, "0"))) timedif, per_sec = get_counter("netapp_api_protocol.%s.%s" % (item, entry), now, value) yield 0, "%s %s" % (text, get_bytes_human_readable(per_sec, 1000, unit = "")), [(entry, per_sec)] diff --git a/checks/netapp_api_temp b/checks/netapp_api_temp index e99b778..2da7dd2 100644 --- a/checks/netapp_api_temp +++ b/checks/netapp_api_temp @@ -53,16 +53,16 @@ def check_netapp_api_temp(item, _no_params, parsed): continue sensor_count += 1 - current_temp = saveint(sensors["temp-sensor-current-temperature"][idx]) + current_temp = int(sensors["temp-sensor-current-temperature"][idx]) sum_temp.append(current_temp) # Check built-in levels if sensors["temp-sensor-is-error"][idx] == "true": sensor_no = sensors["temp-sensor-element-no"][idx] - warn_low = saveint(sensors["temp-sensor-low-warning"][idx]) - crit_low = saveint(sensors["temp-sensor-low-critical"][idx]) - warn_high = saveint(sensors["temp-sensor-hi-warning"][idx]) - crit_high = saveint(sensors["temp-sensor-hi-critical"][idx]) + warn_low = int(sensors["temp-sensor-low-warning"][idx]) + crit_low = int(sensors["temp-sensor-low-critical"][idx]) + warn_high = int(sensors["temp-sensor-hi-warning"][idx]) + crit_high = int(sensors["temp-sensor-hi-critical"][idx]) if current_temp >= crit_high: sensor_errors.append((2, "Shelf %s(%s) too high (warn/crit at %s/%s)" % (shelf, sensor_no, warn_high, crit_high))) elif current_temp >= warn_high: diff --git a/checks/netapp_api_vf_stats b/checks/netapp_api_vf_stats index e9ea330..3be9a70 100644 --- a/checks/netapp_api_vf_stats +++ b/checks/netapp_api_vf_stats @@ -40,7 +40,7 @@ def check_netapp_api_vf_stats_cpu_util(item, params, info): else: now = time.time() - cpu_busy = saveint(vf["vfiler_cpu_busy"]) + cpu_busy = int(vf["vfiler_cpu_busy"]) timedif, ticks_per_sec = get_counter("netapp_api_vf_stats.cpu_util.%s" % item, now, cpu_busy ) cpusecs_per_sec = ticks_per_sec / 1000.0 / 1000 / 10000 used_perc = 100.0 * cpusecs_per_sec @@ -86,7 +86,7 @@ def check_netapp_api_vf_stats_traffic(item, params, info): ("net_data_sent", "Net Data Sent", 1024.0, 1024, "B/s"), ("read_bytes", "Read", 1024.0, 1024, "B/s"), ("write_bytes", "Write", 1024.0, 1024, "B/s")]: - traffic = saveint(vf["vfiler_" + entry]) * factor + traffic = int(vf["vfiler_" + entry]) * factor timedif, ticks_per_sec = get_counter("netapp_api_vf_stats.traffic.%s.%s" % (item, entry), now, traffic) yield 0, "%s: %s" % (name, get_bytes_human_readable(ticks_per_sec, base = base, unit = unit)), [(entry, ticks_per_sec)] diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index c5d6dfd..4aea4c4 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -65,8 +65,8 @@ def check_netapp_api_volumes(item, params, parsed): return (3, "Volume not found in agent output") mega = 1024.0 * 1024.0 - size_total = saveint(volume.get("size-total")) / mega - size_avail = saveint(volume.get("size-available")) / mega + size_total = int(volume.get("size-total")) / mega + size_avail = int(volume.get("size-available")) / mega state, info, perf = df_check_filesystem_list(item, params, [(volume.get("name"), size_total, size_avail)]) counter_wrapped = False @@ -80,7 +80,7 @@ def check_netapp_api_volumes(item, params, parsed): for mode in ["read_", "write_", "other_"]: for field, factor, format_text in [ ("data", None, None), ("latency", 10000.0, "%s: %.2f ms")]: key = protocol + mode + field - value = saveint(volume.get("counters", {}).get(key)) + value = int(volume.get("counters", {}).get(key)) if value != None: try: timedif, delta = get_counter("netapp_api_volumes.%s.%s" % (item, key), now, value)

9 years, 7 months

Check_MK Git: check_mk: #1674 ibm_svc_license / other license checks: now able to configure limits

by Andreas Boesl

Module: check_mk Branch: master Commit: 0124c926b47ba120a0929c7f94a82b7fce143a55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0124c926b47ba1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 26 15:03:16 2015 +0100 #1674 ibm_svc_license / other license checks: now able to configure limits The check ibm_svc_license now has configurable license limits via WATO. Additionally, the limits for all license check got a small change, thats why this werk is marked as <tt>incompatible</tt>. Old limits: <ul> <li>Absolute unused levels - Warn/Crit at xx</li> <li>Percentage unused levels - Warn/Crit at xx</li> <li>Go critical if all licenses are used</li> <li>Always report OK</li> </ul> New limits: <ul> <li>Absolute unused levels - Warn/Crit below xx</li> <li>Percentage unused levels - Warn/Crit below xx</li> <li>Go critical if all licenses are used</li> <li>Always report OK</li> </ul> This change has been made because it was hard to configure an OK state when the used licenses equalled the number of available licenses. --- .werks/1674 | 33 +++++++++++++++++++++++++++++++++ ChangeLog | 2 ++ checks/ibm_svc_license | 9 +++------ checks/license.include | 4 ++-- web/plugins/wato/check_parameters.py | 20 ++++++++++++++++---- 5 files changed, 56 insertions(+), 12 deletions(-) diff --git a/.werks/1674 b/.werks/1674 new file mode 100644 index 0000000..c0951e7 --- /dev/null +++ b/.werks/1674 @@ -0,0 +1,33 @@ +Title: ibm_svc_license / other license checks: now able to configure limits +Level: 1 +Component: wato +Compatible: incomp +Version: 1.2.7i1 +Date: 1422280492 +Class: feature + +The check ibm_svc_license now has configurable license limits via WATO. + +Additionally, the limits for all license check got a small change, +thats why this werk is marked as <tt>incompatible</tt>. + + +Old limits: +<ul> +<li>Absolute unused levels - Warn/Crit at xx</li> +<li>Percentage unused levels - Warn/Crit at xx</li> +<li>Go critical if all licenses are used</li> +<li>Always report OK</li> +</ul> + + +New limits: +<ul> +<li>Absolute unused levels - Warn/Crit below xx</li> +<li>Percentage unused levels - Warn/Crit below xx</li> +<li>Go critical if all licenses are used</li> +<li>Always report OK</li> +</ul> + +This change has been made because it was hard to configure an OK state +when the used licenses equalled the number of available licenses. diff --git a/ChangeLog b/ChangeLog index ff04e32..c097d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -140,6 +140,8 @@ * 1785 Upload SNMP MIBs via WATO... * 1461 msexch_dag.copyqueue: added a WATO rule for this check * 1868 "Successfully created the host" message is also shown on host diagnose page now + * 1674 ibm_svc_license / other license checks: now able to configure limits... + NOTE: Please refer to the migration notes! * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/checks/ibm_svc_license b/checks/ibm_svc_license index 8fe566b..098d553 100644 --- a/checks/ibm_svc_license +++ b/checks/ibm_svc_license @@ -65,21 +65,18 @@ def inventory_ibm_svc_license(info): inventory.append( (license, None) ) return inventory -def check_ibm_svc_license(item, _no_params, info): +def check_ibm_svc_license(item, params, info): licenses = parse_ibm_svc_license(info) licensed, used = licenses[item] perfdata = [ ("licensed", licensed), ("used", used) ] - if used > licensed: - status = 2 - else: - status = 0 - return status, "%s %s licensed, %s used" % (item, licensed, used), perfdata + return license_check_levels(licensed, used, params) check_info["ibm_svc_license"] = { "check_function" : check_ibm_svc_license, "inventory_function" : inventory_ibm_svc_license, "service_description" : "License %s", + "group" : "ibmsvc_licenses", "has_perfdata" : True, } diff --git a/checks/license.include b/checks/license.include index 8bf8f34..198248b 100644 --- a/checks/license.include +++ b/checks/license.include @@ -45,9 +45,9 @@ def license_check_levels(have, used, params): else: infotext = "used %d licenses, but you have only %d" % (used, have) - if crit != None and used >= crit: + if crit != None and used > crit: status = 2 - elif warn != None and used >= warn: + elif warn != None and used > warn: status = 1 else: status = 0 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index adf4487..644b7b5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6793,15 +6793,15 @@ vs_license = Alternative( Tuple( title = _("Absolute levels for unused licenses"), elements = [ - Integer(title = _("Warning at"), default_value = 5, unit = _("unused licenses")), - Integer(title = _("Critical at"), default_value = 0, unit = _("unused licenses")), + Integer(title = _("Warning below"), default_value = 5, unit = _("unused licenses")), + Integer(title = _("Critical below"), default_value = 0, unit = _("unused licenses")), ] ), Tuple( title = _("Percentual levels for unused licenses"), elements = [ - Percentage(title = _("Warning at"), default_value = 10.0), - Percentage(title = _("Critical at"), default_value = 0), + Percentage(title = _("Warning below"), default_value = 10.0), + Percentage(title = _("Critical below"), default_value = 0), ] ), FixedValue( @@ -6844,6 +6844,18 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "ibmsvc_licenses", + _("Number of used IBM SVC licenses"), + vs_license, + TextAscii( + title = _("ID of the license, e.g. <tt>virtualization</tt>"), + allow_empty = False, + ), + "first" +) + +register_check_parameters( + subgroup_applications, "citrix_load", _("Load of Citrix Server"), Tuple(

9 years, 7 months

Check_MK Git: check_mk: Removed bogus werk 1215

by Mathias Kettner

Module: check_mk Branch: master Commit: 65d79690530a089b331424fe16834289cc866988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65d79690530a08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 26 14:28:02 2015 +0100 Removed bogus werk 1215 --- .werks/1215 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.werks/1215 b/.werks/1215 deleted file mode 100644 index e37b967..0000000 --- a/.werks/1215 +++ /dev/null @@ -1,14 +0,0 @@ -Title: Include check-functions from extra_sections in precompailed checks -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i1 -Date: 1422275822 -Class: fix - -Due a new feature it's no possible for a check to use agent sections from foreign checks. In some -cases this checks has a parse function. In rare cases the foreign check was not part check_table of the host. -This had been leading to a missing parse function. - -Bug not affected the cmc microcore. -

9 years, 7 months

Check_MK Git: check_mk: Fixed a few english texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f91381c8661bcc8d48e510a5fd809b3399bc83d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f91381c8661bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 26 14:26:45 2015 +0100 Fixed a few english texts --- web/htdocs/wato.py | 2 +- web/plugins/wato/active_checks.py | 4 ++-- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/datasource_programs.py | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 36d7dec..ffe8f34 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8258,7 +8258,7 @@ def vs_notification_rule(userid = None): ListOf( UserSelection(only_contacts = False), title = _("The following users"), - help = _("Enter a list of user ids to be notified here. These users need to be members " + help = _("Enter a list of user IDs to be notified here. These users need to be members " "of at least one contact group in order to be notified."), movable = False, ) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index a96a529..9eb00b9 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1209,8 +1209,8 @@ register_rule(group, ( "share", TextUnicode( title = _("SMB share to check"), - help = _("Enter the plain name of the share only, e. g. <tt>iso</tt>, NOT " - "the full UNC like \\\\servername\\iso"), + help = _("Enter the plain name of the share only, e. g. <tt>iso</tt>, <b>not</b> " + "the full UNC like <tt>\\\\servername\\iso</tt>"), size = 32, allow_empty = False, )), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index b2147f2..fd261de 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -290,7 +290,7 @@ register_configvar(group, add_label = _("Create new virtual host tree configuration"), title = _("Virtual Host Trees"), help = _("Here you can define tree configurations for the snapin <i>Virtual Host-Trees</i>. " - "These trees organize your host based on their values in certain host tag groups. " + "These trees organize your hosts based on their values in certain host tag groups. " "Each host tag group you select will create one level in the tree."), ), domain = "multisite", diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index c2517bf..79ba744 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -305,8 +305,6 @@ register_rule(group, title = _("Accept any SSH Host Key"), label = _("Accept any SSH Host Key"), default_value = False, - true_label = _("True"), - false_label = _("False"), help = _("Accepts any SSH Host Key presented by the storage device. " "Please note: This might be a security issue because man-in-the-middle " "attacks are not recognized! Better solution would be to add the "

9 years, 7 months

Check_MK Git: check_mk: #1215 FIX Include check-functions from extra_sections in precompailed checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: 46134a5369f113506c4e97c0073bd4cbfb643903 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46134a5369f113… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 26 13:45:57 2015 +0100 #1215 FIX Include check-functions from extra_sections in precompailed checks Due a new feature it's no possible for a check to use agent sections from foreign checks. In some cases this checks has a parse function. In rare cases the foreign check was not part check_table of the host. This had been leading to a missing parse function. Bug not affected the cmc microcore. --- .werks/1215 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/.werks/1215 b/.werks/1215 new file mode 100644 index 0000000..e37b967 --- /dev/null +++ b/.werks/1215 @@ -0,0 +1,14 @@ +Title: Include check-functions from extra_sections in precompailed checks +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422275822 +Class: fix + +Due a new feature it's no possible for a check to use agent sections from foreign checks. In some +cases this checks has a parse function. In rare cases the foreign check was not part check_table of the host. +This had been leading to a missing parse function. + +Bug not affected the cmc microcore. + diff --git a/ChangeLog b/ChangeLog index ff04e32..ddbfd30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,7 @@ * 1858 FIX: docsis_channels_downstream: allow for negative values of power in dBm * 1847 FIX: oracle_logswitches: Fixed description of WATO rule for levels... * 1877 FIX: printer_input/printer_output: Check can now handle non reported capacity unit + * 1215 FIX: Include check-functions from extra_sections in precompailed checks... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/modules/check_mk.py b/modules/check_mk.py index d3b5aed..2a8d31c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2728,6 +2728,10 @@ no_inventory_possible = None if check_type not in check_info: sys.stderr.write('Warning: Ignoring missing check %s.\n' % check_type) continue + if check_info[check_type].get("extra_sections"): + for section in check_info[check_type]["extra_sections"]: + needed_check_types.add(section) + needed_sections.add(section.split(".")[0]) period = check_period_of(hostname, descr) if period: service_timeperiods[descr] = period

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #1058

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aa4b572c5ed395fc8e845eea3f069b3119abae9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aa4b572c5ed39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 26 13:28:10 2015 +0100 Updated bug entries #1058 --- .bugs/1058 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1058 b/.bugs/1058 index 599b422..d9964ec 100644 --- a/.bugs/1058 +++ b/.bugs/1058 @@ -1,10 +1,13 @@ Title: When RBN are enabled and site is empty, nagios can not be started Component: core -State: open +Class: bug +State: done Date: 2015-01-09 11:36:22 Targetversion: 1.2.5i1 -Class: bug When creating an empty site while the rule based notifications are enabled, then starting the site with e.g. cmk -R, nagios reports a config error because the contact group check-mk-notify can not be found. + +2015-01-23 12:19:39: changed state open -> done +Has already been fixed.

9 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015