Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: Correct format of Multisite JSON output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c1ae70efba787e92a8cef5bc49f7aca048a86aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1ae70efba787e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 15:26:30 2011 +0100 Correct format of Multisite JSON output --- web/plugins/views/webservice.py | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index d9dab8b..53511ea 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -30,23 +30,12 @@ multisite_layouts["python"] = { } -json_escape = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]') -ESCAPE_DCT = { - '\\': '\\\\', - '"': '\\"', - '\b': '\\b', - '\f': '\\f', - '\n': '\\n', - '\r': '\\r', - '\t': '\\t', -} -for i in range(0x20): - ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i)) +json_escape = re.compile(r'[\\"\r\n\t\b\f\x00-\x1f]') +json_encoding_table = dict([(chr(i), '\\u%04x' % i) for i in range(32)]) +json_encoding_table.update({'\b': '\\b', '\f': '\\f', '\n': '\\n', '\r': '\\r', '\t': '\\t', '\\': '\\\\', '"': '\\"' }) def encode_string_json(s): - def replace(match): - return ESCAPE_DCT[match.group(0)] - return '"' + ESCAPE.sub(replace, s) + '"' + return '"' + json_escape.sub(lambda m: json_encoding_table[m.group(0)], s) + '"' def render_json(data, view, group_painters, painters, num_columns): @@ -64,7 +53,6 @@ def render_json(data, view, group_painters, painters, num_columns): tdclass, content = p[0]["paint"](row) stripped = htmllib.strip_tags(content) utf8 = stripped.encode("utf-8") - utf8 += r'\"' html.write(encode_string_json(utf8)) html.write("]") html.write("\n]\n")

13 years, 4 months

Check_MK Git: check_mk: Multisite: new display_option d/D

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7b95db7812b2b9c8c6746355d75fc3aed8c5f62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7b95db7812b2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 15:14:20 2011 +0100 Multisite: new display_option d/D --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 ++++++- web/htdocs/views.py | 38 ++++++++++++++++++++++---------------- web/plugins/views/webservice.py | 27 ++++++++++++++++++++++++--- 4 files changed, 53 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fd9ccd..5aefdb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Acknowledgement of problem now has checkboxes for sticky, send notification and persisten comment * Downtimes: allow to specify fixed/flexible downtime + * new display_options d/D for switching on/off the tab "Display" WATO: * Fixed problem appearing at restart on older Python version (RH) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ed32f1e..13f6a1c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -456,7 +456,12 @@ class html: self.write("\n") def message(self, msg): - self.write("<div class=success>%s</div>\n" % msg) + if self.output_format == "html": + self.write("<div class=success>%s</div>\n" % msg) + else: + self.write("MESSAGE: ") + self.write(strip_tags(msg)) + self.write("\n") def confirm(self, msg): if self.var("_do_actions") == "No": diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fb7d019..c9f48fb 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -935,7 +935,7 @@ def page_view(h): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True): - all_display_options = "HTBFCEOZRSIX" + all_display_options = "HTBFCEOZRSIXD" # Parse display options and if html.output_format == "html": @@ -1064,7 +1064,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if show_buttons and 'B' in display_options: show_context_links(view, hide_filters) - need_navi = show_buttons and ('F' in display_options or 'C' in display_options or 'O' in display_options or 'E' in display_options) + need_navi = show_buttons and ('D' in display_options or 'F' in display_options or 'C' in display_options or 'O' in display_options or 'E' in display_options) if need_navi: html.write("<table class=navi><tr>\n") @@ -1080,7 +1080,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.write("<td class=minigap></td>\n") # Painter-Options - if len(painter_options) > 0 and config.may("painter_options"): + if 'D' in display_options and len(painter_options) > 0 and config.may("painter_options"): toggle_button("painter_options", False, "Display") html.write("<td class=minigap></td>\n") @@ -1130,24 +1130,29 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): show_filter_form(filter_isopen, show_filters) - # Actions - if 'C' in display_options and len(rows) > 0: - if html.do_actions() and html.transaction_valid(): # submit button pressed, no reload - try: + # Actions + if len(rows) > 0: + if html.do_actions() and html.transaction_valid(): # submit button pressed, no reload + try: + if 'C' in display_options: html.write("<tr class=form><td class=whiteborder>") - # Create URI with all actions variables removed - backurl = html.makeuri([]) - has_done_actions = do_actions(datasource["infos"][0], rows, backurl) + # Create URI with all actions variables removed + backurl = html.makeuri([]) + has_done_actions = do_actions(datasource["infos"][0], rows, backurl) + if 'C' in display_options: html.write("</td></tr>") - except MKUserError, e: - html.show_error(e.message) + except MKUserError, e: + html.show_error(e.message) + if 'C' in display_options: html.write("</td></tr>") - html.add_user_error(e.varname, e.message) + html.add_user_error(e.varname, e.message) + if 'C' in display_options: show_action_form(True, datasource) - else: - show_action_form(False, datasource) + elif 'C' in display_options: + show_action_form(False, datasource) + if need_navi: if 'O' in display_options and len(painter_options) > 0 and config.may("painter_options"): show_painter_options(painter_options) @@ -1834,7 +1839,8 @@ def do_actions(what, rows, backurl): message = "Successfully sent %d commands to Nagios." % count if config.debug: message += "The last one was: <pre>%s</pre>" % command - message += '<br><a href="%s">Back to view</a>' % backurl + if html.output_format == "html": # sorry for this hack + message += '<br><a href="%s">Back to view</a>' % backurl html.message(message) elif count == 0: html.message("No matching service. No command sent.") diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 98030ed..d9dab8b 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -16,7 +16,7 @@ def render_python(data, view, group_painters, painters, num_columns): for row in rows: html.write("[") for p in painters: - tdclass, content = prepare_paint(p, row) + tdclass, content = p[0]["paint"](row) html.write(repr(htmllib.strip_tags(content))) html.write(",") html.write("],") @@ -29,6 +29,26 @@ multisite_layouts["python"] = { "hide" : True, } + +json_escape = re.compile(r'[\x00-\x1f\\"\b\f\n\r\t]') +ESCAPE_DCT = { + '\\': '\\\\', + '"': '\\"', + '\b': '\\b', + '\f': '\\f', + '\n': '\\n', + '\r': '\\r', + '\t': '\\t', +} +for i in range(0x20): + ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i)) + +def encode_string_json(s): + def replace(match): + return ESCAPE_DCT[match.group(0)] + return '"' + ESCAPE.sub(replace, s) + '"' + + def render_json(data, view, group_painters, painters, num_columns): columns, rows = data html.write("[\n") @@ -41,10 +61,11 @@ def render_json(data, view, group_painters, painters, num_columns): first = False else: html.write(",") - tdclass, content = prepare_paint(p, row) + tdclass, content = p[0]["paint"](row) stripped = htmllib.strip_tags(content) utf8 = stripped.encode("utf-8") - html.write(repr(utf8)) + utf8 += r'\"' + html.write(encode_string_json(utf8)) html.write("]") html.write("\n]\n")

13 years, 4 months

Check_MK Git: check_mk: Multisite: specifiy downtime by duration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d243b39b71fa3f76ffb48532ffbe4e0766dcfc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d243b39b71fa3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 15:27:03 2011 +0100 Multisite: specifiy downtime by duration Only usable via webservice --- web/htdocs/views.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c9f48fb..84ea6f3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1786,6 +1786,12 @@ def nagios_host_service_action_command(what, dataset): time.asctime(time.localtime(down_from)), time.asctime(time.localtime(down_to))) + # handle hidden field (added for NagStaMon) + elif html.var("_down_duration") and config.may("action.downtimes"): + duration = int(html.var("_down_duration")) + down_to = down_from + duration + title = "<b>schedule a downtime from now lasting for %d seconds</b> on " % duration + elif html.var("_down_remove") and config.may("action.downtimes"): downtime_ids = [] for id in dataset[prefix + "downtimes"]:

13 years, 4 months

Check_MK Git: check_mk: Switched version to 1.1.9i8

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: baebd085958ba522bbca83ce5cf7459cc663b0de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baebd085958ba5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 3 10:42:20 2011 +0100 Switched version to 1.1.9i8 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ce50178..7da26f9 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i7 +VERSION = 1.1.9i8 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 61f532b..890edb8 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i7 +echo Version: 1.1.9i8 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index d4b1403..5eea0c6 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i7 +echo Version: 1.1.9i8 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 886ed69..645003c 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.9i7 +echo Version: 1.1.9i8 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 436484b..63a61dc 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i7 +echo Version: 1.1.9i8 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 1c9d4b3..aff21a2 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i7 +echo Version: 1.1.9i8 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 78d79fb..03b9c49 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i7" +#define CHECK_MK_VERSION "1.1.9i8" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 20acbd9..d7923a8 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 6cff83e..ab46a52 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 0b19a67..185d404 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i7], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i8], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 9108d55..7943115 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i7 +CHECK_MK_VERSION=1.1.9i8 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 4fbfdea..731e8e8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i7 +VERSION=1.1.9i8 NAME=check_mk LANG= LC_ALL=

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a583807b5fd0e6efd3a0a36d0796d48678ca3830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a583807b5fd0e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 10:28:51 2011 +0100 Updated bug entries --- .bugs/121 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/121 b/.bugs/121 new file mode 100644 index 0000000..9c0a887 --- /dev/null +++ b/.bugs/121 @@ -0,0 +1,11 @@ +Title: Adding more than one column at once fails +Component: multisite +Benefit: 2 +State: open +Cost: 1 +Date: 2011-02-04 10:06:44 +Class: bug + +In view editor if you add more than one column in one turn +without saving in between the first added column will be +erased.

13 years, 4 months

Check_MK Git: check_mk: Multsite: HTML variable start_url sets URL of main frame

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 31866638b385745b994bd08fd2b3a38a89442433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31866638b38574… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 11:35:21 2011 +0100 Multsite: HTML variable start_url sets URL of main frame This allows you to construct URLs for the complete frame set of Multisite. You can make links into Multisite directly showing a specific view. --- web/htdocs/main.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 44ff627..046c781 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -27,6 +27,7 @@ import config def page_index(html): + start_url = html.var("start_url", config.start_url) html.req.headers_out.add("Cache-Control", "max-age=7200, public"); html.write(""" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> @@ -40,7 +41,7 @@ def page_index(html): <frame src="%s" name="main" noresize> </frameset> </html> -""" % config.start_url) +""" % start_url) def page_main(html): html.header("Check_MK Multisite")

13 years, 4 months

Check_MK Git: check_mk: Fixed WATO problem on older Python versions ( closerange)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78434dc4e24494f960a6fa16e1f27184df68b728 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78434dc4e24494… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 11:05:18 2011 +0100 Fixed WATO problem on older Python versions (closerange) --- ChangeLog | 4 ++++ modules/check_mk.py | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8ed2bb..b67ca09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.9i8: + WATO: + * Fixed problem appearing at restart on older Python version (RH) + 1.1.9i7: Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file diff --git a/modules/check_mk.py b/modules/check_mk.py index c9693ae..fa1df1a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3660,7 +3660,12 @@ def automation_restart(): # check_mk is called by WATO via Apache. Nagios inherits # the open file where Apache is listening for incoming # HTTP connections. Really. - os.closerange(3, 256) + for fd in range(3, 256): + try: + os.close(fd) + except: + pass + # os.closerange(3, 256) --> not available in older Python versions class null_file: def write(self, stuff):

13 years, 4 months

Check_MK Git: check_mk: First version of Pyhon web service (for NagStaMon)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 69f16d257d7b72ed3327c35d6ea7f6dfdb13fbd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69f16d257d7b72… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 10:29:40 2011 +0100 First version of Pyhon web service (for NagStaMon) --- web/htdocs/htmllib.py | 30 +++++++++++++++++++++++------- web/htdocs/index.py | 13 +++++++++---- web/htdocs/views.py | 22 ++++++++++++++++------ web/plugins/views/webservice.py | 31 +++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 17 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d19f7bb..ed32f1e 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -133,6 +133,10 @@ class html: self.browser_redirect = '' self.events = set([]) # currently used only for sounds self.header_sent = False + self.output_format = "html" + + def set_output_format(self, f): + self.output_format = f def write(self, text): if type(text) == unicode: @@ -381,11 +385,12 @@ class html: self.browser_redirect = url def header(self, title=''): - if not self.header_sent: - self.html_head(title) - self.write("<body class=main>") - self.header_sent = True - self.top_heading(title) + if self.output_format == "html": + if not self.header_sent: + self.html_head(title) + self.write("<body class=main>") + self.header_sent = True + self.top_heading(title) def top_heading(self, title): if type(self.req.user) == str: @@ -429,15 +434,26 @@ class html: self.write("</body></html>\n") def footer(self): + if self.output_format == "html": self.bottom_footer() self.body_end() def show_error(self, msg): - self.write("<div class=error>%s</div>\n" % msg) + if self.output_format == "html": + self.write("<div class=error>%s</div>\n" % msg) + else: + self.write("ERROR: ") + self.write(strip_tags(msg)) + self.write("\n") def show_warning(self, msg): - self.write("<div class=warning>%s</div>\n" % msg) + if self.output_format == "html": + self.write("<div class=warning>%s</div>\n" % msg) + else: + self.write("WARNING: ") + self.write(strip_tags(msg)) + self.write("\n") def message(self, msg): self.write("<div class=success>%s</div>\n" % msg) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 27349bc..b29431f 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -153,6 +153,11 @@ def handler(req): try: read_get_vars(req) + + # Prepare output format + output_format = html.var("output_format", "html") + html.set_output_format(output_format) + config.load_config() # load multisite.mk if html.var("debug"): # Debug flag may be set via URL config.debug = True @@ -179,23 +184,23 @@ def handler(req): except MKUserError, e: html.header("Invalid User Input") - html.show_error(e) + html.show_error(str(e)) html.footer() except MKAuthException, e: html.header("Permission denied") - html.show_error(e) + html.show_error(str(e)) html.footer() except MKConfigError, e: html.header("Configuration Error") - html.show_error(e) + html.show_error(str(e)) html.footer() apache.log_error("Configuration error: %s" % (e,), apache.APLOG_ERR) except MKGeneralException, e: html.header("Error") - html.show_error("Error: %s" % (e,)) + html.show_error(str(e)) html.footer() apache.log_error("Error: %s" % (e,), apache.APLOG_ERR) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 487312e..7555b7d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -636,7 +636,7 @@ function toggle_section(nr, oImg) { section_header(7, "Layout") html.write("<table border=0>") html.write("<tr><td>Basic Layout:</td><td>") - html.sorted_select("layout", [ (k, v["title"]) for k,v in multisite_layouts.items() ]) + html.sorted_select("layout", [ (k, v["title"]) for k,v in multisite_layouts.items() if not v.get("hide")]) html.write("</td></tr>\n") html.write("<tr><td>Number of columns:</td><td>") html.number_input("num_columns", 1) @@ -935,13 +935,18 @@ def page_view(h): # Display view with real data. This is *the* function everying # is about. def show_view(view, show_heading = False, show_buttons = True, show_footer = True): - # Parse display options - display_options = html.var("display_options", "") + all_display_options = "HTBFCEOZRSIX" + + # Parse display options and + if html.output_format == "html": + display_options = html.var("display_options", "") + else: + display_options = all_display_options.lower() # If all display_options are upper case assume all not given values default # to lower-case. Vice versa when all display_options are lower case. # When the display_options are mixed case assume all unset options to be enabled - do_defaults = display_options.isupper() and "htbfceozrsix" or "HTBFCEOZRSIX" + do_defaults = display_options.isupper() and all_display_options.lower() or all_display_options for c in do_defaults: if c.lower() not in display_options.lower(): display_options += c @@ -952,7 +957,12 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru tablename = datasource["table"] # [2] Layout - layout = multisite_layouts[view["layout"]] + if html.output_format == "html": + layout = multisite_layouts[view["layout"]] + else: + layout = multisite_layouts.get(html.output_format) + if not layout: + layout = multisite_layouts["json"] # User can override the layout settings via HTML variables (buttons) # which are safed persistently. This is known as "view options" @@ -1351,7 +1361,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l html.live.set_prepend_site(True) if limit != None: html.live.set_limit(limit + 1) # + 1: We need to know, if limit is exceeded - if config.debug: + if config.debug and html.output_format == "html": html.write("<div class=message><tt>%s</tt></div>\n" % (query.replace('\n', '<br>\n'))) if only_sites: diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py new file mode 100644 index 0000000..39621c7 --- /dev/null +++ b/web/plugins/views/webservice.py @@ -0,0 +1,31 @@ +def render_python_raw(data, view, group_painters, painters, num_columns): + html.write(repr(data)) + +multisite_layouts["python-raw"] = { + "title" : "Python raw data output", + "render" : render_python_raw, + "group" : False, + "hide" : True, +} + +def render_python(data, view, group_painters, painters, num_columns): + columns, rows = data + html.write("[\n") + html.write(repr([p[0]["title"] for p in painters])) + html.write(",\n") + for row in rows: + html.write("[") + for p in painters: + tdclass, content = prepare_paint(p, row) + html.write(repr(htmllib.strip_tags(content))) + html.write(",") + html.write("],") + html.write("\n]\n") + +multisite_layouts["python"] = { + "title" : "Python data output", + "render" : render_python, + "group" : False, + "hide" : True, +} +

13 years, 4 months

Check_MK Git: check_mk: Added some host/service columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 633234abbd6539f63817b398141a2284f22eb776 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=633234abbd6539… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 4 10:56:41 2011 +0100 Added some host/service columns --- web/plugins/views/painters.py | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 35185f9..256110b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -543,12 +543,26 @@ multisite_painters["svc_notifper"] = { } multisite_painters["svc_flapping"] = { - "title" : "Is flapping", - "short" : "flap", + "title" : "Service is flapping", + "short" : "Flap", "columns" : [ "service_is_flapping" ], "paint" : lambda row: paint_nagiosflag(row, "service_is_flapping", True) } +multisite_painters["svc_notifications_enabled"] = { + "title" : "Service notifications enabled", + "short" : "Notif.", + "columns" : [ "service_notifications_enabled" ], + "paint" : lambda row: paint_nagiosflag(row, "service_notifications_enabled", False) +} + +multisite_painters["svc_is_active"] = { + "title" : "Service is active", + "short" : "Active", + "columns" : [ "service_active_checks_enabled" ], + "paint" : lambda row: paint_nagiosflag(row, "service_active_checks_enabled", None) +} + def paint_service_group_memberlist(row): links = [] for group in row["service_groups"]: @@ -1054,6 +1068,20 @@ multisite_painters["host_comments"] = { "paint" : lambda row: paint_comments("host_", row) } +multisite_painters["host_in_downtime"] = { + "title" : "Host in downtime", + "short" : "Downtime", + "columns" : ["host_scheduled_downtime_depth"], + "paint" : lambda row: paint_nagiosflag(row, "host_scheduled_downtime_depth", True) +} + +multisite_painters["host_acknowledged"] = { + "title" : "Host problem acknowledged", + "short" : "Ack", + "columns" : ["host_acknowledged"], + "paint" : lambda row: paint_nagiosflag(row, "host_acknowledged", False) +} + # _ _ _ # | | | | ___ ___| |_ __ _ _ __ ___ _ _ _ __ ___

13 years, 4 months

Check_MK Git: check_mk: Fixed servicegroup search in quicksearch snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 131244ebde8eeaaf9699edbc61ef7f1e4e200071 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=131244ebde8eea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 3 14:42:37 2011 +0100 Fixed servicegroup search in quicksearch snapin Servicegroups can be searched with the quicksearch snapin using the 'sg:' prefix again Signed-off-by: Lars Michelsen <lm(a)mathias-kettner.de> --- ChangeLog | 5 +++++ web/htdocs/js/search.js | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8ed2bb..dfa1fbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.1.9i8 + Multisite: + * Bugfix: Servicegroups can be searched with the quicksearch snapin using + the 'sg:' prefix again + 1.1.9i7: Core, Setup, etc.: * Fix crash on Python 2.4 (e.g. RedHat) with fake_file diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index 4340be0..f3af39f 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -334,7 +334,7 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) { // FIXME: not correct. Need a page where the name parameter can be a part match return 'view.py?view_name=hostgroup&hostgroup=' + objName + '&site=' + objSite; else if(objType == 'sg') - if(single) + if(numMatches == 1) return 'view.py?view_name=servicegroup&servicegroup=' + objName + '&site=' + objSite; else // FIXME: not correct. Need a page where the name parameter can be a part match

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011