Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

3684 infoblox_systeminfo: new inventory plugin for Infoblox devices which support the IB-PLATFORMONE MIB

by Simon Betz

Module: check_mk Branch: master Commit: e43d160851a6796318c4827ec1cccae16e36c872 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e43d160851a679… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sun Jun 26 17:44:46 2016 +0200 3684 infoblox_systeminfo: new inventory plugin for Infoblox devices which support the IB-PLATFORMONE MIB --- .werks/3684 | 9 +++++++ ChangeLog | 1 + inventory/infoblox_systeminfo | 52 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/.werks/3684 b/.werks/3684 new file mode 100644 index 0000000..48365a7 --- /dev/null +++ b/.werks/3684 @@ -0,0 +1,9 @@ +Title: infoblox_systeminfo: new inventory plugin for Infoblox devices which support the IB-PLATFORMONE MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1466955813 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 99bde1e..da35207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ * 3639 intel_true_scale_chassis_temp, intel_true_scale_fans, intel_true_scale_psus, intel_true_scale_sensors_temp: new checks for Intel True Fabric Scale Switches * 3683 infoblox_dhcp_stats, infoblox_dns_stats, infoblox_grid_status, infoblox_node_services, infoblox_replication_status, infoblox_services, infoblox_temp: new checks for Infoblox devices which monitor DHCP and DNS statistics, grid and replication status, services and node services and temperature of the system or CPUs * 2240 check_mk_agent.openwrt: New agent for OpenWRT based systems... + * 3684 infoblox_systeminfo: new inventory plugin for Infoblox devices which support the IB-PLATFORMONE MIB * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/inventory/infoblox_systeminfo b/inventory/infoblox_systeminfo new file mode 100644 index 0000000..6228b44 --- /dev/null +++ b/inventory/infoblox_systeminfo @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +# .1.3.6.1.4.1.7779.3.1.1.2.1.4.0 IB-VM-820 --> IB-PLATFORMONE-MIB::ibHardwareType.0 +# .1.3.6.1.4.1.7779.3.1.1.2.1.5.0 422cc26d1a7a6eec1b03bd16cc74cfe7 --> IB-PLATFORMONE-MIB::ibHardwareId.0 +# .1.3.6.1.4.1.7779.3.1.1.2.1.6.0 422cc26d1a7a6eec1b03bd16cc74cfe7 --> IB-PLATFORMONE-MIB::ibSerialNumber.0 +# .1.3.6.1.4.1.7779.3.1.1.2.1.7.0 7.2.7 --> IB-PLATFORMONE-MIB::ibNiosVersion.0 + + +def inv_infoblox_systeminfo(info): + node = inv_tree("hardware.system.") + model, hardware_id, serial_nr, version = info[0] + node["model"] = model + node["hardware_id"] = hardware_id + node["serial"] = serial_nr + node["version"] = version + + +inv_info['infoblox_systeminfo'] = { + 'inv_function' : inv_infoblox_systeminfo, + 'snmp_info' : (".1.3.6.1.4.1.7779.3.1.1.2.1", [ + "4", # IB-PLATFORMONE-MIB::ibHardwareType + "5", # IB-PLATFORMONE-MIB::ibHardwareId + "6", # IB-PLATFORMONE-MIB::ibSerialNumber + "7", # IB-PLATFORMONE-MIB::ibSerialVersion + ]), + 'snmp_scan_function' : lambda oid: "infoblox" in oid(".1.3.6.1.2.1.1.1.0").lower(), +}

8 years

2240 check_mk_agent.openwrt: New agent for OpenWRT based systems

by Sven Rueß

Module: check_mk Branch: master Commit: 2f0da6aaf61d4172322f082d2c621dd75a525081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f0da6aaf61d41… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Jun 24 21:12:02 2016 +0200 2240 check_mk_agent.openwrt: New agent for OpenWRT based systems New Check_MK agent for OpenWRT based systems. --- .werks/2240 | 9 + ChangeLog | 1 + agents/check_mk_agent.openwrt | 760 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 770 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2f0da6aaf6…

8 years

New bug for PNP4Nagios

by Sven Rueß

Module: check_mk Branch: master Commit: 21a92c2905660d4b2988f9c5630aa40e3c4cf125 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a92c2905660d… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Jun 24 20:11:09 2016 +0200 New bug for PNP4Nagios --- .bugs/2504 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2504 b/.bugs/2504 new file mode 100644 index 0000000..7939170 --- /dev/null +++ b/.bugs/2504 @@ -0,0 +1,10 @@ +Title: PNP4Nagios link in custom links will not work +Component: multisite +State: open +Date: 2016-06-24 20:07:00 +Targetversion: 1.2.8 +Class: nastiness + +Custom link for PNP4Nagios will not work at new set up monitoring sites. +New monitoring sites will store the RRDs at ~/var/check_mk/rrd instead of +~/var/pnp4nagios/perfdata. Internal handling for data store is incorret.

8 years

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: a3b987a3873aa3c3bec83113c68727b8e3e92123 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3b987a3873aa3… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Jun 24 20:06:53 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 307bf8e..f59ab94 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2504 +2505

8 years

3683 infoblox_dhcp_stats, infoblox_dns_stats, infoblox_grid_status, infoblox_node_services, infoblox_replication_status, infoblox_services, infoblox_temp: new checks for Infoblox devices which monitor DHCP and DNS statistics, grid and replication status, services and node services and temperature of the system or CPUs

by Simon Betz

Module: check_mk Branch: master Commit: 924044df3ebf6b73aa6266467e1e84effe5e7ec4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=924044df3ebf6b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 24 13:04:25 2016 +0200 3683 infoblox_dhcp_stats, infoblox_dns_stats, infoblox_grid_status, infoblox_node_services, infoblox_replication_status, infoblox_services, infoblox_temp: new checks for Infoblox devices which monitor DHCP and DNS statistics, grid and replication status, services and node services and temperature of the system or CPUs --- .werks/3683 | 9 ++ ChangeLog | 1 + checkman/infoblox_dhcp_stats | 14 +++ checkman/infoblox_dns_stats | 14 +++ checkman/infoblox_grid_status | 16 ++++ checkman/infoblox_node_services | 18 ++++ checkman/infoblox_replication_status | 16 ++++ checkman/infoblox_services | 18 ++++ checkman/infoblox_temp | 22 +++++ checks/infoblox.include | 163 ++++++++++++++++++++++++++++++++++ checks/infoblox_dhcp_stats | 73 +++++++++++++++ checks/infoblox_dns_stats | 56 ++++++++++++ checks/infoblox_grid_status | 57 ++++++++++++ checks/infoblox_node_services | 63 +++++++++++++ checks/infoblox_replication_status | 76 ++++++++++++++++ checks/infoblox_services | 66 ++++++++++++++ checks/infoblox_temp | 114 ++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 116 ++++++++++++++++++++++++ 18 files changed, 912 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=924044df3e…

8 years

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 61a9b37c5cf537ec9b3cc802db43f5a172303998 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a9b37c5cf537… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 24 13:01:54 2016 +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 ba837bf..7f0e18c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3683 +3693

8 years

Fix displaying of exceptions while in rendering tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 06ac17e826669558a50d464df03dc7133dacd057 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06ac17e8266695… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 08:06:33 2016 +0200 Fix displaying of exceptions while in rendering tables --- web/htdocs/htmllib.py | 7 +++++++ web/htdocs/index.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bea4704..4d96a06 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -226,6 +226,11 @@ class html(GUITester): self.plugged = True self.plugged_text = '' + + def is_plugged(self): + return self.plugged + + def flush(self): if self.plugged: text = self.plugged_text @@ -239,6 +244,7 @@ class html(GUITester): self.lowlevel_write(text) self.plugged_text = '' + def drain(self): if self.plugged: t = self.plugged_text @@ -247,6 +253,7 @@ class html(GUITester): else: return '' + def unplug(self): self.flush() self.plugged = False diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 72f8e15..7f38224 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -140,6 +140,8 @@ def handler(req, fields = None, is_profiling = False): except (MKUserError, MKAuthException, MKUnauthenticatedException, MKConfigError, MKGeneralException, livestatus.MKLivestatusNotFoundError, livestatus.MKLivestatusException), e: + if html.is_plugged(): + html.unplug() ty = type(e) if ty == livestatus.MKLivestatusNotFoundError: title = _("Data not found")

8 years

Fix missing hiliting for complaining invalid input in some cases

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e7f3867b36a55a99e2764951abe91a0ceabfa44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e7f3867b36a55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 24 08:05:45 2016 +0200 Fix missing hiliting for complaining invalid input in some cases This fix applies do edit_dictionary() --- web/htdocs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 3a1e26b..fe133da 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -82,7 +82,7 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, vp = keyname + "_" + varprefix try: v = vs.from_html_vars(vp + name) - vs.validate_value(v, keyname + "_" + varprefix + name) + vs.validate_value(v, vp + name) new_value[keyname][name] = v except MKUserError, e: messages.append("%s: %s" % (vs.title(), e))

8 years

3550 HW/SW inventory: Now able to raise an alert when SW packages info is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 10a4544f079dbed2afbab1bbfec65eee6706df47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10a4544f079dbe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 23 14:54:02 2016 +0200 3550 HW/SW inventory: Now able to raise an alert when SW packages info is missing This option can be configured in the WATO rule <i>Do HW/SW Inventory</i>. --- .werks/3550 | 9 +++++++++ ChangeLog | 1 + checks/check_cmk_inv | 5 +++-- modules/check_mk.py | 8 ++++++-- modules/inventory.py | 4 ++++ web/plugins/wato/inventory.py | 5 +++++ 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.werks/3550 b/.werks/3550 new file mode 100644 index 0000000..e1d4c3d --- /dev/null +++ b/.werks/3550 @@ -0,0 +1,9 @@ +Title: HW/SW inventory: Now able to raise an alert when SW packages info is missing +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i1 +Date: 1466686328 +Class: feature + +This option can be configured in the WATO rule <i>Do HW/SW Inventory</i>. diff --git a/ChangeLog b/ChangeLog index 0926906..4fa3e3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -517,6 +517,7 @@ * 3581 mssql_versions: Added product name to inventory information * 3585 Implemented API for exporting the full host inventory... * 3591 mssql_clusters: Added information about nodes to MSSQL instance inventory + * 3550 HW/SW inventory: Now able to raise an alert when SW packages info is missing... * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/checks/check_cmk_inv b/checks/check_cmk_inv index 1c10f5a..afde8f7 100644 --- a/checks/check_cmk_inv +++ b/checks/check_cmk_inv @@ -28,10 +28,11 @@ def check_cmk_inv(params): if params == None: params = {} # convert from legacy rule syntax - return "--inv-fail-status=%d --hw-changes=%d --sw-changes=%d" % ( + return "--inv-fail-status=%d --hw-changes=%d --sw-changes=%d --sw-missing=%d" % ( params.get("fail_status", 1), params.get("hw_changes", 0), - params.get("sw_changes", 0)) + params.get("sw_changes", 0), + params.get("sw_missing", 0)) active_check_info['cmk_inv'] = { "command_line" : 'cmk $ARG1$ --cache --inventory-as-check $HOSTNAME$', diff --git a/modules/check_mk.py b/modules/check_mk.py index 67840ef..32b9715 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3994,6 +3994,7 @@ OPTIONS: You can specify this option multiple times. --hw-changes=S --inventory-as-check: Use monitoring state S for HW changes --sw-changes=S --inventory-as-check: Use monitoring state S for SW changes + --sw-missing=S --inventory-as-check: Use monitoring state S for missing SW packages info --inv-fail-status=S Use monitoring state S in case if error during inventory NOTES: @@ -4981,8 +4982,8 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", - "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "inv-fail-status=", - "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks" ] + "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "sw-missing=", + "inv-fail-status=", "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--handle-alerts', '--notify', '--real-time-checks', @@ -5008,6 +5009,7 @@ exit_status = 0 opt_verbose = 0 # start again from 0, was already faked at the beginning opt_inv_hw_changes = 0 opt_inv_sw_changes = 0 +opt_inv_sw_missing = 0 opt_inv_fail_status = 1 # State in case of an error (default: WARN) # Scan modifying options first (makes use independent of option order) @@ -5065,6 +5067,8 @@ for o,a in opts: opt_inv_hw_changes = int(a) elif o == "--sw-changes": opt_inv_sw_changes = int(a) + elif o == "--sw-missing": + opt_inv_sw_missing = int(a) elif o == "--inv-fail-status": opt_inv_fail_status = int(a) diff --git a/modules/inventory.py b/modules/inventory.py index 83998b4..57983e5 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -199,6 +199,10 @@ def do_inv_check(hostname): infotext = "found %d entries" % num_entries state = 0 + if not inv_tree.get("software") and opt_inv_sw_missing: + infotext += ", software information is missing" + state = opt_inv_sw_missing + infotext += state_markers[opt_inv_sw_missing] if old_timestamp: path = inventory_archive_dir + "/" + hostname + "/%d" % old_timestamp diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py index a600757..4b22f3b 100644 --- a/web/plugins/wato/inventory.py +++ b/web/plugins/wato/inventory.py @@ -39,6 +39,11 @@ register_rule(group, title = _("State when software changes are detected"), default_value = 0, )), + ( "sw_missing", + MonitoringState( + title = _("State when software packages info is missing"), + default_value = 0, + )), ( "hw_changes", MonitoringState( title = _("State when hardware changes are detected"),

8 years

3147 FIX windows agent: fixed bug where all placeholders in messages were replaced with the same parameter

by Sebastian Herbord

Module: check_mk Branch: master Commit: e5c5625898b148f18bd2bacc10b776a8b5ccad51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c5625898b148… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 23 09:05:20 2016 +0200 3147 FIX windows agent: fixed bug where all placeholders in messages were replaced with the same parameter This commit only adds the werk since the bug didn't affect the master branch --- .werks/3147 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3147 b/.werks/3147 new file mode 100644 index 0000000..ecb4c64 --- /dev/null +++ b/.werks/3147 @@ -0,0 +1,10 @@ +Title: windows agent: fixed bug where all placeholders in messages were replaced with the same parameter +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466664466 + + diff --git a/ChangeLog b/ChangeLog index 78a8e79..0926906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -278,6 +278,7 @@ * 3548 FIX: agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation... * 3549 FIX: netapp_api_snapshots: now correctly processes offline volumes... * 3145 FIX: solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory... + * 3147 FIX: windows agent: fixed bug where all placeholders in messages were replaced with the same parameter Multisite: * 3187 notification view: new filter for log command via regex

8 years

← Newer
1
2
3
4
5
6
7
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016