Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: Implement new Hardware/

by Mathias Kettner

Software-Inventory for Linux and Windows Message-ID: <530a14d7.vGMpdThd+H76B7VK%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9163509407feb7e92d0dc0d9bb29787566c6324d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9163509407feb7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 14 12:48:14 2014 +0100 Implement new Hardware/Software-Inventory for Linux and Windows --- IMPLEMENTIERUNG | 10 + Makefile | 3 +- agents/plugins/mk_inventory.linux | 47 ++ checks/check_cmk_inv | 37 ++ defaults | 1 + inventory/.f12 | 6 + inventory/dmidecode | 266 +++++++++ inventory/export_software_csv | 71 +++ inventory/lnx_cpuinfo | 86 +++ inventory/lnx_distro | 86 +++ inventory/lnx_packages | 72 +++ inventory/mem | 49 ++ modules/check_mk.py | 43 +- modules/check_mk_base.py | 82 ++- modules/inventory.py | 249 ++++++++ modules/packaging.py | 1 + scripts/setup.sh | 4 + web/htdocs/bi.py | 14 - web/htdocs/check_mk.css | 6 + web/htdocs/htmllib.py | 40 +- web/htdocs/images/icon_hardware.png | Bin 0 -> 4401 bytes web/htdocs/images/icon_inv.png | Bin 0 -> 3383 bytes web/htdocs/images/icon_packages.png | Bin 0 -> 3960 bytes web/htdocs/images/icon_software.png | Bin 0 -> 3383 bytes web/htdocs/index.py | 2 +- web/htdocs/inventory.py | 119 ++++ web/htdocs/js/checkmk.js | 28 +- web/htdocs/lib.py | 14 + web/htdocs/views.css | 49 ++ web/htdocs/views.py | 39 +- web/htdocs/wato.py | 7 +- web/plugins/icons/inventory.py | 38 ++ web/plugins/pages/shipped.py | 1 + web/plugins/views/builtin.py | 35 +- web/plugins/views/inventory.py | 880 ++++++++++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/inventory.py | 92 +++ 37 files changed, 2393 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9163509407…

10 years, 6 months

Check_MK Git: check_mk: FIX agent_vsphere: special agent now handles non-standard https port correctly

by Götz Golla

Module: check_mk Branch: master Commit: 28a8a979bf5dc53e89425c49740b0283012e7338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28a8a979bf5dc5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Feb 21 12:49:57 2014 +0100 FIX agent_vsphere: special agent now handles non-standard https port correctly The special agent vsphere to monitor ESX-Servers and vcenters can be configured to use a non-standard port for the vsphere https connection. This might be useful for firewall traversals etc. The configuration was possible before this fix in WATO, but it was never used, so that the default https port 443 was always used. With this fix the port which is actually configured in WATO will be used for https. If a vcenter is queried including the check_mk_agent, the check_mk_agent will still be queried on the standard check_mk_agent port 6556, whereas the https connection port will be the one configured in WATO. --- .werks/584 | 19 +++++++++++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 16 ++++++++++------ agents/special/agent_vsphere.pysphere | 18 ++++++++++++------ checks/agent_vsphere | 4 ++-- web/plugins/wato/datasource_programs.py | 4 ++-- 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/.werks/584 b/.werks/584 new file mode 100644 index 0000000..f825ce5 --- /dev/null +++ b/.werks/584 @@ -0,0 +1,19 @@ +Title: agent_vsphere: special agent now handles non-standard https port correctly +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1392982760 +Class: fix + +The special agent vsphere to monitor ESX-Servers and vcenters can be configured to use a +non-standard port for the vsphere https connection. This might be useful for firewall +traversals etc. + +The configuration was possible before this fix in WATO, but it was never used, so that the +default https port 443 was always used. + +With this fix the port which is actually configured in WATO will be used for https. + +If a vcenter is queried including the check_mk_agent, the check_mk_agent will still be queried +on the standard check_mk_agent port 6556, whereas the https connection port will be the one +configured in WATO. diff --git a/ChangeLog b/ChangeLog index cec9e42..fd5d37b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... * 0673 FIX: zfsget: Fixed broken check - was not compatible to current agent output of "df" * 0719 FIX: postfix_mailq: fix Linux agent in case of ssmtp being installed + * 0584 FIX: agent_vsphere: special agent now handles non-standard https port correctly... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index b1ddcea..69f72ae 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -130,9 +130,10 @@ OPTIONS: -D, --direct Assume a directly queried host system (no vCenter). In This we expect data about only one HostSystem to be found and do not create piggy host data for that host. - -p Skip placeholder virtualmachines. These backup vms are created + -P Skip placeholder virtualmachines. These backup vms are created by the Site Recovery Manager (SRM) and are identified by not having any assigned virtual disks. + -p, --port port Alternative port number (default is 443 for the https connection) --pysphere Fallback to old pysphere based special agent. It supports ESX 4.1 but is very slow. -H, --hostname Specify a hostname. This is neccessary if this is @@ -159,10 +160,10 @@ OPTIONS: """) -short_options = 'hi:u:s:Dat:H:cp' +short_options = 'hi:u:s:Dat:H:cPp:' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', - 'dump-counters', 'tracefile=', "pysphere", + 'dump-counters', 'tracefile=', "pysphere", "port=", ] opt_debug = False @@ -170,6 +171,7 @@ opt_direct = False opt_agent = False opt_dump_counters = False opt_timeout = 60 +opt_port = 443 opt_hostname = None opt_skip_placeholder_vm = False opt_pysphere = False @@ -199,8 +201,10 @@ for o,a in opts: opt_direct = True elif o in [ '-a', '--agent' ]: opt_agent = True - elif o == '-p': + elif o == '-P': opt_skip_placeholder_vm = True + elif o in [ '-p', '--port' ]: + opt_port = a elif o == '--pysphere': opt_pysphere = True elif o in [ '-u', '--user' ]: @@ -303,7 +307,7 @@ if tracefile: try: my_cookie = None - netloc = host_address + netloc = host_address + ":" + str(opt_port) request_uri = "/sdk" transport = httplib.HTTPSConnection transdict = {'timeout': opt_timeout} @@ -311,7 +315,7 @@ try: handle.connect() if opt_debug: - sys.stderr.write("Connecting to %s..." % host_address) + sys.stderr.write("Connecting to %s..." % netloc) sys.stderr.flush() def query_server(soapdata): diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index ece7318..e2a4039 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -53,9 +53,10 @@ OPTIONS: -D, --direct Assume a directly queried host system (no vCenter). In This we expect data about only one HostSystem to be Found and do not create piggy host data for that host. - -p Skip placeholder virtualmachines. These backup vms are created + -P Skip placeholder virtualmachines. These backup vms are created by the Site Recovery Manager (SRM) and are identified by not having any assigned virtual disks. + -p, --port port Alternative port number (default is 443 for the https connection) --pysphere Does nothing. For compatibility with new agent. -H, --hostname Specify a hostname. This is neccessary if this is different from HOST. It is being used in --direct @@ -87,10 +88,10 @@ OPTIONS: """) -short_options = 'hi:u:s:Dat:H:cpS:' +short_options = 'hi:u:s:Dat:H:cPp:S:' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', - 'dump-counters', 'profile', 'pysphere', 'spaces=' + 'dump-counters', 'profile', 'pysphere', 'spaces=', 'port=' ] try: @@ -104,6 +105,7 @@ opt_direct = False opt_agent = False opt_dump_counters = False opt_timeout = 60 +opt_port = 443 opt_hostname = None opt_skip_placeholder_vm = False opt_spaces = "cut" @@ -127,8 +129,10 @@ for o,a in opts: opt_direct = True elif o in [ '-a', '--agent' ]: opt_agent = True - elif o in [ '-p' ]: + elif o in [ '-P' ]: opt_skip_placeholder_vm = True + elif o in [ '-p', '--port' ]: + opt_port = a elif o in [ '-u', '--user' ]: user = a elif o in [ '-s', '--secret' ]: @@ -159,6 +163,8 @@ else: sys.stderr.write("ERROR: Please specify exactly one host.\n") sys.exit(1) +port = ":" + str(opt_port) + socket.setdefaulttimeout(opt_timeout) def get_agent_info_tcp(hostname): @@ -215,9 +221,9 @@ try: # server. Details can be found here: # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim…) if opt_debug: - sys.stderr.write("Connecting to %s..." % host_address) + sys.stderr.write("Connecting to %s%s..." % (host_address, port)) sys.stderr.flush() - host.connect(host_address, user, secret, sock_timeout=opt_timeout) + host.connect(host_address+port, user, secret, sock_timeout=opt_timeout) if opt_debug: sys.stderr.write("Connected.\n") except socket.timeout: diff --git a/checks/agent_vsphere b/checks/agent_vsphere index e83c251..c917b39 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # { -# 'tcp_port': 4711, +# 'tcp_port': 443, # 'secret': 'wef', # 'infos': ['hostsystem', 'virtualmachine'], # 'user': 'wefwef' @@ -48,7 +48,7 @@ def agent_vsphere_arguments(params, hostname, ipaddress): args += ' --direct --hostname ' + quote_shell_string(hostname) if params.get("skip_placeholder_vms", True): - args += " -p" + args += " -P" if "timeout" in params: args += ' --timeout %d' % params["timeout"] diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 9989cbc..7b40e19 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -64,8 +64,8 @@ register_rule(group, ( "tcp_port", Integer( title = _("TCP Port number"), - help = _("Port number for connecting to vSphere"), - default_value = 4711, + help = _("Port number for https connection to vSphere"), + default_value = 443, minvalue = 1, maxvalue = 65535, )

10 years, 6 months

Check_MK Git: check_mk: ListOfStrings allows empty_text label now

by Lars Michelsen

Module: check_mk Branch: master Commit: 17e0fb8d43c47adc5080a1e500970b59397fcdd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17e0fb8d43c47a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 21 10:17:06 2014 +0100 ListOfStrings allows empty_text label now --- web/htdocs/valuespec.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cf95b5f..8f19f50 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -645,6 +645,7 @@ class ListOfStrings(ValueSpec): self._valuespec = TextAscii() self._vertical = kwargs.get("orientation", "vertical") == "vertical" self._allow_empty = kwargs.get("allow_empty", True) + self._empty_text = kwargs.get("empty_text", "") def render_input(self, vp, value): # Form already submitted? @@ -670,6 +671,9 @@ class ListOfStrings(ValueSpec): return [] def value_to_text(self, value): + if not value: + return self._empty_text + if self._vertical: s = '<table>' for v in value:

10 years, 6 months

Check_MK Git: check_mk: check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: c719ad1122cfd5812beeb7d6ed960d383b2813cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c719ad1122cfd5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 20 12:08:10 2014 +0100 check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing Some older solaris machines do not have /usr/bin/top, which is required by <tt><<<solaris_mem>>></tt>. In this case we report the deprecated (but still supported section) <tt><<<statgrab_mem>>></tt>. --- .werks/560 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 10 +++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/560 b/.werks/560 new file mode 100644 index 0000000..8e04f47 --- /dev/null +++ b/.werks/560 @@ -0,0 +1,9 @@ +Title: check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392894310 +Class: feature + +Some older solaris machines do not have /usr/bin/top, which is required by <tt><<<solaris_mem>>></tt>. +In this case we report the deprecated (but still supported section) <tt><<<statgrab_mem>>></tt>. diff --git a/ChangeLog b/ChangeLog index 1647f07..4938048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 0718 logwatch.ec: Optionally monitor the list of forwarded logfiles... * 0556 esx_vsphere_counters.diskio: now also shows disk latency * 0583 stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data + * 0560 check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 20a2c51..a1a328e 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -158,9 +158,13 @@ then grep "^$s\." /tmp/statgrab.$$ | cut -d. -f2-99 | sed 's/ *= */ /' done -# this info is already provided by solaris_mem -# echo '<<<statgrab_mem>>>' -# egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' + # the <<<statgrab_mem>>> info is already provided by <<<solaris_mem>>> + # However, we make an exception if /usr/bin/top is missing (required by solaris_mem) + if [ ! -x /usr/bin/top ] + then + echo '<<<statgrab_mem>>>' + egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' + fi [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ fi

10 years, 6 months

Check_MK Git: check_mk: Compiled 64-Bit agent and agent-installer for Windows

by Andreas Boesl

Module: check_mk Branch: master Commit: dd481cae997d974d0eb19532d411c5fa53596bd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd481cae997d97… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 20 11:44:57 2014 +0100 Compiled 64-Bit agent and agent-installer for Windows --- agents/windows/check_mk_agent-64.exe | Bin 190464 -> 190464 bytes agents/windows/install_agent-64.exe | Bin 0 -> 154588 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index acf48d7..df20359 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe new file mode 100755 index 0000000..896a244 Binary files /dev/null and b/agents/windows/install_agent-64.exe differ

10 years, 6 months

Check_MK Git: check_mk: FIX WATO snapshots: improved validation of ( uploaded) snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: f9cfe41b77a58960073ad933b1565ef02b32acf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9cfe41b77a589… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 20 11:35:47 2014 +0100 FIX WATO snapshots: improved validation of (uploaded) snapshots Some new validation features have been added<br> <ul> <li>Only tar and tar.gz files can be uploaded</li> <li>It is checked if the file size if reasonable</li> <li>It is checked if the content of the tarfile 'looks' OK (real check is done later)</li> </ul> Upon restoring the snapshot, an additional integrity check is done for each of the subtar files. If this check fails, e.g. some tar.gz is corrupted, the snapshot won't get applied and an error message is raised. Conflicts: ChangeLog web/htdocs/wato.py --- .werks/559 | 19 ++++++ ChangeLog | 1 + web/htdocs/multitar.py | 33 ++++++--- web/htdocs/wato.py | 173 +++++++++++++++++++++++++++++++----------------- 4 files changed, 153 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f9cfe41b77…

10 years, 6 months

Check_MK Git: check_mk: stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data

by Götz Golla

Module: check_mk Branch: master Commit: b6b9714679adf6b5a361fc85e470fe7949cbedf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6b9714679adf6… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 20 11:09:46 2014 +0100 stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data --- .werks/583 | 8 ++++++++ ChangeLog | 1 + checkman/stulz_pump | 5 ++++- checks/stulz_pump | 20 ++++++++++++++------ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.werks/583 b/.werks/583 new file mode 100644 index 0000000..679143a --- /dev/null +++ b/.werks/583 @@ -0,0 +1,8 @@ +Title: stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392890913 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b6a9640..cec9e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 0581 emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain * 0718 logwatch.ec: Optionally monitor the list of forwarded logfiles... * 0556 esx_vsphere_counters.diskio: now also shows disk latency + * 0583 stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/stulz_pump b/checkman/stulz_pump index 857c851..2ebe48e 100644 --- a/checkman/stulz_pump +++ b/checkman/stulz_pump @@ -4,8 +4,11 @@ catalog: hw/environment/stulz license: GPL distribution: check_mk description: - This plugin checks the status of pumps of Stulz clima units. Returns + This plugin checks the status and RPM of pumps of Stulz clima units. It returns {OK} if the pump is running and {CRIT} if it is not running. +perfdata: + The RPM of the pump in percent of the maximum RPM are taken as performance data + inventory: The inventory will create exactly one service per pump. diff --git a/checks/stulz_pump b/checks/stulz_pump index e3e6ec2..3268d3b 100644 --- a/checks/stulz_pump +++ b/checks/stulz_pump @@ -26,28 +26,36 @@ def inventory_stulz_pump(info): inventory = [] - for pump_id, pump_status in info: + for pump_id, pump_status in info[0]: pump_id = pump_id.replace('.1', '') inventory.append( (pump_id, None) ) return inventory def check_stulz_pump(item, _no_params, info): - for pump_id, pump_status in info: + for pump_id, pump_status in info[0]: pump_id = pump_id.replace('.1', '') if pump_id == item: + pump_rpm = info[1][int(pump_id)-1][0] + perfdata = [ ('rpm', pump_rpm+"%", None, None, 0, 100) ] if pump_status == '1': - return 0, "Pump is running" + state = 0 + infotext = "Pump is running at %s%%" % pump_rpm elif pump_status == '0': - return 2, "Pump is not running" + state = 2 + infotext = "Pump is not running" else: - return 3, "Pump reports unidentified status " + pump_status + state = 3 + infotext = "Pump reports unidentified status " + pump_status + return state, infotext, perfdata return 3, "Pump %s not found" % item check_info["stulz_pump"] = { "check_function" : check_stulz_pump, "inventory_function" : inventory_stulz_pump, "service_description" : "Pump %s", + "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.29462.10", - "snmp_info" : ( ".1.3.6.1.4.1.29462.10.2.1.1.2.1.4.1.1.5802", [ OID_END, 2] ), + "snmp_info" : [( ".1.3.6.1.4.1.29462.10.2.1.1.2.1.4.1.1.5802", [ OID_END, 2] ), + ( ".1.3.6.1.4.1.29462.10.2.1.1.2.1.4.1.1.5821", [2] ),] }

10 years, 6 months

Check_MK Git: check_mk: Checks now also work with Datadomain 670 series

by Götz Golla

Module: check_mk Branch: master Commit: 155a94d7c74fbc7f76218447e88009c86887734b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=155a94d7c74fbc… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Thu Feb 20 10:52:35 2014 +0100 Checks now also work with Datadomain 670 series --- checks/emc_datadomain_disks | 2 +- checks/emc_datadomain_fans | 2 +- checks/emc_datadomain_fs | 2 +- checks/emc_datadomain_nvbat | 2 +- checks/emc_datadomain_power | 2 +- checks/emc_datadomain_temps | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/emc_datadomain_disks b/checks/emc_datadomain_disks index a5af103..6c1192e 100644 --- a/checks/emc_datadomain_disks +++ b/checks/emc_datadomain_disks @@ -77,6 +77,6 @@ check_info["emc_datadomain_disks"] = { 6, # diskPerfBusy ] )], - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS") } diff --git a/checks/emc_datadomain_fans b/checks/emc_datadomain_fans index cf2b538..cf4d8db 100644 --- a/checks/emc_datadomain_fans +++ b/checks/emc_datadomain_fans @@ -67,6 +67,6 @@ check_info["emc_datadomain_fans"] = { 6, # fanStatus ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS") } diff --git a/checks/emc_datadomain_fs b/checks/emc_datadomain_fs index 1d2d2c3..1d13a68 100644 --- a/checks/emc_datadomain_fs +++ b/checks/emc_datadomain_fs @@ -49,7 +49,7 @@ check_info["emc_datadomain_fs"] = { "group" : "filesystem", "default_levels_variable" : "filesystem_default_levels", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS"), "snmp_info" : (".1.3.6.1.4.1.19746.1.3.2.1.1", [ 1, # fileSystemResourceIndex diff --git a/checks/emc_datadomain_nvbat b/checks/emc_datadomain_nvbat index d577b3c..87d7f23 100644 --- a/checks/emc_datadomain_nvbat +++ b/checks/emc_datadomain_nvbat @@ -61,6 +61,6 @@ check_info["emc_datadomain_nvbat"] = { 4, # BatteryCharge ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS") } diff --git a/checks/emc_datadomain_power b/checks/emc_datadomain_power index b138fdd..1d08570 100644 --- a/checks/emc_datadomain_power +++ b/checks/emc_datadomain_power @@ -61,6 +61,6 @@ check_info["emc_datadomain_power"] = { 4, # powerModuleStatus ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS") } diff --git a/checks/emc_datadomain_temps b/checks/emc_datadomain_temps index f1535e3..ceea71f 100644 --- a/checks/emc_datadomain_temps +++ b/checks/emc_datadomain_temps @@ -63,6 +63,6 @@ check_info["emc_datadomain_temps"] = { 6, # tempSensorStatus ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.19746.3.1.14") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Data Domain OS") }

10 years, 6 months

Check_MK Git: check_mk: FIX postfix_mailq: fix Linux agent in case of ssmtp being installed

by Mathias Kettner

Module: check_mk Branch: master Commit: c3319dcaf21aa36a517ef209a23a7a4a943bf5d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3319dcaf21aa3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 20 10:34:23 2014 +0100 FIX postfix_mailq: fix Linux agent in case of ssmtp being installed --- .werks/719 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/719 b/.werks/719 new file mode 100644 index 0000000..7ebb3a4 --- /dev/null +++ b/.werks/719 @@ -0,0 +1,9 @@ +Title: postfix_mailq: fix Linux agent in case of ssmtp being installed +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392888833 + + diff --git a/ChangeLog b/ChangeLog index 493a437..b6a9640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... * 0673 FIX: zfsget: Fixed broken check - was not compatible to current agent output of "df" + * 0719 FIX: postfix_mailq: fix Linux agent in case of ssmtp being installed Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cf22b2e..d8105a7 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -424,6 +424,7 @@ if type mailq >/dev/null 2>&1 && [ -x /usr/sbin/postfix ] && getent passwd postf echo '<<<postfix_mailq>>>' mailq | tail -n 6 elif [ -x /usr/sbin/ssmtp ] ; then + echo '<<<postfix_mailq>>>' mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6 fi

10 years, 6 months

Check_MK Git: check_mk: FIX zfsget: Fixed broken check - was not compatible to current agent output of "df"

by Lars Michelsen

Module: check_mk Branch: master Commit: c2f9c61ea50818fa17261be16ae1441355052c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f9c61ea50818… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 19 14:28:51 2014 +0100 FIX zfsget: Fixed broken check - was not compatible to current agent output of "df" --- .werks/673 | 9 +++++++++ ChangeLog | 1 + checks/zfsget | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/673 b/.werks/673 new file mode 100644 index 0000000..aef544d --- /dev/null +++ b/.werks/673 @@ -0,0 +1,9 @@ +Title: zfsget: Fixed broken check - was not compatible to current agent output of "df" +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392816428 + + diff --git a/ChangeLog b/ChangeLog index ef5f673..493a437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ * 0555 FIX: snmp_uptime: no longer fails if uptime is < 1 seconds * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... + * 0673 FIX: zfsget: Fixed broken check - was not compatible to current agent output of "df" Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/zfsget b/checks/zfsget index b152291..b798c3b 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -106,7 +106,7 @@ def parse_zfsget(info): def zfsget_parse_df_info(entries, info): new_entries = {} - for device, kbytes, used, avail, percent, mountpoint in info: + for device, fs_type, kbytes, used, avail, percent, mountpoint in info: # ignore entries already contained in zfsget and also # entries for virtual filesystems (like swap) if mountpoint.startswith("/") and mountpoint not in entries:

10 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014