Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1637 FIX Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set

by Lars Michelsen

Module: check_mk Branch: master Commit: da016f21194b51df97a0a1bca9df3ffb982c9cfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da016f21194b51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 10:35:34 2014 +0100 #1637 FIX Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set --- .werks/1637 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.werks/1637 b/.werks/1637 new file mode 100644 index 0000000..2ea739f --- /dev/null +++ b/.werks/1637 @@ -0,0 +1,9 @@ +Title: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417685701 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d2b8121..caca78c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,6 +163,7 @@ * 1589 FIX: Restructured SNMP credentials rule specification... * 1620 FIX: Fixed exception during host renaming when host has no perfdata * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... + * 1637 FIX: Fixed exception in notification analysis when notifications have not NOTIFICATIONTYPE set Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c9f57d..0193033 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8877,10 +8877,9 @@ def mode_notifications(phase): _("Unknown date") table.cell(_("Date/Time"), date, css="nobr") - nottype = entry.get("NOTIFICATIONTYPE") + nottype = entry.get("NOTIFICATIONTYPE", "") table.cell(_("Type"), nottype) - if nottype in [ "PROBLEM", "RECOVERY" ]: if entry.get("SERVICESTATE"): statename = _(entry["SERVICESTATE"][:4]) @@ -8903,8 +8902,6 @@ def mode_notifications(phase): else: table.cell(_("State"), "") - - table.cell(_("Host"), entry.get("HOSTNAME", "")) table.cell(_("Service"), entry.get("SERVICEDESC", "")) output = entry.get("SERVICEOUTPUT", entry.get("HOSTOUTPUT"))

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 869a8148be4db9943471c75131070290bb75bd59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=869a8148be4db9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 10:32:45 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 755d892..af2b5c5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1637 +1657

9 years, 9 months

Check_MK Git: check_mk: #1620 FIX Fixed exception during host renaming when host has no perfdata

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c42be56edcc47c1cf8d668f5d63f014c74faa9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c42be56edcc47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 09:54:55 2014 +0100 #1620 FIX Fixed exception during host renaming when host has no perfdata --- .werks/1620 | 9 +++++++++ ChangeLog | 1 + modules/automation.py | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/1620 b/.werks/1620 new file mode 100644 index 0000000..c0b0a65 --- /dev/null +++ b/.werks/1620 @@ -0,0 +1,9 @@ +Title: Fixed exception during host renaming when host has no perfdata +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417683278 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 246f486..c4b23fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 1576 FIX: SNMP Community host attribute is now visible for IE<=8... * 1588 FIX: Renamed SNMP communities rule to SNMP credentials * 1589 FIX: Restructured SNMP credentials rule specification... + * 1620 FIX: Fixed exception during host renaming when host has no perfdata Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/modules/automation.py b/modules/automation.py index 61e3207..21dad73 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1010,13 +1010,12 @@ def omd_rename_host(oldname, newname): # Fix pathnames in XML files dirpath = omd_root + "/var/pnp4nagios/perfdata/" + oldname - os.system("sed -i 's@/perfdata/%s/@/perfdata/%s/@' %s/*.xml" % (oldname, newname, dirpath)) + os.system("sed -i 's@/perfdata/%s/@/perfdata/%s/@' %s/*.xml 2>/dev/null" % (oldname, newname, dirpath)) # RRD files if rename_host_dir(rrd_path, oldname, newname): actions.append("rrd") - # entries of rrdcached journal dirpath = omd_root + "/var/rrdcached/" if not os.system("sed -i 's@/perfdata/%s/@/perfdata/%s/@' "

9 years, 9 months

Check_MK Git: check_mk: #1619 FIX Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups"

by Lars Michelsen

Module: check_mk Branch: master Commit: 185cdb4c809e8f3b32ac8e6e1d007caa902f08a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=185cdb4c809e8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 09:18:33 2014 +0100 #1619 FIX Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" --- .werks/1619 | 9 +++++++++ ChangeLog | 11 ++++++----- web/plugins/views/builtin.py | 28 +++++++++++++--------------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.werks/1619 b/.werks/1619 new file mode 100644 index 0000000..7b75410 --- /dev/null +++ b/.werks/1619 @@ -0,0 +1,9 @@ +Title: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417681030 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8c35b8a..246f486 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,10 +32,10 @@ * 1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels.... NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... - * 1594 ibm_svc_host: Can now be set to be always OK... - * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... + * 1594 ibm_svc_host: Can now be set to be always OK... + * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1567 postfix_mailq: speedup in Linux agent for large mail queues... * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 @@ -67,9 +67,6 @@ * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... - * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... - NOTE: Please refer to the migration notes! - * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1590 FIX: printer_supply_ricoh: Fixed broken check * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output @@ -77,10 +74,13 @@ * 1604 FIX: mysql_slave: Dealing with situation where connection with master is lost * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! + * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... + NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... * 1612 FIX: job: Fixed wrong reported start time for running jobs + * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... * 1617 FIX: lnx_if: Deal with data provided by cluster host @@ -132,6 +132,7 @@ * 1605 FIX: Fixed perfometer of check check_mk-printer_supply_ricoh * 1607 FIX: check_http: Fixed broken links in escaped plugin output * 1614 FIX: Fixed wrong URL in webapi.py documentation + * 1619 FIX: Renamed "Hostgroups" and "Servicegroups" views to "Host Groups" and "Service Groups" WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index e1ac028..41e3a9f 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -935,8 +935,8 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('hostgroup', False), ('site_host', False)], - 'title': _('Hostgroups (Grid)'), - 'topic': _('Hostgroups')}, + 'title': _('Host Groups (Grid)'), + 'topic': _('Host Groups')}, 'hostgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'hostgroups', @@ -965,8 +965,8 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['hostgroupnameregex', 'hostgroupvisibility'], 'sorters': [], - 'title': _('Hostgroups (Summary)'), - 'topic': _('Hostgroups') }, + 'title': _('Host Groups (Summary)'), + 'topic': _('Host Groups') }, 'hostproblems': {'browser_reload': 30, 'column_headers': 'pergroup', @@ -1052,8 +1052,8 @@ multisite_builtin_views.update({ 'sorters': [('site', False), ('hostgroup', False), ('site_host', False)], - 'title': _('Hostgroups'), - 'topic': _('Hostgroups')}, + 'title': _('Host Groups'), + 'topic': _('Host Groups')}, 'hoststatus': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'hosts', @@ -1486,7 +1486,7 @@ multisite_builtin_views.update({ ('site_host', False), ('svcdescr', False)], 'title': _('Services by group'), - 'topic': _('Servicegroups')}, + 'topic': _('Service Groups')}, 'svcbyhgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicesbyhostgroup', @@ -1517,7 +1517,7 @@ multisite_builtin_views.update({ 'svcgroups': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicegroups', - 'description': _('A short overview over all servicegroups, without explicity listing of the actual hosts and services'), + 'description': _('A short overview over all service groups, without explicity listing of the actual hosts and services'), 'group_painters': [('sitealias', 'sitehosts')], 'hard_filters': [], 'hard_filtervars': [], @@ -1538,12 +1538,12 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['servicegroupnameregex'], 'sorters': [], - 'title': _('Servicegroups (Summary)'), - 'topic': _('Servicegroups')}, + 'title': _('Service Groups (Summary)'), + 'topic': _('Service Groups')}, 'svcgroups_grid': {'browser_reload': 30, 'column_headers': 'pergroup', 'datasource': 'servicegroups', - 'description': _('A short overview over all servicegroups, without explicity listing of the actual hosts and services'), + 'description': _('A short overview over all service groups, without explicity listing of the actual hosts and services'), 'group_painters': [('sitealias', 'sitehosts')], 'hard_filters': [], 'hard_filtervars': [], @@ -1560,8 +1560,8 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': [], 'sorters': [], - 'title': _('Servicegroups (Grid)'), - 'topic': _('Servicegroups'), + 'title': _('Service Groups (Grid)'), + 'topic': _('Service Groups'), }, 'svcproblems': { 'browser_reload': 30, @@ -3148,8 +3148,6 @@ multisite_builtin_views.update({ ('host', None, ''), ('log_state', None, ''), ('log_plugin_output', None, '')], - 'play_sounds': False, - 'public': True, 'show_filters': ['log_plugin_output', 'logtime', 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Service Notifications'),

9 years, 9 months

Check_MK Git: check_mk: Cleaned up jolokia mem check a bit,

by Lars Michelsen

there is a lot of additional work to do here Message-ID: <54802a3b.BCzexSJlJF0UYV9f%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bc1ce37576ee300df985868d9bc0492bf2482248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc1ce37576ee30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 09:42:22 2014 +0100 Cleaned up jolokia mem check a bit, there is a lot of additional work to do here --- checks/jolokia_metrics | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 31b0263..af330b3 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -230,7 +230,6 @@ def check_jolokia_metrics_mem(item, params, info): if item not in parsed: return (3, "data not found in agent output") - # convert old parameter version ( warn, crit ) # represented levels of total heap if type(params) == tuple: @@ -252,28 +251,25 @@ def check_jolokia_metrics_mem(item, params, info): if heapmax > 0 and nonheapmax > 0: totalmax = heapmax + nonheapmax else: - totalmax = "" - if heapmax < 0: - heapmax = "" - if nonheapmax < 0: - nonheapmax = "" + totalmax = 0 + heapmax = max(0, heapmax) + nonheapmax = max(0, nonheapmax) - state_sign = { 0: "", 1: "(!)", 2: "(!!)" } worst_state = 0 - perfdata = [] - info_list = [] + perfdata = [] + info_list = [] - for (what, value, value_max) in [ - ("heap", heap, heapmax), + for what, value, value_max in [ + ("heap", heap, heapmax), ("nonheap", nonheap, nonheapmax), - ("total", total, totalmax), + ("total", total, totalmax), ]: param_state = 0 level_info = "" used_info = "" if params.get(what): - warn_level = "" - crit_level = "" + warn_level = 0 + crit_level = 0 if type(params[what][0]) == int: if what != "total": if value_max: @@ -284,10 +280,10 @@ def check_jolokia_metrics_mem(item, params, info): param_state = 0 elif value >= crit_level: param_state = 2 - level_info = "%s(crit at %sMB free)" % (state_sign[2], params[what][1]) + level_info = "%s(crit at %sMB free)" % (state_markers[2], params[what][1]) elif value >= warn_level: param_state = 1 - level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) + level_info = "%s(warn at %sMB free)" % (state_markers[1], params[what][0]) else: if what != "total": if value_max: @@ -298,10 +294,10 @@ def check_jolokia_metrics_mem(item, params, info): param_state = 0 elif value >= crit_level: param_state = 2 - level_info = "%s(crit at %s%%)" % (state_sign[2], params[what][1]) + level_info = "%s(crit at %s%%)" % (state_markers[2], params[what][1]) elif value >= warn_level: param_state = 1 - level_info = "%s(warn at %s%%)" % (state_sign[1], params[what][0]) + level_info = "%s(warn at %s%%)" % (state_markers[1], params[what][0]) else: if what != "total": perfdata.append((what, value, "", "", "", value_max)) @@ -364,7 +360,6 @@ def check_jolokia_metrics_app_state(item, _unused, info): app_state=3 app = jolokia_metrics_app(info, item.split()) - #print app # FIXME: this could be nicer. if app and "Running" in app: if app['Running'] == '1':

9 years, 9 months

Check_MK Git: check_mk: #1621 Sorting Check_MK* services always on top of services lists

by Lars Michelsen

Module: check_mk Branch: master Commit: 17b8cd8bdf9301697436842d121af6f2b6dca0e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17b8cd8bdf9301… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 4 10:13:58 2014 +0100 #1621 Sorting Check_MK* services always on top of services lists --- .werks/1621 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/1621 b/.werks/1621 new file mode 100644 index 0000000..35f6d3b --- /dev/null +++ b/.werks/1621 @@ -0,0 +1,9 @@ +Title: Sorting Check_MK* services always on top of services lists +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417684329 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c4b23fa..b6e7d0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * 1500 SEC: Preventing livestatus injections in different places... * 1530 Dashboard: Host/service statistics dashlets now deal with the context... * 1558 Better visualize manually changed notification enable/disable + * 1621 Sorting Check_MK* services always on top of services lists * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 1c02cdc..1b2f75d 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -129,8 +129,25 @@ multisite_sorters['servicelevel'] = { 'cmp' : lambda r1, r2: cmp_custom_variable(r1, r2, 'EC_SL', cmp_simple_number) } +def cmp_service_name_equiv(r): + if r == "Check_MK": + return -5 + elif r == "Check_MK inventory": + return -4 + elif r == "Check_MK HW/SW Inventory": + return -3 + else: + return 0 + +def cmp_service_name(column, r1, r2): + o = cmp(cmp_service_name_equiv(r1[column]), cmp_service_name_equiv(r2[column])) + if o == 0: + return cmp_simple_string(column, r1, r2) + else: + return o + # name title column sortfunction -declare_simple_sorter("svcdescr", _("Service description"), "service_description", cmp_simple_string) +declare_simple_sorter("svcdescr", _("Service description"), "service_description", cmp_service_name) declare_simple_sorter("svcdispname", _("Service alternative display name"), "service_display_name", cmp_simple_string) declare_simple_sorter("svcoutput", _("Service plugin output"), "service_plugin_output", cmp_simple_string) declare_simple_sorter("svc_long_plugin_output", _("Long output of check plugin"), "service_long_plugin_output", cmp_simple_string)

9 years, 9 months

Check_MK Git: check_mk: #1625 FIX Safely handle characters that have a special meaning in regexes when creating service-specific rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e22035efcff6a9c485e947dcdfbeb0f3fa41752 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e22035efcff6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 10:09:40 2014 +0100 #1625 FIX Safely handle characters that have a special meaning in regexes when creating service-specific rules When you click an icon or button for creating a service specific rule in WATO then characters, that have a special meaning in regular expressions, are now correctly escaped with backslashes. These characters are: <tt>(</tt>, <tt>)</tt>, <tt>.</tt>, <tt>^</tt>, <tt>$</tt>, <tt>[</tt>, <tt>]</tt>, <tt>{</tt>, <tt>}</tt>, <tt>+</tt> and <tt>*</tt> --- .werks/1625 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 8 ++++++++ web/htdocs/wato.py | 6 ++---- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/1625 b/.werks/1625 new file mode 100644 index 0000000..bffa903 --- /dev/null +++ b/.werks/1625 @@ -0,0 +1,13 @@ +Title: Safely handle characters that have a special meaning in regexes when creating service-specific rules +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417684044 +Class: fix + +When you click an icon or button for creating a service specific rule in +WATO then characters, that have a special meaning in regular expressions, +are now correctly escaped with backslashes. These characters are: <tt>(</tt>, +<tt>)</tt>, <tt>.</tt>, <tt>^</tt>, <tt>$</tt>, <tt>[</tt>, <tt>]</tt>, +<tt>{</tt>, <tt>}</tt>, <tt>+</tt> and <tt>*</tt> diff --git a/ChangeLog b/ChangeLog index 90a0758..ef01d0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 1576 FIX: SNMP Community host attribute is now visible for IE<=8... * 1588 FIX: Renamed SNMP communities rule to SNMP credentials * 1589 FIX: Restructured SNMP credentials rule specification... + * 1625 FIX: Safely handle characters that have a special meaning in regexes when creating service-specific rules... Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index b372d7f..9da5812 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -399,6 +399,14 @@ def regex(r): regex_cache[r] = rx return rx +def escape_regex_chars(text): + escaped = "" + for c in text: + if c in '().^$[]{}+*\\': + escaped += '\\' + escaped += c + return escaped + # Splits a word into sequences of numbers and non-numbers. # Creates a tuple from these where the number are converted diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d941df6..8c9f57d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3198,8 +3198,6 @@ def show_service_table(host, firsttime): else: html.button("_show_parameters", _("Show Check Parameters")) - - html.hidden_fields() if html.var("_scan"): html.hidden_field("_scan", "on") @@ -14600,10 +14598,10 @@ def get_rule_conditions(ruleset): return tag_list, host_list, item_list - def date_and_user(): return time.strftime("%F", time.localtime()) + " " + config.user_id + ": " + def mode_edit_rule(phase, new = False): # Due to localization this cannot be defined in the global context! vs_rule_options = Dictionary( @@ -14670,7 +14668,7 @@ def mode_edit_rule(phase, new = False): host = html.var("host") item = html.has_var("item") and mk_eval(html.var("item")) or NO_ITEM try: - rule = create_rule(rulespec, host, item) + rule = create_rule(rulespec, host, escape_regex_chars(item)) except Exception, e: if phase != "action": html.message(_("Cannot create rule: %s") % e)

9 years, 9 months

Check_MK Git: check_mk: #1624 FIX Remove illegal characters from service descriptions of active checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 33c15fa21c98109d9828ade3e4a4c24653a0e678 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c15fa21c9810… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 4 09:39:51 2014 +0100 #1624 FIX Remove illegal characters from service descriptions of active checks This fix removes illegal characters like brackets from service descriptions of configured active checks (<tt>legacy_checks</tt>, <tt>custom_checks</tt> and <tt>active_checks</tt>). These characters are disallowed by Nagios and will lead to configuration errors. --- .werks/1624 | 12 ++++++++++++ ChangeLog | 11 ++++++----- modules/check_mk.py | 12 +++++++++--- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/1624 b/.werks/1624 new file mode 100644 index 0000000..8f43465 --- /dev/null +++ b/.werks/1624 @@ -0,0 +1,12 @@ +Title: Remove illegal characters from service descriptions of active checks +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1417682307 +Class: fix + +This fix removes illegal characters like brackets from service descriptions +of configured active checks (<tt>legacy_checks</tt>, <tt>custom_checks</tt> and +<tt>active_checks</tt>). These characters are disallowed by Nagios and will +lead to configuration errors. diff --git a/ChangeLog b/ChangeLog index 8c35b8a..90a0758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 1545 FIX: Check_MK Inventory check is now resulting in correct state on duplicate host * 1555 FIX: Improved validation on timeperiod references of non existing periods... * 1574 FIX: Hosts named like used python modules do not break precompiled checks anymore... + * 1624 FIX: Remove illegal characters from service descriptions of active checks... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices @@ -32,10 +33,10 @@ * 1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels.... NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... - * 1594 ibm_svc_host: Can now be set to be always OK... - * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... + * 1594 ibm_svc_host: Can now be set to be always OK... + * 1595 esx_vsphere_objects_count: New Check to Ouput the number of VMs * 1567 postfix_mailq: speedup in Linux agent for large mail queues... * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 @@ -67,9 +68,6 @@ * 1572 FIX: Sample configs, plugins etc. for windows agent use windows linebreaks now... * 1575 FIX: vSphere Monitoring works with RedHat 5.x now... * 1584 FIX: winperf_if: Fixed checks of interfaces with equal names but one with index... - * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... - NOTE: Please refer to the migration notes! - * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1590 FIX: printer_supply_ricoh: Fixed broken check * 1591 FIX: netapp_volumes: The state mixed_raid_type is now treated as non-critical state * 1602 FIX: dell_om_esmlog: Fixed typo in plugin output @@ -77,10 +75,13 @@ * 1604 FIX: mysql_slave: Dealing with situation where connection with master is lost * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! + * 1593 FIX: IBM SVC Checks: The Service Descriptions not longer contain IBM SVC as prefix... + NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... * 1612 FIX: job: Fixed wrong reported start time for running jobs + * 1596 FIX: etherbox: Fix for the inventory in case of not connected temperature sensors... * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... * 1617 FIX: lnx_if: Deal with data provided by cluster host diff --git a/modules/check_mk.py b/modules/check_mk.py index f1afbe8..3820fb9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1332,6 +1332,11 @@ def exit_code_spec(hostname): return spec +# Remove illegal characters from a service description +def sanitize_service_description(descr): + return "".join([ c for c in descr if c not in nagios_illegal_chars ]) + + def service_description(check_type, item): if check_type not in check_info: if item: @@ -1354,7 +1359,7 @@ def service_description(check_type, item): if type(item) == str: # Remove characters from item name that are banned by Nagios - item_safe = "".join([ c for c in item if c not in nagios_illegal_chars ]) + item_safe = sanitize_service_description(item) if "%s" not in descr_format: descr_format += " %s" return (descr_format % (item_safe,)).strip() @@ -2290,6 +2295,7 @@ define service { if len(legchecks) > 0: outfile.write("\n\n# Legacy checks\n") for command, description, has_perfdata in legchecks: + description = sanitize_service_description(description) if do_omit_service(hostname, description): continue @@ -2341,8 +2347,8 @@ define service { g_hostname = hostname has_perfdata = act_info.get('has_perfdata', False) - description = act_info["service_description"](params) description = description.replace('$HOSTNAME$', g_hostname) + description = sanitize_service_description(act_info["service_description"](params)) if do_omit_service(hostname, description): continue @@ -2395,7 +2401,7 @@ define service { # "command_name" (optional) Name of Monitoring command to define. If missing, # we use "check-mk-custom" # "has_perfdata" (optional) If present and True, we activate perf_data - description = entry["service_description"] + description = sanitize_service_description(entry["service_description"]) has_perfdata = entry.get("has_perfdata", False) command_name = entry.get("command_name", "check-mk-custom") command_line = entry.get("command_line", "")

9 years, 9 months

Check_MK Git: check_mk: #1623 FIX hp_proliant_mem: support for some yet unhandled status situations

by Mathias Kettner

Module: check_mk Branch: master Commit: 3907338ab5878169ac2d6cfc9b86acc53121c259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3907338ab58781… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 19:25:55 2014 +0100 #1623 FIX hp_proliant_mem: support for some yet unhandled status situations --- .werks/1623 | 9 +++++++++ ChangeLog | 1 + checks/hp_proliant_mem | 50 +++++++++++++++++++++++++++++++++++------------- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.werks/1623 b/.werks/1623 new file mode 100644 index 0000000..dd21022 --- /dev/null +++ b/.werks/1623 @@ -0,0 +1,9 @@ +Title: hp_proliant_mem: support for some yet unhandled status situations +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417631124 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4dabc1e..e9e89f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... * 1617 FIX: lnx_if: Deal with data provided by cluster host * 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted... + * 1623 FIX: hp_proliant_mem: support for some yet unhandled status situations Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index c6f08c2..c623b1b 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -34,12 +34,19 @@ hp_proliant_mem_type_map = { 5: 'simm', 6: 'pcmcia', 7: 'compaq-specific', - 8: 'dimm', + 8: 'DIMM', 9: 'smallOutlineDimm', - 10: 'rimm', - 11: 'srimm', - 12: 'fb-dimm', + 10: 'RIMM', + 11: 'SRIMM', + 12: 'FB-DIMM', + 13: 'DIMM DDR', + 14: 'DIMM DDR2', + 15: 'DIMM DDR3', + 16: 'DIMM FBD2', + 17: 'FB-DIMM DDR2', + 18: 'FB-DIMM DDR3', } + hp_proliant_mem_status_map = { 1: "other", 2: "notPresent", @@ -52,7 +59,10 @@ hp_proliant_mem_status_map = { 9: "notSupported", 10: "badConfig", 11: "degraded", + 12: "spare", + 13: "partial", } + hp_proliant_mem_status2nagios_map = { 'n/a': 3, 'other': 3, @@ -66,14 +76,24 @@ hp_proliant_mem_status2nagios_map = { 'notSupported': 2, 'badConfig': 2, 'degraded': 2, + 'spare': 0, + 'partial': 1, +} + +hp_proliant_mem_condition_status2nagios_map = { + 'other' : 3, + 'ok' : 0, + 'degraded' : 2, + 'failed' : 2, + 'degradedModuleIndexUnknown' : 3 } -hp_proliant_mem_condition_status2nagios_map = { 'other': 3, 'ok': 0, 'degraded': 2, 'failed': 2 } hp_proliant_mem_condition_map = { - 0: 'n/a', - 1: 'other', - 2: 'ok', - 3: 'degraded', + 0: 'n/a', + 1: 'other', + 2: 'ok', + 3: 'degraded', + 4: 'degradedModuleIndexUnknown', } def inventory_hp_proliant_mem(info): @@ -98,12 +118,14 @@ def check_hp_proliant_mem(item, params, info): detail_output = ', Status: %s ' % snmp_status status = hp_proliant_mem_status2nagios_map[snmp_status] - if status == 1: + if status == 0: + detail_output += '' + elif status == 1: detail_output += '(!) ' elif status == 2: detail_output += '(!!) ' else: - detail_output += '(UNKNOWN) ' + detail_output += '(?) ' condition = 'n/a' if int(module_condition) in hp_proliant_mem_condition_map: @@ -111,12 +133,14 @@ def check_hp_proliant_mem(item, params, info): condition_status = hp_proliant_mem_condition_status2nagios_map[condition] detail_output += ', Condition: %s ' % condition - if condition_status == 1: + if condition_status == 0: + detail_output += '' + elif condition_status == 1: detail_output += '(!) ' elif condition_status == 2: detail_output += '(!!) ' else: - detail_output += '(UNKNOWN) ' + detail_output += '(?) ' if condition_status > status: status = condition_status

9 years, 9 months

Check_MK Git: check_mk: ibm_imm_health: minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: baad810bf6434627bec9cb8289dcea1a6bfe876e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baad810bf64346… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 19:17:35 2014 +0100 ibm_imm_health: minor code cleanup --- checks/ibm_imm_health | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 5f10bde..82a901a 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner - def ibm_imm_health_scan(oid): if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): @@ -64,5 +62,7 @@ check_info["ibm_imm_health"] = { 'inventory_function': inventory_ibm_imm_health, 'service_description': 'System health', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.3.1', ['4']), - 'snmp_scan_function': ibm_imm_health_scan, + 'snmp_scan_function': + lambda oid: oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"), }

9 years, 9 months

← Newer
1
...
37
38
39
40
41
42
43
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014