Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Split TableDownComm into 2 separate tables: TableDowntimes and TableComments.

by Sven Panne

Module: check_mk Branch: master Commit: e99e09f237c60b7cc81aaf39bbd0f79c67678a21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e99e09f237c60b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 24 15:14:19 2016 +0200 Split TableDownComm into 2 separate tables: TableDowntimes and TableComments. Looking at TableDownComm, it is already 2-classes-in-1, controlled by a boolean flag, which is an antipattern. --- livestatus/src/Makefile.am | 3 +- livestatus/src/Store.cc | 4 +- livestatus/src/Store.h | 7 +- .../src/{TableDownComm.cc => TableComments.cc} | 104 ++++++----------- .../src/{TableDownComm.h => TableComments.h} | 16 +-- livestatus/src/TableDowntimes.cc | 120 ++++++++++++++++++++ livestatus/src/TableDowntimes.h | 49 ++++++++ 7 files changed, 217 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e99e09f237…

7 years, 10 months

3792 check_http: now able to configure HTTP method PROPFIND

by Andreas Boesl

Module: check_mk Branch: master Commit: f9c42a7ca6bc488fda8107abd5ce19bff4b9c5f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c42a7ca6bc48… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 24 13:46:11 2016 +0200 3792 check_http: now able to configure HTTP method PROPFIND --- .werks/3792 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/3792 b/.werks/3792 new file mode 100644 index 0000000..93b06d0 --- /dev/null +++ b/.werks/3792 @@ -0,0 +1,9 @@ +Title: check_http: now able to configure HTTP method PROPFIND +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1472039146 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6eca2b6..85d0291 100644 --- a/ChangeLog +++ b/ChangeLog @@ -473,6 +473,7 @@ * 3559 WATO API: now able to bake agents with the new action "bake_agents" * 3785 WATO rulesets: now able to set a negate option for services and items... * 3786 WATO webapi: now able to bake agents with the new action bake_agents + * 3792 check_http: now able to configure HTTP method PROPFIND * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 99f47ba..ebd5900 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -990,6 +990,7 @@ register_rule(group, ( "DELETE", "DELETE" ), ( "HEAD", "HEAD" ), ( "CONNECT", "CONNECT" ), + ( "PROPFIND", "PROPFIND" ), ] ) ),

7 years, 10 months

3791 f5_bigip_vserver: now reports lots of additional performance data

by Andreas Boesl

Module: check_mk Branch: master Commit: bdef291bc71077c625f683efb52929a1a2ff9540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdef291bc71077… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 24 10:20:34 2016 +0200 3791 f5_bigip_vserver: now reports lots of additional performance data This check now reports the following performance data <ul> <li>The min, max and mean connection duration</li> <li>The total connections and connections rate</li> <li>Incoming and outgoing bytes packets</li> <li>Packet velocity asic rate</li> </ul> This werk is marked as incompatible because of a small logic change. If the vserver is not available and all of its children pool members are down the check remains {OK} instead of {CRIT}. --- .werks/3791 | 19 +++++ ChangeLog | 2 + checkman/f5_bigip_vserver | 12 +-- checks/f5_bigip_vserver | 153 ++++++++++++++++++++++++++++++--------- web/plugins/metrics/check_mk.py | 33 +++++++++ 5 files changed, 179 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bdef291bc7…

7 years, 10 months

Turn log spam into a TODO.

by Sven Panne

Module: check_mk Branch: master Commit: 74d42b011dce020bc7937567592274faba26762c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d42b011dce02… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 24 10:22:27 2016 +0200 Turn log spam into a TODO. --- bin/mkeventd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/mkeventd b/bin/mkeventd index 0be8705..d369868 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -2923,6 +2923,9 @@ class StatusServer: output_format = argument elif header == "Limit": limit = int(argument) + elif header == "Columns": + # TODO(sp) Actually filter columns + pass else: log("Ignoring not-implemented header %s" % header)

7 years, 10 months

added missing manpage

by Andreas Boesl

Module: check_mk Branch: master Commit: 63b53e9e19fa16d8df9cbb24d1403a453c3072ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63b53e9e19fa16… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 23 17:15:47 2016 +0200 added missing manpage --- checkman/f5_bigip_cluster_status_v11_2 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/checkman/f5_bigip_cluster_status_v11_2 b/checkman/f5_bigip_cluster_status_v11_2 new file mode 100644 index 0000000..8b0eb21 --- /dev/null +++ b/checkman/f5_bigip_cluster_status_v11_2 @@ -0,0 +1,17 @@ +title: F5 Big-IP: active/active or passive/active cluster status +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + if the cluster correctly runs in an {active/active} or an {active/passive} setup. + You can configure the expected behaviour via a WATO rule. + It will issue a warning if the cluster setup differs from the expected setup. + This check is expected to be run on cluster hosts, since it evaluates the state of multiple nodes. + If you run this check on a cluster node, it will raise no warning if the cluster node state + differs from {active}. + +inventory: + Creates on service +

7 years, 10 months

3790 f5_bigip_cluster_status: New check to monitor integrity of active/ active and standby/active clusters

by Andreas Boesl

Module: check_mk Branch: master Commit: d61094eb01fdd3350a9307c4040bb2663f7d471d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d61094eb01fdd3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 23 17:02:04 2016 +0200 3790 f5_bigip_cluster_status: New check to monitor integrity of active/active and standby/active clusters --- .werks/3790 | 9 ++++ ChangeLog | 1 + checkman/f5_bigip_cluster_status | 17 ++++++ checks/f5_bigip_cluster_status | 99 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 25 +++++++++ 5 files changed, 151 insertions(+) diff --git a/.werks/3790 b/.werks/3790 new file mode 100644 index 0000000..29642ef --- /dev/null +++ b/.werks/3790 @@ -0,0 +1,9 @@ +Title: f5_bigip_cluster_status: New check to monitor integrity of active/active and standby/active clusters +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471964487 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e734b4a..0e597b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 3778 if: now levels for discards rate are configurable * 3788 f5_big_pool: check is now cluster ready * 3789 f5_bigip_snat: new check for source NAT monitoring + * 3790 f5_bigip_cluster_status: New check to monitor integrity of active/active and standby/active clusters * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/f5_bigip_cluster_status b/checkman/f5_bigip_cluster_status new file mode 100644 index 0000000..8b0eb21 --- /dev/null +++ b/checkman/f5_bigip_cluster_status @@ -0,0 +1,17 @@ +title: F5 Big-IP: active/active or passive/active cluster status +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + if the cluster correctly runs in an {active/active} or an {active/passive} setup. + You can configure the expected behaviour via a WATO rule. + It will issue a warning if the cluster setup differs from the expected setup. + This check is expected to be run on cluster hosts, since it evaluates the state of multiple nodes. + If you run this check on a cluster node, it will raise no warning if the cluster node state + differs from {active}. + +inventory: + Creates on service + diff --git a/checks/f5_bigip_cluster_status b/checks/f5_bigip_cluster_status new file mode 100644 index 0000000..9366531 --- /dev/null +++ b/checks/f5_bigip_cluster_status @@ -0,0 +1,99 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Dennis Lerch dennis.lerch(a)telekom.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. + +#SNMPv2-SMI::enterprises.3375.2.1.1.1.1.19.0 = INTEGER: 0 #Version < 11.2 +#SNMPv2-SMI::enterprises.3375.2.1.14.3.1.0 = INTEGER: 3 #Version >= 11.2 + +factory_settings["f5_bigip_cluster_default_levels"] = { + "type" : "active_standby", +} + +def parse_f5_bigip_cluster_status(info): + cluster_status = {} + for status in info: + cluster_status[status[0]] = int(status[1]) + return cluster_status + +def inventory_f5_bigip_cluster_status(parsed): + if parsed: + return [ ( None, None ) ] + +def check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = False): + if is_v11_2: + node_state = ["unknown", "offline", "forcedOffline", "standby", "active"] + active_value = 4 + else: + node_state = ["standby", "active 1", "active 2", "active"] + active_value = 3 + + if params["type"] == "active_standby" and parsed.values().count(active_value) > 1: + yield 2, "More than 1 node is active: " + elif active_value not in parsed.values() and len(parsed) > 1: # Only applies if this check runs on a cluster + yield 2, "No active node found: " + + for node in sorted(parsed): + node_name = node and "[%s] " % node or "" + yield 0, "Node %sis %s" % (node_name, node_state[parsed[node]]) + +def scan_f5_bigip_cluster_status(oid, is_v11_2 = False): + if not (".1.3.6.1.4.1.3375.2" in oid(".1.3.6.1.2.1.1.2.0") and\ + "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower()): + return False + + version = oid(".1.3.6.1.4.1.3375.2.1.4.2.0") + if not version: + return False + + expected_version = 11.2 + version_float = float(".".join(version.split(".")[:2])) + return (version_float >= expected_version) == is_v11_2 + + +check_info["f5_bigip_cluster_status"] = { + "parse_function" : parse_f5_bigip_cluster_status, + "check_function" : lambda x,y,z: check_f5_bigip_cluster_status(x,y,z, is_v11_2 = False), + "inventory_function" : inventory_f5_bigip_cluster_status, + "node_info" : True, + "group" : "cluster_status", + "default_levels_variable" : "f5_bigip_cluster_default_levels", + "service_description" : "BIG-IP Cluster Status", + "snmp_info" : (".1.3.6.1.4.1.3375.2.1.1.1.1.19", ["0"]), # sysAttrFailoverUnitMask + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2 = False) +} + +check_info["f5_bigip_cluster_status_v11_2"] = { + "parse_function" : parse_f5_bigip_cluster_status, + "check_function" : lambda x,y,z: check_f5_bigip_cluster_status(x,y,z, is_v11_2 = True), + "inventory_function" : inventory_f5_bigip_cluster_status, + "node_info" : True, + "group" : "cluster_status", + "default_levels_variable" : "f5_bigip_cluster_default_levels", + "service_description" : "BIG-IP Cluster Status", + "snmp_info" : (".1.3.6.1.4.1.3375.2.1.14.3.1", ["0"]), # sysCmFailoverStatusId + "snmp_scan_function" : lambda oid: scan_f5_bigip_cluster_status(oid, is_v11_2 = True) +} + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9960ff6..ad297ff 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -235,6 +235,31 @@ register_check_parameters( "dict" ) +register_check_parameters( + subgroup_applications, + "cluster_status", + _("Cluster status"), + Dictionary( + elements = [ + ("type", + DropdownChoice( + title = _("Cluster type"), + help = _("Expected cluster type."), + choices = [ + ( "active_standby" , _("active / standby") ), + ( "active_active" , _("active / active") ), + ], + default_value = "active_standby" + ) + ), + ], + required_keys = ["type"] + ), + None, + "dict" +) + + #. # .--Inventory-----------------------------------------------------------. # | ___ _ |

7 years, 10 months

Revert "#2912 FIX mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]""

by Simon Betz

Module: check_mk Branch: master Commit: 8567214d534fee321224cce245ebe0718ac375f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8567214d534fee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 23 15:54:29 2016 +0200 Revert "#2912 FIX mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]"" This reverts commit 530369c4e70c3b31a8496a0c01cd1d989f5ef026. --- .werks/2912 | 14 -------------- agents/plugins/mk_oracle | 2 +- agents/plugins/mk_oracle.aix | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.werks/2912 b/.werks/2912 deleted file mode 100644 index 9469c3a..0000000 --- a/.werks/2912 +++ /dev/null @@ -1,14 +0,0 @@ -Title: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with "_[NUMBER]" -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i4 -Date: 1453369163 -Class: fix - -The agent plugin did not compute the ORACLE_SID_SHORT correctly in case of databases -named like this: - -DB Instance Name = TESTDBDB -Instance RAC Knoten 1: TESTDB_1DB -Instance RAC Knoten 2: TESTDB_2 diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 67e62b2..8c4d6a9 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -755,7 +755,7 @@ function set_oraenv () { ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut -d":" -f2) if [ -z $ORACLE_HOME ] ; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//") + ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//") ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID_SHORT}":" | cut -d":" -f2) fi fi diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index 839133d..1259aff 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -697,7 +697,7 @@ function set_oraenv () { ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut -d":" -f2) if [ -z $ORACLE_HOME ] ; then # cut last number from SID for Oracle RAC to find entry in oratab - ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//") + ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//") ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID_SHORT}":" | cut -d":" -f2) fi

7 years, 10 months

3789 f5_bigip_snat: new check for source NAT monitoring

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d1b534c45fc6958d6686554bb36d8284ac52579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d1b534c45fc69… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 23 13:19:02 2016 +0200 3789 f5_bigip_snat: new check for source NAT monitoring --- .werks/3789 | 9 +++++ ChangeLog | 1 + checkman/f5_bigip_snat | 16 +++++++++ checks/f5_bigip_snat | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) diff --git a/.werks/3789 b/.werks/3789 new file mode 100644 index 0000000..679d9c5 --- /dev/null +++ b/.werks/3789 @@ -0,0 +1,9 @@ +Title: f5_bigip_snat: new check for source NAT monitoring +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471951106 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b5c9dc5..e734b4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 3777 ipmi: IPMI sensor states are configurable * 3778 if: now levels for discards rate are configurable * 3788 f5_big_pool: check is now cluster ready + * 3789 f5_bigip_snat: new check for source NAT monitoring * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/f5_bigip_snat b/checkman/f5_bigip_snat new file mode 100644 index 0000000..acd42dd --- /dev/null +++ b/checkman/f5_bigip_snat @@ -0,0 +1,16 @@ +title: F5 Big-IP: Source NAT +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP load balancers (local traffic + managers) and collects statistical information about the source NAT. + It shows the number if incoming and outgoing bytes and packets, the connection rate + and the current connections. + +perfdata: + Incoming/Outgoing bytes and packet. The connection rate and the current connections. + +inventory: + One check is generated per source NAT. diff --git a/checks/f5_bigip_snat b/checks/f5_bigip_snat new file mode 100644 index 0000000..64a8e66 --- /dev/null +++ b/checks/f5_bigip_snat @@ -0,0 +1,92 @@ +#!/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- +# tails. 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. + +def parse_f5_bigip_snat(info): + snats = {} + for line in info: + name = line[0] + snats.setdefault(name, {}) + snats[name].setdefault("if_in_pkts" , []).append(int(line[1])), + snats[name].setdefault("if_out_pkts" , []).append(int(line[2])), + snats[name].setdefault("if_in_octets" , []).append(int(line[3])), + snats[name].setdefault("if_out_octets" , []).append(int(line[4])), + snats[name].setdefault("connections_rate" , []).append(int(line[5])), + snats[name].setdefault("connections" , []).append(int(line[6])), + return snats + +def inventory_f5_bigip_snat(parsed): + for name, snat in parsed.items(): + yield name, None + +def check_f5_bigip_snat(item, _no_params, parsed): + if item in parsed: + snat = parsed[item] + + summed_values = {} + now = time.time() + # Calculate counters + for what in [ + "if_in_pkts", + "if_out_pkts", + "if_in_octets", + "if_out_octets", + "connections_rate", + ]: + summed_values.setdefault(what, 0) + for idx, entry in enumerate(snat[what]): + rate = get_rate("%s.%s" % (what, idx), now, entry) + summed_values[what] += rate + + # Calculate sum value + for what, function in [ ("connections", sum) ]: + summed_values[what] = function(snat[what]) + + perfdata = map(lambda x: (x[0], x[1]), summed_values.items()) + + # Current number of connections + yield 0, "Client connections: %d" % summed_values["connections"], perfdata + + # New connections per time + yield 0, "Rate: %.2f/sec" % summed_values["connections_rate"] + +check_info["f5_bigip_snat"] = { + "parse_function" : parse_f5_bigip_snat, + "check_function" : check_f5_bigip_snat, + "inventory_function" : inventory_f5_bigip_snat, + "service_description" : "Source NAT %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.3375.2.2.9.2.3.1", [ + "1", #ltmSnatStatName + "2", #ltmSnatStatClientPktsIn + "3", #ltmSnatStatClientBytesIn + "4", #ltmSnatStatClientPktsOut + "5", #ltmSnatStatClientBytesOut + "7", #ltmSnatStatClientTotConns + "8", #ltmSnatStatClientCurConns + ]), + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.3375.2" in oid(".1.3.6.1.2.1.1.2.0") \ + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), +}

7 years, 10 months

Fixed test when having spaces in paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 36a835403ab22a1c98b9adb163fad398324e1aef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36a835403ab22a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 11:04:02 2016 +0200 Fixed test when having spaces in paths --- tests/agents/windows/test_precompiled_age.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py index 617c3c5..8d00727 100644 --- a/tests/agents/windows/test_precompiled_age.py +++ b/tests/agents/windows/test_precompiled_age.py @@ -56,7 +56,7 @@ def find_newest_source_file(): def last_commit_time(path): - lines = os.popen('unset GIT_DIR ; cd %s ; ' - 'git log -n 1 --date=raw -- %s' % (os.path.dirname(path), path)).readlines() + lines = os.popen('unset GIT_DIR ; cd "%s" ; ' + 'git log -n 1 --date=raw -- "%s"' % (os.path.dirname(path), path)).readlines() timestamp = int(lines[2].split()[1]) return timestamp

7 years, 10 months

Added test checking for left html.debug() calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 05ac37978940fc0751b0978a316851d8f1f6b4bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05ac37978940fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 23 11:01:12 2016 +0200 Added test checking for left html.debug() calls --- tests/web/test_find_debug_code.py | 21 +++++++++++++++++++++ web/htdocs/views.py | 2 -- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tests/web/test_find_debug_code.py b/tests/web/test_find_debug_code.py new file mode 100644 index 0000000..a810b66 --- /dev/null +++ b/tests/web/test_find_debug_code.py @@ -0,0 +1,21 @@ +#!/usr/bin/python +# encoding: utf-8 + +import os +import glob +from testlib import cmk_path, cmc_path + +def test_find_debug_code(): + scanned = 0 + for base_path in [ cmk_path(), cmc_path() ]: + for dirpath, dirnames, filenames in os.walk("%s/web" % base_path): + scanned += 1 + for filename in filenames: + path = "%s/%s" % (dirpath, filename) + + for line in open(path): + l = line.lstrip() + assert not l.startswith("html.debug("), \ + "Found \"html.debug(...)\" call" + + assert scanned > 0 diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 2affdd5..7a107b8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1489,9 +1489,7 @@ def play_alarm_sounds(): if not url.endswith("/"): url += "/" - html.debug(g_alarm_sound_states) for state_name, wav in config.sounds: - html.debug(state_name) if not state_name or state_name in g_alarm_sound_states: html.play_sound(url + wav) break # only one sound at one time

7 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016