Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: New localcheck for Linux that makes sure that filesystems in /etc/ fstab are mounted

by Mathias Kettner

Module: check_mk Branch: master Commit: d46c7d6fe8a88bceeaddc8df436ad72ff4dafede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d46c7d6fe8a88b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 3 14:57:57 2014 +0200 New localcheck for Linux that makes sure that filesystems in /etc/fstab are mounted The new local check is in <tt>share/doc/check_mk/treasures/localchecks/check_fstab_mounts</tt>. Simply copy it to <tt>/usr/lib/check_mk_agent/local/</tt> on your Linux agents. It will alert you if any filesystem that is listed in <tt>/etc/fstab</tt> is not being mounted. Filesystems with the option <tt>noauto</tt> are excluded from the check. --- .werks/751 | 11 ++++++++ ChangeLog | 1 + doc/treasures/localchecks/check_fstab_mounts | 37 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/.werks/751 b/.werks/751 new file mode 100644 index 0000000..b20f4c2 --- /dev/null +++ b/.werks/751 @@ -0,0 +1,11 @@ +Title: New localcheck for Linux that makes sure that filesystems in /etc/fstab are mounted +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396529750 +Class: feature + +The new local check is in <tt>share/doc/check_mk/treasures/localchecks/check_fstab_mounts</tt>. Simply +copy it to <tt>/usr/lib/check_mk_agent/local/</tt> on your Linux agents. It will alert you if any +filesystem that is listed in <tt>/etc/fstab</tt> is not being mounted. Filesystems with the option +<tt>noauto</tt> are excluded from the check. diff --git a/ChangeLog b/ChangeLog index d3e785a..527b30f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i3: Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes + * 0751 New localcheck for Linux that makes sure that filesystems in /etc/fstab are mounted... * 0777 FIX: special agent emcvnx: did not work with security file authentication... Multisite: diff --git a/doc/treasures/localchecks/check_fstab_mounts b/doc/treasures/localchecks/check_fstab_mounts new file mode 100755 index 0000000..40b4e0a --- /dev/null +++ b/doc/treasures/localchecks/check_fstab_mounts @@ -0,0 +1,37 @@ +#!/usr/bin/python +# This localcheck makes sure that every filesystem that is listed in /etc/fstab to +# be mounted automatically, also appears mounted in /proc/mounts + +# /dev/mapper/vg0-lv--root / ext4 errors=remount-ro 0 1 +# # /boot was on /dev/md0 during installation +# UUID=bec44dfa-7c70-4da7-857a-2e324cc230bd /boot ext4 defaults 0 2 +# /dev/mapper/vg0-lv--home /home ext4 defaults 0 2 +# tmpfs /omd/sites/aq/tmp tmpfs noauto,user,mode=755,uid=aq,gid=aq 0 0 +# tmpfs /opt/omd/sites/zentrale/tmp tmpfs noauto,user,mode=755,uid=zentrale,gid=zentrale 0 0 +# tmpfs /opt/omd/sites/hirn/tmp tmpfs noauto,user,mode=755,uid=hirn,gid=hirn 0 0 +# tmpfs /opt/omd/sites/heute/tmp tmpfs noauto,user,mode=755,uid=heute,gid=heute 0 0 + +mounted = [ l.split()[1] for l in file("/proc/mounts") ] + +missing = [] +count = 0 +for line in file("/etc/fstab"): + if not line.strip() or line.strip().startswith("#"): + continue + + device, mountpoint, fstype, options, rest = line.split(None, 4) + options = options.split(",") + if "noauto" not in options and mountpoint not in mounted: + missing.append("%s is not mounted on %s" % (device, mountpoint)) + else: + count += 1 + +if missing: + state = 2 + output = ", ".join(missing) + +else: + state = 0 + output = "All %d expected filesystems of /etc/fstab are mounted" % count + +print "%d Mounted_Filesystems - %s" % (state, output)

10 years, 5 months

Check_MK Git: check_mk: FIX special agent emcvnx: did not work with security file authentication

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 07e5befd64df82006a0aca8f0f34d8b4e02eec4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07e5befd64df82… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 3 14:31:14 2014 +0200 FIX special agent emcvnx: did not work with security file authentication when trying to authenticate with security files, the special agent did build invalid naviseccli command line. This is fixed now. --- .werks/777 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_emcvnx | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/777 b/.werks/777 new file mode 100644 index 0000000..3eaca44 --- /dev/null +++ b/.werks/777 @@ -0,0 +1,9 @@ +Title: special agent emcvnx: did not work with security file authentication +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396526883 +Class: fix + +when trying to authenticate with security files, the special agent did build +invalid naviseccli command line. This is fixed now. diff --git a/ChangeLog b/ChangeLog index 79373b5..d3e785a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i3: Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes + * 0777 FIX: special agent emcvnx: did not work with security file authentication... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 7394f23..6303edf 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -165,7 +165,7 @@ except ValueError: if (user == None or user == '') and (password == None or password == ''): # try using security files - basecmd="naviseccli -h %s -Scope 0 " % host_address + basecmd="naviseccli -h %s " % host_address else: basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password)

10 years, 5 months

Check_MK Git: check_mk: FIX host diag page: fixed problem with update of diagnose subwindows

by Andreas Boesl

Module: check_mk Branch: master Commit: 7076d5194550a5ede88bd70e26a8515830fba809 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7076d5194550a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 3 13:05:00 2014 +0200 FIX host diag page: fixed problem with update of diagnose subwindows The subwindows in the host diagnostic page did not get updated properly, because of an incorrect transaction handling. --- .werks/781 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/js/wato.js | 4 ++-- web/htdocs/wato.py | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/781 b/.werks/781 new file mode 100644 index 0000000..17dc7f4 --- /dev/null +++ b/.werks/781 @@ -0,0 +1,9 @@ +Title: host diag page: fixed problem with update of diagnose subwindows +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1396522971 + +The subwindows in the host diagnostic page did not get updated properly, because of an incorrect transaction handling. diff --git a/ChangeLog b/ChangeLog index 9411296..79373b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) + WATO: + * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... + Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 0180c71..7cbafc6 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -799,7 +799,7 @@ function handle_host_diag_result(ident, response_text) { retry.style.display = 'inline'; } -function start_host_diag_test(ident, hostname) { +function start_host_diag_test(ident, hostname, transid) { var log = document.getElementById(ident + '_log'); var img = document.getElementById(ident + '_img'); var retry = document.getElementById(ident + '_retry'); @@ -817,6 +817,6 @@ function start_host_diag_test(ident, hostname) { img.src = "images/icon_loading.gif"; log.innerHTML = "..."; get_url("wato_ajax_diag_host.py?host=" + escape(hostname) + "&_test=" + escape(ident) - + '&_transid=-1' + vars, + + '&_transid=' + transid + vars, handle_host_diag_result, ident); } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 438031f..f15f138 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2690,13 +2690,13 @@ def mode_diag_host(phase): html.write('<table class="data test"><tr class="data odd0">') html.write('<td class="icons"><div>') html.write('<img class="icon" id="%s_img" src="">' % ident) - html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\');">' + html.write('<a href="javascript:start_host_diag_test(\'%s\', \'%s\', \'%s\');">' '<img class="icon retry" id="%s_retry" src="images/icon_retry_disabled.gif" title="%s"></a>' % - (ident, hostname, ident, _('Retry this test'))) + (ident, hostname, html.fresh_transid(), ident, _('Retry this test'))) html.write('</div></td>') html.write('<td><div class="log" id="%s_log"></div>' % ident) html.write('</tr></table>') - html.javascript('start_host_diag_test("%s", "%s")' % (ident, hostname)) + html.javascript('start_host_diag_test("%s", "%s", "%s")' % (ident, hostname, html.fresh_transid())) html.write('</td></tr></table>') html.write('</div>')

10 years, 5 months

Check_MK Git: check_mk: Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter)

by Andreas Boesl

Module: check_mk Branch: master Commit: 6a711d207039f8880f4c55af229791a986619717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a711d207039f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 3 12:31:46 2014 +0200 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) --- .werks/779 | 8 ++++++++ ChangeLog | 3 +++ web/plugins/views/builtin.py | 2 +- web/plugins/views/datasources.py | 2 +- web/plugins/views/filters.py | 18 ++++++++++++++++++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.werks/779 b/.werks/779 new file mode 100644 index 0000000..434df67 --- /dev/null +++ b/.werks/779 @@ -0,0 +1,8 @@ +Title: Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1396521054 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7b48ed2..9411296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes + Multisite: + * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) + Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index ff6df5c..2103533 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -924,7 +924,7 @@ multisite_builtin_views.update({ ('hg_num_services_unknown', None), ('hg_num_services_pending', None)], 'public': True, - 'show_filters': ['hostgroupnameregex'], + 'show_filters': ['hostgroupnameregex', 'hostgroupvisibility'], 'sorters': [], 'title': _('Hostgroups (Summary)'), 'topic': _('Hostgroups') }, diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 2991264..775555f 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -118,7 +118,7 @@ multisite_datasources["servicesbyhostgroup"] = { multisite_datasources["hostgroups"] = { "title" : _("Hostgroups"), "table" : "hostgroups", - "infos" : [ "hostgroup" ], + "infos" : [ "hostgroup", "hostgroups" ], "keys" : [ "hostgroup_name" ], "idkeys" : [ "site", "hostgroup_name" ], } diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index e3a839d..08100b5 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -52,6 +52,21 @@ class FilterText(Filter): def heading_info(self, infoname): return html.var(self.htmlvars[0]) + + +class FilterHostgroupVisibility(Filter): + def __init__(self, name, title): + Filter.__init__(self, name, title, "hostgroups", [ "hostgroupshowempty" ], []) + + def display(self): + html.checkbox("hostgroupshowempty", False, label="Show empty groups") + + def filter(self, infoname): + if html.var("hostgroupshowempty"): + return "" + else: + return "Filter: num_hosts > 0" + # filter title info column htmlvar declare_filter(100, FilterText("hostregex", _("Hostname"), "host", "host_name", "host", "~~"), _("Search field allowing regular expressions and partial matches")) @@ -74,6 +89,9 @@ declare_filter(202, FilterText("service_display_name", _("Service alternative di declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup"), "hostgroup", "hostgroup_name", "hostgroup_name", "~~"), _("Search field allowing regular expressions and partial matches on the names of hostgroups")) +declare_filter(102, FilterHostgroupVisibility("hostgroupvisibility", _("Empty Hostgroup Visibilitiy")), + _("You can enable this checkbox to show empty hostgroups")) + declare_filter(101, FilterText("servicegroupnameregex", _("Servicegroup"), "servicegroup", "servicegroup_name", "servicegroup_name", "~~"), _("Search field allowing regular expression and partial matches"))

10 years, 5 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 4c9477d56bcde6e5a507fe513937bb2ae1a08ea5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c9477d56bcde6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 3 12:30:47 2014 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7e1d92a..e1be92e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -779 +799

10 years, 5 months

Check_MK Git: check_mk: cisco_secure: New check for Port Security on Cisco swichtes

by Bastian Kuhn

Module: check_mk Branch: master Commit: f52ff988687b3fd9f7e030844e4729da7eb73141 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f52ff988687b3f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Apr 3 09:50:07 2014 +0200 cisco_secure: New check for Port Security on Cisco swichtes --- .werks/149 | 8 +++++ ChangeLog | 3 ++ checkman/cisco_secure | 17 ++++++++++ checks/cisco_secure | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/.werks/149 b/.werks/149 new file mode 100644 index 0000000..6aead12 --- /dev/null +++ b/.werks/149 @@ -0,0 +1,8 @@ +Title: cisco_secure: New check for Port Security on Cisco swichtes +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396511368 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4ed1181..7b48ed2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i3: + Checks & Agents: + * 0149 cisco_secure: New check for Port Security on Cisco swichtes + Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... diff --git a/checkman/cisco_secure b/checkman/cisco_secure new file mode 100644 index 0000000..c79b9cd --- /dev/null +++ b/checkman/cisco_secure @@ -0,0 +1,17 @@ +title: Cisco switches: Port Security status +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the port Security feature of cisco_switches. It returns a {CRITICAL} state for + each port which is locked due a security isse. If is port security configured but cant be enabled + the check returns {WARNING}. If a port goes down, the check ignores that and only shows a information in the + check output. + +item: + The description of the Port + +inventory: + One check for each port with enabled port security which is also up will be created + diff --git a/checks/cisco_secure b/checks/cisco_secure new file mode 100644 index 0000000..f3e9fa6 --- /dev/null +++ b/checks/cisco_secure @@ -0,0 +1,86 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +def cisco_secure_convert(info): + data = [] + # l[1] = Name, l[2] = Portstate + names = dict([ (l[0], ( l[1], l[2] )) for l in info[0]] ) + for num, enabled, status, violationCount, lastmac in info[1]: + mac = ":".join(["%02s" % hex(ord(m))[2:] for m in lastmac]).replace(' ', '0') + data.append(( names[num][0], int(names[num][1]), int(enabled), int(status), int(violationCount), mac )) + return data + +def inventory_cisco_secure(info): + info = cisco_secure_convert(info) + inventory = [] + for name, op_state, enabled, status, violationCount, lastmac in info: + #if portsecurity enabled and port up OR currently there is sercurity issue` + if ( enabled == 1 and op_state == 1) or status == 3: + inventory.append( (name, None) ) + return inventory + +def check_cisco_secure(item, params, info): + secure_states = { + 1 : "full Operational", + 2 : "could not be enabled due to certain reasons", + 3 : "shutdown due to security violation" + } + + info = cisco_secure_convert(info) + for name, op_state, enabled, status, violationCount, lastmac in info: + if name == item: + message = "Port Security %s (Violation Count: %s, Last Mac: %s)" % \ + ( secure_states[status], violationCount, lastmac ) + + # If port cant be enabled and is up + if status == 2 and op_state == 1: + return 1, message + # Port cant be enabled but is down, so no error state + elif status == 2: + return 0, "Port is down" + # Security issue + elif status == 3: + return 2, message + return 0, message + +check_info["cisco_secure"] = { + "check_function" : check_cisco_secure, + "inventory_function" : inventory_cisco_secure, + "service_description" : "Security Port %s", + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + oid(".1.3.6.1.4.1.9.9.315.1.2.1.1.1.*"), + "snmp_info" : [ (".1.3.6.1.2.1.2.2.1", [OID_END, 2, 8 ] ), + ( ".1.3.6.1.4.1.9.9.315.1.2.1.1", + [ + OID_END, + "1", # cpsIfPortSecurityEnable + "2", # cpsIfPortSecurityStatus + "9", # cpsIfViolationCount + "10", # cpsIfSecureLastMacAddress + ] ), + ] +} +

10 years, 5 months

Check_MK Git: check_mk: FIX livestatus table hostsbygroup:

by Andreas Boesl

fixed bug with group_authorization strict Message-ID: <533c1351.ZuoBN8EVT1waNze9%ab(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: e29b47d102b2b1baf35a3dbc7ce8888403a743b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e29b47d102b2b1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 2 15:40:06 2014 +0200 FIX livestatus table hostsbygroup: fixed bug with group_authorization strict On calling the livestatus table hostsbygroup with an AuthUser the table did not hide the entire hostsgroup in case the group_authorization was set to <tt>strict</tt> and one host in the group was not a contact for the AuthUser. This has been fixed. With the group_authorization <tt>strict</tt> setting the AuthUser now needs to be a contact of every host in the hostgroup, otherwise the hostgroup is not shown at all. --- .werks/747 | 16 ++++++++++++++++ ChangeLog | 3 +++ livestatus/src/TableHosts.cc | 30 +++++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/.werks/747 b/.werks/747 new file mode 100644 index 0000000..def45a0 --- /dev/null +++ b/.werks/747 @@ -0,0 +1,16 @@ +Title: livestatus table hostsbygroup: fixed bug with group_authorization strict +Level: 2 +Component: livestatus +Version: 1.2.5i3 +Date: 1396445685 +Class: fix + +On calling the livestatus table hostsbygroup with an AuthUser the table +did not hide the entire hostsgroup in case the group_authorization was set to <tt>strict</tt> +and one host in the group was not a contact for the AuthUser. + +This has been fixed. + +With the group_authorization <tt>strict</tt> setting the AuthUser now +needs to be a contact of every host in the hostgroup, otherwise the hostgroup +is not shown at all. diff --git a/ChangeLog b/ChangeLog index eac789b..4ed1181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i3: + Livestatus: + * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... + 1.2.5i2: Checks & Agents: diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index afc1657..86f5243 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -362,14 +362,34 @@ void TableHosts::answerQuery(Query *query) if (_by_group) { hostgroup *hgroup = hostgroup_list; hostbygroup hg; + bool show_hgroup; + + // When g_group_authorization is set to AUTH_STRICT we need to pre-check + // if every host of this group is visible to the _auth_user + bool requires_precheck = query->authUser() && g_group_authorization == AUTH_STRICT; + while (hgroup) { + show_hgroup = true; hg._hostgroup = hgroup; hostsmember *mem = hgroup->members; - while (mem) { - memcpy(&hg._host, mem->host_ptr, sizeof(host)); - if (!query->processDataset(&hg)) - break; - mem = mem->next; + if (requires_precheck) { + while (mem) { + if (!is_authorized_for(query->authUser(), mem->host_ptr, 0)) { + show_hgroup = false; + break; + } + mem = mem->next; + } + } + + if (show_hgroup) { + mem = hgroup->members; + while (mem) { + memcpy(&hg._host, mem->host_ptr, sizeof(host)); + if (!query->processDataset(&hg)) + break; + mem = mem->next; + } } hgroup = hgroup->next; }

10 years, 5 months

Check_MK Git: check_mk: zfsget: fixed problem with agent output of check_mk_agent.solaris

by Andreas Boesl

Module: check_mk Branch: master Commit: 6eba0b96f6403ed1cf4764f3ca7f99f00a646b8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eba0b96f6403e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 2 13:28:23 2014 +0200 zfsget: fixed problem with agent output of check_mk_agent.solaris The reported columns from the check_mk_agent.solaris did not match the columns expected in the check. This has been fixed. Might have fixed problem with other agents than check_mk_agent.linux, too. --- .werks/746 | 11 +++++++++++ ChangeLog | 1 + checks/zfsget | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/746 b/.werks/746 new file mode 100644 index 0000000..6ae8b02 --- /dev/null +++ b/.werks/746 @@ -0,0 +1,11 @@ +Title: zfsget: fixed problem with agent output of check_mk_agent.solaris +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i2 +Date: 1396438010 + +The reported columns from the check_mk_agent.solaris did not match +the columns expected in the check. This has been fixed. +Might have fixed problem with other agents than check_mk_agent.linux, too. diff --git a/ChangeLog b/ChangeLog index ae82fc1..d86bf63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 0600 nfsexports.solaris: new agent plugin for monitoring nfs exports on solaris systems... * 0743 mem, fortigate_memory, solaris_mem: display total SWAP info in check output * 0745 drbd: Roles and diskstates are now configurable via WATO... + * 0746 zfsget: fixed problem with agent output of check_mk_agent.solaris... * 0740 FIX: winperf_if: now able to handle bandwidth > 4GBit... Multisite: diff --git a/checks/zfsget b/checks/zfsget index b798c3b..c57609b 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -106,7 +106,11 @@ def parse_zfsget(info): def zfsget_parse_df_info(entries, info): new_entries = {} - for device, fs_type, kbytes, used, avail, percent, mountpoint in info: + for entry in info: + if len(entry) == 6: + device, kbytes, used, avail, percent, mountpoint = entry + else: + device, fs_type, kbytes, used, avail, percent, mountpoint = entry # ignore entries already contained in zfsget and also # entries for virtual filesystems (like swap) if mountpoint.startswith("/") and mountpoint not in entries:

10 years, 5 months

Check_MK Git: check_mk: drbd: Roles and diskstates are now configurable via WATO

by Andreas Boesl

Module: check_mk Branch: master Commit: e08b11d11bdf6619d7c4a0dc8aa7071fa03abaff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e08b11d11bdf66… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 2 11:38:03 2014 +0200 drbd: Roles and diskstates are now configurable via WATO You can now configure the result for each role scenario as well as set specific states for each diskstate or completely disable the evaluation for roles and diskstates. For example:<br><br> Roles:<br> Secondary/Secondary -> CRIT<br><br> Diskstates:<br> Secondary/Inconsistent -> CRIT<br> Primary/Attaching -> WARN<br> --- .werks/745 | 17 +++++++ ChangeLog | 1 + checkman/drbd | 19 ++++++-- checks/drbd | 87 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 85 +++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e08b11d11b…

10 years, 5 months

Check_MK Git: check_mk: new global parameter state_markers

by Andreas Boesl

Module: check_mk Branch: master Commit: 45863226f4a76d618baa5ffb7ae59f5da1337db9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45863226f4a76d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 2 10:36:07 2014 +0200 new global parameter state_markers --- modules/check_mk_base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f33cc0a..cc3dffc 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1520,6 +1520,9 @@ def get_regex(pattern): # Names of texts usually output by checks nagios_state_names = ["OK", "WARN", "CRIT", "UNKNOWN"] +# Symbolic representations of states +state_markers = ["(.)", "(!)", "(!!)", "(?)"] + # int() function that return 0 for strings the # cannot be converted to a number def saveint(i):

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014