Checkmk git commits October 2010

checkmk-commits@lists.checkmk.com

3 participants
42 discussions

Check_MK Git: check_mk: Fixed typo in latest fix for hp_proliant_psu - Thanks again An?==?UTF-8?Q?dreas Döhler

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0cbfc1b17a079390cdd0eb4b1594945f054ce1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0cbfc1b17a079… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 26 23:30:26 2010 +0200 Fixed typo in latest fix for hp_proliant_psu - Thanks again Andreas Döhler --- checks/hp_proliant_psu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 22d4d79..55c2f71 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -39,7 +39,7 @@ def inventory_hp_proliant_psu(checkname, info): def check_hp_proliant_psu(item, params, info): for line in info: - if '/' in item and line[0] + line [1] == itemi or line[0] == item: + if '/' in item and line[0] + '/' + line [1] == item or line[0] == item: chassis, bay, present, status, redundant = line snmp_status = hp_proliant_psu_status_map[int(status)] status = hp_proliant_status2nagios_map[snmp_status]

13 years, 11 months

Check_MK Git: check_mk: Updated internal doku

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4682884a53fb8b4072984fa740fb42b5782f9e46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4682884a53fb8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 17:44:20 2010 +0200 Updated internal doku --- LIESMICH.zutun | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 815e2f4..3c11e35 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -3,9 +3,52 @@ BUGS beheben bis => 1.1.8 -------------------------------------------------------------------------------- CHECK_MK: +bei den Server Perf Werten "Com. buf. max.total" wird nicht der eigene +sonderen einer der anderen sites angezeigt, +Eigentlich: es sollte (meiner Meinung nach) addiert werden oder evtl. +auch das MAX genommen werden. Oder ganz rausfliegen. Es muss unbedingt +konsisten mit den übrigen werden sein. + -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- +win_dhcp_pools sendet: +[['MIBCounts:'], + ['Discovers', '=', '193.'], + ['Offers', '=', '193.'], + ['Delayed', 'Offers', '=', '0.'], + ['Requests', '=', '14540.'], + ['Acks', '=', '11767.'], + ['Naks', '=', '2.'], + ['Declines', '=', '0.'], + ['Releases', '=', '39.'], + ['ServerStartTime', '=', '26', 'June', '2010', '04:47:49'], + ['Scopes', '=', '1.'], + ['Scopes', 'with', 'Delay', 'configured=', '0.'], + ['Subnet', '=', '10.3.108.0.'], + ['No.', 'of', 'Addresses', 'in', 'use', '=', '40.'], + ['No.', 'of', 'free', 'Addresses', '=', '150.'], + ['No.', 'of', 'pending', 'offers', '=', '0.']] +Besser: = als Trenner nehmen, dann ist das parsen einfacher. + +ich bin mir nicht sicher ob das nun ein Thruk Problem oder ein Livestatus Problem ist. Vermutlich beides :-) +Wenn ich im Thruk im Suchfenster einfach Enter drücke, kommt folgende Query bei raus: +GET services +Columns: .. +Filter: description ~~ +Filter: groups >= +Filter: plugin_output ~~ +Filter: long_plugin_output ~~ +Filter: host_name ~~ +Filter: host_alias ~~ +Filter: host_groups >= +Filter: comments ~~ +Filter: downtimes ~~ +Or: 2 +Or: 8 +livestatus: Sorry, Operator 4 for lists not implemented. + + Noch ein Problem mit Umlauten: Ein Drucker sendet per SNMP Latin1 kodierte Wert, z.B. Resttonerbehälter. Daraus baut Check_MK eine Servicedesription, die in nagios/conf.d/check_mk_objects.cfg ein

13 years, 11 months

Check_MK Git: check_mk: Multisite: fix problem with group filter

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba6d73e3dd44f5d4aa0b671cd2bd987fc5e9a228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba6d73e3dd44f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 15:45:20 2010 +0200 Multisite: fix problem with group filter --- ChangeLog | 2 ++ web/plugins/views/filters.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f870d05..a771acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,8 @@ spaces) * Allow non-ASCII character in downtimes and comments * Added nagvis_base_url to multisite.mk example configuration + * Filter for host/service groups: use name instead of alias if + user has no permissions for groups 1.1.8b3: Core, Setup, etc.: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index db384c7..b9ec53b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -150,7 +150,7 @@ class FilterGroupCombo(Filter): current_value = self.current_value(infoname) if current_value: alias = html.live.query_value("GET %sgroups\nColumns: alias\nFilter: name = %s\n" % - (self.what, current_value)) + (self.what, current_value), current_value) return alias

13 years, 11 months

Check_MK Git: check_mk: Table downtimes/comments: new column is_service

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41372a66b6e241e3e88303649da950661e6d9bd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41372a66b6e241… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 12:03:35 2010 +0200 Table downtimes/comments: new column is_service --- ChangeLog | 1 + livestatus/src/DowntimeOrComment.cc | 8 ++++++-- livestatus/src/DowntimeOrComment.h | 1 + livestatus/src/TableDownComm.cc | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eead3fc..f870d05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ this in version 1.1.8...) * Table status: new columns external_commands and external_commands_rate (also due to Mr. Fiebig - he would have quit our workshop otherwise...) + * Table downtimes/comments: new column is_service Multisite: * Snapin Performance: show external command per second and usage and diff --git a/livestatus/src/DowntimeOrComment.cc b/livestatus/src/DowntimeOrComment.cc index e913afe..87e13cd 100644 --- a/livestatus/src/DowntimeOrComment.cc +++ b/livestatus/src/DowntimeOrComment.cc @@ -34,10 +34,14 @@ DowntimeOrComment::DowntimeOrComment(nebstruct_downtime_struct *dt, , _id(id) { _host = find_host(dt->host_name); - if (dt->service_description) + if (dt->service_description) { _service = find_service(dt->host_name, dt->service_description); - else + _is_service = 1; + } + else { _service = 0; + _is_service = 0; + } } diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 632d184..615d4ad 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -92,6 +92,7 @@ struct DowntimeOrComment char * _author_name; char* _comment; unsigned long _id; + int _is_service; DowntimeOrComment(nebstruct_downtime_struct *data, unsigned long id); virtual ~DowntimeOrComment(); diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 0f28db7..342a45a 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -56,6 +56,8 @@ TableDownComm::TableDownComm(bool is_downtime) addColumn(new OffsetIntColumn("type", is_downtime ? "The type of the downtime: 0 if it is active, 1 if it is pending" : "The type of the comment: 1 is host, 2 is service", (char *)&(ref->_type) - (char *)ref)); + addColumn(new OffsetIntColumn("is_service", + "0, if this entry is for a host, 1 if it is for a service", (char *)&(ref->_is_service) - (char *)ref)); if (is_downtime) {

13 years, 11 months

Check_MK Git: check_mk: Multisite: fix downtimes grouping

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a439ee0cd8d8e0f7dbe8f9c7cb439fcf5523afb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a439ee0cd8d8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 12:05:45 2010 +0200 Multisite: fix downtimes grouping --- web/plugins/views/painters.py | 4 ++-- web/plugins/views/sorters.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1b61662..865921b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1183,8 +1183,8 @@ multisite_painters["downtime_fixed"] = { multisite_painters["downtime_what"] = { "title" : "Downtime type (host/service)", "short" : "Type", - "columns" : ["service_description"], - "paint" : lambda row: (None, row["service_description"] and "Service" or "Host") + "columns" : ["is_service"], + "paint" : lambda row: (None, row["is_service"] and "Service" or "Host") } multisite_painters["downtime_type"] = { "title" : "Downtime active or pending", diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index d04f479..9c41fcd 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -136,9 +136,6 @@ def declare_simple_sorter(name, title, column, func): "cmp" : lambda r1, r2: func(column, r1, r2) } -def cmp_empty_first(column, r1, r2): - return { (True,True):0, (False,False):0, (True,False):-1, (False,True):1}[(not r1[column], not r2[column])] - # name title column sortfunction declare_simple_sorter("svcdescr", "Service description", "service_description", cmp_simple_string) declare_simple_sorter("svcoutput", "Service plugin output", "service_plugin_output", cmp_simple_string) @@ -152,7 +149,7 @@ declare_simple_sorter("comment_author", "Comment author", "comment_author", declare_simple_sorter("comment_type", "Comment type", "comment_type", cmp_simple_number) # Downtimes -declare_simple_sorter("downtime_what", "Downtime type (host/service)", "service_description", cmp_empty_first) +declare_simple_sorter("downtime_what", "Downtime type (host/service)", "is_service", cmp_simple_number) declare_simple_sorter("downtime_start_time", "Downtime start", "downtime_start_time", cmp_simple_number) declare_simple_sorter("downtime_end_time", "Downtime end", "downtime_end_time", cmp_simple_number) declare_simple_sorter("downtime_entry_time", "Downtime entry time", "downtime_entry_time", cmp_simple_number)

13 years, 11 months

Check_MK Git: check_mk: Downtimes view: Group by hosts and services - just like comments

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: f58e2e9252cc972620c82837dbce3c6a4b50231e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f58e2e9252cc97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 11:12:40 2010 +0200 Downtimes view: Group by hosts and services - just like comments --- ChangeLog | 1 + web/plugins/views/builtin.py | 7 ++++--- web/plugins/views/painters.py | 6 ++++++ web/plugins/views/sorters.py | 3 +++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdf086f..eb95080 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ Multisite: * Snapin Performance: show external command per second and usage and size of external command buffer + * Downtimes view: Group by hosts and services - just like comments 1.1.8b3: Core, Setup, etc.: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 185d176..b6caca1 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -221,10 +221,10 @@ multisite_builtin_views = { 'sorters': [], 'linktitle': 'Comments', 'title': 'Comments of service'}, - 'downtimes': {'column_headers': 'perpage', + 'downtimes': {'column_headers': 'pergroup', 'datasource': 'downtimes', 'description': 'All host- und service-downtimes', - 'group_painters': [], + 'group_painters': [('downtime_what', None)], 'hard_filters': [], 'hard_filtervars': [('is_service_scheduled_downtime_depth', '-1'), @@ -247,7 +247,8 @@ multisite_builtin_views = { 'show_filters': ['service_scheduled_downtime_depth', 'hostregex', 'serviceregex'], - 'sorters': [('downtime_start_time', False)], + 'sorters': [('downtime_what', False), + ('downtime_start_time', False)], 'title': 'Downtimes'}, 'downtimes_of_host': {'column_headers': 'perpage', 'datasource': 'downtimes', diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 6d1cfaf..1b61662 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1180,6 +1180,12 @@ multisite_painters["downtime_fixed"] = { "columns" : ["downtime_fixed"], "paint" : lambda row: (None, row["downtime_fixed"] == "0" and "flexible" or "fixed") } +multisite_painters["downtime_what"] = { + "title" : "Downtime type (host/service)", + "short" : "Type", + "columns" : ["service_description"], + "paint" : lambda row: (None, row["service_description"] and "Service" or "Host") +} multisite_painters["downtime_type"] = { "title" : "Downtime active or pending", "short" : "act/pend", diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index cd6cee8..d04f479 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -136,6 +136,8 @@ def declare_simple_sorter(name, title, column, func): "cmp" : lambda r1, r2: func(column, r1, r2) } +def cmp_empty_first(column, r1, r2): + return { (True,True):0, (False,False):0, (True,False):-1, (False,True):1}[(not r1[column], not r2[column])] # name title column sortfunction declare_simple_sorter("svcdescr", "Service description", "service_description", cmp_simple_string) @@ -150,6 +152,7 @@ declare_simple_sorter("comment_author", "Comment author", "comment_author", declare_simple_sorter("comment_type", "Comment type", "comment_type", cmp_simple_number) # Downtimes +declare_simple_sorter("downtime_what", "Downtime type (host/service)", "service_description", cmp_empty_first) declare_simple_sorter("downtime_start_time", "Downtime start", "downtime_start_time", cmp_simple_number) declare_simple_sorter("downtime_end_time", "Downtime end", "downtime_end_time", cmp_simple_number) declare_simple_sorter("downtime_entry_time", "Downtime entry time", "downtime_entry_time", cmp_simple_number)

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 782318c9f91eedd6160a75e0e22bc3b293c547f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=782318c9f91eed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 26 11:13:32 2010 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 11 months

Check_MK Git: check_mk: Added nagvis_base_url to multisite. mk example configuration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a7622ad7c2da16819e413c71b0aec817357377e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7622ad7c2da16… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 25 10:55:52 2010 +0200 Added nagvis_base_url to multisite.mk example configuration --- ChangeLog | 1 + multisite.mk | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3da991f..ec0eec2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * Fix links for items containing + (e.g. service descriptionen including spaces) * Allow non-ASCII character in downtimes and comments + * Added nagvis_base_url to multisite.mk example configuration 1.1.8b3: Core, Setup, etc.: diff --git a/multisite.mk b/multisite.mk index a2abc6b..e66fa8e 100644 --- a/multisite.mk +++ b/multisite.mk @@ -34,6 +34,14 @@ admin_users = [ "nagiosadmin" ] # }, # } +# +# NagVis +# +# The NagVis-Snapin needs to know the URL to nagvis. +# This is not always /nagvis/ - especially not for OMD +nagvis_base_url = '/nagvis' + + # Restrict number of datasets queries via Livestatus. # This prevents you from consuming too much ressources # in case of insensible queries.

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff39dac1700cabd0b0a0879db4e2be45b34a84fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff39dac1700cab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 25 20:19:45 2010 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9b2244fe1643bb80fb570f4c05832bd1eef69cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9b2244fe1643b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 24 22:54:50 2010 +0200 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2010