Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5284 FIX akcp_exp_humidity, akcp_sensor_humidity, allnet_ip_sensoric, apc_humidity, etherbox, humidity.include, knuerr_rms_humidity, stulz_humidity, tinkerforge: Fixed wrong parameters

by Simon Betz

Module: check_mk Branch: master Commit: b679b3fecca9e374e52a459672e155c62ad262ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b679b3fecca9e3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 11:53:03 2017 +0200 5284 FIX akcp_exp_humidity, akcp_sensor_humidity, allnet_ip_sensoric, apc_humidity, etherbox, humidity.include, knuerr_rms_humidity, stulz_humidity, tinkerforge: Fixed wrong parameters Change-Id: I09a85119a9b9f6ca4740eba1cdab212503342055 --- .werks/5284 | 11 +++++++++++ checks/akcp_exp_humidity | 2 +- checks/akcp_sensor.include | 32 +++----------------------------- checks/akcp_sensor_humidity | 2 +- checks/allnet_ip_sensoric | 16 ++-------------- checks/apc_humidity | 25 +++---------------------- checks/etherbox | 23 ++--------------------- checks/humidity.include | 2 +- checks/knuerr_rms_humidity | 17 +++-------------- checks/stulz_humidity | 16 ++-------------- checks/tinkerforge | 15 ++------------- 11 files changed, 31 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b679b3fecc…

6 years, 9 months

5015 FIX mk_oracle.bat: Removed deprecated plugin

by Marcel Arentz

Module: check_mk Branch: master Commit: c4c4c23efb925bb40a52a4b6dc52979fdb07751f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4c4c23efb925b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 18 10:50:10 2017 +0200 5015 FIX mk_oracle.bat: Removed deprecated plugin Removed obsolete plugin which is deprecated since 1.2.6. Please use mk_oracle.ps1 instead. Change-Id: Ia146ab34d72a2e99be259bd99bf43f270a1b02f5 --- .werks/5015 | 11 +++++++ agents/windows/plugins/mk_oracle.bat | 58 ------------------------------------ agents/windows/plugins/mk_oracle.ps1 | 2 -- 3 files changed, 11 insertions(+), 60 deletions(-) diff --git a/.werks/5015 b/.werks/5015 new file mode 100644 index 0000000..db578fa --- /dev/null +++ b/.werks/5015 @@ -0,0 +1,11 @@ +Title: mk_oracle.bat: Removed deprecated plugin +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505724422 +Class: fix + +Removed obsolete plugin which is deprecated since 1.2.6. Please use +mk_oracle.ps1 instead. diff --git a/agents/windows/plugins/mk_oracle.bat b/agents/windows/plugins/mk_oracle.bat deleted file mode 100644 index 255d758..0000000 --- a/agents/windows/plugins/mk_oracle.bat +++ /dev/null @@ -1,58 +0,0 @@ -@echo off -REM Old deprecated ORACLE plugin (Batch) -REM ; If you not run this plugin with the environment variable ORACLE_SID set, -REM ; you can uncomment (Remove the "REM " prefix) the line below to -REM ; use e.g. "localhost" as oracle sid. -REM SET ORACLE_SID=localhost - -REM ; If you like to use a special auth parameter please change the line below -SET AUTH=/ as sysdba - -echo ^<^<^<oracle_version^>^>^> -(echo.|set /p x=%ORACLE_SID% ) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select banner from v$version where banner like 'Oracle%%';" -) | sqlplus -S %AUTH% - -echo ^<^<^<oracle_sessions^>^>^> -(echo.|set /p x=%ORACLE_SID%) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select count(*) from v$session where status = 'ACTIVE';" -) | sqlplus -S %AUTH% - -echo ^<^<^<oracle_logswitches^>^>^> -(echo.|set /p x=%ORACLE_SID%) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select count(*) from v$loghist where first_time > sysdate - 1/24;" -) | sqlplus -S %AUTH% - -REM ; This is nearly the same query as in the linux agent. With the exception that the -REM ; column th.instance is fetched as first column to get the SID -echo ^<^<^<oracle_tablespaces^>^>^> -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set linesize 900" -echo "set tab off" -echo "set feedback off" -echo "set head off" -echo "column instance format a10" -echo "column file_name format a100" -echo "select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from v$thread th, dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION SELECT th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks FROM v$thread th, dba_temp_files f, dba_tablespaces t, v$temp_space_header sh WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, 'TEMP', t.block_size, t.status;" -) | sqlplus -S %AUTH% diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index c983b34..2fa230f 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -27,13 +27,11 @@ # and Mathias Kettner. Thorsten is responsible for the ORACLE # stuff, Mathias for the shell hacking, Andrew for the powershell... -# NOTE: This plugin is still EXPERIMENTAL! ############################################################################### # open issues ############################################################################### # 1. error connection to instance, old async still shown is this ok? -# 2. login to database using Oracle wallet (nice to have, currently not planned) ############################################################################### # usage

6 years, 9 months

5128 arbor_pravail: Now also checks for overrun drop rates of incoming queues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ca04c262b5a74b65950724aa66d2e3fc0325e3dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca04c262b5a74b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Aug 30 09:44:34 2017 +0200 5128 arbor_pravail: Now also checks for overrun drop rates of incoming queues Change-Id: I4ede498259a2a6a3a470849e22946e5961decb9a --- .werks/5128 | 10 ++++++++ checkman/arbor_pravail.drop_rate | 14 +++++++++++ checks/arbor.include | 53 ++++++++++++++++++++++++++++++++++++++++ checks/arbor_pravail | 12 ++++++++- 4 files changed, 88 insertions(+), 1 deletion(-) diff --git a/.werks/5128 b/.werks/5128 new file mode 100644 index 0000000..eafbf60 --- /dev/null +++ b/.werks/5128 @@ -0,0 +1,10 @@ +Title: arbor_pravail: Now also checks for overrun drop rates of incoming queues +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504078675 +Class: feature + + diff --git a/checkman/arbor_pravail.drop_rate b/checkman/arbor_pravail.drop_rate new file mode 100644 index 0000000..aea46ca --- /dev/null +++ b/checkman/arbor_pravail.drop_rate @@ -0,0 +1,14 @@ +title: Arbor Pravail Drop Rate +agents: snmp +catalog: hw/network/arbor +license: GPL +distribution: check_mk +description: + Monitors the packet drop rate of incoming packets on Arbor Pravail + devices. This check can be configured using the "Generic rate" + rule and will turn warn/crit if the drop rate is below or above + the configured lower or upper limits, respectively. + +inventory: + Exactly one service is discovered. + diff --git a/checks/arbor.include b/checks/arbor.include index 299c31f..26096f4 100644 --- a/checks/arbor.include +++ b/checks/arbor.include @@ -162,3 +162,56 @@ def check_arbor_host_fault(no_item, no_params, parsed): #. +# .--Drop Rate-----------------------------------------------------------. +# | ____ ____ _ | +# | | _ \ _ __ ___ _ __ | _ \ __ _| |_ ___ | +# | | | | | '__/ _ \| '_ \ | |_) / _` | __/ _ \ | +# | | |_| | | | (_) | |_) | | _ < (_| | || __/ | +# | |____/|_| \___/| .__/ |_| \_\__,_|\__\___| | +# | |_| | +# '----------------------------------------------------------------------' + +def inventory_arbor_drop_rate(parsed): + if 'drop_rate' in parsed: + return [("Overrun", {})] + + +def check_arbor_drop_rate(no_item, params, parsed): + drop_rate = int(parsed['drop_rate']) + infotext = '%s pps' % drop_rate + + lower_status = 0 + lower_levels = params.get('levels_lower') + if lower_levels: + warn, crit = lower_levels + + if drop_rate <= crit: + lower_status, label = 2, '(!!)' + elif drop_rate <= warn: + lower_status, label = 1, '(!)' + + if lower_status: + infotext += ' (warn/crit below %.1f/%.1f)%s' % (warn, crit, label) + + upper_status = 0 + upper_levels = params.get('levels') + if upper_levels: + warn, crit = upper_levels + + if drop_rate >= crit: + upper_status, label = 2, '(!!)' + elif drop_rate >= warn: + upper_status, label = 1, '(!)' + + if upper_status: + infotext += ' (warn/crit above %.1f/%.1f)%s' % (warn, crit, label) + + perfdata = [("if_in_pkts", drop_rate, warn, crit)] + else: + perfdata = [("if_in_pkts", drop_rate)] + + status = max(lower_status, upper_status) + yield status, infotext, perfdata + + +#. diff --git a/checks/arbor_pravail b/checks/arbor_pravail index 97ede70..5052662 100644 --- a/checks/arbor_pravail +++ b/checks/arbor_pravail @@ -31,6 +31,7 @@ # .1.3.6.1.4.1.9694.1.6.2.6.0 8 --> PRAVAIL-MIB::deviceDiskUsage.0 # .1.3.6.1.4.1.9694.1.6.2.7.0 49 --> PRAVAIL-MIB::devicePhysicalMemoryUsage.0 # .1.3.6.1.4.1.9694.1.6.2.8.0 0 --> PRAVAIL-MIB::deviceSwapSpaceUsage.0 +# .1.3.6.1.4.1.9694.1.6.2.39.0 43 --> PRAVAIL-MIB::pravailOverrunDropRatePps.0 def parse_pravail(info): @@ -40,7 +41,8 @@ def parse_pravail(info): "cpu_loads" : valid[:3], "disk" : valid[3], "memory" : valid[4:6], - "host_fault" : valid[6] + "host_fault" : valid[6], + "drop_rate" : valid[7], } @@ -59,6 +61,7 @@ check_info["arbor_pravail"] = { "7.0", # devicePhysicalMemoryUsage "8.0", # deviceSwapSpaceUsage "1.0", # pravailHostFault + "39.0",# pravailOverrunDropRatePps ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Pravail"), @@ -92,3 +95,10 @@ check_info["arbor_pravail.host_fault"] = { "service_description" : "Host Fault", } +check_info["arbor_pravail.drop_rate"] = { + "check_function" : check_arbor_drop_rate, + "inventory_function" : inventory_arbor_drop_rate, + "service_description" : "%s drop rate", + "has_perfdata" : True, + "group" : "generic_rate", +}

6 years, 9 months

4815 cisco_ip_sla: New check which monitors Cisco IP SLAs

by Tom Baerwinkel

Module: check_mk Branch: master Commit: fd21c73f7876cee843a50f2957e9c1fa3ce4f432 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd21c73f7876ce… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 24 12:56:37 2017 +0200 4815 cisco_ip_sla: New check which monitors Cisco IP SLAs Change-Id: Icc1fab640eb859119b5122d169b68d67a66d0023 --- .werks/4815 | 10 ++ checkman/cisco_ip_sla | 12 ++ checks/cisco_ip_sla | 208 +++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 13 +++ web/plugins/wato/check_parameters.py | 126 +++++++++++++++++++++ 5 files changed, 369 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fd21c73f78…

6 years, 9 months

4816 iptables: New check which monitors parameters of the iptables configuration

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a91fb5c9230532b8a4152806a66e9365dbee4bd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a91fb5c9230532… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 24 13:19:14 2017 +0200 4816 iptables: New check which monitors parameters of the iptables configuration Change-Id: If1fdff09b6af28fa56f2b0945bbb4a547595fff0 --- .werks/4816 | 10 +++++ agents/plugins/mk_iptables | 34 +++++++++++++++ checkman/iptables | 18 ++++++++ checks/iptables | 106 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) diff --git a/.werks/4816 b/.werks/4816 new file mode 100644 index 0000000..c912cc5 --- /dev/null +++ b/.werks/4816 @@ -0,0 +1,10 @@ +Title: iptables: New check which monitors parameters of the iptables configuration +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503573513 +Class: feature + + diff --git a/agents/plugins/mk_iptables b/agents/plugins/mk_iptables new file mode 100755 index 0000000..42beb34 --- /dev/null +++ b/agents/plugins/mk_iptables @@ -0,0 +1,34 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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. + +# iptables +if type iptables-save > /dev/null +then + echo "<<<iptables>>>" + # output filter configuration without table name, comments and + # status data, i.e. lines beginning with '*', '#' or ':'. + iptables-save -t filter | sed '/^[#*:]/d' +fi + diff --git a/checkman/iptables b/checkman/iptables new file mode 100644 index 0000000..96dbc42 --- /dev/null +++ b/checkman/iptables @@ -0,0 +1,18 @@ +title: Iptables modifications +agents: linux +catalog: os/misc +license: GPL +distribution: check_mk +description: + This check computes the differences between the current output of the + command iptables-save and a cached initial state persisted on the + monitoring server. + The check is OK if no changes can be detected and CRIT otherwise. + If the state is CRIT a diff of the cached and initial configurations + is shown in the long output. If a user wants to accept the diff a + service rediscovery can be performed. + +inventory: + One check per system is created if the agent plugin mk_iptables was + deployed. + diff --git a/checks/iptables b/checks/iptables new file mode 100644 index 0000000..b99f72a --- /dev/null +++ b/checks/iptables @@ -0,0 +1,106 @@ +#!/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. + + +# Example output from agent: +#<<<iptables>>> +#-A INPUT -j RH-Firewall-1-INPUT +#-A FORWARD -j RH-Firewall-1-INPUT +#-A OUTPUT -d 10.139.7.11/32 -j REJECT --reject-with icmp-port-unreachable +#-A RH-Firewall-1-INPUT -i lo -j ACCEPT +#-A RH-Firewall-1-INPUT -p icmp -m icmp --icmp-type any -j ACCEPT +#-A RH-Firewall-1-INPUT -p esp -j ACCEPT +#-A RH-Firewall-1-INPUT -p ah -j ACCEPT +#-A RH-Firewall-1-INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 4000 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 29543 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 29043 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 30001 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 30000 -j ACCEPT +#-A RH-Firewall-1-INPUT -d 224.0.0.251/32 -p udp -m udp --dport 5353 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 58002 -j ACCEPT +#-A RH-Firewall-1-INPUT -p udp -m udp --dport 58001 -j ACCEPT +#-A RH-Firewall-1-INPUT -p udp -m udp --dport 631 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 631 -j ACCEPT +#-A RH-Firewall-1-INPUT -p tcp -m state --state NEW -m tcp --dport 6556 -j ACCEPT +#-A RH-Firewall-1-INPUT -p udp -m udp --dport 6556 -j ACCEPT +#-A RH-Firewall-1-INPUT -s 89.254.0.0/16 -p tcp -m state --state NEW -m tcp --dport 252 -j ACCEPT +#-A RH-Firewall-1-INPUT -s 89.254.0.0/16 -p tcp -m state --state NEW -m tcp --dport 7070 -j ACCEPT +#-A RH-Firewall-1-INPUT -j REJECT --reject-with icmp-host-prohibited +#COMMIT + + +def parse_iptables(info): + config_lines = [" ".join(sublist) for sublist in info] + config = "\n".join(config_lines) + return config + + +def inventory_iptables(parsed): + return [(None, {"config_hash": hash(parsed)})] + + +def check_iptables(_no_item, params, parsed): + item_state = get_item_state("iptables.config") + + if not item_state: + set_item_state("iptables.config", + {"config": parsed, "hash": hash(parsed)}) + return 0, "saved initial configuration" + + initial_config_hash = params["config_hash"] + new_config_hash = hash(parsed) + + if initial_config_hash == new_config_hash: + if initial_config_hash != item_state.get("hash"): + set_item_state("iptables.config", + {"config": parsed, "hash": new_config_hash}) + return 0, "accepted new filters after service rediscovery / reboot" + else: + return 0, "no changes in filters table detected" + else: + import difflib + + reference_config = item_state["config"].splitlines() + actual_config = parsed.splitlines() + diff = difflib.context_diff(reference_config, actual_config, + fromfile="before", tofile="after", + lineterm="") + diff_output = "\n".join(diff) + + return 2, "\r\n".join(["changes in filters table detected", + diff_output]) + + +check_info["iptables"] = { + 'parse_function' : parse_iptables, + 'check_function' : check_iptables, + 'inventory_function' : inventory_iptables, + 'service_description' : 'Iptables', +}

6 years, 9 months

4811 mssql_backup: Set limits for different type of backups

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 188e55649fbfc17c45ec184c69d6e435ba68e983 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=188e55649fbfc1… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Jul 17 14:02:22 2017 +0200 4811 mssql_backup: Set limits for different type of backups For the check mssql_backup it is now possible to set limits for different types of backups (e.g. database backup, log backup etc.) instead of just one limit that is valid for all backups. The limits can be set in the rule "MSSQL Time since last Backup". If no backup types are supported by the agent the parameter "Database Backup" can be used to set a general limit. Change-Id: Iea7ff7a86d03e6fd5a043c9bdb6f120053febed8 --- .werks/4811 | 15 ++++ checks/mssql_backup | 134 ++++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 88 +++++++++++++++++++++-- 3 files changed, 183 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=188e55649f…

6 years, 9 months

4817 netapp_api_vs_traffic: Extend check by nfs values

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a268d0d84d06c472944ed9fb7d02f22930dd7f33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a268d0d84d06c4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Aug 24 14:06:02 2017 +0200 4817 netapp_api_vs_traffic: Extend check by nfs values Change-Id: Ib896fb293c2198f334c28215a6c8bca2b501f5d9 --- .werks/4817 | 10 ++++++++++ checks/netapp_api_vs_traffic | 18 +++++++++++++----- web/plugins/metrics/check_mk.py | 19 ++++++++++++++++--- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/.werks/4817 b/.werks/4817 new file mode 100644 index 0000000..3b21f9c --- /dev/null +++ b/.werks/4817 @@ -0,0 +1,10 @@ +Title: netapp_api_vs_traffic: Extend check by nfs values +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503576293 +Class: feature + + diff --git a/checks/netapp_api_vs_traffic b/checks/netapp_api_vs_traffic index 5e9a9d7..2b752f4 100644 --- a/checks/netapp_api_vs_traffic +++ b/checks/netapp_api_vs_traffic @@ -66,15 +66,23 @@ def check_netapp_api_vs_traffic(item, _no_params, parsed): ("write_data", "iscsi_write_data", "write data", 1, get_bytes_human_readable)]), "nfsv3": ("NFS", - [ ("nfsv3_read_ops", "nfs_read_ios", "read OPs", 1, int), - ("nfsv3_write_ops", "nfs_write_ios", "write OPs", 1, int)]), + [ ("nfsv3_read_ops", "nfs_read_ios", "read OPs", 1, int), + ("nfsv3_write_ops", "nfs_write_ios", "write OPs", 1, int), + ("nfsv3_read_throughput", "nfs_read_throughput", "read throughput", 1, lambda x: get_bytes_human_readable(x) + "/s"), + ("nfsv3_write_throughput", "nfs_write_throughput", "write throughput", 1, lambda x: get_bytes_human_readable(x) + "/s"), + ("nfsv3_ops", "nfs_ios", "OPs", 1, int)]), "nfsv4": ("NFSv4", - [ ("nfsv4_read_ops", "nfsv4_read_ios", "read OPs", 1, int), - ("nfsv4_write_ops", "nfsv4_write_ios", "write OPs", 1, int)]), + [ ("nfsv4_read_ops", "nfsv4_read_ios", "read OPs", 1, int), + ("nfsv4_write_ops", "nfsv4_write_ios", "write OPs", 1, int), + ("nfs4_read_throughput", "nfsv4_read_throughput", "read throughput", 1, lambda x: get_bytes_human_readable(x) + "/s"), + ("nfs4_write_throughput", "nfsv4_write_throughput", "write throughput", 1, lambda x: get_bytes_human_readable(x) + "/s"), + ("nfsv4_ops", "nfsv4_ios", "OPs", 1, int)]), "nfsv4_1": ("NFSv4.1", - [ ("nfsv4_1_ops", "nfsv4_1_ios", "OPs", 1, int) ]) + [ ("nfsv4_1_ops", "nfsv4_1_ios", "OPs", 1, int), + ("nfs41_read_throughput", "nfsv4_1_read_throughput", "read throughput", 1, lambda x: get_bytes_human_readable(x) + "/s"), + ("nfs41_write_throughput", "nfsv4_1_write_throughput", "write throughput", 1, lambda x: get_bytes_human_readable(x) + "/s")]) } vserver = item.split(" ", 3) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b5335b2..f3884c6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3142,10 +3142,11 @@ metric_info["time_transfer"] = { "color" : "41/a", } -for volume_info in [ "NFS", "NFSv4", "CIFS", "SAN", "FCP", "ISCSI" ]: - for what, unit in [ ("data", "bytes"), ("latency", "s"), ("ios", "1/s") ]: +for volume_info in [ "NFS", "NFSv4", "NFSv4.1", "CIFS", "SAN", "FCP", "ISCSI" ]: + for what, unit in [ ("data", "bytes"), ("latency", "s"), ("ios", "1/s"), + ("throughput", "bytes/s")]: - volume = volume_info.lower() + volume = volume_info.lower().replace(".", "_") metric_info["%s_read_%s" % (volume, what)] = { "title" : _( "%s read %s") % (volume_info, what), @@ -3159,6 +3160,18 @@ for volume_info in [ "NFS", "NFSv4", "CIFS", "SAN", "FCP", "ISCSI" ]: "color" : "44/a", } +metric_info["nfs_ios"] = { + "title" : _( "NFS operations"), + "unit" : "1/s", + "color" : "31/a", +} + +metric_info["nfsv4_ios"] = { + "title" : _( "NFSv4 operations"), + "unit" : "1/s", + "color" : "31/a", +} + metric_info["nfsv4_1_ios"] = { "title" : _( "NFSv4.1 operations"), "unit" : "1/s",

6 years, 9 months

4814 sshd_config: New check which monitors security relevant parameters of the sshd_config

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 69cdeda55fa6fd40b5c2e46bfef732177cce840c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69cdeda55fa6fd… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Aug 18 11:34:46 2017 +0200 4814 sshd_config: New check which monitors security relevant parameters of the sshd_config Change-Id: I838a574a39e31267d9432a64ec4f1775cc6c9935 --- .werks/4814 | 10 ++++ agents/plugins/mk_sshd_config | 31 ++++++++++ checkman/sshd_config | 19 ++++++ checks/sshd_config | 109 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 95 ++++++++++++++++++++++++++++++ 5 files changed, 264 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=69cdeda55f…

6 years, 9 months

Get rid of WideCharToMultiByte

by Jukka Aro

Module: check_mk Branch: master Commit: fc96cd0d661bd51434d252198b574b2dc752a9c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc96cd0d661bd5… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Sep 12 16:56:35 2017 +0200 Get rid of WideCharToMultiByte Replace WinAPI WideCharToMultiByte by std::wstring_convert. TODO: MultiByteToWideChar cannot be replaced yet due to an endian error in MinGW version of std::wstring_convert::from_bytes. Change-Id: I561fabe9fb7d42e4473abc2e6c8f5a32a048744f --- agents/windows/EventLog.cc | 12 ++-- agents/windows/EventLogVista.cc | 6 +- agents/windows/WinApi.cc | 10 ---- agents/windows/WinApi.h | 5 -- agents/windows/WinApiAdaptor.h | 5 -- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1382912 -> 1565696 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 17449197 -> 22787160 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1382912 -> 1565696 bytes agents/windows/check_mk_agent.exe | Bin 1359872 -> 1548800 bytes agents/windows/check_mk_agent.msi | Bin 3013632 -> 3388416 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 15247150 -> 19628063 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1359872 -> 1548800 bytes agents/windows/install_agent-64.exe | Bin 606728 -> 681533 bytes agents/windows/install_agent.exe | Bin 605804 -> 676613 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes agents/windows/sections/SectionEventlog.cc | 2 +- agents/windows/sections/SectionLogwatch.cc | 25 ++++---- agents/windows/sections/SectionPS.cc | 71 +++++++++-------------- agents/windows/sections/SectionPS.h | 2 +- agents/windows/sections/SectionPluginGroup.cc | 2 +- agents/windows/sections/SectionSkype.cc | 7 +-- agents/windows/stringutil.cc | 39 ++----------- agents/windows/stringutil.h | 17 ++++-- agents/windows/wmiHelper.cc | 27 +++++---- agents/windows/wmiHelper.h | 6 +- 26 files changed, 83 insertions(+), 155 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc96cd0d66…

6 years, 9 months

Remove temporary implementation of Logger(Adaptor)

by Jukka Aro

Module: check_mk Branch: master Commit: e6a9bcd0d1eee609bcb8334122e521594f1e242a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6a9bcd0d1eee6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Sep 7 10:37:15 2017 +0200 Remove temporary implementation of Logger(Adaptor) Change-Id: I9695e5ad8111c0ad793ba58a6b6392f4ffe4c611 --- agents/windows/Logger.cc | 188 ----------------------------------------- agents/windows/Logger.h | 85 ------------------- agents/windows/LoggerAdaptor.h | 54 ------------ 3 files changed, 327 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6a9bcd0d1…

6 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017