Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65209 discussions

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) {

14 years

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)

14 years

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)

14 years

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 ---

14 years

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.

14 years

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 ---

14 years

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 ---

14 years

Check_MK Git: check_mk: hp_proliant_psu: Fixed multiple PSU detection on one system ( Thanks to Andreas Döhler)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4e4d56a4e40576fa9b9301e4c5974225c55a350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e4d56a4e4057… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Oct 24 22:54:01 2010 +0200 hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to Andreas Döhler) --- ChangeLog | 2 ++ checks/hp_proliant_psu | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 031b037..9e34fb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ %u. That will be replaced with the user name and thus makes the service description unique. * win_dhcp_pools: better handle invalid agent output + * hp_proliant_psu: Fixed multiple PSU detection on one system (Thanks to + Andreas Döhler) Livestatus: * Prohibit { and } in regular expressions. This avoids a segmentation diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index 236dd0a..22d4d79 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -33,13 +33,13 @@ hp_proliant_redundant_map = { 1: 'other', 2: 'notRedundant', 3: 'redundant' } def inventory_hp_proliant_psu(checkname, info): if len(info) > 0: - return [ (line[0], None) for line in info if line[2] == '3' ] + return [ (line[0] + '/' + line[1], None) for line in info if line[2] == '3' ] else: return [] def check_hp_proliant_psu(item, params, info): for line in info: - if line[0] == item: + if '/' in item and line[0] + line [1] == itemi 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]

14 years

Check_MK Git: check_mk: cluster host check: use service IP if available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd56f2b31e57210326371a63565ed46a249a7484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd56f2b31e5721… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:37:11 2010 +0200 cluster host check: use service IP if available --- ChangeLog | 2 ++ modules/check_mk.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 031b037..3da991f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core, Setup, etc.: * setup.sh: turn off Python debugging * Cleaned up documentation directory + * cluster host: use real IP address for host check if cluster has + one (e.g. service IP address) Checks & Agents: * Added missing PNP template for check_mk-hr_cpu diff --git a/modules/check_mk.py b/modules/check_mk.py index 0961e18..8a69f09 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1169,7 +1169,7 @@ def create_nagios_hostdefs(outfile, hostname): except: if not is_cluster(hostname): raise MKGeneralException("Cannot determine ip address of %s. Please add to ipaddresses." % hostname) - ip = "0.0.0.0" + ip = None # _ # / | @@ -1181,7 +1181,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write("\ndefine host {\n") outfile.write(" host_name\t\t\t%s\n" % hostname) outfile.write(" use\t\t\t\t%s\n" % (is_clust and cluster_template or host_template)) - outfile.write(" address\t\t\t%s\n" % ip) + outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) # Host groups: If the host has no hostgroups it gets the default @@ -1219,6 +1219,10 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) + # Host check uses (service-) IP address if available + if ip: + outfile.write(" check_command\t\t\tcheck-mk-ping\n") + outfile.write(" alias\t\t\t\t%s\n" % alias) # Custom configuration last -> user may override all other values @@ -1237,7 +1241,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" host_name\t\t\t%s\n" % summary_hostname(hostname)) outfile.write(" use\t\t\t\t%s-summary\n" % (is_clust and cluster_template or host_template)) outfile.write(" alias\t\t\t\tSummary of %s\n" % alias) - outfile.write(" address\t\t\t%s\n" % ip) + outfile.write(" address\t\t\t%s\n" % (ip and ip or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) outfile.write(" __REALNAME\t\t\t%s\n" % hostname) outfile.write(" parents\t\t\t%s\n" % hostname)

14 years

Check_MK Git: check_mk: Changed internel compile helper for OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe163fbde2eed498238fa33cf41a5097b740cf56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe163fbde2eed4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 24 22:37:22 2010 +0200 Changed internel compile helper for OMD --- modules/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/.f12 b/modules/.f12 index bb771a7..98c404c 100644 --- a/modules/.f12 +++ b/modules/.f12 @@ -1 +1 @@ -cp *.py /usr/share/check_mk/modules +sudo cp -v *.py /omd/versions/default/share/check_mk/modules/

14 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits