Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: Fix exception when core is Nagios

by Mathias Kettner

Module: check_mk Branch: master Commit: 236544ae6c5f34e37a42150015025557efbafa45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=236544ae6c5f34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 1 15:34:57 2014 +0200 Fix exception when core is Nagios --- modules/check_mk.py | 3 --- modules/check_mk_base.py | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6c1b1c3..40acf4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -719,9 +719,6 @@ def get_snmp_character_encoding(hostname): if len(entries) > 0: return entries[0] -def check_uses_snmp(check_type): - return snmp_info.get(check_type.split(".")[0]) != None - def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index da5a01f..b081296 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1585,6 +1585,9 @@ def nodes_of(hostname): g_nodesof_cache[hostname] = None return None +def check_uses_snmp(check_type): + return snmp_info.get(check_type.split(".")[0]) != None + def pnp_cleanup(s): return s \ .replace(' ', '_') \

10 years

Check_MK Git: check_mk: kernel: Fix invalid exception in case of simulated agent output

by Mathias Kettner

Module: check_mk Branch: master Commit: b1addafa45ae12e2f2ea7cb01702e2ed896fe457 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1addafa45ae12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 1 15:12:09 2014 +0200 kernel: Fix invalid exception in case of simulated agent output --- checks/kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/kernel b/checks/kernel index 3a3c804..6135420 100644 --- a/checks/kernel +++ b/checks/kernel @@ -155,7 +155,7 @@ def kernel_check_cpu_utilization(item, params, info): sum_jiffies = sum(diff_values[0:7]) # do not account for steal! if sum_jiffies == 0: - raise MKCounterException(None, "Too short time difference since last check") + raise MKCounterWrapped(None, "Too short time difference since last check") user = diff_values[0] + diff_values[1] # add user + nice system = diff_values[2]

10 years

Check_MK Git: check_mk: knuerr_rms_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0ce8af5430bf23d5909ab765a042083525c403ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce8af5430bf23… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 14:50:45 2014 +0200 knuerr_rms_temp: Now uses temperature.include --- checks/knuerr_rms_temp | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/checks/knuerr_rms_temp b/checks/knuerr_rms_temp index e08d6d6..bb81c2c 100644 --- a/checks/knuerr_rms_temp +++ b/checks/knuerr_rms_temp @@ -24,26 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -knuerr_rms_temp_default_levels = ( 30, 35 ) +knuerr_rms_temp_default_levels = (30, 35) + def inventory_knuerr_rms_temp(info): - return [ ( None, 'knuerr_rms_temp_default_levels') ] + return [ (None, 'knuerr_rms_temp_default_levels') ] + def check_knuerr_rms_temp(_no_item, params, info): - name, reading = info[0] - reading = float(reading) / 10 - warn, crit = params - infotext = "Current Temperature: %.1f°C on Sensor %s" % ( reading, name ) - levels = ' (Warn/Crit at %s/%s)' % ( warn, crit ) - perfdata = [ ('temp', reading, warn, crit ) ] - state = 0 - if reading >= crit: - state = 2 - infotext += levels - elif reading >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata + name, rawtemp = info[0] + status, infotext, perfdata = check_temperature(float(rawtemp) / 10, params) + infotext += " (%s)" % name + return status, infotext, perfdata + check_info["knuerr_rms_temp"] = { "check_function" : check_knuerr_rms_temp, @@ -51,7 +44,8 @@ check_info["knuerr_rms_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", - "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1" , [ 2 , 4 ]), - "group" : "hw_single_temperature" + "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1", [2, 4]), + "group" : "hw_single_temperature", + "includes" : [ "temperature.include" ], }

10 years

Check_MK Git: check_mk: temperature.include: Added fahrenheit_to_celsius conversion function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 922d3919abc0f41b9fd554f4c4086aee8486d35a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922d3919abc0f4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 11:54:43 2014 +0200 temperature.include: Added fahrenheit_to_celsius conversion function --- checks/temperature.include | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index 3db199e..3020d78 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -24,7 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Checks Temperature against crit/warn levels defined in params. temp must + +def fahrenheit_to_celsius(tempf): + return (float(tempf) - 32) * (5.0 / 9.0) + + +# Checks Celsius temperature against crit/warn levels defined in params. temp must # be int or float def check_temperature(temp, params):

10 years

Check_MK Git: check_mk: hwg_temp: Reworked to use include function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2b570e2dce03bb67e5ec97a961aff1fb8b8733f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b570e2dce03bb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 11:50:10 2014 +0200 hwg_temp: Reworked to use include function --- checks/hwg_temp | 60 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index e29dd8b..e397a76 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -28,11 +28,12 @@ hwg_temp_defaultlevels = (23, 25) def inventory_hwg_temp(info): - return [ (line[0], "hwg_temp_defaultlevels" ) for line in info if int(line[2]) != 0] + return [ (line[0], "hwg_temp_defaultlevels") + for line in info + if int(line[2]) != 0 and line[5] in ["1", "2", "3"] ] def check_hwg_temp(item, params, info): - warn, crit = params status_text = { "0" : "Invalid", "1" : "Normal", @@ -40,36 +41,42 @@ def check_hwg_temp(item, params, info): "3" : "Out Of Range High", "4" : "Alarm Low", "5" : "Alarm High", - } + } + unit_text = { "0" : "unknown", "1" : "°C", "2" : "°F", "3" : "°K", "4" : "%", - } - for line in info: - if line[0] == item: - descr, status, current, current_m, unit = line[1:] - current_state = savefloat(current_m)/10 + } + + # Nomenclature in this check: sensorstatus is what the device sends, state is what the check returns. + for index, descr, sensorstatus, current, unit in info: + if index == item: + tempval = float(current) + if unit == "2": + temp = fahrenheit_to_celsius(tempval) + elif unit == "3": + temp = tempval - 273.15 + elif unit == "4": + return + else: + temp = tempval + + state, infotext, perfdata = check_temperature(temp, params) + if descr: + infotext += " (%s)" % descr + yield state, infotext, perfdata - state = 0 - if current_state >= crit: - state = 2 - elif current_state >= warn: - state = 1 - elif status in ('4', '2'): - state = 1 - elif status in('0', '3', '5'): - state = 2 + if sensorstatus != '1': + if sensorstatus in ['2', '3', '4', '5']: + state = 2 + else: + state = 3 - perfdata = [ ("temp", current, warn, crit, 0 ) ] - unit = unit_text.get(unit) - status = status_text.get(status, "UNKOWN") - return(state, "%s at %s%s (warn/crit at %s%s/%s%s), Status is %s" % \ - (descr, current, unit, warn, unit, crit, unit, status), perfdata) + yield state, "Status is %s" % status_text.get(sensorstatus, "UNKNOWN") - return (3, "Sensor %s not found in SNMP data %s" % (item) ) check_info['hwg_temp'] = { "check_function" : check_hwg_temp, @@ -84,12 +91,11 @@ check_info['hwg_temp'] = { "1.3", # current value string "1.4", - # current value*10 integer - "1.5", # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% "1.7", ]), - "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "group" : "room_temperature", + "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "group" : "room_temperature", + "includes" : [ "temperature.include" ], }

10 years

Check_MK Git: check_mk: new incomplete checks and agent plugin for db2 monitoring

by Andreas Boesl

Module: check_mk Branch: master Commit: bbfeb82852eeb2b50b71ac7a8c5632e8d76f0b79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbfeb82852eeb2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 30 16:34:08 2014 +0200 new incomplete checks and agent plugin for db2 monitoring --- .../incomplete_checks/db2/db2_bp_hitratios | 67 ++++++ doc/treasures/incomplete_checks/db2/db2_counters | 97 +++++++++ doc/treasures/incomplete_checks/db2/db2_logsizes | 101 +++++++++ doc/treasures/incomplete_checks/db2/db2_sessions | 69 ++++++ .../incomplete_checks/db2/db2_tablespaces | 226 ++++++++++++++++++++ doc/treasures/incomplete_checks/db2/db2_versions | 50 +++++ doc/treasures/incomplete_checks/db2/mk_db2 | 60 ++++++ 7 files changed, 670 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bbfeb82852…

10 years

Check_MK Git: check_mk: Multisite visuals: fixed some i18n issues

by Andreas Boesl

Module: check_mk Branch: master Commit: 214991ee51fe749d52cc33e7fe7a0537fe7b8d88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=214991ee51fe74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 30 16:24:52 2014 +0200 Multisite visuals: fixed some i18n issues --- web/htdocs/dashboard.py | 6 +++--- web/htdocs/views.py | 4 ++-- web/htdocs/visuals.py | 38 +++++++++++++++++--------------------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index d29e416..ad67e77 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -608,7 +608,7 @@ def page_edit_dashboards(): # '----------------------------------------------------------------------' def page_create_dashboard(): - visuals.page_create_visual('dashboards', allow_global = True) + visuals.page_create_visual('dashboards', _("Dashboard"), allow_global = True) #. # .--Dashb. Config-------------------------------------------------------. @@ -654,7 +654,7 @@ def page_edit_dashboard(): ], ) - visuals.page_edit_visual('dashboards', dashboards, + visuals.page_edit_visual('dashboards', _("Dashboard"), dashboards, create_handler = create_dashboard, custom_field_handler = custom_field_handler ) @@ -701,7 +701,7 @@ def page_create_view_dashlet(): if create: # Create a new view by choosing the context type and then the datasource - visuals.page_create_visual('views', allow_global = False, + visuals.page_create_visual('views', _("View"), allow_global = False, next_url = 'create_view_dashlet_ds.py?mode=create&context_type=%s' + '&name=%s' % html.urlencode(name)) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e3717ed..b6578e7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -317,7 +317,7 @@ def page_edit_views(): # '----------------------------------------------------------------------' def page_create_view(): - visuals.page_create_visual('views', allow_global = False, + visuals.page_create_visual('views', _("View"), allow_global = False, next_url = 'create_view_ds.py?mode=create&context_type=%s') # Seconds step: Select the data source @@ -400,7 +400,7 @@ def page_create_view_ds(next_url = 'edit_view.py?context_type=%s&datasource=%s') def page_edit_view(): load_views() - visuals.page_edit_visual('views', multisite_views, + visuals.page_edit_visual('views', _("View"), multisite_views, custom_field_handler = render_view_config, load_handler = transform_view_to_valuespec, create_handler = create_view_config, diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index e1b65b9..30ebab1 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -342,7 +342,7 @@ def page_list(what, title, visuals, custom_columns = []): # | Realizes the steps before getting to the editor (context type) | # '----------------------------------------------------------------------' -def page_create_visual(what, allow_global = False, next_url = None): +def page_create_visual(what, title, allow_global = False, next_url = None): what_s = what[:-1] def cmp_context_titles(a, b): @@ -356,17 +356,15 @@ def page_create_visual(what, allow_global = False, next_url = None): vs_type = DropdownChoice( title = _('Context Type'), choices = context_choices, - help = _('The context of a %s controls the type of objects to be shown. It ' + help = _('The context of a visual controls the type of objects to be shown. It ' 'also sets wether single or multiple objects are displayed. The context ' - 'type of a %s can not be changed anymore.') % (what_s, what_s), + 'type of a visual can not be changed anymore.'), ) - html.header(_('Create %s') % what_s.title(), stylesheets=["pages"]) + html.header(_('Create %s') % title, stylesheets=["pages"]) html.begin_context_buttons() back_url = html.var("back", "") - if back_url: - html.context_button(_("Back"), back_url, "back") - html.context_button(_("All %s") % what.title(), "edit_%s.py" % what, what_s) + html.context_button(_("Back"), back_url or "edit_%s.py" % what, "back") html.end_context_buttons() if html.var('save') and html.check_transaction(): @@ -412,11 +410,11 @@ def page_create_visual(what, allow_global = False, next_url = None): # | Edit global settings of the visual | # '----------------------------------------------------------------------' -def page_edit_visual(what, all_visuals, custom_field_handler = None, create_handler = None, try_handler = None, +def page_edit_visual(what, title, all_visuals, custom_field_handler = None, create_handler = None, try_handler = None, load_handler = None): what_s = what[:-1] if not config.may("general.edit_" + what): - raise MKAuthException(_("You are not allowed to edit %s.") % what) + raise MKAuthException(_("You are not allowed to edit %s.") % title) visual = {} @@ -430,7 +428,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand mode = 'clone' visual = copy.deepcopy(all_visuals.get((cloneuser, visualname), None)) if not visual: - raise MKUserError('cloneuser', _('The %s does not exist.') % what_s) + raise MKUserError('cloneuser', _('The %s does not exist.') % title) # Make sure, name is unique if cloneuser == config.user_id: # Clone own visual @@ -466,18 +464,16 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand visual['context_type'] = context_type if mode == 'clone': - title = _('Clone %s') % what_s.title() + title = _('Clone %s') % title elif mode == 'create': - title = _('Create %s') % what_s.title() + title = _('Create %s') % title else: - title = _('Edit %s') % what_s.title() + title = _('Edit %s') % title html.header(title, stylesheets=["pages", "views", "status", "bi"]) html.begin_context_buttons() back_url = html.var("back", "") - if back_url: - html.context_button(_("Back"), back_url, "back") - html.context_button(_("All %s") % what.title(), "edit_%s.py" % what, what_s) + html.context_button(_("Back"), back_url or "edit_%s.py" % what, "back") html.end_context_buttons() vs_general = Dictionary( @@ -512,7 +508,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand ('linktitle', TextUnicode( title = _('Button Text') + '<sup>*</sup>', help = _('If you define a text here, then it will be used in ' - 'context buttons linking to the %s instead of the regular title.') % what_s, + 'context buttons linking to the %s instead of the regular title.') % title, size = 26)), ('icon', IconSelector( title = _('Button Icon'), @@ -520,10 +516,10 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand ('visibility', ListChoice( title = _('Visibility'), choices = (config.may("general.publish_" + what) and [ - ('public', _('Make this %s available for all users') % what_s), + ('public', _('Make this %s available for all users') % title), ] or []) + - [ ('hidden', _('Hide this %s from the sidebar') % what_s), - ('hidebutton', _('Do not show a context button to this %s') % what_s) + [ ('hidden', _('Hide this %s from the sidebar') % title), + ('hidebutton', _('Do not show a context button to this %s') % title) ], )), ], @@ -575,7 +571,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand save(what, all_visuals) html.immediate_browser_redirect(1, back) - html.message(_('Your %s has been saved.') % what_s) + html.message(_('Your %s has been saved.') % title) html.reload_sidebar() html.footer() return

10 years

Check_MK Git: check_mk: #1411 New builting views for the history of scheduled downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 794103fd8b46ddfc85e61d94642f7b0caed263c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794103fd8b46dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 16:05:40 2014 +0200 #1411 New builting views for the history of scheduled downtimes --- .werks/1411 | 9 +++++ ChangeLog | 1 + web/plugins/views/builtin.py | 91 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/views/filters.py | 1 + 4 files changed, 102 insertions(+) diff --git a/.werks/1411 b/.werks/1411 new file mode 100644 index 0000000..0046823 --- /dev/null +++ b/.werks/1411 @@ -0,0 +1,9 @@ +Title: New builting views for the history of scheduled downtimes +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1412085926 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4b077df..6a560da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * 1398 Allow to spread times of next check when rescheduling... * 1405 Checkbox for settings downtimes on the hosts of the selected services... * 1410 Output log text of scheduled downtime log entries... + * 1411 New builting views for the history of scheduled downtimes * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1d5d26e..1dd6022 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -390,6 +390,39 @@ multisite_builtin_views.update({ 'sorters': [('downtime_what', False), ('downtime_start_time', False)], 'title': _('Downtimes')}, + +'downtime_history': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'log_events', + 'description': _('All historic scheduled downtimes of hosts and services'), + 'group_painters': [], + 'hard_filters': [ 'log_type' ], + 'hard_filtervars': [('logtime_from_range', '86400'), + ('logtime_from', '60'), + ('log_type', 'SERVICE DOWNTIME ALERT'), + ], + 'hidden': False, + 'hide_filters': [], + 'icon' : 'downtime', + 'layout': 'table', + 'linktitle': _('Host Dt-History'), + 'mustsearch': False, + 'num_columns': 1, + 'painters': [('log_icon', None), + ('log_time', None), + ('host', 'host_dt_hist'), + ('service_description', 'svc_dt_hist'), + ('log_state_type', None), + ('log_plugin_output', None), + ], + 'play_sounds': False, + 'public': True, + 'show_filters': ['logtime', ], + 'sorters': [('log_time', True), ('log_lineno', True)], + 'title': _('History of scheduled downtimes'), + 'topic': _('Other'), +}, + 'api_downtimes': {'column_headers': 'pergroup', 'datasource': 'downtimes', 'description': _('All host- and service-downtimes (including ids)'), @@ -1856,6 +1889,35 @@ multisite_builtin_views.update({ 'show_filters': ['logtime', 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host')}, + +'host_dt_hist': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'log_events', + 'description': _('All historic scheduled downtimes of a certain host'), + 'group_painters': [], + 'hard_filters': [ 'log_type' ], + 'hard_filtervars': [('logtime_from_range', '86400'), + ('logtime_from', '60'), + ('log_type', 'HOST DOWNTIME ALERT'), + ], + 'hidden': True, + 'hide_filters': ['site', 'host' ], + 'icon' : 'downtime', + 'layout': 'table', + 'linktitle': _('Host Dt-History'), + 'mustsearch': False, + 'num_columns': 1, + 'painters': [('log_icon', None), + ('log_time', None), + ('log_state_type', None), + ('log_plugin_output', None), + ], + 'play_sounds': False, + 'public': True, + 'show_filters': ['logtime', ], + 'sorters': [('log_time', True), ('log_lineno', True)], + 'title': _('Historic downtimes of host')}, + 'svcevents': {'browser_reload': 0, 'column_headers': 'pergroup', 'datasource': 'log_events', @@ -1885,6 +1947,35 @@ multisite_builtin_views.update({ 'show_filters': ['logtime', 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of service')}, + +'svc_dt_hist': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'datasource': 'log_events', + 'description': _('All historic scheduled downtimes of a certain service'), + 'group_painters': [], + 'hard_filters': [ 'log_type' ], + 'hard_filtervars': [('logtime_from_range', '86400'), + ('logtime_from', '60'), + ('log_type', '(HOST|SERVICE) DOWNTIME ALERT'), + ], + 'hidden': True, + 'hide_filters': ['site', 'host', 'service'], + 'icon' : 'downtime', + 'layout': 'table', + 'linktitle': _('Downtime-History'), + 'mustsearch': False, + 'num_columns': 1, + 'painters': [('log_icon', None), + ('log_time', None), + ('log_state_type', None), + ('log_plugin_output', None), + ], + 'play_sounds': False, + 'public': True, + 'show_filters': ['logtime', ], + 'sorters': [('log_time', True), ('log_lineno', True)], + 'title': _('Historic downtimes of service')}, + 'hostsvcevents': {'browser_reload': 0, 'column_headers': 'pergroup', 'datasource': 'log_events', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index d764df4..32c5387 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -703,6 +703,7 @@ class FilterLogClass(Filter): declare_filter(255, FilterLogClass()) declare_filter(202, FilterText("log_plugin_output", _("Log: plugin output"), "log", "log_plugin_output", "log_plugin_output", "~~")) +declare_filter(203, FilterText("log_type", _("Log: message type"), "log", "log_type", "log_type", "~~")) declare_filter(260, FilterText("log_contact_name", _("Log: contact name"), "log", "log_contact_name", "log_contact_name", "="), _("Exact match, used for linking"))

10 years

Check_MK Git: check_mk: Merge brancl 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 505ebca17dd93aec1526e349be2c136e147dd414 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505ebca17dd93a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 30 16:05:44 2014 +0200 Merge brancl 'master' of ssh://mathias-kettner.de/check_mk ---

10 years

Check_MK Git: check_mk: juniper_screenos_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 655b3f666af1ae5d2862f2b3acd16f4a220f951c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=655b3f666af1ae… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 30 15:55:07 2014 +0200 juniper_screenos_temp: Now uses temperature.include --- checks/juniper_screenos_temp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/checks/juniper_screenos_temp b/checks/juniper_screenos_temp index 1b6c644..37fc05e 100644 --- a/checks/juniper_screenos_temp +++ b/checks/juniper_screenos_temp @@ -37,20 +37,8 @@ def check_juniper_screenos_temp(item, params, info): if name.endswith("Temperature"): name = name.rsplit(None, 1)[0] if name == item: - temp = int(temp) - warn, crit = params - perfdata = [( "temp", temp, warn, crit )] - infotxt = "Temperature is %s °C" % temp - if temp >= crit: - status = 2 - elif temp >= warn: - status = 1 - else: - status = 0 - if status: - infotext += " (levels at %d °C/%d °C)" % (warn, crit) - return status, infotxt, perfdata - return (3, "Sensor not found in SNMP data") + return check_temperature(int(temp), params) + check_info["juniper_screenos_temp"] = { "check_function" : check_juniper_screenos_temp, @@ -62,7 +50,6 @@ check_info["juniper_screenos_temp"] = { "snmp_info" : (".1.3.6.1.4.1.3224.21.4.1",[ 4, # Name 3, # Temperatur - ]) - - + ]), + "includes" : [ "temperature.include" ], }

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits