Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: Fixed BI Aggregations for Hosts by Hostgroups definition

by Lars Michelsen

Module: check_mk Branch: master Commit: f9c27b2699b2d744478d13ed0a51b786e95f579a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c27b2699b2d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 09:03:28 2015 +0200 Fixed BI Aggregations for Hosts by Hostgroups definition --- web/plugins/views/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index bea1ed9..de2301c 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -64,7 +64,7 @@ multisite_datasources["bi_hostname_aggregations"] = { multisite_datasources["bi_hostnamebygroup_aggregations"] = { "title" : _("BI Aggregations for Hosts by Hostgroups"), "table" : bi.hostname_by_group_table, - "infos" : [ "aggr", "host" "hostgroup", "aggr_group" ], + "infos" : [ "aggr", "host", "hostgroup", "aggr_group" ], "keys" : [], "idkeys" : [ 'aggr_name' ], }

9 years

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a3bb0bfe2bf9a43804633a8440fa6924c81cb66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a3bb0bfe2bf9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 08:55:38 2015 +0200 Conflicts: ChangeLog web/plugins/views/bi.py web/plugins/visuals/infos.py --- .werks/2607 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 2 ++ web/plugins/views/bi.py | 8 ++++---- web/plugins/views/builtin.py | 6 +++--- web/plugins/visuals/infos.py | 9 +++++++++ 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.werks/2607 b/.werks/2607 new file mode 100644 index 0000000..a2fa5fb --- /dev/null +++ b/.werks/2607 @@ -0,0 +1,10 @@ +Title: Fixed broken links from BI views to aggregation group views +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442472836 + + diff --git a/ChangeLog b/ChangeLog index b050fb5..88182ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -233,6 +233,7 @@ * 2604 FIX: Dashboards: Improved error handling in case of broken dashlet * 2597 FIX: Fix settings downtimes on BI aggregates in distributed environment... * 2598 FIX: Remove button for removing downtimes an BI aggregates because it cannot work... + * 2607 FIX: Fixed broken links from BI views to aggregation group views WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index bfdcac0..360ab29 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -139,6 +139,8 @@ def transform_old_views(): view['single_infos'] = ['service'] elif 'aggr_name' in hide_filters: view['single_infos'] = ['aggr'] + elif 'aggr_group' in hide_filters: + view['single_infos'] = ['aggr_group'] elif 'log_contact_name' in hide_filters: view['single_infos'] = ['contact'] elif 'event_host' in hide_filters: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 0288419..bea1ed9 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -37,7 +37,7 @@ import bi multisite_datasources["bi_aggregations"] = { "title" : _("BI Aggregations"), "table" : bi.table, - "infos" : [ "aggr" ], + "infos" : [ "aggr", "aggr_group", ], "keys" : [], "idkeys" : [ 'aggr_name' ], } @@ -45,7 +45,7 @@ multisite_datasources["bi_aggregations"] = { multisite_datasources["bi_host_aggregations"] = { "title" : _("BI Aggregations affected by one host"), "table" : bi.host_table, - "infos" : [ "aggr", "host" ], + "infos" : [ "aggr", "host", "aggr_group" ], "keys" : [], "idkeys" : [ 'aggr_name' ], } @@ -55,7 +55,7 @@ multisite_datasources["bi_host_aggregations"] = { multisite_datasources["bi_hostname_aggregations"] = { "title" : _("BI Hostname Aggregations"), "table" : bi.hostname_table, - "infos" : [ "aggr", "host" ], + "infos" : [ "aggr", "host", "aggr_group" ], "keys" : [], "idkeys" : [ 'aggr_name' ], } @@ -64,7 +64,7 @@ multisite_datasources["bi_hostname_aggregations"] = { multisite_datasources["bi_hostnamebygroup_aggregations"] = { "title" : _("BI Aggregations for Hosts by Hostgroups"), "table" : bi.hostname_by_group_table, - "infos" : [ "aggr", "host" "hostgroup" ], + "infos" : [ "aggr", "host" "hostgroup", "aggr_group" ], "keys" : [], "idkeys" : [ 'aggr_name' ], } diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 9bce7d4..c031bfa 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2411,7 +2411,7 @@ multisite_builtin_views.update({ 'column_headers': 'off', 'datasource': 'bi_host_aggregations', 'description': _('Lists all aggregations which only rely on information of one host.'), - 'group_painters': [('aggr_group', 'biaggr_group')], + 'group_painters': [('aggr_group', 'aggr_group')], 'hard_filters': ['summary_host'], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '-1'), ('aggr_name_regex', ''), @@ -2479,7 +2479,7 @@ multisite_builtin_views.update({ 'column_headers': 'off', 'datasource': 'bi_hostname_aggregations', 'description': _('Host related aggregations'), - 'group_painters': [('aggr_group', 'biaggr_group')], + 'group_painters': [('aggr_group', 'aggr_group')], 'hard_filters': ['summary_host'], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '-1'), ('aggr_name_regex', ''), @@ -2735,7 +2735,7 @@ multisite_builtin_views.update({ 'column_headers': 'off', 'datasource': 'bi_host_aggregations', 'description': _('All single-host aggregations that are in non-OK state (honoring state assumptions)'), - 'group_painters': [('aggr_group', 'biaggr_group')], + 'group_painters': [('aggr_group', 'aggr_group')], 'hard_filters': ['summary_host'], 'hard_filtervars': [('is_host_scheduled_downtime_depth', '-1'), ('aggr_name_regex', ''), diff --git a/web/plugins/visuals/infos.py b/web/plugins/visuals/infos.py index 3c5f681..0b8ed2f 100644 --- a/web/plugins/visuals/infos.py +++ b/web/plugins/visuals/infos.py @@ -122,3 +122,12 @@ infos['aggr'] = { ], } +infos['aggr_group'] = { + 'title' : _('BI Aggregation Group'), + 'title_plural': _('BI Aggregation Groups'), + 'single_spec' : [ + ('aggr_group', TextAscii( + title = _('Aggregation group'), + )), + ], +}

9 years

Check_MK Git: check_mk: fixed invalid line in sophos man pages

by Simon Betz

Module: check_mk Branch: master Commit: 5e3f6fded6b647e6ee4f6ff52e0a9e03f8be2335 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e3f6fded6b647… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 16 16:50:50 2015 +0200 fixed invalid line in sophos man pages --- checkman/sophos_messages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/sophos_messages b/checkman/sophos_messages index f2d84f7..e3607ab 100644 --- a/checkman/sophos_messages +++ b/checkman/sophos_messages @@ -7,7 +7,7 @@ description: This check monitors the rate of the inbound and outbound messages of the Sophos Email Appliance which supports the SOPHOS-MIB. -item +item: The name of the type of messages. perfdata:

9 years

Check_MK Git: check_mk: added man pages for sophos checks

by Simon Betz

Module: check_mk Branch: master Commit: d4bbc647957e689ac08343f2bfcaa5a077888b84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4bbc647957e68… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 16 16:49:34 2015 +0200 added man pages for sophos checks --- checkman/sophos | 27 +++++++++++++++++++++++++++ checkman/sophos_messages | 17 +++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/checkman/sophos b/checkman/sophos new file mode 100644 index 0000000..353319f --- /dev/null +++ b/checkman/sophos @@ -0,0 +1,27 @@ +title: Sophos Email Appliance: Module States +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the states of the following modules + of the Sophos Email Appliance which supports the SOPHOS-MIB: + - the memory consumption, + - memory, + - RAID, + - CPU, + - left, right and summary power supply, + - left, right and summary fan, + - system temperature + - system voltage usage + + The device sends the states by itself and will be handled as follows: + - OK -> OK + - warn -> WARN + - error -> CRIT + +item: + The module name. + +inventory: + One service per module is created. diff --git a/checkman/sophos_messages b/checkman/sophos_messages new file mode 100644 index 0000000..f2d84f7 --- /dev/null +++ b/checkman/sophos_messages @@ -0,0 +1,17 @@ +title: Sophos Email Appliance: Inbound and outbound messages +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the rate of the inbound and outbound messages + of the Sophos Email Appliance which supports the SOPHOS-MIB. + +item + The name of the type of messages. + +perfdata: + The rates of the total number and the inbound and outbound messages. + +inventory: + One service per type is created.

9 years

Check_MK Git: check_mk: updated sophos checks

by Simon Betz

Module: check_mk Branch: master Commit: 040926b4572b9da637455ee4a8367aff2b43681f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040926b4572b9d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 16 16:39:00 2015 +0200 updated sophos checks --- checks/sophos | 294 +++++++++---------------------- checks/{sophos_mail => sophos_messages} | 27 +-- web/plugins/metrics/check_mk.py | 27 +++ 3 files changed, 125 insertions(+), 223 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=040926b457…

9 years

Check_MK Git: check_mk: #2598 FIX Remove button for removing downtimes an BI aggregates because it cannot work

by Mathias Kettner

Module: check_mk Branch: master Commit: 715243e118c5e75954464a97e40f261fe345c6b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=715243e118c5e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 16 16:37:07 2015 +0200 #2598 FIX Remove button for removing downtimes an BI aggregates because it cannot work This button has never worked and was never intended. Currently you can set a downtime on all services and hosts contained in a BI aggregation. But there is no way - alas - to revert this and remove all those downtimes. The reason is that for creating a downtime you just need the name of a host and service. For removing one you need its ID. And that is not available in BI. --- .werks/2598 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/views/bi.py | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/2598 b/.werks/2598 new file mode 100644 index 0000000..3be3b0c --- /dev/null +++ b/.werks/2598 @@ -0,0 +1,14 @@ +Title: Remove button for removing downtimes an BI aggregates because it cannot work +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442414132 + +This button has never worked and was never intended. Currently you can set +a downtime on all services and hosts contained in a BI aggregation. But +there is no way - alas - to revert this and remove all those downtimes. The +reason is that for creating a downtime you just need the name of a host and +service. For removing one you need its ID. And that is not available in BI. diff --git a/ChangeLog b/ChangeLog index 66b10b5..b050fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,6 +232,7 @@ * 2580 FIX: Remove bogus ;0 in comment of problem acknowledgements... * 2604 FIX: Dashboards: Improved error handling in case of broken dashlet * 2597 FIX: Fix settings downtimes on BI aggregates in distributed environment... + * 2598 FIX: Remove button for removing downtimes an BI aggregates because it cannot work... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 3fd48c3..0288419 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -45,7 +45,7 @@ multisite_datasources["bi_aggregations"] = { multisite_datasources["bi_host_aggregations"] = { "title" : _("BI Aggregations affected by one host"), "table" : bi.host_table, - "infos" : [ "host", "aggr" ], + "infos" : [ "aggr", "host" ], "keys" : [], "idkeys" : [ 'aggr_name' ], } @@ -55,7 +55,7 @@ multisite_datasources["bi_host_aggregations"] = { multisite_datasources["bi_hostname_aggregations"] = { "title" : _("BI Hostname Aggregations"), "table" : bi.hostname_table, - "infos" : [ "host", "aggr" ], + "infos" : [ "aggr", "host" ], "keys" : [], "idkeys" : [ 'aggr_name' ], } @@ -64,7 +64,7 @@ multisite_datasources["bi_hostname_aggregations"] = { multisite_datasources["bi_hostnamebygroup_aggregations"] = { "title" : _("BI Aggregations for Hosts by Hostgroups"), "table" : bi.hostname_by_group_table, - "infos" : [ "host", "aggr", "hostgroup" ], + "infos" : [ "aggr", "host" "hostgroup" ], "keys" : [], "idkeys" : [ 'aggr_name' ], }

9 years

Check_MK Git: check_mk: #2597 FIX Fix settings downtimes on BI aggregates in distributed environment

by Mathias Kettner

Module: check_mk Branch: master Commit: 896d0ed16124f589e83204b383f72aec1b3325ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=896d0ed16124f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 16 16:14:58 2015 +0200 #2597 FIX Fix settings downtimes on BI aggregates in distributed environment This fixes the exception about a missing key <tt>site</tt>. --- .werks/2597 | 10 ++++++++++ ChangeLog | 3 ++- web/htdocs/views.py | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/2597 b/.werks/2597 new file mode 100644 index 0000000..95e4cb6 --- /dev/null +++ b/.werks/2597 @@ -0,0 +1,10 @@ +Title: Fix settings downtimes on BI aggregates in distributed environment +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1442412858 + +This fixes the exception about a missing key <tt>site</tt>. diff --git a/ChangeLog b/ChangeLog index eada469..66b10b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,8 +82,8 @@ NOTE: Please refer to the migration notes! * 2590 new check raritan_px2_sensors: monitors the temperature, humidity, air flow and pressure sensors connected to a Raritan PX2 Device * 2591 new check raritan_emx_sensors: monitors contact, temperature, humidity, air flow and pressure sensors connected to a Raritan EMX Device - * 2625 kernel.util and winperf_processor.util checks now support an optional graph showing utilization of individual cores... * 2592 new checks netextreme_fan, netextreme_psu, netextreme_psu_in, netextreme_psu_out, netextreme_temp for Extreme Networks Switches... + * 2625 kernel.util and winperf_processor.util checks now support an optional graph showing utilization of individual cores... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... @@ -231,6 +231,7 @@ * 2556 FIX: Availability: Fixed exception when trying to group BI aggregations by host/service-groups * 2580 FIX: Remove bogus ;0 in comment of problem acknowledgements... * 2604 FIX: Dashboards: Improved error handling in case of broken dashlet + * 2597 FIX: Fix settings downtimes on BI aggregates in distributed environment... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a0a10bb..bfdcac0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1960,19 +1960,19 @@ def do_actions(view, what, action_rows, backurl): for nr, row in enumerate(action_rows): core_commands, title, executor = core_command(what, row, nr, len(action_rows)) for command_entry in core_commands: - if (row["site"], command_entry) not in already_executed: + site = row.get("site") # site is missing for BI rows (aggregations can spawn several sites) + if (site, command_entry) not in already_executed: # Some command functions return the information about the site per-command (e.g. for BI) if type(command_entry) == tuple: site, command = command_entry else: command = command_entry - site = row["site"] if type(command) == unicode: command = command.encode("utf-8") executor(command, site) - already_executed.add((row["site"], command_entry)) + already_executed.add((site, command_entry)) count += 1 message = None

9 years

Check_MK Git: check_mk: htmllib: made json import more portable

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ab801b344d4a44b10f4aac4213be3294341f7ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ab801b344d4a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 16 16:09:07 2015 +0200 htmllib: made json import more portable --- web/htdocs/htmllib.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 635b70e..add2ca0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -45,7 +45,12 @@ # input to str or unicode must happen as early as possible, # directly when reading from file or URL. -import time, os, pwd, urllib, random, re, __builtin__, json +import time, os, pwd, urllib, random, re, __builtin__ + +try: + import simplejson as json +except ImportError: + import json from lib import * # Python 2.3 does not have 'set' in normal namespace.

9 years

Check_MK Git: check_mk: Fix 'Reset to defaults' button after reload in availability view

by Mathias Kettner

Module: check_mk Branch: master Commit: 40edfc45eae56577ce7099323102d62366819f2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40edfc45eae565… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 16 16:04:54 2015 +0200 Fix 'Reset to defaults' button after reload in availability view --- web/htdocs/availability.py | 53 ++++++++++++++++++++----------------- web/plugins/views/availability.py | 9 ++++--- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ddf59f2..ee184d4 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -469,37 +469,40 @@ def get_avoption_entries(what): def get_default_avoptions(): return { - "range" : (time.time() - 86400, time.time()), - "rangespec" : "d0", - "labelling" : [], - "downtimes" : { + "range" : (time.time() - 86400, time.time()), + "rangespec" : "d0", + "labelling" : [], + "av_levels" : None, + "av_filter_outages" : { "warn" : 0.0, "crit" : 0.0, "non-ok" : 0.0 }, + "outage_statistics" : ([],[]), + "av_mode" : False, + "service_period" : "honor", + "notification_period" : "ignore", + "grouping" : None, + "dateformat" : "yyyy-mm-dd hh:mm:ss", + "timeformat" : "percentage_2", + "short_intervals" : 0, + "dont_merge" : False, + "summary" : "sum", + "show_timeline" : False, + "timelimit" : 30, + + "downtimes" : { "include" : "honor", "exclude_ok" : False, }, - "consider" : { - "flapping" : True, - "host_down" : True, - "unmonitored" : True, + + "consider" : { + "flapping" : True, + "host_down" : True, + "unmonitored" : True, }, + "state_grouping" : { - "warn" : "warn", - "unknown" : "unknown", - "host_down" : "host_down", + "warn" : "warn", + "unknown" : "unknown", + "host_down" : "host_down", }, - "av_levels" : None, - "av_filter_outages" : { "warn" : 0.0, "crit" : 0.0, "non-ok" : 0.0 }, - "outage_statistics" : ([],[]), - "av_mode" : False, - "service_period" : "honor", - "notification_period" : "ignore", - "grouping" : None, - "dateformat" : "yyyy-mm-dd hh:mm:ss", - "timeformat" : "percentage_2", - "short_intervals" : 0, - "dont_merge" : False, - "summary" : "sum", - "show_timeline" : False, - "timelimit" : 30, } #. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 58b291f..fadc412 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -55,7 +55,7 @@ def get_availability_options_from_url(what): def render_availability_options(what): - if html.var("_reset") and html.check_transaction(): + if html.var("_reset"): config.save_user_file("avoptions", {}) for varname in html.vars.keys(): if varname.startswith("avo_"): @@ -110,12 +110,13 @@ def render_availability_options(what): html.write("<tr><td>") html.button("apply", _("Apply"), "submit") - html.button("_reset", _("Reset to defaults"), "submit") + html.hidden_fields() + html.end_form() + + html.buttonlink(html.makeuri([("_reset", "1")], remove_prefix="avo_"), _("Reset to defaults")) html.write("</td></tr></table>") html.write("</div>") - html.hidden_fields() - html.end_form() if html.form_submitted(): config.save_user_file("avoptions", avoptions)

9 years

Check_MK Git: check_mk: preliminary version of checks sophos and sophos_mail

by Simon Betz

Module: check_mk Branch: master Commit: a2e1dc3ca4758fbc7c3e6e2e262a440c52d8830c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e1dc3ca4758f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 16 14:41:35 2015 +0200 preliminary version of checks sophos and sophos_mail --- checks/sophos | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++ checks/sophos_mail | 66 +++++++++++++ 2 files changed, 328 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a2e1dc3ca4…

9 years

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015