Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64140 discussions

Check_MK Git: check_mk: Livestatus: tried to fix timeperiod problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b62855f7817216263cd04f535df53b7d3044ef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b62855f781721… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 16:54:20 2011 +0200 Livestatus: tried to fix timeperiod problem --- livestatus/src/TimeperiodsCache.cc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 96007ec..b00815a 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -56,11 +56,13 @@ void TimeperiodsCache::update(time_t now) return; } - _cache_time = minutes; - // Loop over all timeperiods and compute if we are - // currently in + // currently in. Detect the case where no time periods + // are known (yet!). This might be the case when a timed + // event broker message arrives *before* the start of the + // event loop. timeperiod *tp = timeperiod_list; + int num_periods = 0; while (tp) { bool is_in = 0 == check_time_against_period(now, tp); @@ -76,7 +78,13 @@ void TimeperiodsCache::update(time_t now) } tp = tp->next; + num_periods++; } + if (num_periods > 0) + _cache_time = minutes; + else + logger(LG_INFO, "Timeperiod cache not updated, there are no timeperiods (yet)"); + pthread_mutex_unlock(&_cache_lock); }

13 years, 1 month

Check_MK Git: check_mk: Livestatus: better handling of " No timeperiod information"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd8b6a64542aebc5e078bb85409cdf03e55c7409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd8b6a64542aeb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 13:21:22 2011 +0200 Livestatus: better handling of "No timeperiod information" --- livestatus/src/TimeperiodsCache.cc | 10 +++++++--- livestatus/src/module.c | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index ed94aba..96007ec 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -89,9 +89,13 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp) if (it != _cache.end()) is_in = it->second; else { - logger(LG_INFO, "No timeperiod information available for %s.", tp->name); - time_t now = time(0); - is_in = 0 == check_time_against_period(now, tp); + logger(LG_INFO, "No timeperiod information available for %s. Assuming out of period.", tp->name); + is_in = false; + // Problem: The method check_time_against_period is to a high + // degree not thread safe. In the current situation Icinga is + // very probable to hang up forever. + // time_t now = time(0); + // is_in = 0 == check_time_against_period(now, tp); } pthread_mutex_unlock(&_cache_lock); return is_in; diff --git a/livestatus/src/module.c b/livestatus/src/module.c index c5b1bbb..d740369 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -193,6 +193,7 @@ void *client_thread(void *data __attribute__ ((__unused__))) void start_threads() { + logger(LG_INFO, "Going to open socket and starting threads"); if (!g_thread_running) { /* start thread that listens on socket */ pthread_atfork(livestatus_count_fork, NULL, livestatus_cleanup_after_fork);

13 years, 1 month

Check_MK Git: check_mk: Multisite: better error message for missing views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc3c97bd2c4ecdf9ee5595acb909662cff75f627 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc3c97bd2c4ecd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 12:49:12 2011 +0200 Multisite: better error message for missing views --- web/htdocs/views.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ee3306e..6fa53db 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1000,6 +1000,8 @@ def page_view(): load_views() view_name = html.var("view_name") + if view_name == None: + raise MKGeneralException("Missing the variable view_name in the URL.") view = html.available_views.get(view_name) if not view: raise MKGeneralException("No view defined with the name '%s'." % view_name)

13 years, 1 month

Check_MK Git: check_mk: Multisite: new painters host/svc_contact_groups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4a1b0b142d39230aa51da2cb9bda68b27c1d158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4a1b0b142d392… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 11:40:49 2011 +0200 Multisite: new painters host/svc_contact_groups Also added information about the contact groups to the detail views. --- ChangeLog | 1 + web/plugins/views/builtin.py | 2 ++ web/plugins/views/painters.py | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index feccecc..0554719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * WATO: Added new hook "active-changes" which calls the registered hosts with a dict of "dirty" hosts * Added column painter for host contacts + * Added column painters for contact groups, added those to detail views * Detail views of host/service now show contacts * Fix playing of sounds: All problem views now have play_sounds activated, all other deactivated. diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 15ef3b7..7c2b86c 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -840,6 +840,7 @@ multisite_builtin_views.update({ ('host_group_memberlist', None), ('host_parents', None), ('host_childs', None), + ('host_contact_groups', None), ('host_contacts', None), ('host_plugin_output', None), ('host_perf_data', None), @@ -1034,6 +1035,7 @@ multisite_builtin_views.update({ ('service_icons', None), ('service_state', None), ('svc_group_memberlist', None), + ('svc_contact_groups', None), ('svc_contacts', None), ('svc_plugin_output', None), ('svc_long_plugin_output', None), diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9b976a0..db20f0c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -545,6 +545,14 @@ multisite_painters["svc_contacts"] = { "paint" : lambda row: (None, ", ".join(row["service_contacts"])) } +multisite_painters["svc_contact_groups"] = { + "title" : _("Service contact groups"), + "short" : _("Contact groups"), + "columns" : ["service_contact_groups"], + "paint" : lambda row: (None, ", ".join(row["service_contact_groups"])) +} + + multisite_painters["service_description"] = { "title" : _("Service description"), "short" : _("Service"), @@ -1167,6 +1175,13 @@ multisite_painters["host_contacts"] = { "paint" : lambda row: (None, ", ".join(row["host_contacts"])) } +multisite_painters["host_contact_groups"] = { + "title" : _("Host contact groups"), + "short" : _("Contact groups"), + "columns" : ["host_contact_groups"], + "paint" : lambda row: (None, ", ".join(row["host_contact_groups"])) +} + multisite_painters["host_custom_notes"] = { "title" : _("Custom host notes"), "short" : _("Notes"),

13 years, 1 month

Check_MK Git: check_mk: Multisite: filters for host and service contact groups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62535a69db66f3effe6d9065f08b23cbcb64d3ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62535a69db66f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 11:51:31 2011 +0200 Multisite: filters for host and service contact groups --- ChangeLog | 1 + web/plugins/views/builtin.py | 3 +++ web/plugins/views/filters.py | 16 +++++++++------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0554719..189746b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ with a dict of "dirty" hosts * Added column painter for host contacts * Added column painters for contact groups, added those to detail views + * Added filters for host and service contact groups * Detail views of host/service now show contacts * Fix playing of sounds: All problem views now have play_sounds activated, all other deactivated. diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 7c2b86c..5471c0a 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -940,6 +940,7 @@ multisite_builtin_views.update({ 'hostregex', 'summary_host', 'opthostgroup', + 'opthost_contactgroup', 'host_check_command', ], 'sorters': [], @@ -994,6 +995,7 @@ multisite_builtin_views.update({ 'public': True, 'show_filters': ['service_in_notification_period', 'optservicegroup', + 'optservice_contactgroup', 'service_notifications_enabled', 'host_in_notification_period', 'in_downtime', @@ -1006,6 +1008,7 @@ multisite_builtin_views.update({ 'check_command', 'svcstate', 'opthostgroup', + 'opthost_contactgroup', 'output', 'service_is_flapping', 'svc_last_state_change', diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 0d8e939..cbcf3c3 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -90,14 +90,14 @@ class FilterGroupCombo(Filter): if not enforce: htmlvars.append("neg_" + htmlvars[0]) Filter.__init__(self, self.prefix + what + "group", # name, e.g. "hostgroup" - what[0].upper() + what[1:] + "group", # title, e.g. "Hostgroup" - what, # info, e.g. "host" + what[0].upper() + what[1:].replace("_"," ") + " group", # title, e.g. "Hostgroup" + what.split("_")[0], # info, e.g. "host" htmlvars, # htmlvars, e.g. "hostgroup" [ what + "group_name" ]) # rows needed to fetch for link information self.what = what def display(self): - choices = all_groups(self.what) + choices = all_groups(self.what.split("_")[-1]) if not self.enforce: choices = [("", "")] + choices html.select(self.htmlvars[0], choices) @@ -150,10 +150,12 @@ class FilterGroupCombo(Filter): return alias -declare_filter(104, FilterGroupCombo("host", True), _("Dropdown list, selection of host group is enforced")) -declare_filter(204, FilterGroupCombo("service", True), _("Dropdown list, selection of service group is enforced")) -declare_filter(105, FilterGroupCombo("host", False), _("Optional selection of host group")) -declare_filter(205, FilterGroupCombo("service", False), _("Optional selection of service group")) +declare_filter(104, FilterGroupCombo("host", True), _("Dropdown list, selection of host group is enforced")) +declare_filter(204, FilterGroupCombo("service", True), _("Dropdown list, selection of service group is enforced")) +declare_filter(105, FilterGroupCombo("host", False), _("Optional selection of host group")) +declare_filter(205, FilterGroupCombo("service", False), _("Optional selection of service group")) +declare_filter(106, FilterGroupCombo("host_contact", False), _("Optional selection of host contact group group")) +declare_filter(206, FilterGroupCombo("service_contact", False), _("Optional selection of service contact group group")) # Livestatus still misses "contact_groups" column. # declare_filter(FilterGroupCombo("contact"))

13 years, 1 month

Check_MK Git: check_mk: Livestatus: new column contact_groups in hosts and services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9b0a27252143050f529f12bcf3cd522a4cc49dbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0a2725214305… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 16 11:36:46 2011 +0200 Livestatus: new column contact_groups in hosts and services thanks to a patch of Matthew Kent --- ChangeLog | 2 + livestatus/src/ContactgroupsColumn.cc | 84 +++++++++++++++++++++++++++++++++ livestatus/src/ContactgroupsColumn.h | 51 ++++++++++++++++++++ livestatus/src/Makefile.am | 3 +- livestatus/src/TableHosts.cc | 3 + livestatus/src/TableServices.cc | 3 + 6 files changed, 145 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6c8bd..feccecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,8 @@ * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) * Column aggregation (Stats) now also works for perf_data * New configuration variable data_encoding and full UTF-8 support. + * New column contact_groups in table hosts and services (thanks to + Matthew Kent) 1.1.11i1: Core, Setup, etc.: diff --git a/livestatus/src/ContactgroupsColumn.cc b/livestatus/src/ContactgroupsColumn.cc new file mode 100644 index 0000000..0c68ac4 --- /dev/null +++ b/livestatus/src/ContactgroupsColumn.cc @@ -0,0 +1,84 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#include "ContactgroupsColumn.h" +#include "nagios.h" +#include "Query.h" + +contactgroupsmember *ContactgroupsColumn::getData(void *data) +{ + if (data) { + data = shiftPointer(data); + if (data) + return *(contactgroupsmember **)((char *)data + _offset); + } + return 0; +} + +void ContactgroupsColumn::output(void *data, Query *query) +{ + query->outputBeginList(); + contactgroupsmember *cgm = getData(data); + if (cgm) { + bool first = true; + while (cgm) { + contactgroup *cg = (contactgroup *)cgm->group_ptr; + if (!first) + query->outputListSeparator(); + else + first = false; + query->outputString(cg->group_name); + cgm = cgm->next; + } + } + query->outputEndList(); +} + +void *ContactgroupsColumn::getNagiosObject(char *name) +{ + return find_contactgroup(name); +} + +bool ContactgroupsColumn::isNagiosMember(void *data, void *nagobject) +{ + if (!nagobject || !data) + return false; + + // data is already shifted (_indirect_offset is taken into account) + // But _offset needs still to be accounted for + contactgroupsmember *cgm = *(contactgroupsmember **)((char *)data + _offset); + + while (cgm) { + if (cgm->group_ptr == nagobject) + return true; + cgm = cgm->next; + } + return false; +} + +bool ContactgroupsColumn::isEmpty(void *data) +{ + contactgroupsmember *cgm = *(contactgroupsmember **)((char *)data + _offset); + return cgm == 0; +} diff --git a/livestatus/src/ContactgroupsColumn.h b/livestatus/src/ContactgroupsColumn.h new file mode 100644 index 0000000..96aacc2 --- /dev/null +++ b/livestatus/src/ContactgroupsColumn.h @@ -0,0 +1,51 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef ContactgroupsColumn_h +#define ContactgroupsColumn_h + +#include "config.h" + +#include "ListColumn.h" +#include "nagios.h" + +class ContactgroupsColumn : public ListColumn +{ + int _offset; +public: + ContactgroupsColumn(string name, string description, int offset, int indirect_offset) + : ListColumn(name, description, indirect_offset), _offset(offset) {} + int type() { return COLTYPE_LIST; } + void output(void *, Query *); + void *getNagiosObject(char *name); // return pointer to contact group + bool isNagiosMember(void *data, void *nagobject); + bool isEmpty(void *data); +private: + contactgroupsmember *getData(void *); +}; + + + +#endif // ContactgroupsColumn_h + diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 9c38a67..c0117dc 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -46,7 +46,8 @@ livestatus_so_SOURCES = \ ContactgroupsMemberColumn.cc OffsetStringMacroColumn.cc OffsetStringServiceMacroColumn.cc \ OffsetStringHostMacroColumn.cc StatsColumn.cc IntAggregator.cc CountAggregator.cc \ DoubleAggregator.cc AttributelistColumn.cc AttributelistFilter.cc \ - global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc + global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ + ContactgroupsColumn.cc livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 3af4998..0241aab 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -42,6 +42,7 @@ #include "ServicelistColumn.h" #include "ServicelistStateColumn.h" #include "HostgroupsColumn.h" +#include "ContactgroupsColumn.h" #include "HostSpecialIntColumn.h" #include "tables.h" @@ -298,6 +299,8 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) table->addColumn(new HostgroupsColumn(prefix + "groups", "A list of all host groups this host is in", (char *)(&hst.hostgroups_ptr) - ref, indirect_offset)); + table->addColumn(new ContactgroupsColumn(prefix + "contact_groups", + "A list of all contact groups this host is in", (char *)(&hst.contact_groups) - ref, indirect_offset)); table->addColumn(new ServicelistColumn(prefix + "services", "A list of all services of the host", (char *)(&hst.services) - ref, indirect_offset, false, 0)); diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 2eb5cfd..05993ba 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -41,6 +41,7 @@ #include "DownCommColumn.h" #include "CustomVarsColumn.h" #include "ServicegroupsColumn.h" +#include "ContactgroupsColumn.h" #include "tables.h" #include "auth.h" #include "strutil.h" @@ -366,6 +367,8 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, table->addColumn(new ServicegroupsColumn(prefix + "groups", "A list of all service groups the service is in", (char *)(&svc.servicegroups_ptr) - ref, indirect_offset)); + table->addColumn(new ContactgroupsColumn(prefix + "contact_groups", + "A list of all contact groups this service is in", (char *)(&svc.contact_groups) - ref, indirect_offset)); }

13 years, 1 month

Check_MK Git: check_mk: WATO: Sidebar is also reloaded after file add/ delete

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff38225d227e9de66c6b5026e4efdbae9d2f0fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff38225d227e9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 16 10:10:22 2011 +0200 WATO: Sidebar is also reloaded after file add/delete --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 28fd26f..f6c2961 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -386,8 +386,8 @@ def mode_editfolder(phase, what, new): the_thing["roles"] = roles the_thing["attributes"] = attributes - if what == "folder": - html.reload_sidebar() # refresh WATO snapin + # refresh WATO snapin + html.reload_sidebar() save_folder_config() @@ -2218,6 +2218,8 @@ def delete_file_after_confirm(del_file): save_folder_config() call_hook_file_or_folder_deleted('file', del_file) call_hook_host_changed(g_folder) + # refresh WATO snapin + html.reload_sidebar() global g_file g_file = None return "folder"

13 years, 1 month

Check_MK Git: check_mk: Dashboard: Caring about body padding now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2bbeae1579e71286caf4621b49b9b71579f6f831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bbeae1579e712… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 16 09:59:58 2011 +0200 Dashboard: Caring about body padding now --- web/htdocs/dashboard.py | 3 +-- web/htdocs/js/dashboard.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7d5defb..ac3a492 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -252,8 +252,7 @@ def ajax_resize(): board = dashboards[html.var("name")] - screensize = vec((int(html.var("width")) - 2*screen_margin, - int(html.var("height")) - 2*screen_margin - header_height)) + screensize = vec((int(html.var("width")), int(html.var("height")))) rastersize = screensize / raster used_matrix = {} # keep track of used raster elements diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 685095b..adb8bb4 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -72,14 +72,18 @@ function resize_dashlets(id, code) function set_dashboard_size() { - var width = pageWidth(); + var body_padding = 10; + var width = pageWidth(); var height = pageHeight(); + width = width - 2*screen_margin - 2*body_padding; + height = height - 2*screen_margin - header_height - body_padding; + oDash = document.getElementById("dashboard"); oDash.style.position = 'absolute'; oDash.style.left = screen_margin + "px"; - oDash.style.top = header_height + screen_margin + "px"; - oDash.style.width = width - 2*screen_margin + "px"; - oDash.style.height = height - 2*screen_margin - header_height + "px"; + oDash.style.top = (header_height + screen_margin) + "px"; + oDash.style.width = width + "px"; + oDash.style.height = height + "px"; ajax_url = 'dashboard_resize.py?name=' + dashboard_name + '&width=' + width

13 years, 1 month

Check_MK Git: check_mk: Added missing i18n strings in filter section of view editor

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3052b8bba1dcce257a8ca11e3958f99812ad8c27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3052b8bba1dcce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 16 07:57:31 2011 +0200 Added missing i18n strings in filter section of view editor --- ChangeLog | 1 + web/plugins/views/filters.py | 44 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f87d09..4a6c8bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ all other deactivated. * Rescheduling of Check_MK: introduce a short sleep of 0.7 sec. This increases the chance of the passive services being updated before the repaint. + * Added missing i18n strings in filter section of view editor WATO: * Configration files can now be administered via the WEB UI diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 6100bfd..0d8e939 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -229,7 +229,7 @@ class FilterHostState(Filter): defval = "" else: defval = "on" - for var, text in [("hst0", "UP"), ("hst1", "DOWN"), ("hst2", "UNREACH"), ("hstp", "PENDING")]: + for var, text in [("hst0", _("UP")), ("hst1", _("DOWN")), ("hst2", _("UNREACH")), ("hstp", _("PENDING"))]: html.checkbox(var, defval) html.write(" %s " % text) @@ -261,7 +261,7 @@ class FilterTristate(Filter): def display(self): current = html.var(self.varname) - for value, text in [("1", "yes"), ("0", "no"), ("-1", "(ignore)")]: + for value, text in [("1", _("yes")), ("0", _("no")), ("-1", _("(ignore)"))]: checked = current == value or (current in [ None, ""] and int(value) == self.deflt) html.radiobutton(self.varname, value, checked, text + "   ") @@ -299,34 +299,34 @@ class FilterNagiosExpression(FilterTristate): def filter_code(self, infoname, positive): return positive and self.pos or self.neg -declare_filter(120, FilterNagiosExpression("host", "summary_host", "Is summary host", +declare_filter(120, FilterNagiosExpression("host", "summary_host", _("Is summary host"), "Filter: host_custom_variable_names >= _REALNAME\n", "Filter: host_custom_variable_names < _REALNAME\n")) -declare_filter(250, FilterNagiosFlag("service", "service_process_performance_data", "Processes performance data")) -declare_filter(251, FilterNagiosExpression("service", "has_performance_data", "Has performance data", +declare_filter(250, FilterNagiosFlag("service", "service_process_performance_data", _("Processes performance data"))) +declare_filter(251, FilterNagiosExpression("service", "has_performance_data", _("Has performance data"), "Filter: service_perf_data != \n", "Filter: service_perf_data = \n")) -declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", "Host in notif. period")) -declare_filter(131, FilterNagiosFlag("host", "host_acknowledged", "Host problem has been acknowledged")) -declare_filter(132, FilterNagiosFlag("host", "host_active_checks_enabled", "Host active checks enabled")) -declare_filter(133, FilterNagiosFlag("host", "host_notifications_enabled", "Host notifications enabled")) -declare_filter(230, FilterNagiosFlag("service", "service_acknowledged", "Problem acknowledged")) -declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", "Service in notif. per.")) -declare_filter(232, FilterNagiosFlag("service", "service_active_checks_enabled", "Active checks enabled")) -declare_filter(233, FilterNagiosFlag("service", "service_notifications_enabled", "Notifications enabled")) -declare_filter(236, FilterNagiosFlag("service", "service_is_flapping", "Flapping")) -declare_filter(231, FilterNagiosFlag("service", "service_scheduled_downtime_depth", "Service in downtime")) -declare_filter(132, FilterNagiosFlag("host", "host_scheduled_downtime_depth", "Host in downtime")) -declare_filter(232, FilterNagiosExpression("service", "in_downtime", "Host/service in downtime", +declare_filter(130, FilterNagiosFlag("host", "host_in_notification_period", _("Host in notif. period"))) +declare_filter(131, FilterNagiosFlag("host", "host_acknowledged", _("Host problem has been acknowledged"))) +declare_filter(132, FilterNagiosFlag("host", "host_active_checks_enabled", _("Host active checks enabled"))) +declare_filter(133, FilterNagiosFlag("host", "host_notifications_enabled", _("Host notifications enabled"))) +declare_filter(230, FilterNagiosFlag("service", "service_acknowledged", _("Problem acknowledged"))) +declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notif. per."))) +declare_filter(232, FilterNagiosFlag("service", "service_active_checks_enabled", _("Active checks enabled"))) +declare_filter(233, FilterNagiosFlag("service", "service_notifications_enabled", _("Notifications enabled"))) +declare_filter(236, FilterNagiosFlag("service", "service_is_flapping", _("Flapping"))) +declare_filter(231, FilterNagiosFlag("service", "service_scheduled_downtime_depth", _("Service in downtime"))) +declare_filter(132, FilterNagiosFlag("host", "host_scheduled_downtime_depth", _("Host in downtime"))) +declare_filter(232, FilterNagiosExpression("service", "in_downtime", _("Host/service in downtime"), "Filter: service_scheduled_downtime_depth > 0\nFilter: host_scheduled_downtime_depth > 0\nOr: 2\n", "Filter: service_scheduled_downtime_depth = 0\nFilter: host_scheduled_downtime_depth = 0\nAnd: 2\n")) class FilterSite(Filter): def __init__(self, name, enforce): - Filter.__init__(self, name, "Site", None, ["site"], []) + Filter.__init__(self, name, _("Site"), None, ["site"], []) self.enforce = enforce def display(self): @@ -336,11 +336,11 @@ class FilterSite(Filter): if config.is_multisite(): site = html.var("site") if site: - return "Sites: %s\n" % html.var("site", "") + return "%s: %s\n" % (_('Sites'), html.var("site", "")) elif not self.enforce: return "" else: - return "Sites:\n" # no site at all + return "%s:\n" % _('Sites') # no site at all else: return "" @@ -367,7 +367,7 @@ class FilterTime(Filter): def __init__(self, info, name, title, column): self.column = column self.name = name - self.ranges = [ (1, "sec"), (60, "min"), (3600, "hours"), (86400, "days") ] + self.ranges = [ (1, _("sec")), (60, _("min")), (3600, _("hours")), (86400, _("days")) ] Filter.__init__(self, name, title, info, [ name ] + [ name + "_" + n for (s, n) in self.ranges], [column]) def display(self): @@ -457,7 +457,7 @@ class FilterLogClass(Filter): (3, _("Notifications")), (4, _("Passive checks")), (5, _("Commands")), (6, _("States")) ] - Filter.__init__(self, "log_class", "Logentry class", + Filter.__init__(self, "log_class", _("Logentry class"), "log", [ "logclass%d" % l for l, c in self.log_classes ], []) def display(self):

13 years, 1 month

Check_MK Git: check_mk: blade_*: fix scan function for newer firmware

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3aab4c147b45a2f7125efb44149d0219fbbce16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3aab4c147b45a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 15 22:56:00 2011 +0200 blade_*: fix scan function for newer firmware --- ChangeLog | 1 + checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2da9ee..8f87d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * FIX: windows agent: hopefully fix case with quotes in directory name * FIX: printer_supply: fixed logic of Perf-O-Meter (mixed up crit with ok) * FIX: Solaris agent: reset localization to C, fixes problems with statgrab + * FIX: blade_*: fix SNMP scan function for newer firmwares (thanks to Carlos Peón) * snmp_uptime, snmp_info: added scan functions. These checks will now always be added. Please use ingored_checktypes to disable, if non needed. * brocade_port: check for Brocade FC ports has been rewritten with diff --git a/checks/blade_bays b/checks/blade_bays index 8532148..9d1c409 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -55,4 +55,4 @@ check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays snmp_info['blade_bays'] = ( ".1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6, 2, 1 ] ) # BLADE-MIB snmp_scan_functions['blade_bays'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_blades b/checks/blade_blades index 5fa5733..7223804 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -74,4 +74,4 @@ snmp_info['blade_blades'] = ( ".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1", [ # BLADE-MIB ]) snmp_scan_functions['blade_blades'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_blowers b/checks/blade_blowers index 1884e41..7d00a01 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -101,4 +101,4 @@ check_info['blade_blowers'] = ( check_blade_blowers, "Blower %s", 1, inventory_b snmp_info['blade_blowers'] = ( ".1.3.6.1.4.1.2.3.51.2.2", [3] ) snmp_scan_functions['blade_blowers'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_health b/checks/blade_health index 6444096..39aa479 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -51,4 +51,4 @@ check_info['blade_health'] = ( check_blade_health, "Summary health state", 0, in snmp_info['blade_health'] = ( ".1.3.6.1.4.1.2.3.51.2.2.7", [ '1', '2.1.3.1' ]) snmp_scan_functions['blade_health'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 8c7e5fc..ca8d7a9 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -46,4 +46,4 @@ check_info['blade_mediatray'] = ( check_blade_mediatray, "Media tray", 0, invent snmp_info['blade_mediatray'] = ( ".1.3.6.1.4.1.2.3.51.2.2.5.2", [74, 75]) snmp_scan_functions['blade_mediatray'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_powerfan b/checks/blade_powerfan index da45933..19383c5 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -54,4 +54,4 @@ check_info['blade_powerfan'] = (check_blade_powerfan, "Power Module Cooling Devi snmp_info['blade_powerfan'] = ( ".1.3.6.1.4.1.2.3.51.2.2.6.1.1", [ 1, 2, 3, 4, 5, 6, 7 ] ) # BLADE-MIB snmp_scan_functions['blade_powerfan'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) diff --git a/checks/blade_powermod b/checks/blade_powermod index a5c1174..8593154 100644 --- a/checks/blade_powermod +++ b/checks/blade_powermod @@ -45,4 +45,4 @@ check_info['blade_powermod'] = (check_blade_powermod, "Power Module %s", 0, inve snmp_info['blade_powermod'] = ( ".1.3.6.1.4.1.2.3.51.2.2.4.1.1", [ 1, 2, 3, 4 ]) # BLADE-MIB snmp_scan_functions['blade_powermod'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0"))

13 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits