Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: edited werk 2284

by Simon Betz

Module: check_mk Branch: master Commit: a5a77482920a52082bcd66b048f508c3595f8d08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5a77482920a52… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 7 08:09:21 2015 +0200 edited werk 2284 --- .werks/2284 | 1 - 1 file changed, 1 deletion(-) diff --git a/.werks/2284 b/.werks/2284 index 16d914e..942ecce 100644 --- a/.werks/2284 +++ b/.werks/2284 @@ -9,4 +9,3 @@ Class: feature The kaspersky_av_client-check monitors the signature and fullscan age, the mcafee_av_client-check monitors the signature age on a windows client. Both can be configured in WATO. -

9 years, 2 months

Check_MK Git: check_mk: Fixed typo

by Konstantin Büttner

Module: check_mk Branch: master Commit: fb81b5e99e498828f15be185ff840f23a608ffe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb81b5e99e4988… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 6 17:01:40 2015 +0200 Fixed typo --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 4ac6f3a..ef58f62 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -995,7 +995,7 @@ multisite_builtin_views["inv_hosts_ports"] = { # General options 'datasource' : 'hosts', 'topic' : _('Inventory'), - 'title' : _('Switch port statisticss'), + 'title' : _('Switch port statistics'), 'linktitle' : _('Switch ports (all Hosts)'), 'description' : _('A list of all hosts with statistics about total, used and free networking interfaces'), 'public' : True,

9 years, 2 months

Check_MK Git: check_mk: #2449 FIX db2_mem: Fixed scaling of perfdata

by Konstantin Büttner

Module: check_mk Branch: master Commit: 59977b58d6a5ae55bd4e9b4cee64e61445efb3ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59977b58d6a5ae… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jul 6 16:25:09 2015 +0200 #2449 FIX db2_mem: Fixed scaling of perfdata Previously, this check would in many cases misinterpret KB as Bytes. This has been fixed. --- .werks/2449 | 11 +++++++++++ ChangeLog | 1 + checks/db2_mem | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/2449 b/.werks/2449 new file mode 100644 index 0000000..8c04103 --- /dev/null +++ b/.werks/2449 @@ -0,0 +1,11 @@ +Title: db2_mem: Fixed scaling of perfdata +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1436192652 + +Previously, this check would in many cases misinterpret KB as Bytes. +This has been fixed. diff --git a/ChangeLog b/ChangeLog index c0bf304..f7d101d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 2320 FIX: winperf_msx_queues: no longer crashes in service discovery if there are no msx queues available * 2321 FIX: process discovery: fixed exception during service discovery when no explicit process matching was set... * 2394 FIX: megaraid_ldisks: Is now supporting LSI CacheCade drives + * 2449 FIX: db2_mem: Fixed scaling of perfdata... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/db2_mem b/checks/db2_mem index 8e5c322..8a47db3 100644 --- a/checks/db2_mem +++ b/checks/db2_mem @@ -39,7 +39,13 @@ def check_db2_mem(item, params, info): for line in info: if hit > 0 and hit <= 2: hit += 1 - values.append(saveint(line[-2])) + if line[-1].lower() == "kb": + value = int(line[-2]) * 1024 + elif line[-1].lower() == "mb": + value = int(line[-2]) * 1024 * 1024 + else: + value = int(line[-2]) + values.append(value) if len(values) == 2: limit, usage = values left = limit - usage

9 years, 2 months

Check_MK Git: check_mk: Fixed detecting icons in local/

by Lars Michelsen

hierarchy of sites which do not exist in original directory Message-ID: <559a842e.wzIE8PXgyxPg/m7v%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 371f0e15c3ff28b0a3be3adf974ad3a910d28422 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=371f0e15c3ff28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 6 15:35:28 2015 +0200 Fixed detecting icons in local/ hierarchy of sites which do not exist in original directory --- web/htdocs/htmllib.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1d0b83f..484a9ad 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -365,13 +365,18 @@ class html: def detect_icon_path(self, icon_name): # Detect whether or not the icon is available as images/icon_*.png # or images/icons/*.png. When an icon is available as internal icon, - # always use this onec + # always use this one + is_internal = False if defaults.omd_root: - base_path = defaults.omd_root+"/share/check_mk/web/htdocs/images" - else: - base_path = defaults.web_dir+"/htdocs/images" - - if os.path.exists(base_path+'/icon_'+icon_name+'.png'): + rel_path = "share/check_mk/web/htdocs/images/icon_"+icon_name+".png" + if os.path.exists(defaults.omd_root+"/"+rel_path): + is_internal = True + elif os.path.exists(defaults.omd_root+"/local/"+rel_path): + is_internal = True + elif os.path.exists(defaults.web_dir+"/htdocs/images/icon_"+icon_name+".png"): + is_internal = True + + if is_internal: return "images/icon_%s.png" % icon_name else: return "images/icons/%s.png" % icon_name

9 years, 2 months

Check_MK Git: check_mk: #2127 haproxy.frontend, haproxy.server: new checks and agent plugin for HAProxy

by Goetz Golla

Module: check_mk Branch: master Commit: f850f78bf51962bb0d29390c664552c1c6af1565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f850f78bf51962… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 6 14:39:03 2015 +0200 #2127 haproxy.frontend, haproxy.server: new checks and agent plugin for HAProxy --- .werks/2127 | 8 +++ ChangeLog | 1 + agents/plugins/mk_haproxy.freebsd | 5 ++ checkman/haproxy.frontend | 22 ++++++++ checkman/haproxy.server | 19 +++++++ checks/haproxy | 104 +++++++++++++++++++++++++++++++++++++ modules/catalog.py | 1 + web/plugins/metrics/check_mk.py | 15 +++++- 8 files changed, 174 insertions(+), 1 deletion(-) diff --git a/.werks/2127 b/.werks/2127 new file mode 100644 index 0000000..0f1ad38 --- /dev/null +++ b/.werks/2127 @@ -0,0 +1,8 @@ +Title: haproxy.frontend, haproxy.server: new checks and agent plugin for HAProxy +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436186276 +Class: feature + diff --git a/ChangeLog b/ChangeLog index e754917..c0bf304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 2448 Various Checks for Citrix XenApp 7.x Farms... * 2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address... * 1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks.... + * 2127 haproxy.frontend, haproxy.server: new checks and agent plugin for HAProxy * 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/agents/plugins/mk_haproxy.freebsd b/agents/plugins/mk_haproxy.freebsd new file mode 100755 index 0000000..c56c85a --- /dev/null +++ b/agents/plugins/mk_haproxy.freebsd @@ -0,0 +1,5 @@ +if [ -r /var/run/haproxy.stat ]; then + echo "<<<haproxy:sep(44)>>>" + echo "show stat" | socat - UNIX-CONNECT:/var/run/haproxy.sock +fi + diff --git a/checkman/haproxy.frontend b/checkman/haproxy.frontend new file mode 100644 index 0000000..7d39231 --- /dev/null +++ b/checkman/haproxy.frontend @@ -0,0 +1,22 @@ +title: HAProxy: Status of the Frontends +agents: freebsd +catalog: hw/app/haproxy +license: GPL +distribution: check_mk +description: + + This check monitors the status of the frontends of the HAProxy loadbalancer + for TCP and HTTP connections. It requires the mk_haproxy.freebsd agent plugin + to be installed on the FreeBSD host to be monitored. + + The check is {OK} if the frontend has the status {OPEN}. It is {CRIT} + otherwise. + +item: + The name of the frontend. + +inventory: + One service for each frontend is created. + +perfdata: + The session rate of the frontend. diff --git a/checkman/haproxy.server b/checkman/haproxy.server new file mode 100644 index 0000000..2bba86a --- /dev/null +++ b/checkman/haproxy.server @@ -0,0 +1,19 @@ +title: HAProxy: Server Status +agents: freebsd +catalog: hw/app/haproxy +license: GPL +distribution: check_mk +description: + + This check monitors the status of the servers of the HAProxy loadbalancer + for TCP and HTTP connections. It requires the mk_haproxy.freebsd agent + plugin to be installed on the FreeBSD host to be monitored. + + The check is {OK} if the server indicates the status {UP} and either {active} + or {backup}. It is {CRIT} otherwise. + +item: + The name of backend and server, separated by a "/". + +inventory: + One service for each server is created. diff --git a/checks/haproxy b/checks/haproxy new file mode 100644 index 0000000..e761263 --- /dev/null +++ b/checks/haproxy @@ -0,0 +1,104 @@ +#!/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. + + +# Example output from agent: +# <<<haproxy:sep(44)>>> +# # pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime, +# https_t3test.tgic.de,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,0,,,,0,0,0,0,,,,0,0,0,0,0,0,,0,0,0,,,0,0,0,0,,,,,,,, +# https_t3test.tgic.de,BACKEND,0,0,0,0,200,0,0,0,0,0,,0,0,0,0,UP,0,0,0,,0,363417,0,,1,2,0,,0,,1,0,,0,,,,0,0,0,0,0,0,,,,,0,0,0,0,0,0,-1,,,0,0,0,0, +# t3test,t3test,0,0,0,0,,0,0,0,,0,,0,0,0,0,UP,1,1,0,0,0,363417,0,,1,3,1,,0,,2,0,,0,L4OK,,0,0,0,0,0,0,0,0,,,,0,0,,,,,-1,,,0,0,0,0, + + +def inventory_haproxy_frontend(info): + for line in info: + if line[1] == "FRONTEND": + yield line[0], None + +def check_haproxy_frontend(item, _no_params, info): + for line in info: + if line[1] == "FRONTEND" and line[0] == item: + now = time.time() + status = line[17] + stot = int(line[7]) + session_rate = get_rate("sessions.%s" % item, now, stot) + + infotext = "%s, Session Rate: %.2f/s" % (status, session_rate) + perfdata = [ ("session_rate", session_rate) ] + + if status == "OPEN": + state = 0 + else: + state = 2 + + return state, infotext, perfdata + + +check_info["haproxy.frontend"] = { + 'check_function' : check_haproxy_frontend, + 'inventory_function' : inventory_haproxy_frontend, + 'service_description' : 'HAProxy Frontend %s', + 'has_perfdata' : True, +} + + +def inventory_haproxy_server(info): + for line in info: + if line[1] != "BACKEND" and line[1] != "FRONTEND" and not line[0].startswith("#"): + item = "%s/%s" % (line[0], line[1]) + yield item, None + +def check_haproxy_server(item, _no_params, info): + backend, server = item.split("/") + for line in info: + if line[0] == backend and line[1] == server: + status = line[17] + uptime = get_age_human_readable(int(line[23])) + layer_check = line[36] + active = int(line[19]) + backup = int(line[20]) + + if status == "UP" and (active or backup): + state = 0 + else: + state = 2 + + infotext = "%s since %s, Layer Check: %s" % \ + (status, uptime, layer_check) + if active: + infotext += ", active" + elif backup: + infotext += ", backup" + else: + infotext += ", neither active nor backup (!!)" + return state, infotext + + +check_info["haproxy.server"] = { + 'check_function' : check_haproxy_server, + 'inventory_function' : inventory_haproxy_server, + 'service_description' : 'HAProxy Server %s', +} diff --git a/modules/catalog.py b/modules/catalog.py index f3d1174..6900d46 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -106,6 +106,7 @@ manpage_catalog_titles = { "citrix" : "Citrix", "netscaler" : "Citrix Netscaler", "exchange" : "Microsoft Exchange", + "haproxy" : "HAProxy Loadbalancer", "java" : "Java (Tomcat, Weblogic, JBoss, etc.)", "libelle" : "Libelle Business Shadow", "lotusnotes" : "IBM Lotus Domino", diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 52184f2..d13d663 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1136,6 +1136,12 @@ metric_info["inactive_sessions"] = { "color" : "13/a", } +metric_info["session_rate"] = { + "title" : _("Session Rate"), + "unit" : "1/s", + "color" : "#4080a0", +} + metric_info["shared_locks"] = { "title" : _("Shared locks"), "unit" : "count", @@ -3188,6 +3194,13 @@ perfometer_info.append({ perfometer_info.append({ "type" : "logarithmic", + "metric" : "session_rate", + "half_value" : 50.0, + "exponent" : 2, +}) + +perfometer_info.append({ + "type" : "logarithmic", "metric" : "uptime", "half_value" : 2592000.0, "exponent" : 2, @@ -4874,7 +4887,7 @@ graph_info.append({ "title" : _("Livestatus Requests per Connection"), "metrics" : [ ( "livestatus_request_rate,livestatus_connect_rate,/#88aa33", "area", - _("Averate requests per connection")), + _("Average requests per connection")), ], })

9 years, 2 months

Check_MK Git: check_mk: nginx_status: added missing example output

by Lars Michelsen

Module: check_mk Branch: master Commit: 822e92b48662b2de5b13ba605484f6ba7ce145c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=822e92b48662b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 6 13:45:30 2015 +0200 nginx_status: added missing example output --- checks/nginx_status | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/checks/nginx_status b/checks/nginx_status index f81d73f..e490339 100644 --- a/checks/nginx_status +++ b/checks/nginx_status @@ -24,6 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example output: +# <<<nginx_status>>> +# 127.0.0.1 80 Active connections: 1 +# 127.0.0.1 80 server accepts handled requests +# 127.0.0.1 80 12 12 12 +# 127.0.0.1 80 Reading: 0 Writing: 1 Waiting: 0 + def nginx_status_parse(info): if len(info) != 4: return {} # skip unknown data format

9 years, 2 months

Check_MK Git: check_mk: Reworked printer pages checks - not yet finished

by Mathias Kettner

Module: check_mk Branch: master Commit: 70041c58308967580e6b91df1e3e9857fe4279cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70041c58308967… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 6 12:19:13 2015 +0200 Reworked printer pages checks - not yet finished --- checks/canon_pages | 65 ++++++++++++++++++----------------- checks/printer_pages | 25 ++++++-------- checks/printer_pages.include | 71 +++++++++++++++++++++++++++++++++++++++ checks/printer_pages_ricoh | 59 ++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 6 +++- 5 files changed, 178 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70041c5830…

9 years, 2 months

Check_MK Git: check_mk: mod_contacts_mk.py: Treasures script to modify the contacts.mk file used by wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: 52aaaffa9273df218d6492518254b0deda055cd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52aaaffa9273df… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 6 11:45:56 2015 +0200 mod_contacts_mk.py: Treasures script to modify the contacts.mk file used by wato --- doc/treasures/mod_contacts_mk.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/doc/treasures/mod_contacts_mk.py b/doc/treasures/mod_contacts_mk.py new file mode 100755 index 0000000..c0b1b15 --- /dev/null +++ b/doc/treasures/mod_contacts_mk.py @@ -0,0 +1,34 @@ +#!/usr/bin/python +# This script can be used to modify the contacts.mk file +# The core mus be reloaded after changes +import sys, os + +if len(sys.argv) != 4: + print "Usage: ./mod_contacts_mk.py USERID FIELD NEW CONTENT" + sys.exit() +try: + path = os.environ.pop('OMD_ROOT') + pathlokal = "~/etc/check_mk/conf.d/wato/" + pathlokal = os.path.expanduser(pathlokal) + contacts_mk = pathlokal + "contacts.mk" +except: + print "Run this script inside a OMD site" + sys.exit() + + +user_id = sys.argv[1] +field = sys.argv[2] +content = sys.argv[3] + +contacts = {} + +eval(file(contacts_mk).read()) + +contacts[user_id][field] = content + +file(contacts_mk, "w").write( """ +# Written by Multisite UserDB +# encoding: utf-8 + +contacts.update( +%s)""" % str(contacts))

9 years, 2 months

Check_MK Git: check_mk: modified werk

by Bastian Kuhn

Module: check_mk Branch: master Commit: c3bd999de08cedaa9015a8c33accc1e08b1bc3f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3bd999de08ced… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 6 11:11:57 2015 +0200 modified werk --- .werks/1262 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1262 b/.werks/1262 index 841e5e7..b8e6f1c 100644 --- a/.werks/1262 +++ b/.werks/1262 @@ -6,4 +6,4 @@ Version: 1.2.7i3 Date: 1436173822 Class: feature - +See the Wato inline documentation for details. diff --git a/ChangeLog b/ChangeLog index e656e5b..e754917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ * 2398 agent_vsphere: now able to opt-out of servers ssl certifcate check... * 2448 Various Checks for Citrix XenApp 7.x Farms... * 2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address... - * 1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks. + * 1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks.... * 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, 2 months

Check_MK Git: check_mk: #1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks.

by Bastian Kuhn

Module: check_mk Branch: master Commit: a3e72831d79c5816e0a51fbc1b7d57f40e633ca7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e72831d79c58… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 6 11:11:03 2015 +0200 #1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks. --- .werks/1262 | 9 +++++++++ ChangeLog | 1 + checks/check_dns | 7 ++++++- checks/check_ldap | 6 +++++- checks/check_smtp | 6 +++++- web/plugins/wato/active_checks.py | 12 ++++++++++-- 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.werks/1262 b/.werks/1262 new file mode 100644 index 0000000..841e5e7 --- /dev/null +++ b/.werks/1262 @@ -0,0 +1,9 @@ +Title: check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks. +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1436173822 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 45f11fc..e656e5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 2398 agent_vsphere: now able to opt-out of servers ssl certifcate check... * 2448 Various Checks for Citrix XenApp 7.x Farms... * 2399 agent_vsphere/esx_vsphere_counters.if: now also reports interface state, bandwidth and mac address... + * 1262 check_dns, check_ldap, check_smtp: It is now possible to customize the service descriptions of this checks. * 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/check_dns b/checks/check_dns index ebc54f4..8ea2887 100644 --- a/checks/check_dns +++ b/checks/check_dns @@ -54,10 +54,15 @@ def check_dns_arguments(params): return args +def check_dns_desc(params): + if "name" in params[1]: + return params[1]['name'] + return "DNS %s" % params[0] + active_check_info['dns'] = { "command_line" : '$USER1$/check_dns $ARG1$', "argument_function" : check_dns_arguments, - "service_description" : lambda params: "DNS %s" % params[0], + "service_description" : check_dns_desc, "has_perfdata" : True, } diff --git a/checks/check_ldap b/checks/check_ldap index c022acc..1ea4e06 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -60,11 +60,15 @@ def check_ldap_arguments(params): return args +def check_ldap_desc(params): + if params[0].startswith("^"): + return params[0][1:] + return "LDAP %s" % params[0] active_check_info['ldap'] = { "command_line" : '$USER1$/check_ldap -H $HOSTADDRESS$ $ARG1$', "argument_function" : check_ldap_arguments, - "service_description" : lambda args: "LDAP " + args[0], + "service_description" : check_ldap_desc, "has_perfdata" : True, } diff --git a/checks/check_smtp b/checks/check_smtp index bc75c0b..493dd6e 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -77,11 +77,15 @@ def check_smtp_arguments(params): args += ' -H $HOSTADDRESS$' return args +def check_smtp_desc(params): + if params[0].startswith("^"): + return params[0][1:] + return "SMTP %s" % params[0] active_check_info['smtp'] = { "command_line" : '$USER1$/check_smtp $ARG1$', "argument_function" : check_smtp_arguments, - "service_description" : lambda params: "SMTP %s" % params[0], + "service_description" : check_smtp_desc, "has_perfdata" : True, } diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index e0b4253..59c72c9 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -331,6 +331,12 @@ register_rule(group, Dictionary( title = _("Optional parameters"), elements = [ + ("name", + TextUnicode( + title = _("Alternative Service description"), + help = _("The service description will be this name instead DNS Servername"), + ) + ), ( "server", Alternative( title = _("DNS Server"), @@ -1012,7 +1018,8 @@ register_rule(group, elements = [ TextUnicode( title = _("Name"), - help = _("The service description will be LDAP plus this name"), + help = _("The service description will be LDAP plus this name. If the name starts with " + "a caret (<tt>^</tt>), the service description will not be prefixed with <tt>LDAP</tt>." ), allow_empty = False), TextAscii( title = _("Base DN"), @@ -1115,7 +1122,8 @@ register_rule(group, elements = [ TextUnicode( title = _("Name"), - help = _("The service description will be SMTP plus this name"), + help = _("The service description will be SMTP plus this name. If the name starts with " + "a caret (<tt>^</tt>), the service description will not be prefixed with <tt>SMTP</tt>." ), allow_empty = False), Dictionary( title = _("Optional parameters"),

9 years, 2 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015