Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: #2574 FIX postfix_mailq: speed up agent part on FreeBSD

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cb19c2d6a9a21f115925daa4702099869fbb510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cb19c2d6a9a21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 10:17:16 2015 +0200 #2574 FIX postfix_mailq: speed up agent part on FreeBSD --- .werks/2574 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 19 +++++++++++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/2574 b/.werks/2574 new file mode 100644 index 0000000..805e66c --- /dev/null +++ b/.werks/2574 @@ -0,0 +1,9 @@ +Title: postfix_mailq: speed up agent part on FreeBSD +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441268204 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c0bc7c6..e0c2284 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * 2547 FIX: mysql mysql_capacity mysql_ping mysql_slave: Fixed broken service discovery when instance id is empty... * 2564 FIX: logins: missing manpage * 2575 FIX: cpu.loads: Fix exception in displaying parameters for CPU load check... + * 2574 FIX: postfix_mailq: speed up agent part on FreeBSD Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index e35aded..096b538 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -317,12 +317,23 @@ netstat -na | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' # Only handle the last 6 lines (includes the summary line at the bottom and # the last message in the queue. The last message is not used at the moment # but it could be used to get the timestamp of the last message. -if which mailq >/dev/null 2>&1 && getent passwd postfix >/dev/null 2>&1; then - echo '<<<postfix_mailq>>>' - mailq | tail -n 6 +if type postconf >/dev/null ; then + echo '<<<postfix_mailq>>>' + postfix_queue_dir=$(postconf -h queue_directory) + postfix_count=$(find $postfix_queue_dir/deferred -type f | wc -l) + postfix_size=$(du -ks $postfix_queue_dir/deferred | awk '{print $1 }') + if [ $postfix_count -gt 0 ] + then + echo -- $postfix_size Kbytes in $postfix_count Requests. + else + echo Mail queue is empty + fi +elif [ -x /usr/sbin/ssmtp ] ; then + echo '<<<postfix_mailq>>>' + mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6 fi -#Check status of qmail mailqueue +# Check status of qmail mailqueue if type qmail-qstat >/dev/null then echo "<<<qmail_stats>>>"

9 years

Check_MK Git: check_mk: #2565 dell_om_disks now warns if SMART predicts disk failure

by Sebastian Herbord

Module: check_mk Branch: master Commit: 888176bcfcae33c8e037057b6b9dba8a09a650bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=888176bcfcae33… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 3 10:15:58 2015 +0200 #2565 dell_om_disks now warns if SMART predicts disk failure --- .werks/2565 | 9 +++++++++ ChangeLog | 1 + checks/dell_om_disks | 9 ++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/2565 b/.werks/2565 new file mode 100644 index 0000000..144587b --- /dev/null +++ b/.werks/2565 @@ -0,0 +1,9 @@ +Title: dell_om_disks now warns if SMART predicts disk failure +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441267878 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c0bc7c6..f4290cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ * 2425 agent_hp_msa: New special agent to monitor "HP MSA Storage" devices... * 2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 * 2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states + * 2565 dell_om_disks now warns if SMART predicts disk failure * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/dell_om_disks b/checks/dell_om_disks index 916fd23..8de635c 100644 --- a/checks/dell_om_disks +++ b/checks/dell_om_disks @@ -76,17 +76,20 @@ def check_dell_om_disks(item, _no_params, info): 40 : 'Clear', } - for name, dstate, pid, eid, cid, tid, sizeMB, btype, sstate, mt in info: + for name, dstate, pid, eid, cid, tid, sizeMB, btype, sstate, smart, mt in info: ditem = "%s:%s:%s" % ( eid, cid, tid ) if ditem == item: state = 0 dstate = saveint(dstate) btype = saveint(btype) sstate = saveint(sstate) + smart = saveint(smart) mt = saveint(mt) size = saveint(sizeMB)*1024*1024 msg = ["%s (%s, %s)" % ( name, pid, get_bytes_human_readable(size) ) ] label = "" + if smart == 2: + dstate = 34 if dstate in [ 40, 35, 34, 26, 7, 4]: state = 1 label = "(!)" @@ -96,7 +99,7 @@ def check_dell_om_disks(item, _no_params, info): # handle hot spares as OK if sstate in [ 3, 4 ] and dstate == 1: - state = 0 + state = 0 label = "" msg.append("state %s%s" % ( pdisk_state.get(dstate, 'ukn (%s)' % dstate ), label)) @@ -128,7 +131,7 @@ check_info["dell_om_disks"] = { 21, # arrayDiskBusType 22, # arrayDiskSpareState #24, #arrayDiskComponentStatus - #31, #arrayDiskSmartAlertIndication + 31, #arrayDiskSmartAlertIndication 35, # arrayDiskMediaType ]), "includes" : [ "dell_om.include" ],

9 years

Check_MK Git: check_mk: Removed obsolete variable from previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: a44312173f15c7ca50078c382ff98cd442f23f3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a44312173f15c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 10:08:28 2015 +0200 Removed obsolete variable from previous commit --- checks/cpu | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cpu b/checks/cpu index d276ba0..8a822d4 100644 --- a/checks/cpu +++ b/checks/cpu @@ -39,7 +39,6 @@ cpuload_default_levels = (5.0, 10.0) -threads_default_levels = (2000, 4000) def inventory_cpu_load(info): if len(info) == 1 and len(info[0]) >= 5:

9 years

Check_MK Git: check_mk: This also might have affected other checks. Integer values had not been accepted

by Mathias Kettner

Module: check_mk Branch: master Commit: d19a762099e459dbba641c1c0966e12dc6d28340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d19a762099e459… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 10:07:53 2015 +0200 This also might have affected other checks. Integer values had not been accepted here but created as default parameters. Conflicts: ChangeLog checks/cpu --- .werks/2575 | 11 +++++++++++ ChangeLog | 1 + checks/cpu | 4 ++-- checks/hpux_cpu | 2 +- checks/ucd_cpu_load | 2 +- web/htdocs/valuespec.py | 12 ++++++++---- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.werks/2575 b/.werks/2575 new file mode 100644 index 0000000..53926c4 --- /dev/null +++ b/.werks/2575 @@ -0,0 +1,11 @@ +Title: cpu.loads: Fix exception in displaying parameters for CPU load check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441267525 + +This also might have affected other checks. Integer values had not been accepted +here but created as default parameters. diff --git a/ChangeLog b/ChangeLog index 9a5e7e5..c0bc7c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,6 +151,7 @@ * 2546 FIX: brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states... * 2547 FIX: mysql mysql_capacity mysql_ping mysql_slave: Fixed broken service discovery when instance id is empty... * 2564 FIX: logins: missing manpage + * 2575 FIX: cpu.loads: Fix exception in displaying parameters for CPU load check... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/cpu b/checks/cpu index 8523fff..d276ba0 100644 --- a/checks/cpu +++ b/checks/cpu @@ -38,8 +38,8 @@ # '----------------------------------------------------------------------' -cpuload_default_levels = (5, 10) - +cpuload_default_levels = (5.0, 10.0) +threads_default_levels = (2000, 4000) def inventory_cpu_load(info): if len(info) == 1 and len(info[0]) >= 5: diff --git a/checks/hpux_cpu b/checks/hpux_cpu index 6588ab1..ef04acb 100644 --- a/checks/hpux_cpu +++ b/checks/hpux_cpu @@ -28,7 +28,7 @@ # 2:23pm up 196 days, 4:47, 5 users, load average: 0.05, 0.04, 0.04 # 8 logical processors (2 per socket) -cpuload_default_levels = (5, 10) +cpuload_default_levels = (5.0, 10.0) def inventory_hpux_cpu_load(info): if len(info) >= 1 and 'load' in info[0]: diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index 51b7f14..653b062 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -cpuload_default_levels = (5, 10) +cpuload_default_levels = (5.0, 10.0) def inventory_ucd_cpu_load(info): if len(info) == 3: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e9833aa..49743ea 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1117,10 +1117,14 @@ class Float(Integer): _("The text <b><tt>%s</tt></b> is not a valid floating point number." % html.var(varprefix))) def validate_datatype(self, value, varprefix): - if type(value) != float and not \ - (type(value) not in [ int, long ] and self._allow_int): - raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % - (value, type_name(value), self._allow_int and _(" or int") or "")) + if type(value) == float: + return + + if type(value) in [ int, long ] and self._allow_int: + return + + raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % + (value, type_name(value), self._allow_int and _(" or int") or "")) class Percentage(Float):

9 years

Check_MK Git: check_mk: #2564 FIX logins: missing manpage

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7ba1051c7dbc759144c4ba152c4a503b6e418a00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba1051c7dbc75… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 3 09:50:44 2015 +0200 #2564 FIX logins: missing manpage --- .werks/2564 | 10 ++++++++++ ChangeLog | 1 + checkman/logins | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/2564 b/.werks/2564 new file mode 100644 index 0000000..90e6f84 --- /dev/null +++ b/.werks/2564 @@ -0,0 +1,10 @@ +Title: logins: missing manpage +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441266553 + + diff --git a/ChangeLog b/ChangeLog index f917b2d..9a5e7e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -150,6 +150,7 @@ * 2545 FIX: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these devices * 2546 FIX: brocade_mlx_power: Only discover power supplies in state normal/failure, skip other states... * 2547 FIX: mysql mysql_capacity mysql_ping mysql_slave: Fixed broken service discovery when instance id is empty... + * 2564 FIX: logins: missing manpage Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checkman/logins b/checkman/logins new file mode 100644 index 0000000..b59752c --- /dev/null +++ b/checkman/logins @@ -0,0 +1,13 @@ +title: Number of logged in users +agents: linux +catalog: os/misc +license: GPL +distribution: check_mk +description: + This checks the number of logged in users. It goes to warn/crit levels + if the login count exceeds the configurable limits. + For this check to work the "mk_logins" plugin needs to be installed. + +inventory: + Creates one service if the agent output contains the section. +

9 years

Check_MK Git: check_mk: #2552 FIX API: Service Discovery action is now creating missing pending log entry and marks the site dirty

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ffad806c2be68e74d410804bf7c204d4d926ad2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ffad806c2be68… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 09:44:48 2015 +0200 #2552 FIX API: Service Discovery action is now creating missing pending log entry and marks the site dirty --- .werks/2552 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 22 +++++++++++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/2552 b/.werks/2552 new file mode 100644 index 0000000..df6b768 --- /dev/null +++ b/.werks/2552 @@ -0,0 +1,10 @@ +Title: API: Service Discovery action is now creating missing pending log entry and marks the site dirty +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441266258 + + diff --git a/ChangeLog b/ChangeLog index bb8f3cb..f917b2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ * 2499 FIX: Git: Fixed message "Please tell me who you are. Run git config ..." on making changes... * 2539 FIX: Fix impossibility of removing a status host from an existing site configuration * 2550 FIX: Catching exception when having name conflicts while moving a folder + * 2552 FIX: API: Service Discovery action is now creating missing pending log entry and marks the site dirty Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index edfe7ce..0bad9b7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -19120,24 +19120,32 @@ class API: self.__prepare_folder_info() all_hosts = self.__get_all_hosts() + host = all_hosts[hostname] + folder = host[".folder"] + config.need_permission("wato.services") self.__validate_host_parameters(None, hostname, {}, all_hosts, True, ["host_missing"]) - check_host_permissions(hostname, folder = all_hosts[hostname][".folder"]) + check_host_permissions(hostname, folder=folder) ### Start inventory - host = all_hosts[hostname] counts, failed_hosts = check_mk_automation(host[".siteid"], "inventory", [ "@scan", mode ] + [hostname]) if failed_hosts: - if not host.get("inventory_failed") and not host.get(".folder", {}).get(".lock_hosts"): + if not host.get("inventory_failed") and not folder.get(".lock_hosts"): host["inventory_failed"] = True - save_hosts(host[".folder"]) + save_hosts(folder) raise MKUserError(None, _("Failed to inventorize %s: %s") % (hostname, failed_hosts[hostname])) - if host.get("inventory_failed") and not host.get(".folder", {}).get(".lock_hosts"): + if host.get("inventory_failed") and not folder.get(".lock_hosts"): del host["inventory_failed"] - save_hosts(host[".folder"]) + save_hosts(folder) + + msg = _("Service discovery successful. Added %d, Removed %d, Kept %d, New Count %d") % \ + tuple(counts[hostname]) + + mark_affected_sites_dirty(folder, hostname, sync=False, restart=True) + log_pending(AFFECTED, hostname, "api-inventory", msg) - return _("Service discovery successful. Added %d, Removed %d, Kept %d, New Count %d") % tuple(counts[hostname]) + return msg def activate_changes(self, sites, mode = "dirty", allow_foreign_changes = False): self.__prepare_folder_info()

9 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: be23e9a40fa5e3e903c96d4f6cecbf93b30eb4dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be23e9a40fa5e3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 2 16:39:26 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7d0553d..697eb4b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2583 +2593

9 years

Check_MK Git: check_mk: modified tcp_conn_stats ruke and added map page for datapoer_tcp check

by Simon Betz

Module: check_mk Branch: master Commit: b1c21181bec31120e35b88eb5b9f342d412f249c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1c21181bec311… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 2 16:38:38 2015 +0200 modified tcp_conn_stats ruke and added map page for datapoer_tcp check --- checkman/datapower_tcp | 16 ++++++++++++++++ web/plugins/wato/check_parameters.py | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/checkman/datapower_tcp b/checkman/datapower_tcp new file mode 100644 index 0000000..89c6aec --- /dev/null +++ b/checkman/datapower_tcp @@ -0,0 +1,16 @@ +title: IBM Datapower: Number of TCP Connections per state +agents: snmp +catalog: hw/network/ibm +license: GPL +distribution: check_mk +description: + This check monitors the number of TCP connections in the various possible states, + which are: {ESTABLISHED}, {SYN_SENT}, {SYN_RECV}, {LAST_ACK}, {CLOSE_WAIT}, + {TIME_WAIT}, {CLOSED}, {CLOSING}, {FIN_WAIT1}, {FIN_WAIT2}. + This check supports the IBM Datapower XG45 device. + + Moreover the check is configurable via WATO. For the possible states you + can set upper warn and crit levels. No default levels are set. + +inventory: + If there is at least one TCP connection then the check will be created. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3ba57a6..9638b68 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2550,6 +2550,16 @@ register_check_parameters( ] ) ), + ( "LISTEN", + Tuple( + title = _("LISTEN"), + help = _("represents waiting for a connection request from any remote TCP and port"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), ( "BOUND", Tuple( title = _("BOUND"), @@ -2562,6 +2572,17 @@ register_check_parameters( ] ) ), + ( "IDLE", + Tuple( + title = _("IDLE"), + help = _("a TCP session that is active but that has no data being " + "transmitted by either device for a prolonged period of time"), + elements = [ + Integer(title = _("Warning at"), label = _("connections")), + Integer(title = _("Critical at"), label = _("connections")) + ] + ) + ), ] ), None,

9 years

Check_MK Git: check_mk: #2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states

by Simon Betz

Module: check_mk Branch: master Commit: 940eac3a0ec7204fd2105b863be928c23929b6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940eac3a0ec720… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 2 16:40:47 2015 +0200 #2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states --- .werks/2583 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2583 b/.werks/2583 new file mode 100644 index 0000000..9ff6404 --- /dev/null +++ b/.werks/2583 @@ -0,0 +1,9 @@ +Title: new check datapower_tcp: monitors the number of TCP connections in the various possible states +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441204774 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3e94bb0..bb8f3cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 1288 cisco_vpn_tunnel: Added Metrics for trafic, please beware:... * 2425 agent_hp_msa: New special agent to monitor "HP MSA Storage" devices... * 2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 + * 2583 new check datapower_tcp: monitors the number of TCP connections in the various possible states * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

9 years

Check_MK Git: check_mk: datapower_tcp: new check for TCP connection stats on datapower

by Mathias Kettner

Module: check_mk Branch: master Commit: dfc16a4cafd0ee19c7cf6707e7057ba149ff2821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfc16a4cafd0ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 2 16:20:45 2015 +0200 datapower_tcp: new check for TCP connection stats on datapower Werk will follow --- checks/datapower_tcp | 59 ++++++++++++++++++++++ checks/tcp_conn_stats | 82 +++++++++++------------------- checks/tcp_connections.include | 92 ++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 20 +++++++- web/plugins/wato/check_parameters.py | 2 +- 5 files changed, 200 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dfc16a4caf…

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015