Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

Check_MK Git: check_mk: Fixed assumption button for services with non-Ascii-characters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e68746c7b4e2aaf1620086e1b370f170071b796 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e68746c7b4e2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 15 10:32:54 2011 +0200 Fixed assumption button for services with non-Ascii-characters --- .bugs/323 | 11 +++++++++++ ChangeLog | 3 ++- web/htdocs/bi.py | 6 +++--- web/htdocs/js/check_mk.js | 7 +++++-- web/plugins/views/bi.py | 13 ++++++++----- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.bugs/323 b/.bugs/323 new file mode 100644 index 0000000..e9ba1f0 --- /dev/null +++ b/.bugs/323 @@ -0,0 +1,11 @@ +Title: Service with Non-Ascii-Characters do not work +Component: bi +Benefit: 1 +State: open +Cost: 1 +Date: 2011-08-14 16:17:13 +Class: bug + +Problems are (maybe not only) +- Link to Service details +- Assumption button not working diff --git a/ChangeLog b/ChangeLog index d28e0cb..348678d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,7 +98,8 @@ BI: * FIX: Fixed displaying of host states (after i18n introduction)h - * FiX: fixed filter for aggregation group + * FiX: Fixed filter for aggregation group + * FIX: Fixed assumption button for services with non-Ascii-characters MK Livestatus: * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 18c5807..dc8b211 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -901,9 +901,9 @@ def page_all(): def ajax_set_assumption(): - site = html.var("site") - host = html.var("host") - service = html.var("service") + site = html.var_utf8("site") + host = html.var_utf8("host") + service = html.var_utf8("service") if service: key = (site, host, service) else: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 622ebc1..dae749a 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -637,6 +637,7 @@ function toggle_foldable_container(treename, id) { oBox = null; } +// TODO: Why is this not in a bi.js? function toggle_assumption(oImg, site, host, service) { // get current state @@ -654,9 +655,11 @@ function toggle_assumption(oImg, site, host, service) else current = parseInt(current) + 1; - var url = "bi_set_assumption.py?site=" + site + '&host=' + host; + // TODO: This needs to be URL-encoded. Also test for non-Ascii-Characters! + var url = "bi_set_assumption.py?site=" + encodeURIComponent(site) + + '&host=' + encodeURIComponent(host); if (service) { - url += '&service=' + service; + url += '&service=' + encodeURIComponent(service); } url += '&state=' + current; oImg.src = "images/assume_" + current + ".png"; diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 705e1ba..7a98af3 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -164,20 +164,23 @@ def render_assume_icon(site, host, service): else: key = (site, host) ass = bi.g_assumptions.get(key) + # TODO: Non-Ascii-Characters do not work yet! mousecode = \ - 'onmouseover="this.style.cursor=\'pointer\';" ' \ + u'onmouseover="this.style.cursor=\'pointer\';" ' \ 'onmouseout="this.style.cursor=\'auto\';" ' \ 'title="%s" ' \ - 'onclick="toggle_assumption(this, %s, %s, %s);" ' % \ + 'onclick="toggle_assumption(this, \'%s\', \'%s\', \'%s\');" ' % \ (_("Assume another state for this item (reload page to activate)"), - repr(site), repr(str(host)), service == None and 'null' or repr(str(service))) + # MIST: DAS HIER MUSS verfünftig für Javascript encodiert werden. + # Das Ausgangsmaterial sind UTF-8 kodierte str-Objekte. + site, host, service != None and service or '') current = str(ass).lower() - return '<img state="%s" class=assumption %s src="images/assume_%s.png">\n' % (current, mousecode, current) + return u'<img state="%s" class=assumption %s src="images/assume_%s.png">\n' % (current, mousecode, current) def aggr_render_leaf(tree, show_host): site, host = tree[2]["host"] service = tree[2].get("service") - content = render_assume_icon(site, host, service) + content = u"" + render_assume_icon(site, host, service) # Four cases: # (1) zbghora17 . Host status (show_host == True, service == None)

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a49c5fe83e4e92de1f0c99fa32b350dadddba8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a49c5fe83e4e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 15:48:02 2011 +0200 Updated bug entries --- .bugs/206 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/.bugs/206 b/.bugs/206 index ca9a610..3bd3094 100644 --- a/.bugs/206 +++ b/.bugs/206 @@ -1,6 +1,6 @@ Title: View editor has layout problems in IE 8 Component: multisite -Benefit: 2 +Benefit: 1 State: open Cost: 1 Date: 2011-03-07 16:08:31 @@ -8,3 +8,5 @@ Class: bug For example the column editor: the input box is far too small. Also the input boxes of title, etc. are too long. + +Could someone try, if this is still the case?

13 years, 1 month

Check_MK Git: check_mk: BI: fixed filter for aggregation group

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7cabb1077213e9a86c2a329e48f560f8b11cb87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7cabb1077213e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 16:06:05 2011 +0200 BI: fixed filter for aggregation group --- .bugs/241 | 10 +++++++--- ChangeLog | 3 ++- web/plugins/views/bi.py | 9 ++++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.bugs/241 b/.bugs/241 index 680efbb..4417908 100644 --- a/.bugs/241 +++ b/.bugs/241 @@ -1,10 +1,14 @@ Title: BI filter for aggregation group does not work Component: bi +State: done +Class: bug +Date: 2011-04-07 17:12:11 Benefit: 2 -State: open Cost: 2 -Date: 2011-04-07 17:12:11 -Class: bug +Fun: 0 In the table single host aggregations the filter for the BI group is not effective. It is simply ignored. + +2011-08-14 16:05:22: changed state open -> done +Done. The filter code was simply missing. diff --git a/ChangeLog b/ChangeLog index 063c29e..d28e0cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,7 +97,8 @@ no scan will be done until new button "Full Scan" is pressed. BI: - * Fixed displaying of host states (after i18n introduction)h + * FIX: Fixed displaying of host states (after i18n introduction)h + * FiX: fixed filter for aggregation group MK Livestatus: * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index ab406ed..705e1ba 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -396,11 +396,18 @@ class BIGroupFilter(Filter): def display(self): bi.compile_forest(html.req.user) htmlvar = self.htmlvars[0] - html.select(htmlvar, [(g,g) for g in bi.g_user_cache["forest"].keys()]) + html.select(htmlvar, [ ("", "") ] + [(g,g) for g in bi.g_user_cache["forest"].keys()]) def selected_group(self): return html.var(self.htmlvars[0]) + def filter_table(self, rows): + group = self.selected_group() + if not group: + return rows + else: + return [ row for row in rows if row[self.column] == group ] + def heading_info(self, infoname): return html.var(self.htmlvars[0])

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08c8397334c72f1c31b9828202d890112cc262b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08c8397334c72f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 16:06:08 2011 +0200 Updated bug entries --- .bugs/175 | 13 +++++++++---- .bugs/242 | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.bugs/175 b/.bugs/175 index cf9ba44..1e05dad 100644 --- a/.bugs/175 +++ b/.bugs/175 @@ -1,11 +1,16 @@ Title: Scan parents scans only the first gateway Component: core +State: wontfix +Class: bug +Date: 2011-03-03 12:09:11 Benefit: 3 -State: open Cost: 3 -Date: 2011-03-03 12:09:11 -Class: bug +Fun: 0 -In our tests the parent scan did only find and add the nearest gateway to the target system. The gateways in the middle of the route to the target host were not be added to the configuration. +In our tests the parent scan did only find and add the nearest gateway to the target system. The +gateways in the middle of the route to the target host were not be added to the configuration. Platform: Ubuntu 10.04 64, OMD 0.46 + +2011-08-14 15:54:29: changed state open -> wontfix +This is exactly the behaviour that is intended. diff --git a/.bugs/242 b/.bugs/242 index 26e2912..c9c1f58 100644 --- a/.bugs/242 +++ b/.bugs/242 @@ -1,10 +1,14 @@ Title: Filter for only_service in BI aggregations needs error handling Component: bi +State: done +Class: bug +Date: 2011-04-07 17:44:13 Benefit: 2 -State: open Cost: 2 -Date: 2011-04-07 17:44:13 -Class: bug +Fun: 0 -If the selected service does not exist, an exception occurs. Tis +If the selected service does not exist, an exception occurs. This is already fixed by not tested. + +2011-08-14 15:49:17: changed state open -> done +Should work. Not tested yet.

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d708625c0dc4655d81c205cfafc39fccf5f211a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d708625c0dc46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 15:47:26 2011 +0200 Updated bug entries --- .bugs/126 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/126 b/.bugs/126 index 9111e20..59744a0 100644 --- a/.bugs/126 +++ b/.bugs/126 @@ -1,12 +1,16 @@ Title: Reschedule button on Check_MK service should be delayed Component: multisite +State: done +Class: nastiness +Date: 2011-02-09 12:04:09 Benefit: 2 -State: open Cost: 1 -Date: 2011-02-09 12:04:09 -Class: nastiness +Fun: 0 If you press the reschedule button on the Check_MK service then it sometimes misses the update of the passive services of Check_MK. It might be sufficient to add a short delay of 0.5 sec in order to make sure they are always updated. + +2011-08-14 15:47:08: changed state open -> done +Delay of 0.7 sec is introduced for Check_MK. Seems to be enough.

13 years, 1 month

Check_MK Git: check_mk: Reschedule button: force sleep of . 7sec for Check_MK

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e890a9facffe855735ff6e208b6996d2ae9bfffe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e890a9facffe85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 15:46:30 2011 +0200 Reschedule button: force sleep of .7sec for Check_MK --- ChangeLog | 2 ++ web/htdocs/actions.py | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e57ec9..063c29e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,8 @@ * Detail views of host/service now show contacts * Fix playing of sounds: All problem views now have play_sounds activated, all other deactivated. + * Rescheduling of Check_MK: introduce a short sleep of 0.7 sec. This increases + the chance of the passive services being updated before the repaint. WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 6316597..f1060f8 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -77,6 +77,12 @@ def action_reschedule(): html.write("['TIMEOUT', 'Check not executed within %d seconds']\n" % (config.reschedule_timeout)) else: + if service == "Check_MK": + # Passive services triggered by Check_MK often are updated + # a few ms later. We introduce a small wait time in order + # to increase the chance for the passive services already + # updated also when we return. + time.sleep(0.7); html.write("['OK', %d, %d, %r]\n" % (row[0], row[1], row[2].encode("utf-8"))) except Exception, e:

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6aad88aab2bfd789c922333a04fb909594664b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6aad88aab2bfd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 15:24:43 2011 +0200 Updated bug entries --- .bugs/14 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/14 b/.bugs/14 index f47baea..03f28a6 100644 --- a/.bugs/14 +++ b/.bugs/14 @@ -1,10 +1,11 @@ Title: Livestatus: implement full UTF-8 support Component: livestatus +State: done +Class: bug +Date: 2010-12-21 12:12:58 Benefit: 2 -State: open Cost: 3 -Date: 2010-12-21 12:12:58 -Class: bug +Fun: 0 Currently Livestatus correctly handles 2-Byte UTF-8 sequences, assumes all other non-Ascii Characters to @@ -26,3 +27,6 @@ codes for UTF-8 are produced. The programmer has to make sure, that this encoding matches the encoding used in COMMAND queries. Strings in that query are never transcoded but put 1:1 into Nagios. + +2011-08-14 15:24:41: changed state open -> done +Done via new config option data_encoding

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ef9073f1e9a4e92a7dde01bc1a6dfbea8614488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ef9073f1e9a4e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 15:39:17 2011 +0200 Updated bug entries --- .bugs/13 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/.bugs/13 b/.bugs/13 index 3f7a57c..69b2283 100644 --- a/.bugs/13 +++ b/.bugs/13 @@ -11,3 +11,10 @@ kodierte Wert, z.B. Resttonerbehälter. Daraus baut Check_MK eine Servicedesription, die in nagios/conf.d/check_mk_objects.cfg ein Latin1-Zeichen enthält. Hier sollte unbedingt UTF-8 verwendet werden. Nur: woher kennen wir die Kodierung vom Drucker?? + +Lösung könnte evtl sein, über eine snmp_character_encoding = [] +Liste den Hosts Encodings zuzuweisen. Dann werden die Daten, +im Falle vom Datentyp String, automatisch konvertiert. Oder +man macht das explizit im Check, der weiß, dass die Daten +evtl. kodiert daher kommen. +

13 years, 1 month

Check_MK Git: check_mk: Livestatus: full UTF-8 support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 294fc0456e8877f0bcbed7683c48ad29bb1d7d49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294fc0456e8877… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Aug 14 12:01:28 2011 +0200 Livestatus: full UTF-8 support --- ChangeLog | 1 + livestatus/.f12 | 4 ++ livestatus/src/Query.cc | 113 +++++++++++++++++++++++++++++---------- livestatus/src/data_encoding.h | 32 +++++++++++ livestatus/src/module.c | 13 +++++ 5 files changed, 134 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 317afe2..4e57ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ MK Livestatus: * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) * Column aggregation (Stats) now also works for perf_data + * New configuration variable data_encoding and full UTF-8 support. 1.1.11i1: Core, Setup, etc.: diff --git a/livestatus/.f12 b/livestatus/.f12 index ad5157d..693ffad 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -10,4 +10,8 @@ fi make -j 8 + +SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo install src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o +echo "$C files copied" +sudo omd restart $SITE nagios diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 4e3c3b9..f089741 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -42,9 +42,11 @@ #include "Aggregator.h" #include "OringFilter.h" #include "waittriggers.h" +#include "data_encoding.h" extern int g_debug_level; extern unsigned long g_max_response_size; +extern int g_data_encoding; Query::Query(InputBuffer *input, OutputBuffer *output, Table *table) : _output(output), @@ -879,37 +881,90 @@ void Query::outputHostService(const char *host_name, const char *service_descrip void Query::outputString(const char *value) { - if (!value) { - if (_output_format != OUTPUT_FORMAT_CSV) - _output->addBuffer("\"\"", 2); - return; - } + if (!value) { + if (_output_format != OUTPUT_FORMAT_CSV) + _output->addBuffer("\"\"", 2); + return; + } - else if (_output_format == OUTPUT_FORMAT_CSV) - _output->addString(value); + else if (_output_format == OUTPUT_FORMAT_CSV) + _output->addString(value); - else // JSON - { - if (_output_format == OUTPUT_FORMAT_PYTHON) - _output->addChar('u'); // mark strings as unicode - _output->addChar('"'); - const char *r = value; - while (*r) { - if (*r < 32 && *r >= 0) - outputUnicodeEscape((unsigned)*r); - else if ((*r & 0xE0) == 0xC0) - outputUnicodeEscape(((*r & 31) << 6) | (*++r & 0x3F)); // 2 byte encoding - else if (*r < 0) - outputUnicodeEscape((unsigned)((int)*r + 256)); // assume latin1 encoding - else { - if (*r == '"' || *r == '\\') - _output->addChar('\\'); - _output->addChar(*r); - } - r++; - } - _output->addChar('"'); - } + else // JSON + { + if (_output_format == OUTPUT_FORMAT_PYTHON) + _output->addChar('u'); // mark strings as unicode + _output->addChar('"'); + const char *r = value; + int chars_left = strlen(r); + while (*r) { + // Always escape control characters (1..31) + if (*r < 32 && *r >= 0) + outputUnicodeEscape((unsigned)*r); + + // Output ASCII characters unencoded + else if (*r >= 32) { + if (*r == '"' || *r == '\\') + _output->addChar('\\'); + _output->addChar(*r); + } + + // interprete two-Byte UTF-8 sequences in mode 'utf8' and 'mixed' + else if ((g_data_encoding == ENCODING_UTF8 || g_data_encoding == ENCODING_MIXED) + && ((*r & 0xE0) == 0xC0)) { + outputUnicodeEscape(((*r & 31) << 6) | (*(r+1) & 0x3F)); // 2 byte encoding + r++; + chars_left--; + } + + // interprete 3/4-Byte UTF-8 sequences only in mode 'utf8' + else if (g_data_encoding == ENCODING_UTF8) { + // three-byte sequences (avoid buffer overflow!) + if ((*r & 0xF0) == 0xE0) { + if (chars_left < 3) { + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + break; // end of string. No use in continuing + } + else { + outputUnicodeEscape( + ((*r & 0x0F) << 12 | + (*(r+1) & 0x3F) << 6 | + (*(r+2) & 0x3F))); + r += 2; + chars_left -= 2; + } + } + // four-byte sequences + else if ((*r & 0xF8) == 0xF0) { + if (chars_left < 4) { + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + break; // end of string. No use in continuing + } + else { + outputUnicodeEscape( + ((*r & 0x07) << 18 | + (*(r+1) & 0x3F) << 6 | + (*(r+2) & 0x3F) << 6 | + (*(r+3) & 0x3F))); + r += 3; + chars_left -= 3; + } + } + else { + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + } + } + + // in latin1 and mixed mode interprete all other non-ASCII characters as latin1 + else { + outputUnicodeEscape((unsigned)((int)*r + 256)); // assume latin1 encoding + } + + r++; + chars_left--; + } + _output->addChar('"'); + } } void Query::outputBeginList() diff --git a/livestatus/src/data_encoding.h b/livestatus/src/data_encoding.h new file mode 100644 index 0000000..79a8d15 --- /dev/null +++ b/livestatus/src/data_encoding.h @@ -0,0 +1,32 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef data_encoding_h +#define data_encoding_h + +#define ENCODING_UTF8 0 +#define ENCODING_LATIN1 1 +#define ENCODING_MIXED 2 + +#endif // data_encoding_h diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 0735e71..c5b1bbb 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -47,6 +47,7 @@ #include "global_counters.h" #include "strutil.h" #include "auth.h" +#include "data_encoding.h" #include "waittriggers.h" #ifndef AF_LOCAL @@ -89,6 +90,7 @@ int g_thread_running = 0; int g_thread_pid = 0; int g_service_authorization = AUTH_LOOSE; int g_group_authorization = AUTH_STRICT; +int g_data_encoding = ENCODING_UTF8; void* voidp; @@ -602,6 +604,17 @@ void livestatus_parse_arguments(const char *args_orig) strncat(g_pnp_path, "/", sizeof(g_pnp_path) - strlen(g_pnp_path) - 1 ); // make sure, that trailing slash is always there check_pnp_path(); } + else if (!strcmp(left, "data_encoding")) { + if (!strcmp(right, "utf8")) + g_data_encoding = ENCODING_UTF8; + else if (!strcmp(right, "latin1")) + g_data_encoding = ENCODING_LATIN1; + else if (!strcmp(right, "mixed")) + g_data_encoding = ENCODING_MIXED; + else { + logger(LG_INFO, "Invalid data_encoding %s. Allowed are utf8, latin1 and mixed.", right); + } + } else { logger(LG_INFO, "Ignoring invalid option %s=%s", left, right); }

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57cdd6f0f177530abcc265fb7503cbd631635abd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57cdd6f0f17753… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 13 15:03:38 2011 +0200 Updated bug entries --- .bugs/14 | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.bugs/14 b/.bugs/14 index e4513b2..f47baea 100644 --- a/.bugs/14 +++ b/.bugs/14 @@ -1,14 +1,28 @@ -Title: UTF-8 Kodierung von Eurosymbol geht nicht +Title: Livestatus: implement full UTF-8 support Component: livestatus -Benefit: 1 +Benefit: 2 State: open Cost: 3 Date: 2010-12-21 12:12:58 Class: bug -Livestatus: bestimmte UTF-8 Zeichen werden nicht korrekt kodiert, z.B. "€". -Um das umzustellen, muss man wahrscheinlich einfach UTF-8 generell -annehmen. +Currently Livestatus correctly handles 2-Byte UTF-8 +sequences, assumes all other non-Ascii Characters to +be Latin-1 encoded. While this works well for Western +languages, other non-Latin1 languages not not supported. -Die aktuelle Implementierung erkennt halbautomatisch eine Mischung -aus Latin1 und UTF-8. Kann man bei Nagios einfach UTF-8 verlangen? +We can do it the following way: We introduce a module +option "data_encoding", which is either "mixed", "latin1" or "utf-8". +The default is "utf-8". + +the "mixed" mode is the current implementation. The "utf-8" +mode assumes all Nagios-strings to be UTF-8 encoded and +outputs the according escape sequences for JSON/Python. + +In mode "latin1" all characters are interpreted as one-byte +Latin-1 encoded characters and the according escape +codes for UTF-8 are produced. + +The programmer has to make sure, that this encoding matches +the encoding used in COMMAND queries. Strings in that +query are never transcoded but put 1:1 into Nagios.

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits