Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

Log more details to web.log in case of painter exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e61e1493a1be00c442e638138a171ce9726a153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e61e1493a1be0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 20:27:49 2017 +0200 Log more details to web.log in case of painter exceptions Change-Id: Ibd70627fcaf4617f819a8aff88f716d79e62e911 --- web/htdocs/lib.py | 6 ++++-- web/htdocs/views.py | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 3a702c0..2dd0f55 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -288,8 +288,10 @@ def format_plugin_output(output, row = None): return output -def log_exception(): - logger.error("%s %s: %s" % (html.request_uri(), _('Internal error'), traceback.format_exc())) +def log_exception(msg=None): + if msg is None: + msg = _('Internal error') + logger.error("%s %s: %s" % (html.request_uri(), msg, traceback.format_exc())) # Escape/strip unwanted chars from (user provided) strings to diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f2792bb..ffffe3e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -747,7 +747,13 @@ class Cell(object): def render(self, row): row = join_row(row, self) - tdclass, content = self.render_content(row) + + try: + tdclass, content = self.render_content(row) + except: + log_exception("Failed to render painter '%s' (Row: %r)" % + (self._painter_name, row)) + raise if tdclass == None: tdclass = ""

7 years

Refactoring: renamed 'select' to 'dropdown' and fixed bug.

by Roland Halbig

Module: check_mk Branch: master Commit: c380faf2cc56d04b63766862f85c736615836fea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c380faf2cc56d0… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Apr 3 09:36:07 2017 +0200 Refactoring: renamed 'select' to 'dropdown' and fixed bug. Refactoring: applied dropdown/select API changes to files. Change-Id: I84272ee0da77116ee54a5c63b01c0ce247214c07 --- web/htdocs/htmllib.py | 62 ++++++++++++++++++++++------------ web/htdocs/i18n.py | 2 +- web/htdocs/prediction.py | 2 +- web/htdocs/sidebar.py | 4 ++- web/htdocs/valuespec.py | 43 ++++++++++------------- web/htdocs/wato.py | 39 +++++++++++---------- web/htdocs/watolib.py | 30 ++++++++-------- web/plugins/sidebar/shipped.py | 3 +- web/plugins/sidebar/wato.py | 12 +++---- web/plugins/views/commands.py | 2 +- web/plugins/visuals/bi.py | 2 +- web/plugins/visuals/filters.py | 31 +++++++---------- web/plugins/visuals/mkeventd.py | 2 +- web/plugins/visuals/wato.py | 2 +- web/plugins/wato/builtin_attributes.py | 2 +- web/plugins/wato/mkeventd.py | 2 +- 16 files changed, 123 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c380faf2cc…

7 years

Refactored = and or.

by Roland Halbig

Module: check_mk Branch: master Commit: 1c245beda632c3ef20bf57da2f69729e148e9945 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c245beda632c3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu May 11 14:00:38 2017 +0200 Refactored = and or. Change-Id: I0279b676227a3707af16c59ae4ec8731e91a8156 --- web/htdocs/bi.py | 11 +++++++---- web/htdocs/pagetypes.py | 2 +- web/htdocs/sidebar.py | 2 +- web/htdocs/views.py | 20 ++++++++++---------- web/htdocs/visuals.py | 4 ++-- web/htdocs/watolib.py | 2 +- web/htdocs/weblib.py | 2 +- web/plugins/perfometer/check_mk.py | 4 ++-- web/plugins/userdb/ldap.py | 6 +++--- web/plugins/views/bi.py | 2 +- web/plugins/views/commands.py | 12 ++++++------ web/plugins/views/layouts.py | 14 +++++++------- web/plugins/views/mobile.py | 2 +- web/plugins/views/webservice.py | 8 ++++---- web/plugins/visuals/filters.py | 6 +++--- web/plugins/webapi/webapi.py | 4 ++-- 16 files changed, 52 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1c245beda6…

7 years

livestatus: Added some error handling ( Trying to track down multi site connect issue)

by Lars Michelsen

Module: check_mk Branch: master Commit: 288ad95695afb2a5c4ffb2af00720fa8822c7f6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=288ad95695afb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 20:21:13 2017 +0200 livestatus: Added some error handling (Trying to track down multi site connect issue) Change-Id: Ia92fd9326575ba27d5f17f7609b0b654639c39fd --- web/htdocs/sites.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 837423d..4383fcd 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -153,7 +153,19 @@ def _connect_multiple_sites(): "Cache: reload\n" "Columns: livestatus_version program_version program_start num_hosts num_services"): - site_id, v1, v2, ps, num_hosts, num_services = response + try: + site_id, v1, v2, ps, num_hosts, num_services = response + except ValueError: + e = livestatus.MKLivestatusQueryError( + "Invalid response to status query: %s" % response) + + site_id = response[0] + _update_site_status(site_id, { + "exception" : e, + "status_host_state" : None, + "state" : _status_host_state_name(None), + }) + continue _update_site_status(site_id, { "state" : "online",

7 years

Livestatus queries: Table not found now raises a MKLivestatusTableNotFoundError() exception

by Lars Michelsen

Module: check_mk Branch: master Commit: 12254f12e9580ed5eda22e021f41dc013888de96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12254f12e9580e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 17:38:42 2017 +0200 Livestatus queries: Table not found now raises a MKLivestatusTableNotFoundError() exception Change-Id: I3f155a1e9415ea68e0977b86b5bad1f49dd2fd11 --- livestatus/api/python/livestatus.py | 18 ++++++++++++++++++ web/htdocs/sites.py | 2 +- web/plugins/sidebar/shipped.py | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/livestatus/api/python/livestatus.py b/livestatus/api/python/livestatus.py index 63a95cb..fd51baf 100644 --- a/livestatus/api/python/livestatus.py +++ b/livestatus/api/python/livestatus.py @@ -71,6 +71,9 @@ class MKLivestatusNotFoundError(MKLivestatusException): def __str__(self): return "No matching entries found for query %s" % str(self.parameter) +class MKLivestatusTableNotFoundError(MKLivestatusException): + pass + # We need some unique value here NO_DEFAULT = lambda: None @@ -336,12 +339,18 @@ class BaseConnection: length = int(resp[4:15].lstrip()) except: raise MKLivestatusSocketError("Malformed output. Livestatus TCP socket might be unreachable.") + data = self.receive_data(length) + if code == "200": try: return ast.literal_eval(data) except: raise MKLivestatusSocketError("Malformed output") + + elif code == "404": + raise MKLivestatusTableNotFoundError("Not Found (%s): %s" % (code, data.strip())) + else: raise MKLivestatusQueryError("%s: %s" % (code, data.strip())) @@ -365,6 +374,9 @@ class BaseConnection: else: raise MKLivestatusSocketError(str(e)) + except MKLivestatusTableNotFoundError: + raise + except Exception, e: raise MKLivestatusSocketError("Unhandled exception: %s" % e) @@ -709,6 +721,12 @@ class MultiSiteConnection(Helpers): if self.prepend_site: r = [ [sitename] + l for l in r ] result += r + #except MKLivestatusTableNotFoundError: + # # In case of multi site queries it may happen that one site knows a table and + # # another site does not have this table because it runs an older version. + # # Don't mark the site as dead site in such a case. + # pass + except Exception, e: self.deadsites[sitename] = { "exception" : e, diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index a216496..837423d 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -186,7 +186,7 @@ def _get_enabled_and_disabled_sites(): def update_site_states_from_dead_sites(): # Get exceptions in case of dead sites - for site_id, deadinfo in _live.dead_sites().items(): + for site_id, deadinfo in live().dead_sites().items(): status_host_state = deadinfo.get("status_host_state") _update_site_status(site_id, { "exception" : deadinfo["exception"], diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 54d0200..6cbcffa 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1258,7 +1258,8 @@ def render_master_control(): html.close_td() html.close_tr() - html.close_table() + html.close_table() + if not config.is_single_local_site(): html.end_foldable_container()

7 years

4758 FIX Fixed site status and master control snapin not displaying states of sites

by Lars Michelsen

Module: check_mk Branch: master Commit: f88eda79a20768f79dae7793c7d906463fa4a8a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f88eda79a20768… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 17:07:10 2017 +0200 4758 FIX Fixed site status and master control snapin not displaying states of sites The master control snapin was hiding sites with communication errors completely. It is now displaying a box with the occured error message. The site status snapin was showing the site, but displaying a site as "online" while it was reported as "dead" by the livestatus connection. This appeared when an error was found in a query, for example when a queried table does not exist. Change-Id: I44aa10019a7b78fa381bdb3ebac1719c4ab22576 --- .werks/4758 | 16 ++++++++++++++++ web/htdocs/sites.py | 21 +++++++++++++-------- web/plugins/sidebar/shipped.py | 15 +++++++++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.werks/4758 b/.werks/4758 new file mode 100644 index 0000000..500f81c --- /dev/null +++ b/.werks/4758 @@ -0,0 +1,16 @@ +Title: Fixed site status and master control snapin not displaying states of sites +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497625512 + +The master control snapin was hiding sites with communication errors completely. +It is now displaying a box with the occured error message. + +The site status snapin was showing the site, but displaying a site as "online" +while it was reported as "dead" by the livestatus connection. This appeared when +an error was found in a query, for example when a queried table does not exist. diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 3c22398..a216496 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -166,14 +166,9 @@ def _connect_multiple_sites(): }) _live.set_prepend_site(False) - # Get exceptions in case of dead sites - for site_id, deadinfo in _live.dead_sites().items(): - shs = deadinfo.get("status_host_state") - _update_site_status(site_id, { - "exception" : deadinfo["exception"], - "status_host_state" : shs, - "state" : _status_host_state_name(shs), - }) + # TODO(lm): Find a better way to make the Livestatus object trigger the update + # once self.deadsites is updated. + update_site_states_from_dead_sites() def _get_enabled_and_disabled_sites(): @@ -189,6 +184,16 @@ def _get_enabled_and_disabled_sites(): return enabled_sites, disabled_sites +def update_site_states_from_dead_sites(): + # Get exceptions in case of dead sites + for site_id, deadinfo in _live.dead_sites().items(): + status_host_state = deadinfo.get("status_host_state") + _update_site_status(site_id, { + "exception" : deadinfo["exception"], + "status_host_state" : status_host_state, + "state" : _status_host_state_name(status_host_state), + }) + def _status_host_state_name(shs): if shs == None: diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 902f357..bf5c5ef 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -482,9 +482,13 @@ def render_sitestatus(): if config.is_multisite(): html.open_table(cellspacing=0, class_="sitestate") + sites.update_site_states_from_dead_sites() + for sitename, sitealias in config.sorted_sites(): site = config.site(sitename) + state = sites.state(sitename, {}) + if state.get("state") == None: state = "missing" text = _("Missing site") @@ -1239,6 +1243,17 @@ def render_master_control(): if not config.is_single_local_site(): html.end_foldable_container() + # Also show the dead sites + for site_id, site_status in sorted(sites.live().dead_sites().items()): + if not config.is_single_local_site(): + sitealias = config.site(site_id)["alias"] + html.begin_foldable_container("master_control", site_id, True, sitealias) + + html.show_error(site_status["exception"]) + + if not config.is_single_local_site(): + html.end_foldable_container() + sidebar_snapins["master_control"] = { "title" : _("Master Control"),

7 years

Master control: Display all sites, show dead sites with error text in order

by Lars Michelsen

Module: check_mk Branch: master Commit: fbf138f0af7abe35c6b290fc00d8f5b9622a4a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbf138f0af7abe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 17:18:17 2017 +0200 Master control: Display all sites, show dead sites with error text in order Change-Id: I4186eab3534d2b0ac2f853decf7e80be4c5ca35f --- web/plugins/sidebar/shipped.py | 84 +++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index bf5c5ef..54d0200 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1205,52 +1205,60 @@ def render_master_control(): ( "enable_event_handlers", _("Event handlers" )), ( "process_performance_data", _("Performance data" )), ( "enable_event_handlers", _("Alert handlers" )), - ] + ] - sites.live().set_prepend_site(True) - data = sites.live().query("GET status\nColumns: %s" % " ".join([ i[0] for i in items ])) - sites.live().set_prepend_site(False) + sites.update_site_states_from_dead_sites() + + site_status_info = {} + try: + sites.live().set_prepend_site(True) + for row in sites.live().query("GET status\nColumns: %s" % + " ".join([ i[0] for i in items ])): + site_id, values = row[0], row[1:] + site_status_info[site_id] = values + finally: + sites.live().set_prepend_site(False) - for siteline in data: - siteid = siteline[0] + for site_id, site_alias in config.sorted_sites(): if not config.is_single_local_site(): - sitealias = config.site(siteid)["alias"] - html.begin_foldable_container("master_control", siteid, True, sitealias) - is_cmc = sites.state(siteid)["program_version"].startswith("Check_MK ") - html.open_table(class_="master_control") - for i, (colname, title) in enumerate(items): - # Do not show event handlers on Check_MK Micro Core - if is_cmc and title == _("Event handlers"): - continue - elif not is_cmc and title == _("Alert handlers"): - continue + html.begin_foldable_container("master_control", site_id, True, site_alias) - colvalue = siteline[i + 1] - url = config.url_prefix() + ("check_mk/switch_master_state.py?site=%s&switch=%s&state=%d" % (siteid, colname, 1 - colvalue)) - onclick = "get_url('%s', updateContents, 'snapin_master_control')" % url + site_state = sites.state(site_id) + if site_state["state"] == "dead": + html.show_error(site_state["exception"]) - html.open_tr() - html.td(title, class_="left") - html.open_td() - html.toggle_switch( - enabled=colvalue, - help=_("Switch '%s' to '%s'") % (title, _("off") if colvalue else _("on")), - onclick=onclick, - ) - html.close_td() - html.close_tr() - html.close_table() - if not config.is_single_local_site(): - html.end_foldable_container() + else: + is_cmc = site_state["program_version"].startswith("Check_MK ") - # Also show the dead sites - for site_id, site_status in sorted(sites.live().dead_sites().items()): - if not config.is_single_local_site(): - sitealias = config.site(site_id)["alias"] - html.begin_foldable_container("master_control", site_id, True, sitealias) + try: + site_info = site_status_info[site_id] + except KeyError: + site_info = None + + html.open_table(class_="master_control") + for i, (colname, title) in enumerate(items): + # Do not show event handlers on Check_MK Micro Core + if is_cmc and title == _("Event handlers"): + continue + elif not is_cmc and title == _("Alert handlers"): + continue - html.show_error(site_status["exception"]) + colvalue = site_info[i] + url = config.url_prefix() + ("check_mk/switch_master_state.py?site=%s&switch=%s&state=%d" % (site_id, colname, 1 - colvalue)) + onclick = "get_url('%s', updateContents, 'snapin_master_control')" % url + + html.open_tr() + html.td(title, class_="left") + html.open_td() + html.toggle_switch( + enabled=colvalue, + help=_("Switch '%s' to '%s'") % (title, _("off") if colvalue else _("on")), + onclick=onclick, + ) + html.close_td() + html.close_tr() + html.close_table() if not config.is_single_local_site(): html.end_foldable_container()

7 years

Improved styling of error messages in sidebar snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: bcc2ad5004bf0f6ef0e62d652e105eaee8d6f728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcc2ad5004bf0f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 16 16:43:31 2017 +0200 Improved styling of error messages in sidebar snapins Change-Id: I5fc5e8f728305f7b1eac1855193ce4082e396e47 --- web/htdocs/check_mk.css | 10 ++++++++++ web/htdocs/pages.css | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2cb1f85..d964b18 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -406,6 +406,16 @@ ul.closed { | Styles for messages-boxes in various situations (called by htmllib.py) | '-------------------------------------------------------------------------*/ +div.really, div.success, div.error, div.message, div.warning { + margin: 0.25em; + border-radius: 1ex; + padding: 0.5em 1em; + box-shadow: 0 0 3px #444; +} + +div.message { + color: black; +} div.really { background-color: #fdc400; border-color: #800; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index beb8e8d..8ebc40a 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -997,11 +997,7 @@ table.nform tr.bottom td { '-------------------------------------------------------------------------*/ div.really, div.success, div.error, div.message, div.warning { margin: 2em 0em; - border-radius: 1ex; padding: 1em 2em; - box-shadow: 0 0 3px #444; - /* border-width: 2px; - border-style: solid;*/ } div.message {

7 years

Updated werks 4868, 4785 for other mk_oracle plugins

by Simon Betz

Module: check_mk Branch: master Commit: c77facf10fa871af9c8104ac7308c5b616667704 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c77facf10fa871… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 16 15:50:57 2017 +0200 Updated werks 4868, 4785 for other mk_oracle plugins Change-Id: I79581af0583340c18a016cc4852cce4c42753ec4 --- agents/plugins/mk_oracle.aix | 43 +++++++++++++++++++++++++++++++++--- agents/windows/plugins/mk_oracle.ps1 | 39 +++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index 27f5bb4..74ebdc2 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -68,12 +68,12 @@ fi # '----------------------------------------------------------------------' # Sections that run fast and do no caching -SYNC_SECTIONS="instance sessions logswitches undostat recovery_area processes recovery_status longactivesessions dataguard_stats performance" +SYNC_SECTIONS="instance sessions logswitches undostat recovery_area processes recovery_status longactivesessions dataguard_stats performance locks" # Sections that are run in the background and at a larger interval. # Note: sections not listed in SYNC_SECTIONS or ASYNC_SECTIONS will not be # executed at all! -ASYNC_SECTIONS="tablespaces rman jobs ts_quotas resumable locks" +ASYNC_SECTIONS="tablespaces rman jobs ts_quotas resumable" # Sections that are run in the background and at a larger interval. # Note: _ASM_ sections are only executed when SID starts with '+' @@ -192,7 +192,8 @@ sql_tablespaces() WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, - 'TEMP', t.block_size, t.status); + 'TEMP', t.block_size, t.status) + where d.database_role = 'PRIMARY'; " elif [ "$AT_LEAST_ORACLE_92" = 'yes' ] ; then @@ -560,6 +561,42 @@ sql_logswitches() sql_locks() { + if [ "$AT_LEAST_ORACLE_102" = 'yes' ] ; then + echo 'prompt <<<oracle_locks:sep(124)>>>' + echo "select upper(i.instance_name) + || '|' || b.sid + || '|' || b.serial# + || '|' || b.machine + || '|' || b.program + || '|' || b.process + || '|' || b.osuser + || '|' || b.username + || '|' || b.SECONDS_IN_WAIT + || '|' || b.BLOCKING_SESSION_STATUS + || '|' || bs.inst_id + || '|' || bs.sid + || '|' || bs.serial# + || '|' || bs.machine + || '|' || bs.program + || '|' || bs.process + || '|' || bs.osuser + || '|' || bs.username + from v\$session b + join v\$instance i on 1=1 + join gv\$session bs on bs.inst_id = b.BLOCKING_INSTANCE + and bs.sid = b.BLOCKING_SESSION + where b.BLOCKING_SESSION is not null +; + select upper(i.instance_name) + || '|||||||||||||||||' + from v\$instance i +; + " + fi +} + +sql_locks_old() +{ if [ "$AT_LEAST_ORACLE_101" = 'yes' ] ; then echo 'prompt <<<oracle_locks:sep(124)>>>' echo "SET SERVEROUTPUT ON feedback off diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index da6ea5d..c983b34 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -635,7 +635,7 @@ Function sql_tablespaces { GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, 'TEMP', t.block_size, t.status) - ; + where d.database_role = 'PRIMARY'; '@ @@ -1114,6 +1114,43 @@ echo $query_logswitches # SQL for database lock information ################################################################################ Function sql_locks { + if ($DBVERSION -gt 101000) + { + $query_locks = @' + select upper(i.instance_name) + || '|' || b.sid + || '|' || b.serial# + || '|' || b.machine + || '|' || b.program + || '|' || b.process + || '|' || b.osuser + || '|' || b.username + || '|' || b.SECONDS_IN_WAIT + || '|' || b.BLOCKING_SESSION_STATUS + || '|' || bs.inst_id + || '|' || bs.sid + || '|' || bs.serial# + || '|' || bs.machine + || '|' || bs.program + || '|' || bs.process + || '|' || bs.osuser + || '|' || bs.username + from v\$session b + join v\$instance i on 1=1 + join gv\$session bs on bs.inst_id = b.BLOCKING_INSTANCE + and bs.sid = b.BLOCKING_SESSION + where b.BLOCKING_SESSION is not null + ; + select upper(i.instance_name) + || '|||||||||||||||||' + from v\$instance i + ; + '@ + echo $query_locks + } +} + +Function sql_locks_old { if ($DBVERSION -gt 101000) { $query_locks = @'

7 years

updated werk 4868

by Simon Betz

Module: check_mk Branch: master Commit: 66a19a08d76ac0b4225d7053e302ad7ba6c11c1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66a19a08d76ac0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 16 15:32:43 2017 +0200 updated werk 4868 Change-Id: I6a514637f87e23f2e5f7bbefd5772ce7680a0638 --- agents/plugins/mk_oracle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index b199eea..dcc871d 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -204,7 +204,8 @@ sql_tablespaces() WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, - 'TEMP', t.block_size, t.status); + 'TEMP', t.block_size, t.status) + where d.database_role = 'PRIMARY'; " elif [ "$AT_LEAST_ORACLE_92" = 'yes' ] ; then

7 years

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017