Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

3865 oracle_sessions: now relative levels for sessions are configurable

by Simon Betz

Module: check_mk Branch: master Commit: 1f81ebebfd6b2f939f70bfd97b801c144279e7f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f81ebebfd6b2f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 31 09:58:22 2016 +0200 3865 oracle_sessions: now relative levels for sessions are configurable Please note: you have to update the {{mk_oracle}} plugin in order to get new data. --- .werks/3865 | 9 +++ ChangeLog | 1 + agents/plugins/mk_oracle | 12 ++-- checks/oracle_sessions | 126 +++++++++++++++++++++++++++------- web/plugins/wato/check_parameters.py | 37 +++++++--- 5 files changed, 145 insertions(+), 40 deletions(-) diff --git a/.werks/3865 b/.werks/3865 new file mode 100644 index 0000000..a4b079b --- /dev/null +++ b/.werks/3865 @@ -0,0 +1,9 @@ +Title: oracle_sessions: now relative levels for sessions are configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1472630212 +Class: feature + + Please note: you have to update the {{mk_oracle}} plugin in order to get new data. diff --git a/ChangeLog b/ChangeLog index 55efa0f..6b27a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,7 @@ * 3834 hitachi_hus_dku, hitachi_hus_dkc: now recognises Hitachi G800/HM800 devices * 3796 agent_vsphere: new option allows monitoring of ESX hostsystem and windows agent * 3797 Check_MK Check helpers: Decreased memory consumption in distributed setups... + * 3865 oracle_sessions: now relative levels for sessions are configurable... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 8c4d6a9..2acbe98 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -529,12 +529,14 @@ sql_instance() sql_sessions() { - echo 'prompt <<<oracle_sessions>>>' + echo 'prompt <<<oracle_sessions:sep(124)>>>' echo "select upper(i.instance_name) - || ' ' || CURRENT_UTILIZATION - from v\$resource_limit, v\$instance i - where RESOURCE_NAME = 'sessions'; - " + || '|' || CURRENT_UTILIZATION + || '|' || ltrim(LIMIT_VALUE) + || '|' || MAX_UTILIZATION + from v\$resource_limit, v\$instance i + where RESOURCE_NAME = 'sessions';" + } sql_processes() diff --git a/checks/oracle_sessions b/checks/oracle_sessions index 82a36dd..048ab12 100644 --- a/checks/oracle_sessions +++ b/checks/oracle_sessions @@ -19,7 +19,7 @@ # 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- -# tails. You should have received a copy of the GNU General Public +# tails. 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. @@ -27,32 +27,104 @@ # <<<oracle_sessions>>> # pengt 15 # hirni 22 +# newdb 47 772 65 -oracle_sessions_default_levels = (50, 100) -def inventory_oracle_sessions(info): - oracle_handle_ora_errors_discovery(info) - return [ (line[0], "oracle_sessions_default_levels") for line in info if len(line) >= 2 ] +factory_settings["oracle_sessions_default_levels"] = { + "sessions_abs" : (50, 100), +} + -def check_oracle_sessions(item, params, info): +def parse_oracle_sessions(info): + parsed = {} for line in info: - if line[0] == item: - err = oracle_handle_ora_errors(line) - if err == False: - continue - elif isinstance(err, tuple): - return err - - warn, crit = params - sessions = int(line[1]) - infotext = "%d active sessions (warn/crit at %d/%d)" % (sessions, warn, crit) - perfdata = [("sessions", sessions, warn, crit)] + if len(line) == 4: + # new format with max values + sid, cursess, maxsess, curmax = line + parsed.setdefault(sid, { + "cursess" : int(cursess), + "maxsess" : int(maxsess), + "curmax" : int(curmax), + }) + + elif len(line) == 7: + # detailed session information for PDBs + sid, pdb_name, sstate, smode, stype, bmode, cnt = line + + if pdb_name <> '' and pdb_name <> 'CDB$ROOT': + sid = '%s.%s' % (sid, pdb_name) + + if sstate == '': + # found a line with only number of sessions + # typically found in PDB without any connected session + parsed.setdefault(sid, { + "count" : cnt, + }) + + else: + parsed.setdefault(sid, { + "count" : cnt, + "sessstate" : sstate, + "sessmode" : smode, + "sesstype" : stype, + "blockmode" : bmode, + }) + + elif len(line) == 2: + # old agent format! + sid, cursess = line + parsed.setdefault(sid, { + "cursess" : int(cursess), + }) + + return parsed + + +def inventory_oracle_sessions(parsed): + for sid in parsed: + if sid.find(".") < 0: + yield sid, {} + + +def check_oracle_sessions(item, params, parsed): + if type(params) == tuple: + params = { "sessions_abs" : params } + + if item in parsed and 'cursess' in parsed[item]: + data = parsed[item] + sessions = data['cursess'] + sessions_max = data.get('maxsess') + + if sessions_max is not None: + state = 0 + infotext = "%d of %d sessions" % (sessions, sessions_max) + sessions_perc = 100.0*sessions/sessions_max + infotext_perc = "%.2f%%" % sessions_perc + if "sessions_perc" in params: + warn_perc, crit_perc = params["sessions_perc"] + if sessions_perc >= crit_perc: + state = 2 + elif sessions_perc >= warn_perc: + state = 1 + if state: + infotext_perc += " (warn/crit at %.1f%%/%.1f%%)" % (warn_perc, crit_perc) + yield state, infotext_perc + + else: + infotext = "%d sessions" % sessions + + state = 0 + warn, crit = None, None + if "sessions_abs" in params: + warn, crit = params["sessions_abs"] if sessions >= crit: - return (2, infotext, perfdata) + state = 2 elif sessions >= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) + state = 1 + if state: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + yield state, infotext, [ ("sessions", sessions, warn, crit, 0, sessions_max) ] + return # In case of missing information we assume that the login into # the database has failed and we simply skip this check. It won't @@ -61,9 +133,11 @@ def check_oracle_sessions(item, params, info): check_info["oracle_sessions"] = { - 'check_function': check_oracle_sessions, - 'inventory_function': inventory_oracle_sessions, - 'service_description': 'ORA %s Sessions', - 'has_perfdata': True, - 'group': 'oracle_sessions', + "parse_function" : parse_oracle_sessions, + 'inventory_function' : inventory_oracle_sessions, + 'check_function' : check_oracle_sessions, + 'service_description' : 'ORA %s Sessions', + 'has_perfdata' : True, + 'group' : 'oracle_sessions', + 'default_levels_variable' : 'oracle_sessions_default_levels' } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 45619ce..f6eae09 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8128,18 +8128,37 @@ register_check_parameters( subgroup_applications, "oracle_sessions", _("Oracle Sessions"), - Tuple( - title = _("Number of active sessions"), - help = _("This check monitors the current number of active sessions on Oracle"), - elements = [ - Integer(title = _("Warning at"), unit = _("sessions"), default_value = 100), - Integer(title = _("Critical at"), unit = _("sessions"), default_value = 200), - ], - ), + Transform( + Dictionary( + elements = [ + ("sessions_abs", + Tuple( + title = _("Number of active sessions"), + help = _("This check monitors the current number of active sessions on Oracle"), + elements = [ + Integer(title = _("Warning at"), unit = _("sessions"), default_value = 100), + Integer(title = _("Critical at"), unit = _("sessions"), default_value = 200), + ], + ), + ), + ("sessions_perc", + Tuple( + title = _("Relative levels of active sessions."), + help = _("Set upper levels of active sessions relative to max. number of sessions."), + elements = [ + Percentage(title = _("Warning at")), + Percentage(title = _("Critical at")), + ], + ), + ), + ] + ), + forth = lambda p: type(p) == tuple and { "sessions_abs" : p } or p, + ), TextAscii( title = _("Database name"), allow_empty = False), - match_type = "first", + match_type = "dict", ) register_check_parameters(

7 years, 10 months

Make cppcheck and Jenkins happy again.

by Sven Panne

Module: check_mk Branch: master Commit: c7349375a19bc2ba692d08d5fb692454024b4d47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7349375a19bc2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 31 08:32:34 2016 +0200 Make cppcheck and Jenkins happy again. --- livestatus/src/Logger.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 921d8b0..6b45b26 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -31,7 +31,6 @@ #endif #include <sstream> #include <string> -#include <utility> class LogRecord; @@ -60,8 +59,8 @@ FILE *get_logfile(); class LogRecord { public: - LogRecord(LogLevel level, std::string message) - : _level(level), _message(std::move(message)) {} + LogRecord(LogLevel level, const std::string &message) + : _level(level), _message(message) {} virtual ~LogRecord() {} LogLevel getLevel() const { return _level; }

7 years, 10 months

Removed not existing painter from view

by Lars Michelsen

Module: check_mk Branch: master Commit: 61a9eb6d21e8da1ef47d93ba77ba76ce1d439353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a9eb6d21e8da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 15:48:22 2016 +0200 Removed not existing painter from view --- web/plugins/views/builtin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f905f88..deeeaf1 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1070,7 +1070,6 @@ multisite_builtin_views.update({ ('host_perf_data', None), ('host_in_downtime', None), ('host_in_notifper', None), - ('host_discovery', None), # 2b. Serivce statistics ('num_services', None),

7 years, 10 months

Removed unused old "transformation" feature from htmllib

by Lars Michelsen

Module: check_mk Branch: master Commit: a2640d7404fb0daed022560c357b9fee7389ab75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2640d7404fb0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 15:48:55 2016 +0200 Removed unused old "transformation" feature from htmllib --- web/htdocs/htmllib.py | 14 -------------- web/htdocs/valuespec.py | 7 ++----- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d373bff..d430557 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -102,7 +102,6 @@ class html(GUITester): self.context_buttons_open = False self.mobile = False self.buffering = True - self.transformations = [] self.final_javascript_code = "" self.auto_id = 0 self.have_help = False @@ -171,16 +170,6 @@ class html(GUITester): self.buffering = b - # TODO: Can this be dropped? - def push_transformation(self, tf): - self.transformations.append(tf) - - - # TODO: Can this be dropped? - def pop_transformation(self): - del self.transformations[-1] - - # TODO: Can this please be dropped? def some_id(self): self.auto_id += 1 @@ -614,9 +603,6 @@ class html(GUITester): # def write(self, text): - for tf in self.transformations: - text = tf(text) - if self.plugged: self.plugged_text += text else: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ba4520e..d4ddf73 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1030,19 +1030,16 @@ class ListOf(ValueSpec): # Actual table of currently existing entries html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) - # FIXME: Use plug/unplug mechanism instead of transform / then remove transform for nr, v in enumerate(value): - html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "", add_var=True) # reconstruct order after moving stuff self.del_button(varprefix, nr+1) if self._movable: - self.move_button(varprefix, self._magic, "up") # visibility fixed by javascript - self.move_button(varprefix, self._magic, "down") + self.move_button(varprefix, nr+1, "up") # visibility fixed by javascript + self.move_button(varprefix, nr+1, "down") html.write("</td><td class=vlof_content>") self._valuespec.render_input(varprefix + "_%d" % (nr+1), v) html.write("</td></tr>") - html.pop_transformation() html.write("</table>") html.write(" ") html.jsbutton(varprefix + "_add", self._add_label,

7 years, 10 months

Add some help text to joined columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 18b36c65979334e531f6ff1c7a03577491eefea2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b36c65979334… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 15:35:22 2016 +0200 Add some help text to joined columns --- web/htdocs/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 67f1652..bea5edd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -605,7 +605,7 @@ def view_editor_specs(ds_name, general_properties=True): title = _('Tooltip'), choices = [(None, "")] + collist, ), - ] + ], ) joined = allowed_for_joined_datasource(multisite_painters, ds_name) @@ -618,6 +618,9 @@ def view_editor_specs(ds_name, general_properties=True): Tuple( title = _('Joined column'), + help = _("A joined column can display information about specific services for " + "host objects in a view showing host objects. You need to specify the " + "service description of the service you like to show the data for."), elements = [ DropdownChoice( title = _('Column'), @@ -688,7 +691,7 @@ def view_editor_specs(ds_name, general_properties=True): orientation = 'horizontal', ), title = _('Sorting'), - add_label = _('Add column'), + add_label = _('Add sorter'), )), ], )),

7 years, 10 months

Some small refactoring of old code

by Lars Michelsen

Module: check_mk Branch: master Commit: ee17af0de82063bf34c441d2d6628cda1791a654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee17af0de82063… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 30 16:23:30 2016 +0200 Some small refactoring of old code --- web/htdocs/views.py | 60 +++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bea5edd..156b225 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -575,11 +575,8 @@ def view_editor_specs(ds_name, general_properties=True): )) ) - allowed = allowed_for_datasource(multisite_sorters, ds_name) - def column_spec(ident, title, ds_name): - allowed = allowed_for_datasource(multisite_painters, ds_name) - collist = collist_of_collection(allowed) + painter_choices = choices_of_collection(painters_of_datasource(ds_name)) allow_empty = True empty_text = None @@ -592,8 +589,7 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = collist, - sorted = True, + choices = painter_choices, no_preselect = True, ), DropdownChoice( @@ -603,14 +599,14 @@ def view_editor_specs(ds_name, general_properties=True): ), DropdownChoice( title = _('Tooltip'), - choices = [(None, "")] + collist, + choices = [(None, "")] + painter_choices, ), ], ) - joined = allowed_for_joined_datasource(multisite_painters, ds_name) - if ident == 'columns' and joined: - joined_cols = collist_of_collection(joined, collist) + join_painters = join_painters_of_datasource(ds_name) + if ident == 'columns' and join_painters: + join_painter_choices = choices_of_collection(join_painters, painter_choices) vs_column = Alternative( elements = [ @@ -624,8 +620,7 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = joined_cols, - sorted = True, + choices = join_painter_choices, no_preselect = True, ), TextUnicode( @@ -639,7 +634,7 @@ def view_editor_specs(ds_name, general_properties=True): ), DropdownChoice( title = _('Tooltip'), - choices = [(None, "")] + joined_cols, + choices = [(None, "")] + join_painter_choices, ), TextUnicode( title = _('Title'), @@ -678,7 +673,8 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = [ (name, p["title"]) for name, p in allowed.items() ], + choices = [ (name, p["title"]) for name, p + in sorters_of_datasource(ds_name).items() ], sorted = True, no_preselect = True, ), @@ -701,6 +697,7 @@ def view_editor_specs(ds_name, general_properties=True): return specs + def render_view_config(view, general_properties=True): ds_name = view.get("datasource", html.var("datasource")) if not ds_name: @@ -1869,6 +1866,23 @@ def sort_data(data, sorters): data.sort(multisort) + +def sorters_of_datasource(ds_name): + return allowed_for_datasource(multisite_sorters, ds_name) + + +def painters_of_datasource(ds_name): + return allowed_for_datasource(multisite_painters, ds_name) + + +def join_painters_of_datasource(ds_name): + ds = multisite_datasources[ds_name] + if "join" not in ds: + return {} # no joining with this datasource + + return allowed_for_datasource(multisite_painters, ds['join'][0]) + + # Filters a list of sorters or painters and decides which of # those are available for a certain data source def allowed_for_datasource(collection, datasourcename): @@ -1884,22 +1898,12 @@ def allowed_for_datasource(collection, datasourcename): allowed[name] = item return allowed -def allowed_for_joined_datasource(collection, datasourcename): - if 'join' not in multisite_datasources[datasourcename]: - return {} - return allowed_for_datasource(collection, multisite_datasources[datasourcename]['join'][0]) -def collist_of_collection(collection, join_target = []): - def sort_list(l): - # Sort the lists but don't mix them up - swapped = [ (disp, key) for key, disp in l ] - swapped.sort() - return [ (key, disp) for disp, key in swapped ] +def choices_of_collection(collection, join_target=None): + l = [ (name, p["title"]) for name, p in collection.items() + if not join_target or (name, p["title"]) not in join_target ] - if not join_target: - return sort_list([ (name, p["title"]) for name, p in collection.items() ]) - else: - return sort_list([ (name, p["title"]) for name, p in collection.items() if (name, p["title"]) not in join_target ]) + return sorted(l, key=lambda x: x[1]) #. # .--Commands------------------------------------------------------------.

7 years, 10 months

cleaned up condition display in WATO rule overview page

by Andreas Boesl

Module: check_mk Branch: master Commit: da942859eb1a55595a643dbdaacf47655bc5a8a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da942859eb1a55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 30 16:09:46 2016 +0200 cleaned up condition display in WATO rule overview page --- web/htdocs/wato.py | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 75601df..bca8685 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12822,6 +12822,9 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): html.write('</li>') # Explicit list of hosts + def boldify(what): + return "%s" % what + if host_list != ALL_HOSTS: condition = None if host_list == []: @@ -12830,28 +12833,31 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): tt_list = [] for host_spec in host_list: host = Host.host(host_spec) + is_regex = False if host: host_spec = '<a href="%s">%s</a>' % (html.attrencode(host.edit_url()), host_spec) - tt_list.append("<tt>%s</tt>" % host_spec) + elif host_spec[0] == "~": + is_regex = True + host_spec = host_spec[1:] + tt_list.append("%s<tt>%s</tt>" % (is_regex and "matches regex " or "is ", boldify(host_spec))) if len(host_list) == 1: - condition = _("Host name is %s") % tt_list[0] + condition = _("Host name %s") % tt_list[0] else: - condition = _("Host name is ") + ", ".join(tt_list[:-1]) + condition = _("Host name ") + ", ".join(tt_list[:-1]) condition += _(" or ") + tt_list[-1] elif host_list[0][0] == ENTRY_NEGATE_CHAR: hosts = [ h[1:] for h in host_list[:-1] ] - if len(hosts) == 1: - condition = _("Host is not ") + hosts[0] + host_texts = map(lambda x: x[0] == "~" and "regex " + x[1:] or x, hosts) + if len(host_texts) == 1: + condition = _("Host is not ") + host_texts[0] else: - condition = _("Host is not one of ") + ", ".join(hosts) + condition = _("Host is not one of ") + ", ".join(host_texts) # other cases should not occur, e.g. list of explicit hosts # plus ALL_HOSTS. if condition: html.write('<li class="condition">%s</li>' % condition) - def boldify(what): - return "%s" % what # Item list if ruleset["itemtype"] and item_list != ALL_SERVICES: @@ -12867,22 +12873,15 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): else: cleaned_item_list = item_list - explicit_items = [ i[:-1] for i in cleaned_item_list if i[-1] == "$" ] - prefix_items = [ i for i in cleaned_item_list if i[-1] != "$" ] - - explicit_text = negated and _("is not ") or _("is ") - prefix_text = negated and _("begins not with ") or _("begins with ") - condition_texts = [] - for what, text in [ (explicit_items, explicit_text), - (prefix_items, prefix_text) ]: - if not what: - continue - condition_text = text + " or ".join(map(boldify, what)) - condition_texts.append(condition_prefix + condition_text) + svc_texts = [] + for item in cleaned_item_list: + if item[-1] == "$": + svc_texts.append("is %s%s" % (negated and "not " or "", boldify(item[:-1]))) + else: + svc_texts.append("begins %s with %s" % (negated and "not " or "", boldify(item))) - html.write('<li class="condition">%s</li>' %\ - (negated and _(" and ") or _(" or ")).join(condition_texts)) + html.write('<li class="condition">%s %s</li>' % (condition_prefix, (negated and _(" and ") or _(" or ")).join(svc_texts))) html.write("</ul>")

7 years, 10 months

Move streaming capabilities out of LogRecord itself.

by Sven Panne

Module: check_mk Branch: master Commit: 865a65aea41de2127c537942fc823bf8ecbe7369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=865a65aea41de2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 15:58:00 2016 +0200 Move streaming capabilities out of LogRecord itself. --- livestatus/src/Logger.h | 61 +++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 3bdd854..921d8b0 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -31,6 +31,7 @@ #endif #include <sstream> #include <string> +#include <utility> class LogRecord; @@ -59,56 +60,70 @@ FILE *get_logfile(); class LogRecord { public: - explicit LogRecord(LogLevel level) : _level(level) {} - virtual ~LogRecord() { logger(*this); } + LogRecord(LogLevel level, std::string message) + : _level(level), _message(std::move(message)) {} + virtual ~LogRecord() {} LogLevel getLevel() const { return _level; } - std::string getMessage() const { return _os.str(); } + std::string getMessage() const { return _message; } + void setMessage(const std::string &message) { _message = message; } -#ifdef CMC - bool isLoggable() const { return ::isLoggable(getLevel()); } -#endif +private: + LogLevel _level; + std::string _message; +}; + +class LogRecordStream : public LogRecord { +public: + explicit LogRecordStream(LogLevel level) : LogRecord(level, "") {} + virtual ~LogRecordStream() { + setMessage(_os.str()); + logger(*this); + } template <typename T> std::ostream &operator<<(const T &t) { return _os << t; } +#ifdef CMC + bool isLoggable() const { return ::isLoggable(getLevel()); } +#endif + private: - LogLevel _level; std::ostringstream _os; }; -struct Emergency : public LogRecord { - Emergency() : LogRecord(LogLevel::emergency) {} +struct Emergency : public LogRecordStream { + Emergency() : LogRecordStream(LogLevel::emergency) {} }; -struct Alert : public LogRecord { - Alert() : LogRecord(LogLevel::alert) {} +struct Alert : public LogRecordStream { + Alert() : LogRecordStream(LogLevel::alert) {} }; -struct Critical : public LogRecord { - Critical() : LogRecord(LogLevel::critical) {} +struct Critical : public LogRecordStream { + Critical() : LogRecordStream(LogLevel::critical) {} }; -struct Error : public LogRecord { - Error() : LogRecord(LogLevel::error) {} +struct Error : public LogRecordStream { + Error() : LogRecordStream(LogLevel::error) {} }; -struct Warning : public LogRecord { - Warning() : LogRecord(LogLevel::warning) {} +struct Warning : public LogRecordStream { + Warning() : LogRecordStream(LogLevel::warning) {} }; -struct Notice : public LogRecord { - Notice() : LogRecord(LogLevel::notice) {} +struct Notice : public LogRecordStream { + Notice() : LogRecordStream(LogLevel::notice) {} }; -struct Informational : public LogRecord { - Informational() : LogRecord(LogLevel::informational) {} +struct Informational : public LogRecordStream { + Informational() : LogRecordStream(LogLevel::informational) {} }; -struct Debug : public LogRecord { - Debug() : LogRecord(LogLevel::debug) {} +struct Debug : public LogRecordStream { + Debug() : LogRecordStream(LogLevel::debug) {} }; #endif // Logger_h

7 years, 10 months

Improved naming.

by Sven Panne

Module: check_mk Branch: master Commit: fb01054c44f4dc9d93ea64240e60e24a01ba8181 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb01054c44f4dc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 15:10:16 2016 +0200 Improved naming. --- livestatus/src/Logger.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 8106bbf..e76e755 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -55,10 +55,10 @@ bool should_log(LogLevel log_level); FILE *get_logfile(); #endif -class Logger { +class LogRecord { public: - explicit Logger(LogLevel log_level) : _log_level(log_level) {} - virtual ~Logger() { logger(_log_level, _os.str()); } + explicit LogRecord(LogLevel log_level) : _log_level(log_level) {} + virtual ~LogRecord() { logger(_log_level, _os.str()); } #ifdef CMC bool isEnabled() const { return should_log(_log_level); } #endif @@ -73,36 +73,36 @@ private: std::ostringstream _os; }; -struct Emergency : public Logger { - Emergency() : Logger(LogLevel::emergency) {} +struct Emergency : public LogRecord { + Emergency() : LogRecord(LogLevel::emergency) {} }; -struct Alert : public Logger { - Alert() : Logger(LogLevel::alert) {} +struct Alert : public LogRecord { + Alert() : LogRecord(LogLevel::alert) {} }; -struct Critical : public Logger { - Critical() : Logger(LogLevel::critical) {} +struct Critical : public LogRecord { + Critical() : LogRecord(LogLevel::critical) {} }; -struct Error : public Logger { - Error() : Logger(LogLevel::error) {} +struct Error : public LogRecord { + Error() : LogRecord(LogLevel::error) {} }; -struct Warning : public Logger { - Warning() : Logger(LogLevel::warning) {} +struct Warning : public LogRecord { + Warning() : LogRecord(LogLevel::warning) {} }; -struct Notice : public Logger { - Notice() : Logger(LogLevel::notice) {} +struct Notice : public LogRecord { + Notice() : LogRecord(LogLevel::notice) {} }; -struct Informational : public Logger { - Informational() : Logger(LogLevel::informational) {} +struct Informational : public LogRecord { + Informational() : LogRecord(LogLevel::informational) {} }; -struct Debug : public Logger { - Debug() : Logger(LogLevel::debug) {} +struct Debug : public LogRecord { + Debug() : LogRecord(LogLevel::debug) {} }; #endif // Logger_h

7 years, 10 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 63ad7bd6475bfaed4fc3d6b132f2100a8a16e463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ad7bd6475bfa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 30 15:45:48 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.cc | 31 ++++++++++++++++--------------- livestatus/src/Logger.h | 20 +++++++++++++------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index fb9c489..db0c9d5 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -40,8 +40,7 @@ FILE *fl_logfile = nullptr; void open_logfile(const string &path) { fl_logfile = fopen(path.c_str(), "a"); if (fl_logfile == nullptr) { - logger(LogLevel::warning, - "Cannot open logfile " + path + ": " + strerror(errno)); + Warning() << "Cannot open logfile " << path << ": " << strerror(errno); } } @@ -63,7 +62,7 @@ using std::mutex; namespace { std::mutex fl_logfile_mutex; -LogLevel fl_log_level = LogLevel::notice; +LogLevel fl_level = LogLevel::notice; bool fl_log_microtime = false; } // namespace @@ -73,21 +72,21 @@ void reopen_logfile(const string &path) { if (fl_logfile != nullptr) { close_logfile(); open_logfile(path); - logger(LogLevel::notice, "Reopened logfile."); + Notice() << "Reopened logfile."; } } -void set_log_config(LogLevel log_level, bool log_microtime) { - fl_log_level = log_level; +void set_log_config(LogLevel level, bool log_microtime) { + fl_level = level; fl_log_microtime = log_microtime; } -bool should_log(LogLevel log_level) { return log_level <= fl_log_level; } +bool isLoggable(LogLevel level) { return level <= fl_level; } FILE *get_logfile() { return fl_logfile != nullptr ? fl_logfile : stdout; } -void logger(LogLevel log_level, const string &message) { - if (!should_log(log_level)) { +void logger(const LogRecord &record) { + if (!isLoggable(record.getLevel())) { return; // msg not important enough } @@ -107,9 +106,9 @@ void logger(LogLevel log_level, const string &message) { if (fl_log_microtime) { fprintf(logfile, "%03ld.%03ld ", tv.tv_usec / 1000, tv.tv_usec % 1000); } - fprintf(logfile, "[%d] ", log_level); - fputs(message.c_str(), logfile); - fputc('\n', logfile); + fprintf(logfile, "[%d] ", static_cast<int>(record.getLevel())); + fputs(record.getMessage().c_str(), logfile); + fputs("\n", logfile); fflush(logfile); } @@ -117,19 +116,21 @@ void logger(LogLevel log_level, const string &message) { #include <ctime> -void logger(LogLevel /*log_level*/, const string &message) { +void logger(const LogRecord &record) { extern bool runningInLivestatusMainThread(); extern void writeToAllLogs(const string &message); // Only the main process may use the Nagios log methods if (fl_logfile == nullptr || runningInLivestatusMainThread()) { - writeToAllLogs("livestatus: " + message); + writeToAllLogs("livestatus: " + record.getMessage()); } else if (fl_logfile != nullptr) { char timestring[64]; time_t now_t = time(nullptr); struct tm now; localtime_r(&now_t, &now); strftime(timestring, 64, "%F %T ", &now); - fputs((timestring + message + "\n").c_str(), fl_logfile); + fputs(timestring, fl_logfile); + fputs(record.getMessage().c_str(), fl_logfile); + fputs("\n", fl_logfile); fflush(fl_logfile); } } diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index e76e755..3bdd854 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -32,6 +32,8 @@ #include <sstream> #include <string> +class LogRecord; + // values must be in sync with config enum class LogLevel { emergency = 0, @@ -46,21 +48,25 @@ enum class LogLevel { void open_logfile(const std::string &path); void close_logfile(); -void logger(LogLevel log_level, const std::string &message); +void logger(const LogRecord &record); #ifdef CMC -void set_log_config(LogLevel log_level, bool log_microtime); +void set_log_config(LogLevel level, bool log_microtime); void reopen_logfile(const std::string &path); -bool should_log(LogLevel log_level); +bool isLoggable(LogLevel level); FILE *get_logfile(); #endif class LogRecord { public: - explicit LogRecord(LogLevel log_level) : _log_level(log_level) {} - virtual ~LogRecord() { logger(_log_level, _os.str()); } + explicit LogRecord(LogLevel level) : _level(level) {} + virtual ~LogRecord() { logger(*this); } + + LogLevel getLevel() const { return _level; } + std::string getMessage() const { return _os.str(); } + #ifdef CMC - bool isEnabled() const { return should_log(_log_level); } + bool isLoggable() const { return ::isLoggable(getLevel()); } #endif template <typename T> @@ -69,7 +75,7 @@ public: } private: - LogLevel _log_level; + LogLevel _level; std::ostringstream _os; };

7 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016