Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: #2070 FIX agent_netapp: fixed exception when a channel has no shelf-list configured

by Andreas Boesl

Module: check_mk Branch: master Commit: 8112dce63e6f59c0a27e1043c249fc4f65eae6ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8112dce63e6f59… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 21 13:23:11 2015 +0200 #2070 FIX agent_netapp: fixed exception when a channel has no shelf-list configured --- .werks/2070 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2070 b/.werks/2070 new file mode 100644 index 0000000..d63e851 --- /dev/null +++ b/.werks/2070 @@ -0,0 +1,10 @@ +Title: agent_netapp: fixed exception when a channel has no shelf-list configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429615270 + + diff --git a/ChangeLog b/ChangeLog index 029cd37..e52046d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -336,6 +336,7 @@ * 2068 FIX: Filesystem checks: Fix crash when legacy parameters (tuple) were used... * 2213 FIX: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature... * 2069 FIX: netapp_api_disk.summary: fixed one missing disk in summary check... + * 2070 FIX: agent_netapp: fixed exception when a channel has no shelf-list configured Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 577b251..83c8947 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -160,6 +160,9 @@ def output_environment(results): channel_name = channel.child_get_string("channel-name") shelf_list = channel.child_get("shelf-environ-shelf-list") + if not shelf_list: + continue + for idx, child in enumerate(shelf_list.children_get()): current_shelf = child.child_get("ses-generic-info").child_get_string("ses-logical-id") # convert 0x50050cc002219406 to 50:05:0c:c0:02:21:94:06

9 years, 4 months

Check_MK Git: check_mk: #2069 FIX netapp_api_disk.summary:

by Andreas Boesl

fixed one missing disk in summary check Message-ID: <55362f2d./0meDl98TeXyJVhp%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 56131db24a03a402e4793ef0cc401f39eb456ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56131db24a03a4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 21 13:05:45 2015 +0200 #2069 FIX netapp_api_disk.summary: fixed one missing disk in summary check The library function responsible for parsing the agent data did omit the last disk entry, thus leading to an invalid disk count and possibly missing error data. --- .werks/2069 | 11 +++++++++++ ChangeLog | 2 ++ checks/netapp_api.include | 2 ++ 3 files changed, 15 insertions(+) diff --git a/.werks/2069 b/.werks/2069 new file mode 100644 index 0000000..b3f569b --- /dev/null +++ b/.werks/2069 @@ -0,0 +1,11 @@ +Title: netapp_api_disk.summary: fixed one missing disk in summary check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429614114 + +The library function responsible for parsing the agent data did omit the last +disk entry, thus leading to an invalid disk count and possibly missing error data. diff --git a/ChangeLog b/ChangeLog index 10eceb9..029cd37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -335,6 +335,7 @@ * 2067 FIX: windows agent: product version is no longer set to 1.0.0... * 2068 FIX: Filesystem checks: Fix crash when legacy parameters (tuple) were used... * 2213 FIX: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature... + * 2069 FIX: netapp_api_disk.summary: fixed one missing disk in summary check... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... @@ -460,6 +461,7 @@ * 1662 notification plugin spectrum: finalized script. now able to handle host notications * 1213 New Notification macros $SERVICEFORURL$ and $HOSTFORURL$... * 2041 Notification Spooler can now handle incoming and outgoing persistent TCP connections... + NOTE: Please refer to the migration notes! * 2135 Allow to filter notification contacts based on values of custom macros... * 1235 Added notification plugin for Braintower SMS Gateways... * 2188 Rule based notification now allow match for notification comment... diff --git a/checks/netapp_api.include b/checks/netapp_api.include index c77914a..d1926f6 100644 --- a/checks/netapp_api.include +++ b/checks/netapp_api.include @@ -88,6 +88,7 @@ def netapp_api_convert_info(info, configs = {}, counter_key = None, counter_as_k while True: line = lines.next() if line[0] == "[config_instance]": + add_config() add_counter() current_counter = {} is_config = True @@ -95,6 +96,7 @@ def netapp_api_convert_info(info, configs = {}, counter_key = None, counter_as_k continue elif line[0] == "[counter_instance]": add_config() + add_counter() current_config = {} is_config = False continue

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2315

by Lars Michelsen

Module: check_mk Branch: master Commit: 05297bc33a0c23d5dbe3a5935a11ad3f15558e82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05297bc33a0c23… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 21 12:27:14 2015 +0200 Updated bug entries #2315 --- .bugs/2315 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2315 b/.bugs/2315 new file mode 100644 index 0000000..a8c47dc --- /dev/null +++ b/.bugs/2315 @@ -0,0 +1,13 @@ +Title: Interval for SNMP-Checks rule affects manual calls on command line +Component: core +State: open +Date: 2015-04-21 12:24:49 +Targetversion: 1.2.6 +Class: bug + +The rule "Interval for SNMP-Checks", which is meant to customize the check +interval for each SNMP service, seems to affect the command line calls +cmk -nv [hostname]. + +Shouldn't the command line calls ignore the interval and enforce +fetching of all SNMP checks?

9 years, 4 months

Check_MK Git: check_mk: set werk #2041 (new mknotifyd) to incompabtible. configuration needs to be redone

by Andreas Boesl

Module: check_mk Branch: master Commit: 45ad80353e950b04804b5cb212da699ce1e98244 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45ad80353e950b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 21 11:33:41 2015 +0200 set werk #2041 (new mknotifyd) to incompabtible. configuration needs to be redone --- .werks/2041 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.werks/2041 b/.werks/2041 index e9c7d60..40cd002 100644 --- a/.werks/2041 +++ b/.werks/2041 @@ -1,7 +1,7 @@ Title: Notification Spooler can now handle incoming and outgoing persistent TCP connections Level: 2 Component: notifications -Compatible: compat +Compatible: incomp Version: 1.2.7i1 Date: 1425463954 Class: feature @@ -32,3 +32,6 @@ spooler. We propose starting with the highest log level. Also a file <tt>var/log/mknotifyd.log</tt> is being written every 20 seconds. It shows the state of the spooler and its connections. This is being used for the monitoring of the spooler. + +Note: To get the new mknotifyd running you need to reconfigure its global settings. +Otherwise it will use the incompatible configuration of the previous version.

9 years, 4 months

Check_MK Git: check_mk: #2180 FIX cmk -D showed always "bulkwalk: no" for SNMPv3 hosts (which is wrong)

by Lars Michelsen

Module: check_mk Branch: master Commit: 344d23fdb57876904332fe896d03fb1105a2b18d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=344d23fdb57876… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 21 11:01:26 2015 +0200 #2180 FIX cmk -D showed always "bulkwalk: no" for SNMPv3 hosts (which is wrong) When using SNMPv3 to query hosts Check_MK is always using bulkwalks, cmk -D [hostname] did not show display this behaviour correctly. It only showed "yes" when the host was configured as "bulkwalk host". --- .werks/2180 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2180 b/.werks/2180 new file mode 100644 index 0000000..1261272 --- /dev/null +++ b/.werks/2180 @@ -0,0 +1,11 @@ +Title: cmk -D showed always "bulkwalk: no" for SNMPv3 hosts (which is wrong) +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i1 +Date: 1429606780 +Class: fix + +When using SNMPv3 to query hosts Check_MK is always using bulkwalks, cmk -D [hostname] +did not show display this behaviour correctly. It only showed "yes" when the host +was configured as "bulkwalk host". diff --git a/ChangeLog b/ChangeLog index 79cb1f5..10eceb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 2093 FIX: Fixed handling of check_mk commandline parameter "-c" * 2187 FIX: Avoid CLOSE_WAIT sockets for agent connection in case of timeouts... * 2194 FIX: Avoid new discovered checks from being used without config reload + * 2180 FIX: cmk -D showed always "bulkwalk: no" for SNMPv3 hosts (which is wrong)... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 7035a17..7171263 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4317,7 +4317,7 @@ def dump_host(hostname): else: cred = "credentials: '%s'" % ", ".join(credentials) - if is_bulkwalk_host(hostname): + if is_snmpv3_host(hostname) or is_bulkwalk_host(hostname): bulk = "yes" else: bulk = "no"

9 years, 4 months

Check_MK Git: check_mk: Improved handling of graph hover when distributed site is not reachable

by Lars Michelsen

Module: check_mk Branch: master Commit: 165a09fb5f9f769a0b5343c7cf51907b49300e88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=165a09fb5f9f76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 21 10:49:26 2015 +0200 Improved handling of graph hover when distributed site is not reachable --- web/htdocs/check_mk.css | 5 +++++ web/htdocs/js/checkmk.js | 2 +- web/htdocs/livestatus.py | 6 +++++- web/htdocs/metrics.py | 8 +++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 88674a7..80349a2 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -553,3 +553,8 @@ div#hover_menu { z-index: 40; color: #000; } + +div#hover_menu div.error { + width:350px; + margin: 0; +} diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 43f6dd2..28a905c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -812,7 +812,7 @@ function hover_graph(site, host_name, service) // the expected code, simply display an error message. if (c.indexOf('/image?') === -1) { // Error! unexpected response - c = '<div style="background-color:#BA2C2C;width:350px;padding:5px"> ' + c = '<div class="error"> ' + 'ERROR: Received an unexpected response ' + 'while trying to display the PNP-Graphs. Maybe there is a problem with the ' + 'authentication.</div>'; diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index cc67c40..562345f 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -109,7 +109,11 @@ class Helpers: def query_row(self, query): """Issues a query that returns one line of data and returns the elements of that line as list""" - return self.query(query, "ColumnHeaders: off\n")[0] + result = self.query(query, "ColumnHeaders: off\n") + try: + return result[0] + except IndexError: + raise MKLivestatusNotFoundError(query) def query_row_assoc(self, query): """Issues a query that returns one line of data and returns the elements diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index e1a17d3..ab1f578 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -37,6 +37,7 @@ import math, time import config, defaults from lib import * +import livestatus # Datastructures and functions needed before plugins can be loaded loaded_with_language = False @@ -957,7 +958,12 @@ def page_show_graph(): "Columns: perf_data metrics check_command\n" % (host_name, service) html.live.set_only_sites([site]) - data = html.live.query_row(query) + try: + data = html.live.query_row(query) + except livestatus.MKLivestatusNotFoundError: + html.write('<div class="error">%s</div>' % + _('Failed to fetch data for graph. Maybe the site is not reachable?')) + return html.live.set_only_sites(None) if service == "_HOST_":

9 years, 4 months

Check_MK Git: check_mk: fixed \r\n linefeeds of mk_oracle.ps1 and windows_tasks.ps1

by Andreas Boesl

Module: check_mk Branch: master Commit: 47af3e5c09d04a01f4afed04db0f1b07ab241632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47af3e5c09d04a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 21 09:38:02 2015 +0200 fixed \r\n linefeeds of mk_oracle.ps1 and windows_tasks.ps1 --- agents/windows/plugins/mk_oracle.ps1 | 2838 +++++++++++++++--------------- agents/windows/plugins/windows_tasks.ps1 | 2 +- 2 files changed, 1420 insertions(+), 1420 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47af3e5c09…

9 years, 4 months

Check_MK Git: check_mk: converted get_counter to get_rate

by Andreas Boesl

Module: check_mk Branch: master Commit: 9f9d56cf1c7b5b84427dfbb8122f99d68da58d98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f9d56cf1c7b5b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 20 15:42:16 2015 +0200 converted get_counter to get_rate --- checks/netapp_api_cpu | 2 +- checks/netapp_api_vf_stats | 4 ++-- checks/netapp_api_volumes | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/netapp_api_cpu b/checks/netapp_api_cpu index 8f192d9..133666c 100644 --- a/checks/netapp_api_cpu +++ b/checks/netapp_api_cpu @@ -41,7 +41,7 @@ def check_netapp_api_cpu_utilization(item, params, info): cpu_busy = int(data["cpu_busy"]) num_cpus = int(data["num_processors"]) - timedif, ticks_per_sec = get_counter("netapp_api_cpu.utilization", now, cpu_busy) + ticks_per_sec = get_rate("netapp_api_cpu.utilization", now, cpu_busy, onwrap=RAISE) cpusecs_per_sec = ticks_per_sec / 1000000.0 used_perc = 100.0 * cpusecs_per_sec diff --git a/checks/netapp_api_vf_stats b/checks/netapp_api_vf_stats index 3be9a70..b1323b6 100644 --- a/checks/netapp_api_vf_stats +++ b/checks/netapp_api_vf_stats @@ -41,7 +41,7 @@ def check_netapp_api_vf_stats_cpu_util(item, params, info): now = time.time() cpu_busy = int(vf["vfiler_cpu_busy"]) - timedif, ticks_per_sec = get_counter("netapp_api_vf_stats.cpu_util.%s" % item, now, cpu_busy ) + ticks_per_sec = get_rate("netapp_api_vf_stats.cpu_util.%s" % item, now, cpu_busy, onwrap=RAISE) cpusecs_per_sec = ticks_per_sec / 1000.0 / 1000 / 10000 used_perc = 100.0 * cpusecs_per_sec @@ -87,7 +87,7 @@ def check_netapp_api_vf_stats_traffic(item, params, info): ("read_bytes", "Read", 1024.0, 1024, "B/s"), ("write_bytes", "Write", 1024.0, 1024, "B/s")]: traffic = int(vf["vfiler_" + entry]) * factor - timedif, ticks_per_sec = get_counter("netapp_api_vf_stats.traffic.%s.%s" % (item, entry), now, traffic) + ticks_per_sec = get_rate("netapp_api_vf_stats.traffic.%s.%s" % (item, entry), now, traffic) yield 0, "%s: %s" % (name, get_bytes_human_readable(ticks_per_sec, base = base, unit = unit)), [(entry, ticks_per_sec)] diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 0af8698..d6bb34d 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -84,7 +84,7 @@ def check_netapp_api_volumes(item, params, parsed): if value != None: value = int(value) try: - timedif, delta = get_counter("netapp_api_volumes.%s.%s" % (item, key), now, value) + delta = get_rate("netapp_api_volumes.%s.%s" % (item, key), now, value, onwrap=RAISE) perf.append( (key, delta) ) if protocol == "" and mode in ["read_", "write_"]:

9 years, 4 months

Check_MK Git: check_mk: #2209 New filter for selecting hosts/services in/ out of their service period

by Mathias Kettner

Module: check_mk Branch: master Commit: 042cb4adf443734a0cfc42df6f179ea36b52df75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=042cb4adf44373… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 20 15:25:23 2015 +0200 #2209 New filter for selecting hosts/services in/out of their service period --- .werks/2209 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 4 ++++ web/plugins/visuals/filters.py | 6 ++++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/2209 b/.werks/2209 new file mode 100644 index 0000000..82d1d05 --- /dev/null +++ b/.werks/2209 @@ -0,0 +1,9 @@ +Title: New filter for selecting hosts/services in/out of their service period +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1429536304 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 53eb04d..79cb1f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -352,6 +352,7 @@ * 2174 Added action popup to host & service views, supporting custom actions now... * 2175 Added icon uploader, unified icon selection... * 2200 New filter for (de-)selecting preliminary notifications to "check-mk-notify"... + * 2209 New filter for selecting hosts/services in/out of their service period * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index a4447b2..66bf33d 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -72,6 +72,7 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['host_scheduled_downtime_depth', 'host_in_notification_period', + 'host_in_service_period', 'hoststate', 'siteopt', 'host_acknowledged', @@ -193,6 +194,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', + 'service_in_service_period', 'optservicegroup', 'service_notifications_enabled', 'host_in_notification_period', @@ -1110,6 +1112,7 @@ multisite_builtin_views.update({ 'show_filters': [ 'host_scheduled_downtime_depth', 'host_in_notification_period', + 'host_in_service_period', 'hoststate', 'siteopt', 'hostregex', @@ -1171,6 +1174,7 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['service_in_notification_period', + 'service_in_service_period', 'optservicegroup', 'optservice_contactgroup', 'hostgroups', diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 7b50809..5fb04c8 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -487,12 +487,14 @@ declare_filter(251, FilterNagiosExpression("service", "has_performance_data", "Filter: service_perf_data != \n", "Filter: service_perf_data = \n")) -declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", _("Host in notif. period"))) +declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", _("Host in notification period"))) +declare_filter(130, FilterNagiosFlag("host", "host_in_service_period", _("Host in service period"))) declare_filter(131, FilterNagiosFlag("host", "host_acknowledged", _("Host problem has been acknowledged"))) declare_filter(132, FilterNagiosFlag("host", "host_active_checks_enabled", _("Host active checks enabled"))) declare_filter(133, FilterNagiosFlag("host", "host_notifications_enabled", _("Host notifications enabled"))) declare_filter(230, FilterNagiosFlag("service", "service_acknowledged", _("Problem acknowledged"))) -declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notif. per."))) +declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notification period"))) +declare_filter(231, FilterNagiosFlag("service", "service_in_service_period", _("Service in service period"))) declare_filter(233, FilterNagiosFlag("service", "service_active_checks_enabled", _("Active checks enabled"))) declare_filter(234, FilterNagiosFlag("service", "service_notifications_enabled", _("Notifications enabled"))) declare_filter(236, FilterNagiosFlag("service", "service_is_flapping", _("Flapping")))

9 years, 4 months

Check_MK Git: check_mk: #2208 FIX Add missing Livestatus column service_period

by Mathias Kettner

Module: check_mk Branch: master Commit: 9eff4edf7bd030742df58cb394bf8809413e685f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eff4edf7bd030… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 20 15:20:33 2015 +0200 #2208 FIX Add missing Livestatus column service_period This column was not being accessable due to the fact that it's prefix is <tt>service_</tt>. This has been fixed. Conflicts: ChangeLog livestatus/src/Table.cc --- .werks/2208 | 11 +++++++++++ ChangeLog | 3 +++ livestatus/src/Table.cc | 11 +++++++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/2208 b/.werks/2208 new file mode 100644 index 0000000..9877ef0 --- /dev/null +++ b/.werks/2208 @@ -0,0 +1,11 @@ +Title: Add missing Livestatus column service_period +Level: 1 +Component: livestatus +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429535813 + +This column was not being accessable due to the fact that it's +prefix is <tt>service_</tt>. This has been fixed. diff --git a/ChangeLog b/ChangeLog index be01533..53eb04d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -500,6 +500,9 @@ * 2139 FIX: Fix exception in Event Console when archiving events with match groups and non ASCII characters * 2151 FIX: Fixed wrong time in events when forwarding logwatch to EC between timezones... + Livestatus: + * 2208 FIX: Add missing Livestatus column service_period... + HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers diff --git a/livestatus/src/Table.cc b/livestatus/src/Table.cc index d462be2..cb526b6 100644 --- a/livestatus/src/Table.cc +++ b/livestatus/src/Table.cc @@ -105,6 +105,17 @@ Column *Table::column(const char *colname) _columns_t::iterator it = _columns.find(string(colname)); if (it != _columns.end()) return it->second; + + // Now we try to readd the removed prefix. That way we tackle the + // problem with the column "service_period". Here the prefix service_ + // is part of the actual name of the column! + string with_prefix(prefixname(), prefix_len - 1); + with_prefix += "_"; + with_prefix += colname; + + it = _columns.find(with_prefix); + if (it != _columns.end()) + return it->second; else return 0; }

9 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015