Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: #1185 mobile ui: Added a new view to see events from the Event Console

by Bastian Kuhn

Module: check_mk Branch: master Commit: b8a480881bf269129584c5f301699a8fe50474a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8a480881bf269… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 14 12:07:44 2014 +0200 #1185 mobile ui: Added a new view to see events from the Event Console --- .werks/1185 | 9 ++++ ChangeLog | 1 + web/plugins/views/mobile.py | 109 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/.werks/1185 b/.werks/1185 new file mode 100644 index 0000000..550190d --- /dev/null +++ b/.werks/1185 @@ -0,0 +1,9 @@ +Title: mobile ui: Added a new view to see events from the Event Console +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1413281133 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c369389..0fd0eaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 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 + * 1185 mobile ui: Added a new view to see events from the Event Console * 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/mobile.py b/web/plugins/views/mobile.py index 609c91d..607bf11 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -708,6 +708,115 @@ multisite_builtin_views.update({ 'topic': _('Other')}), + + 'ec_event_mobile': {'browser_reload': 0, + 'column_headers': 'pergroup', + 'context': {}, + 'datasource': 'mkeventd_events', + 'description': u'Details about one event\n', + 'group_painters': [], + 'hidden': True, + 'hidebutton': False, + 'icon': 'mkeventd', + 'layout': 'mobiledataset', + 'linktitle': u'Event Details', + 'mobile': True, + 'name': 'ec_event_mobile', + 'num_columns': 1, + 'painters': [('event_state', None, None), + ('event_host', None, None), + ('host_address', 'hoststatus', None), + ('host_contacts', None, None), + ('host_icons', None, None), + ('event_text', None, None), + ('event_comment', None, None), + ('event_owner', None, None), + ('event_first', None, None), + ('event_last', None, None), + ('event_id', None, None), + ('event_icons', None, None), + ('event_count', None, None), + ('event_sl', None, None), + ('event_contact', None, None), + ('event_contact_groups', None, None), + ('event_application', None, None), + ('event_pid', None, None), + ('event_priority', None, None), + ('event_facility', None, None), + ('event_rule_id', None, None), + ('event_phase', None, None), + ('host_services', None, None)], + 'public': True, + 'single_infos': ['event'], + 'sorters': [], + 'title': u'Event Details', + 'topic': u'Event Console', + 'user_sortable': True}, + 'ec_events_mobile': {'browser_reload': 60, + 'column_headers': 'pergroup', + 'context': {'event_application': {'event_application': ''}, + 'event_comment': {'event_comment': ''}, + 'event_contact': {'event_contact': ''}, + 'event_count': {'event_count_from': '', + 'event_count_to': ''}, + 'event_facility': {'event_facility': ''}, + 'event_first': {'event_first_from': '', + 'event_first_from_range': '3600', + 'event_first_until': '', + 'event_first_until_range': '3600'}, + 'event_host_regex': {'event_host_regex': ''}, + 'event_id': {'event_id': ''}, + 'event_last': {'event_last_from': '', + 'event_last_from_range': '3600', + 'event_last_until': '', + 'event_last_until_range': '3600'}, + 'event_phase': {'event_phase_ack': 'on', + 'event_phase_closed': 'on', + 'event_phase_counting': '', + 'event_phase_delayed': '', + 'event_phase_open': 'on'}, + 'event_priority': {'event_priority_0': 'on', + 'event_priority_1': 'on', + 'event_priority_2': 'on', + 'event_priority_3': 'on', + 'event_priority_4': 'on', + 'event_priority_5': 'on', + 'event_priority_6': 'on', + 'event_priority_7': 'on'}, + 'event_rule_id': {'event_rule_id': ''}, + 'event_sl': {'event_sl': ''}, + 'event_sl_max': {'event_sl_max': ''}, + 'event_state': {'event_state_0': 'on', + 'event_state_1': 'on', + 'event_state_2': 'on', + 'event_state_3': 'on'}, + 'event_text': {'event_text': ''}, + 'hostregex': {'host_regex': ''}}, + 'datasource': 'mkeventd_events', + 'description': u'Table of all currently open events (handled and unhandled)\n', + 'group_painters': [], + 'hidden': False, + 'hidebutton': False, + 'icon': 'mkeventd', + 'layout': 'mobilelist', + 'linktitle': u'Events', + 'mobile': True, + 'name': 'ec_events_mobile', + 'num_columns': 1, + 'owner': 'omdadmin', + 'painters': [('event_id', 'ec_event_mobile', None), + ('event_state', None, None), + ('event_host', 'ec_events_of_host', None), + ('event_application', None, None), + ('event_text', None, None), + ('event_last', None, None)], + 'public': True, + 'single_infos': [], + 'sorters': [], + 'title': u'Events', + 'topic': u'Event Console', + 'user_sortable': True} + })

9 years, 11 months

Check_MK Git: check_mk: #1077 FIX Fixed labelling of Y achsis in prediction graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: 64a16e919888def38b10a596ce8e84247bf21139 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64a16e919888de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 14 12:02:41 2014 +0200 #1077 FIX Fixed labelling of Y achsis in prediction graphs In some cases the vertical achsis was not labelled. This has been fixed. --- .werks/1077 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/prediction.py | 13 ++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/1077 b/.werks/1077 new file mode 100644 index 0000000..cc89a40 --- /dev/null +++ b/.werks/1077 @@ -0,0 +1,11 @@ +Title: Fixed labelling of Y achsis in prediction graphs +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i6 +Date: 1413280924 + +In some cases the vertical achsis was not labelled. This has +been fixed. diff --git a/ChangeLog b/ChangeLog index d124b02..c369389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * 1120 FIX: Multisite filters Host/Service Contactgroup: Fixed livestatus exception... * 1158 FIX: Moved filter logic to visuals module... NOTE: Please refer to the migration notes! + * 1077 FIX: Fixed labelling of Y achsis in prediction graphs... WATO: * 1096 New WATO webservices: manage hosts via webinterface... diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index c2c6ee5..b1a1059 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -159,7 +159,7 @@ vranges = [ def compute_vertical_scala(low, high): m = max(abs(low), abs(high)) for letter, factor in vranges: - if m <= 15 * factor: + if m <= 99 * factor: break else: letter = 'P' @@ -172,6 +172,10 @@ def compute_vertical_scala(low, high): step = 0.2 * factor elif steps < 6: step = 0.5 * factor + elif steps > 50: + step = 5 * factor + elif steps > 20: + step = 2 * factor else: step = factor @@ -184,6 +188,13 @@ def compute_vertical_scala(low, high): vert_scala = [ [v, "%.1f%s" % (v / factor, letter)] ] + vert_scala v -= step + # Remove trailing ".0", if that is present for *all* entries + for entry in vert_scala: + if not entry[1].endswith(".0"): + break + else: + vert_scala = [ [e[0],e[1][:-2]] for e in vert_scala ] + return vert_scala def get_current_perfdata(host, service, dsname):

9 years, 11 months

Check_MK Git: check_mk: #1184 FIX cisco_power: Fixed detection of item. In some cases the status information was part of the item

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1b605d38f28f0356d134fe52b2817a76f6dbd6a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b605d38f28f03… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 14 09:43:55 2014 +0200 #1184 FIX cisco_power: Fixed detection of item. In some cases the status information was part of the item A reinventory is in some cases necessary. Please Check after the Update for {UNKOWN} states of checks of this check_type --- .werks/1184 | 10 ++++++++++ ChangeLog | 2 ++ checks/cisco_power | 28 ++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.werks/1184 b/.werks/1184 new file mode 100644 index 0000000..1839e7f --- /dev/null +++ b/.werks/1184 @@ -0,0 +1,10 @@ +Title: cisco_power: Fixed detection of item. In some cases the status information was part of the item +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.5i6 +Date: 1413272472 +Class: fix + +A reinventory is in some cases necessary. Please Check after the Update for {UNKOWN} states of checks of this check_type + diff --git a/ChangeLog b/ChangeLog index 3e77fe0..d124b02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,8 @@ * 1114 FIX: bluecat_threads: no longer detected on wrong systems... * 1116 FIX: megaraid_ldisk: now longer raises an exception for adapters with 'No Virtual Drive Configured' * 1122 FIX: windows agent: unicode logfile monitoring: now able to detect incomplete written lines... + * 1184 FIX: cisco_power: Fixed detection of item. In some cases the status information was part of the item... + NOTE: Please refer to the migration notes! Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/cisco_power b/checks/cisco_power index 863bf1e..a2cccf8 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -36,21 +36,33 @@ cisco_power_states = ('', 'normal', 'warning', 'critical', cisco_power_source = ( '', 'unknown', 'ac', 'dc', 'externalPowerSupply', 'internalRedundant') def inventory_cisco_power(info): - # 5 in line[1] means cisco_power_states = notPresent - return [ (line[0], '', '""') for line in info if 'RPS NotExist' not in line[0] and line[1] != '5' ] + for line in info: + # 5 in line[1] means cisco_power_states = notPresent + if 'RPS NotExist' not in line[0] and line[1] != '5': + # The field used here (ciscoEnvMonSupplyStatusDescr) can also + # contain a textual description of the current status. + # This tryes to remove that information + try: + item = line[0].split(',')[0] + except: + item = line[0] + yield item, None -def check_cisco_power(item, params, info): +def check_cisco_power(item, no_params, info): for line in info: - if line[0] == item: + try: + convert_item = line[0].split(',')[0] + except: + convert_item = line[0] + if convert_item == item: state, source = map(saveint, line[1:3]) output = 'State: %s, Source: %s' % (cisco_power_states[state], cisco_power_source[source]) if state == 1: - return (0, "%s" % output) + return 0, "%s" % output elif state == 2: - return (1, "%s" % output) + return 1, "%s" % output else: - return (2, "%s" % output) - return (3, "item not found in snmp data") + return 2, "%s" % output

9 years, 11 months

Check_MK Git: check_mk: msi build: missing cleanup of work_dir

by Andreas Boesl

Module: check_mk Branch: master Commit: a8747233b2629365547878dffdfbb2a6d21dee34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8747233b26293… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 13 16:23:23 2014 +0200 msi build: missing cleanup of work_dir --- agents/windows/msibuild/msi-update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index a999e84..99a5dd8 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, sys, uuid, tempfile +import os, sys, uuid, tempfile, shutil def verbose(text): if opt_verbose: @@ -181,5 +181,6 @@ verbose("Add modified product.cab") os.system((path_prefix + "msibuild %(new_msi_file)s -a product.cab %(work_dir)s/product.cab") % \ { "work_dir" : work_dir, "new_msi_file": new_msi_file }) +shutil.rmtree(work_dir) verbose("Successfully created file " + new_msi_file)

9 years, 11 months

Check_MK Git: check_mk: Spelling corrections

by Konstantin Büttner

Module: check_mk Branch: master Commit: be5ddacefb5ec134204905854ed1047639e0cf1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5ddacefb5ec1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Oct 13 14:13:59 2014 +0200 Spelling corrections --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c49ab8c..a8f7f27 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -528,9 +528,9 @@ register_rule(group + '/' + subgroup_inventory, register_rule(group + '/' + subgroup_inventory, varname = "sap_value_groups", title = _('SAP Value Grouping Patterns'), - help = _('The check <tt>sap.value</tt> normaly creates one service for each sap value ' - 'By defining grouping patterns you can switch to the check <tt>sap.value-groups</tt>. ' - 'That check monitors a list of SAP values at once. This is usefull if you have ' + help = _('The check <tt>sap.value</tt> normally creates one service for each SAP value. ' + 'By defining grouping patterns, you can switch to the check <tt>sap.value-groups</tt>. ' + 'That check monitors a list of SAP values at once. This is useful if you have ' 'a very big list of values which do you want to monitor'), valuespec = ListOf( Tuple(

9 years, 11 months

Check_MK Git: check_mk: Fixed another format error in Werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 4346b1e2fb4311df9c155bdd2968a86ce6997cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4346b1e2fb4311… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 13 10:24:53 2014 +0200 Fixed another format error in Werk --- .werks/984 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/984 b/.werks/984 index 3e24a47..b030778 100644 --- a/.werks/984 +++ b/.werks/984 @@ -24,6 +24,6 @@ systems WATO still uses <tt>pickle</tt>, even with this fix. Note: This change makes the current Check_MK versions incompatible to older versions. In a mixed environment with old and new Check_MK versions or with old and newer Python versions you have to force WATO to use the old -unsafe method by setting <tt>wato_legacy_eval = True<tt> in <tt>multisite.mk</tt>. +unsafe method by setting <tt>wato_legacy_eval = True</tt> in <tt>multisite.mk</tt>. This can also be done with the new global WATO setting Use unsafe legacy encoding for distributed WATO.

9 years, 11 months

Check_MK Git: check_mk: brocade: extended scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0dabe6a93983141cbbefc18926609b90098e1925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dabe6a9398314… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 13 10:21:58 2014 +0200 brocade: extended scan function --- checks/brocade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/brocade b/checks/brocade index e90c9c4..4940442 100644 --- a/checks/brocade +++ b/checks/brocade @@ -44,9 +44,10 @@ def brocade_sensor_convert(info, what): return return_list def brocade_scan(oid): - return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.2.1") + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.2.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.3.3.1") brocade_info = ('.1.3.6.1.4.1.1588.2.1.1.1.1.22.1', [ 3, # swSensorStatus, 6 = absent

9 years, 11 months

Check_MK Git: check_mk: Fixed formatting in Werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 1dbe7e788f0df88e993ba702d9f0a0f8e01afb26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dbe7e788f0df8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 13 10:04:41 2014 +0200 Fixed formatting in Werk --- .werks/984 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/984 b/.werks/984 index e80167f..3e24a47 100644 --- a/.werks/984 +++ b/.werks/984 @@ -17,7 +17,7 @@ this was modified as a security means from a former version, which used documentation clearly state, "pickle" should be considered unsafe as well, see: <tt>https://docs.python.org/2/library/pickle.html</tt>. -The fix replaces <tt>pickle<tt> with a module called <tt>ast</tt>. Unfortunately +The fix replaces <tt>pickle</tt> with a module called <tt>ast</tt>. Unfortunately this module is not available on Centos/RedHat 5.X and Debian 5. On these systems WATO still uses <tt>pickle</tt>, even with this fix.

9 years, 11 months

Check_MK Git: check_mk: Changed scan function of some brocade switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: dbee381957b6b5c4570fd0024f5cc6231206630e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbee381957b6b5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 13 09:56:44 2014 +0200 Changed scan function of some brocade switches --- checks/brocade_info | 2 +- checks/brocade_vdx_status | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/brocade_info b/checks/brocade_info index f11bd03..bad098c 100644 --- a/checks/brocade_info +++ b/checks/brocade_info @@ -90,6 +90,6 @@ check_info["brocade_info"] = { ], ), ], - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588") or \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1"), } diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index c31402b..22af8d4 100644 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -53,7 +53,7 @@ check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, "service_description" : "Status", - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.2.1"), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588"), "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status

9 years, 11 months

Check_MK Git: check_mk: Removed commented out code

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a023e81256027cb7d5c1fb38066aa62ee3d4962 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a023e81256027… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 10 13:43:10 2014 +0200 Removed commented out code --- web/htdocs/visuals.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 1f76acd..f81a77d 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -1007,20 +1007,6 @@ class VisualFilterList(ListOfMultiple): def filter_names(self): return self._filters.keys() - # get the filters to be used from the value and the data from the filter - # objects using the row data - ## FIXME: This function does not deal with user input. It is just being - ## used for creating links to views. Why is it here? - ## def filter_variable_settings(self, value, row): - ## vars = [] - ## for fname in value.keys(): - ## try: - ## vars += self._filters[fname].variable_settings(row) - ## except KeyError: - ## # When the row misses at least one var for a filter ignore this filter completely - ## pass - ## return vars - # Realizes a Multisite/visual filter in a valuespec. It can render the filter form, get # the filled in values and provide the filled in information for persistance. class VisualFilter(ValueSpec):

9 years, 12 months

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014