Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64496 discussions

Check_MK Git: check_mk: check to monitor fan trays of cisco nexus switches

by Götz Golla

Module: check_mk Branch: master Commit: 7248f70728aeb59595538ce8fae1c9743100d697 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7248f70728aeb5… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 4 11:51:39 2013 +0100 check to monitor fan trays of cisco nexus switches --- checkman/cisco_fantray | 17 +++++++++++++++ checks/cisco_fantray | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/checkman/cisco_fantray b/checkman/cisco_fantray new file mode 100644 index 0000000..08e8f82 --- /dev/null +++ b/checkman/cisco_fantray @@ -0,0 +1,17 @@ +title: Cisco switches: FAN health status +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the state of fans on Cisco devices like the + nexus series of switches. The following states are returned by the + device: {1}: unknown, {2}: up, {3}: down, {4}: warning. They are evaluated + by the check as follows: {1}: WARN, {2}: OK, {3}: CRIT, {4}: WARN. + +item: + The id of the sensor as provided by the snmp agent of the device. + +inventory: + One check for each sensor is created by the inventory. + diff --git a/checks/cisco_fantray b/checks/cisco_fantray new file mode 100644 index 0000000..3a5f5eb --- /dev/null +++ b/checks/cisco_fantray @@ -0,0 +1,54 @@ +#!/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. + +cisco_fan_states = ('', 'unknown', 'up', 'down', 'warning') + +def inventory_cisco_fantray(info): + if info[0]: + return [ (line[0], None) for line in info ] + +def check_cisco_fantray(item, params, info): + for line in info: + if line[0] == item: + state = saveint(line[1]) + status = [ "", "unknown", "up", "down", "warning" ] + if state == 2: + return (0, "State is %s (%d)" % (status[state], state)) + elif state in ( 0, 1, 4 ): + return (1, "State is %s (%d)" % (status[state], state)) + else: + return (2, "State is %s (%d)" % (status[state], state)) + return (3, "item not found in snmp data") + + +check_info["cisco_fantray"] = { + 'check_function': check_cisco_fantray, + 'inventory_function': inventory_cisco_fantray, + 'service_description': 'FAN %s', + 'snmp_info': ('.1.3.6.1.4.1.9.9.117.1.4.1.1.1',[ OID_END, '' ]), + 'snmp_scan_function': \ + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), +}

10 years, 11 months

Check_MK Git: check_mk: check to monitor fan trays of cisco nexus switches

by Götz Golla

Module: check_mk Branch: master Commit: 2e9867a21873829478b29e92103acfccb32aa4b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e9867a2187382… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 4 11:45:27 2013 +0100 check to monitor fan trays of cisco nexus switches --- .werks/60 | 8 ++++++++ ChangeLog | 3 +++ 2 files changed, 11 insertions(+) diff --git a/.werks/60 b/.werks/60 new file mode 100644 index 0000000..f4003e0 --- /dev/null +++ b/.werks/60 @@ -0,0 +1,8 @@ +Title: check to monitor fan trays of cisco nexus switches +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1383561852 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 547a939..b0f390e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i7: + Checks & Agents: + * 0060 : check to monitor fan trays of cisco nexus switches... + Multisite: * 0001 : New filters for selecting several host/service-groups at once... * 0050 : New concept of favorite hosts and services plus matching filters and views...

10 years, 11 months

Check_MK Git: check_mk: fix performance data for sql check

by Götz Golla

Module: check_mk Branch: master Commit: 6d54688b3d98d4fca7c58a6336f7f5dceb36f00f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d54688b3d98d4… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 4 11:43:31 2013 +0100 fix performance data for sql check --- doc/treasures/active_checks/.f12 | 2 +- doc/treasures/active_checks/check_sql | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/treasures/active_checks/.f12 b/doc/treasures/active_checks/.f12 index 131fbd8..30897fc 100755 --- a/doc/treasures/active_checks/.f12 +++ b/doc/treasures/active_checks/.f12 @@ -1,2 +1,2 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo rsync -a ./ /omd/sites/$SITE/lib/nagios/plugins +sudo rsync -va ./ /omd/sites/$SITE/lib/nagios/plugins diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 8ea0e23..ac384d5 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -228,12 +228,13 @@ try: sys.exit(3) #row = result[0] - row = result.split(",") + row = result[0].split(",") number = float(row[0]) text = str(row[1]) try: perf = row[2] + perf = "|"+row[2] except IndexError: if opt_debug: raise

10 years, 11 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Götz Golla

Module: check_mk Branch: master Commit: 76e985cf21e335fb69c9da03aa4549fcde70e531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76e985cf21e335… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 4 11:26:04 2013 +0100 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 abdfb05..d15a2cc 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -60 +80

10 years, 11 months

Check_MK Git: check_mk: New concept of favorite hosts and services plus matching filters and views

by Mathias Kettner

Module: check_mk Branch: master Commit: aa85a030a5245cdc473445ab7ef38fa498abf2fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa85a030a5245c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 2 18:14:26 2013 +0100 New concept of favorite hosts and services plus matching filters and views The new "Favorites" feature introduces a new pair of commands for hosts and services: <i>Add to favourites</i> and <i>Remove from favourites</i>. It allows you to manage your personal list of favourite hosts and services. This list is saved on a per-user-base. Objects on this list are marked with a star icon. The favourites-list can be used for filtering. Two new predefined views "Favourite hosts" and "Favourite services" are available for showing you favourite objects. Also the new filters have been added to several views. Please note, that when you make a host a favourite, the services of that host will not automatically get favourites as well. But you easily can use the "Service Search" view for listing all services on favorite hosts, if you like that behaviour. With a combination of the existing filters you can do many useful queries like "Show me all problems on my favourite hosts in host group X". The advantage of favourites as opposed to host- and service groups are: <ul> <li>No change to the monitoring configuration is neccessary and thus no restart of the core.</li> <li>Each user can manage his indiviual list.</li. </ul> --- .werks/50 | 29 +++++++++ ChangeLog | 1 + web/htdocs/check_mk.css | 6 ++ web/htdocs/images/icon_starred.png | Bin 0 -> 2914 bytes web/htdocs/views.py | 1 + web/plugins/icons/builtin.py | 33 ++++++++++ web/plugins/views/builtin.py | 116 ++++++++++++++++++++++++++++++++++++ web/plugins/views/commands.py | 65 ++++++++++++++++++-- web/plugins/views/filters.py | 56 ++++++++++++++++- 9 files changed, 300 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=aa85a030a5…

10 years, 11 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: d29ed0a4bdd3b964281f8b1b84320b45b1b57cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29ed0a4bdd3b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 2 18:01:20 2013 +0100 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 e373ee6..abdfb05 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -50 +60

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1064

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 96e901530a1559008a773ee9bc63d577faa0e042 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e901530a1559… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Oct 31 15:40:58 2013 +0100 Updated bug entries #1064 --- .bugs/1064 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/1064 b/.bugs/1064 new file mode 100644 index 0000000..3820e2a --- /dev/null +++ b/.bugs/1064 @@ -0,0 +1,8 @@ +Title: problem with strange encoding of Umlauts when querying windows SNMP agent +Component: checks +State: open +Date: 2013-10-31 15:37:33 +Targetversion: future +Class: bug + +for detailed description and snmp walk see ticket 13, customer geobasis

10 years, 11 months

Check_MK Git: check_mk: New filters for selecting several host/

by Mathias Kettner

service-groups at once Message-ID: <527269ab.NfUvVhagv6l5vfK1%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: 2a57db81fd4ef944904a672668d7048266ef17cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a57db81fd4ef9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 31 15:30:12 2013 +0100 New filters for selecting several host/service-groups at once There are two new filters that allow you to select not only one, but several host- and service groups at once. This filters are added to the builtin views "Host Search", "Service Search" and "All hosts". --- .werks/1 | 10 +++++++++ ChangeLog | 3 +++ web/htdocs/valuespec.py | 5 +++-- web/htdocs/views.css | 9 ++++++++ web/plugins/views/builtin.py | 4 ++++ web/plugins/views/filters.py | 47 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/.werks/1 b/.werks/1 new file mode 100644 index 0000000..fd9236c --- /dev/null +++ b/.werks/1 @@ -0,0 +1,10 @@ +Title: New filters for selecting several host/service-groups at once +Level: 2 +Component: multisite +Version: 1.2.3i7 +Date: 1383229744 +Class: feature + +There are two new filters that allow you to select not only one, but +several host- and service groups at once. This filters are added to +the builtin views "Host Search", "Service Search" and "All hosts". diff --git a/ChangeLog b/ChangeLog index 5554448..4d1fe97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i7: + Multisite: + * 0001 : New filters for selecting several host/service-groups at once... + 1.2.3i6: Core & Setup: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 239b87a..00fb846 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1293,6 +1293,7 @@ class MultiSelect(ListChoice): class DualListChoice(ListChoice): def __init__(self, **kwargs): ListChoice.__init__(self, **kwargs) + self._autoheight = kwargs.get("autoheight", True) def render_input(self, varprefix, value): self.load_elements() @@ -1310,11 +1311,11 @@ class DualListChoice(ListChoice): html.write(_('Selected:')) html.write('</td></tr><tr><td>') html.sorted_select(varprefix + '_unselected', unselected, - attrs = {'size': 5, 'style': 'height:auto'}, + attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or ''}, onchange = 'vs_duallist_switch(this, \'%s\');' % varprefix) html.write('</td><td>') html.sorted_select(varprefix + '_selected', selected, - attrs = {'size': 5, 'style': 'height:auto', 'multiple': 'multiple'}, + attrs = {'size': 5, 'style': self._autoheight and 'height:auto' or '', 'multiple': 'multiple'}, onchange = 'vs_duallist_switch(this, \'%s\');' % varprefix) html.write('</td></tr></table>') html.hidden_field(varprefix, '|'.join([k for k, v in selected]), id = varprefix, add_var = True) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 2a1609b..18965f2 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -111,6 +111,15 @@ div.floatfilter .content > select#optservicegroup { width: 240px; } +div.floatfilter .content .multigroup table { + margin-top: -6px; +} + +div.floatfilter .content .multigroup select { + width: 148px; + height: 66px; +} + div.floatfilter .content .filtertime select { width: 136px; } diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e029d59..639163e 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -56,6 +56,7 @@ multisite_builtin_views.update({ 'host_acknowledged', 'hostregex', 'host_notifications_enabled', + 'hostgroups', 'opthostgroup', 'host_check_command', 'opthost_contactgroup', @@ -1029,6 +1030,7 @@ multisite_builtin_views.update({ 'siteopt', 'hostregex', 'summary_host', + 'hostgroups', 'opthostgroup', 'opthost_contactgroup', 'host_check_command', @@ -1091,6 +1093,8 @@ multisite_builtin_views.update({ 'show_filters': ['service_in_notification_period', 'optservicegroup', 'optservice_contactgroup', + 'hostgroups', + 'servicegroups', 'service_notifications_enabled', 'host_in_notification_period', 'in_downtime', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 24b9fd7..b1742cb 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -120,6 +120,46 @@ def all_groups(what): groups = dict(html.live.query("GET %sgroups\nCache: reload\nColumns: name alias\n" % what)) return [ (name, groups[name] or name) for name in groups.keys() ] +class FilterMultigroup(Filter): + def __init__(self, what, title): + htmlvars = [ what + "groups" ] + Filter.__init__(self, htmlvars[0], # name + title, + what, # info, e.g. "service" + htmlvars, + []) # no link info needed + self.what = what + self.htmlvar = htmlvars[0] + + def double_height(self): + return True + + def valuespec(self): + return DualListChoice(choices = all_groups(self.what), autoheight=False) + + def selection(self): + current = html.var(self.htmlvar, "").strip().split("|") + if current == ['']: + return [] + else: + return current + + def display(self): + html.write('<div class=multigroup>') + self.valuespec().render_input(self.htmlvar, self.selection()) + html.write('</div>') + + def filter(self, infoname): + current = self.selection() + if len(current) == 0: + return "" # No group selected = all groups selected, filter unused + filters = "" + for group in current: + filters += "Filter: %s_groups >= %s\n" % (self.what, group) + filters += "Or: %d\n" % len(current) + return filters + + class FilterGroupCombo(Filter): def __init__(self, what, title, enforce): self.enforce = enforce @@ -189,10 +229,13 @@ class FilterGroupCombo(Filter): declare_filter(104, FilterGroupCombo("host", _("Hostgroup"), False), _("Optional selection of host group")) declare_filter(104, FilterGroupCombo("host", _("Hostgroup (enforced)"), True), _("Dropdown list, selection of host group is <b>enforced</b>")) +declare_filter(105, FilterMultigroup("host", _("Several Hostgroups")), _("Selection of multiple host groups")) declare_filter(204, FilterGroupCombo("service", _("Servicegroup"), False), _("Optional selection of service group")) declare_filter(205, FilterGroupCombo("service", _("Servicegroup (enforced)"), True), _("Dropdown list, selection of service group is <b>enforced</b>")) -declare_filter(106, FilterGroupCombo("host_contact", _("Host Contactgroup"), False), _("Optional selection of host contact group group")) -declare_filter(206, FilterGroupCombo("service_contact", _("Service Contactgroup"), False), _("Optional selection of service contact group group")) +declare_filter(205, FilterMultigroup("service", _("Several Servicegroups")), _("Selection of multiple service groups")) + +declare_filter(106, FilterGroupCombo("host_contact", _("Host Contactgroup"), False), _("Optional selection of host contact group")) +declare_filter(206, FilterGroupCombo("service_contact", _("Service Contactgroup"), False), _("Optional selection of service contact group")) declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) declare_filter(207, FilterText("service_ctc", _("Service Contact"), "service", "service_contacts", "service_ctc", ">="))

10 years, 11 months

Check_MK Git: check_mk: Fixed minor bug in werk tool (grep)

by Mathias Kettner

Module: check_mk Branch: master Commit: 930beb741faf5a8a35f465ccdaadc143698972a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930beb741faf5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 31 15:30:49 2013 +0100 Fixed minor bug in werk tool (grep) --- werk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/werk b/werk index 546d48c..cfb8db0 100755 --- a/werk +++ b/werk @@ -40,6 +40,12 @@ else: def tty_colors(c): return "" +grep_colors = [ + tty_bold + tty_magenta, + tty_bold + tty_cyan, + tty_bold + tty_green, +] + def get_tty_size(): import termios,struct,fcntl try:

10 years, 11 months

Check_MK Git: check_mk: Updated version in changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e91125ddf12e29af54006ad827e15680f9a6e59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e91125ddf12e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 31 11:32:40 2013 +0100 Updated version in changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f0445dc..5554448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i7: + 1.2.3i6: Core & Setup: * 0041 FIX : setup.py now handles non existing wwwuser gracefully...

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits