Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64687 discussions

Check_MK Git: check_mk: #1528 FIX Fixed actions in mobile GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 18079c8614fac92574fdc3dbd472789d9c321323 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18079c8614fac9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:12:31 2014 +0100 #1528 FIX Fixed actions in mobile GUI It was not possible to perform any actions using the mobile GUI. This has been fixed now. --- .werks/1528 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 13 +++++++++---- web/htdocs/mobile.py | 26 +++++++++++++++----------- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.werks/1528 b/.werks/1528 new file mode 100644 index 0000000..1cd1129 --- /dev/null +++ b/.werks/1528 @@ -0,0 +1,10 @@ +Title: Fixed actions in mobile GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416478312 + +It was not possible to perform any actions using the mobile GUI. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 37877bf..1552b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... + * 1528 FIX: Fixed actions in mobile GUI... * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... WATO: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 75ec7f6..d2f20ad 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1130,12 +1130,16 @@ class html: def confirm(self, msg, method="POST", action=None): if self.var("_do_actions") == _("No"): - return # user has pressed "No" # None --> "No" + # User has pressed "No", now invalidate the unused transid + self.check_transaction() + return # None --> "No" if not self.has_var("_do_confirm"): if self.mobile: self.write('<center>') self.write("<div class=really>%s" % msg) - self.begin_form("confirm", method=method, action=action) + # The confirm dialog is never a dialog which need to be protected + # by a transid itselfs. It is only a intermediate step to the real action + self.begin_form("confirm", method=method, action=action, add_transid=False) self.hidden_fields(add_action_vars = True) self.button("_do_confirm", _("Yes!"), "really") self.button("_do_actions", _("No"), "") @@ -1143,9 +1147,10 @@ class html: self.write("</div>") if self.mobile: self.write('</center>') - return False # False --> "Dialog shown, no answer yet" + return False # False --> "Dialog shown, no answer yet" else: - return self.check_transaction() and True or None # True: "Yes", None --> Browser reload + # Now check the transaction + return self.check_transaction() and True or None # True: "Yes", None --> Browser reload of "yes" page def register_event(self, name): self.events.add(name) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f9e6812..751d798 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -71,6 +71,7 @@ def mobile_html_head(title, ready_code=""): def mobile_html_foot(): html.write("</body></html>\n") + html.store_new_transids() def jqm_header_button(pos, url, title, icon=""): html.write('<a href="%s" class="ui-btn-%s" data-direction="reverse" data-icon="%s" data-iconpos="notext" title="%s" ></a>' % (url, pos, icon, title )) @@ -221,11 +222,10 @@ def page_view(): try: views.show_view(view, show_heading = False, show_buttons = False, show_footer = False, render_function = render_view) - pass except Exception, e: if config.debug: raise - html.write("ERROR showing view: %s" % e) + html.write("ERROR showing view: %s" % html.attrencode(e)) mobile_html_foot() @@ -355,24 +355,28 @@ def show_command_form(view, datasource, rows): if not one_shown: html.write(_('No commands are possible in this view')) +# FIXME: Reduce ducplicate code with views.py def do_commands(view, what, rows): command = None - title, executor = views.core_command(what, rows[0])[1:3] # just get the title + title, executor = views.core_command(what, rows[0], 0, len(rows))[1:3] # just get the title r = html.confirm(_("Do you really want to %(title)s the %(count)d %(what)ss?") % { "title" : title, "count" : len(rows), "what" : _(what + "s"), }) if r != True: return r == None # Show commands on negative answer count = 0 - for row in rows: - nagios_commands, title, executor = views.core_command(what, row) + already_executed = set([]) + for nr, row in enumerate(rows): + nagios_commands, title, executor = views.core_command(what, row, nr, len(rows)) for command in nagios_commands: - if type(command) == unicode: - command = command.encode("utf-8") - executor(command, row["site"]) - count += 1 - - if command: + if command not in already_executed: + if type(command) == unicode: + command = command.encode("utf-8") + executor(command, row["site"]) + already_executed.add(command) + count += 1 + + if count > 0: html.message(_("Successfully sent %d commands.") % count) return True # Show commands again

9 years, 10 months

Check_MK Git: check_mk: #1527 FIX Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f1dd7ed6bb7e58103bf9feaaf808b577b221a17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1dd7ed6bb7e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 09:51:57 2014 +0100 #1527 FIX Fixed views missing values of some filters (serviceregex, hostgroup filters, ...) With the rewrite of the views/dashboards/visuals we introduced a mechanism of transforming views of the old format to the new format. This transform mechanism missed to transform hard coded values of some filters where the variable names had been renamed. The affected filters are: 'serviceregex' 'hostregex' 'hostgroupnameregex' 'servicegroupnameregex' 'opthostgroup' 'optservicegroup' 'hostgroup' 'servicegroup' 'host_contactgroup' 'service_contactgroup' If you already have migrated to a previous release, which transformed your views and made you miss these filters or hard coded values, you can install a version containing this fix, remove the file <tt>var/check_mk/web/USER/user_views.mk</tt> from your site and then access the Web-GUI again. This should fix the problem. Be aware: By removing the user_views.mk all your changes to your views you made since the initial creation of the user_views.mk will be reverted. --- .werks/1527 | 31 +++++++++++++++++++++++++++++++ web/htdocs/views.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/.werks/1527 b/.werks/1527 new file mode 100644 index 0000000..502c88e --- /dev/null +++ b/.werks/1527 @@ -0,0 +1,31 @@ +Title: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6p3 +Date: 1416473103 +Class: fix + +With the rewrite of the views/dashboards/visuals we introduced a mechanism of transforming +views of the old format to the new format. This transform mechanism missed to transform +hard coded values of some filters where the variable names had been renamed. + +The affected filters are: + +'serviceregex' +'hostregex' +'hostgroupnameregex' +'servicegroupnameregex' +'opthostgroup' +'optservicegroup' +'hostgroup' +'servicegroup' +'host_contactgroup' +'service_contactgroup' + +If you already have migrated to a previous release, which transformed your views and made +you miss these filters or hard coded values, you can install a version containing this +fix, remove the file <tt>var/check_mk/web/USER/user_views.mk</tt> from your site and then +access the Web-GUI again. This should fix the problem. Be aware: By removing the user_views.mk +all your changes to your views you made since the initial creation of the user_views.mk +will be reverted. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8601980..b6f0d13 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -171,6 +171,7 @@ def transform_old_views(): # The exact match filters have been removed. They where used only as # link filters anyway - at least by the builtin views. continue + for var in f.htmlvars: # Check whether or not the filter is supported by the datasource, # then either skip or use the filter vars @@ -179,6 +180,56 @@ def transform_old_views(): all_vars[var] = value context[filter_name][var] = value + # We changed different filters since the visuals-rewrite. This must be treated here, since + # we need to transform views which have been created with the old filter var names. + # Changes which have been made so far: + changed_filter_vars = { + 'serviceregex': { # Name of the filter + # old var name: new var name + 'service': 'service_regex', + }, + 'hostregex': { + 'host': 'host_regex', + }, + 'hostgroupnameregex': { + 'hostgroup_name': 'hostgroup_regex', + }, + 'servicegroupnameregex': { + 'servicegroup_name': 'servicegroup_regex', + }, + 'opthostgroup': { + 'opthostgroup': 'opthost_group', + 'neg_opthostgroup': 'neg_opthost_group', + }, + 'optservicegroup': { + 'optservicegroup': 'optservice_group', + 'neg_optservicegroup': 'neg_optservice_group', + }, + 'hostgroup': { + 'hostgroup': 'host_group', + 'neg_hostgroup': 'neg_host_group', + }, + 'servicegroup': { + 'servicegroup': 'service_group', + 'neg_servicegroup': 'neg_service_group', + }, + 'host_contactgroup': { + 'host_contactgroup': 'host_contact_group', + 'neg_host_contactgroup': 'neg_host_contact_group', + }, + 'service_contactgroup': { + 'service_contactgroup': 'service_contact_group', + 'neg_service_contactgroup': 'neg_service_contact_group', + }, + } + + if filter_name in changed_filter_vars and f.info in datasource['infos']: + for old_var, new_var in changed_filter_vars[filter_name].items(): + if old_var in filtervars: + value = filtervars[old_var] + all_vars[new_var] = value + context[filter_name][new_var] = value + # Now, when there are single object infos specified, add these keys to the # context for single_key in single_keys:

9 years, 10 months

Check_MK Git: check_mk: Fixed werk version

by Lars Michelsen

Module: check_mk Branch: master Commit: c0ff879205c6f6f328a3b44dd6260e88dedf78ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ff879205c6f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 10:01:23 2014 +0100 Fixed werk version --- .werks/1527 | 2 +- ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.werks/1527 b/.werks/1527 index 502c88e..e9e60e5 100644 --- a/.werks/1527 +++ b/.werks/1527 @@ -2,7 +2,7 @@ Title: Fixed views missing values of some filters (serviceregex, hostgroup filte Level: 1 Component: multisite Compatible: compat -Version: 1.2.5i6p3 +Version: 1.2.5i7 Date: 1416473103 Class: fix diff --git a/ChangeLog b/ChangeLog index 19be91d..5dfe667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1438 FIX: quicksearch: fixed various non-working quicksearch filters... * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... + * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog

9 years, 10 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: f31cc90a83e87cc89d1867a469ccde9d02fec50b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f31cc90a83e87c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 09:44: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 c16dfe7..d8e2d5c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1527 +1547

9 years, 10 months

Check_MK Git: check_mk: #1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: a4fc73ce2f4f478ebcbe8e7b349f3b7ab763c1b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4fc73ce2f4f47… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 19 18:28:14 2014 +0100 #1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices --- .werks/1517 | 9 +++ ChangeLog | 1 + checkman/carel_sensors | 22 +++++++ checks/carel_sensors | 103 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-carel_sensors.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 137 insertions(+) diff --git a/.werks/1517 b/.werks/1517 new file mode 100644 index 0000000..09875a0 --- /dev/null +++ b/.werks/1517 @@ -0,0 +1,9 @@ +Title: carel_sensors: New check for monitoring temperature sensors of Carel AC devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416418058 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 25aa3db..19be91d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 1448 domino_info: check is extended to also show and monitor the lnNotesServerState * 1509 if, if64: New option for make inventory based on port alias... * 1440 livedump: now able to add hosts icon_image on config generation... + * 1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checkman/carel_sensors b/checkman/carel_sensors new file mode 100644 index 0000000..26572a5 --- /dev/null +++ b/checkman/carel_sensors @@ -0,0 +1,22 @@ +title: Temperature sensors for Carel air conditioning +agents: snmp +catalog: hw/environment/carel +license: GPL +distribution: check_mk +description: + This check monitors the temperature for Carel + air conditioning devices. + +perfdata: + The current temperature in degrees celsius + +item: + The description of the sensor. + +inventory: + One check for each sensor is created by the inventory if the + sensor does not read 0 or -9999. + +[parameters] +warn(int): Warning level for the temperature. +crit(int): Critical level for the temperature. diff --git a/checks/carel_sensors b/checks/carel_sensors new file mode 100644 index 0000000..043958d --- /dev/null +++ b/checks/carel_sensors @@ -0,0 +1,103 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +# This is not intended for overriding in main.mk, as any changes will require +# re-inventory. +carel_temp_defaultlevels = { # This still needs sensible values + "Room" : (30, 35), + "Outdoor" : (60, 70), + "Delivery" : (60, 70), + "Cold Water" : (60, 70), + "Hot Water" : (60, 70), + "Cold Water Outlet" : (60, 70), + "Circuit 1 Suction" : (60, 70), + "Circuit 2 Suction" : (60, 70), + "Circuit 1 Evap" : (60, 70), + "Circuit 2 Evap" : (60, 70), + "Circuit 1 Superheat" : (60, 70), + "Circuit 2 Superheat" : (60, 70), + "Cooling Set Point" : (60, 70), + "Cooling Prop. Band" : (60, 70), + "Cooling 2nd Set Point" : (60, 70), + "Heating Set Point" : (60, 70), + "Heating 2nd Set Point" : (60, 70), + "Heating Prop. Band" : (60, 70), +} + +def carel_sensors_parse(info): + + oidtothing = { + "1.0" : ("temp", "Room"), + "2.0" : ("temp", "Outdoor"), + "3.0" : ("temp", "Delivery"), + "4.0" : ("temp", "Cold Water"), + "5.0" : ("temp", "Hot Water"), + "7.0" : ("temp", "Cold Water Outlet"), + "10.0" : ("temp", "Circuit 1 Suction"), + "11.0" : ("temp", "Circuit 2 Suction"), + "12.0" : ("temp", "Circuit 1 Evap"), + "13.0" : ("temp", "Circuit 2 Evap"), + "14.0" : ("temp", "Circuit 1 Superheat"), + "15.0" : ("temp", "Circuit 2 Superheat"), + "20.0" : ("temp", "Cooling Set Point"), + "21.0" : ("temp", "Cooling Prop. Band"), + "22.0" : ("temp", "Cooling 2nd Set Point"), + "23.0" : ("temp", "Heating Set Point"), + "24.0" : ("temp", "Heating 2nd Set Point"), + "25.0" : ("temp", "Heating Prop. Band"), + } + + parsed = {} + parsed["temp"] = {} + for oidend, value in info: + quantity, sensor = oidtothing.get(oidend, (None, None)) + if quantity == "temp": + if value and value != "0" and value != "-9999": + parsed[quantity][sensor] = float(value) / 10 + + return parsed + + +def inventory_carel_sensors_temp(parsed): + for thing in parsed["temp"].keys(): + yield thing, carel_temp_defaultlevels[thing] + + +def check_carel_sensors_temp(item, params, parsed): + return check_temperature(parsed["temp"][item], params) + + +check_info["carel_sensors"] = { + "parse_function" : carel_sensors_parse, + "inventory_function" : inventory_carel_sensors_temp, + "check_function" : check_carel_sensors_temp, + "service_description" : "Temperature %s", + "group" : "room_temperature", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.9839.2.1", [ OID_END, "2" ] ), + "snmp_scan_function" : lambda oid: "pCO" in oid(".1.3.6.1.2.1.1.1.0"), + "includes" : [ "temperature.include" ], +} diff --git a/pnp-templates/check_mk-carel_sensors.php b/pnp-templates/check_mk-carel_sensors.php new file mode 120000 index 0000000..8f2a365 --- /dev/null +++ b/pnp-templates/check_mk-carel_sensors.php @@ -0,0 +1 @@ +template-temperature.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0a09b48..87f6fa9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -348,6 +348,7 @@ perfometers["check_mk-rms200_temp"] = perfometer_temperature perfometers["check_mk-juniper_screenos_temp"] = perfometer_temperature perfometers["check_mk-lnx_thermal"] = perfometer_temperature perfometers["check_mk-climaveneta_temp"] = perfometer_temperature +perfometers["check_mk-carel_sensors"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

9 years, 10 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8ad018bdf51831fd2c68c326a2a77ad09e63a891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad018bdf51831… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 19 18:27:23 2014 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 522e1e9..c16dfe7 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1517 +1527

9 years, 10 months

Check_MK Git: check_mk: New versions of all alert icons

by Mathias Kettner

Module: check_mk Branch: master Commit: ab22b20bf12029774bb10e761a837dc3240be351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab22b20bf12029… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 19 18:05:01 2014 +0100 New versions of all alert icons These should also fix ugly transparency errors in PDF versions of the views. --- web/htdocs/images/alert_command.png | Bin 1244 -> 5083 bytes web/htdocs/images/alert_crit.png | Bin 1166 -> 2953 bytes web/htdocs/images/alert_down.png | Bin 1166 -> 2953 bytes web/htdocs/images/alert_downtime.png | Bin 1014 -> 4052 bytes web/htdocs/images/alert_downtimestop.png | Bin 865 -> 2816 bytes web/htdocs/images/alert_ok.png | Bin 1367 -> 3485 bytes web/htdocs/images/alert_restart.png | Bin 1052 -> 3375 bytes web/htdocs/images/alert_start.png | Bin 971 -> 2558 bytes web/htdocs/images/alert_stop.png | Bin 1185 -> 796 bytes web/htdocs/images/alert_unknown.png | Bin 1278 -> 3205 bytes web/htdocs/images/alert_unreach.png | Bin 1278 -> 3205 bytes web/htdocs/images/alert_up.png | Bin 1367 -> 3485 bytes web/htdocs/images/alert_warn.png | Bin 1153 -> 2804 bytes web/plugins/views/painters.py | 6 +++--- 14 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/images/alert_command.png b/web/htdocs/images/alert_command.png index 077a566..0c17cd9 100644 Binary files a/web/htdocs/images/alert_command.png and b/web/htdocs/images/alert_command.png differ diff --git a/web/htdocs/images/alert_crit.png b/web/htdocs/images/alert_crit.png index f04113c..2d0f217 100644 Binary files a/web/htdocs/images/alert_crit.png and b/web/htdocs/images/alert_crit.png differ diff --git a/web/htdocs/images/alert_down.png b/web/htdocs/images/alert_down.png index f04113c..2d0f217 100644 Binary files a/web/htdocs/images/alert_down.png and b/web/htdocs/images/alert_down.png differ diff --git a/web/htdocs/images/alert_downtime.png b/web/htdocs/images/alert_downtime.png index ff0e4e3..20f55b5 100644 Binary files a/web/htdocs/images/alert_downtime.png and b/web/htdocs/images/alert_downtime.png differ diff --git a/web/htdocs/images/alert_downtimestop.png b/web/htdocs/images/alert_downtimestop.png index 76160c3..b85e57a 100644 Binary files a/web/htdocs/images/alert_downtimestop.png and b/web/htdocs/images/alert_downtimestop.png differ diff --git a/web/htdocs/images/alert_ok.png b/web/htdocs/images/alert_ok.png index 738a10e..df67814 100644 Binary files a/web/htdocs/images/alert_ok.png and b/web/htdocs/images/alert_ok.png differ diff --git a/web/htdocs/images/alert_restart.png b/web/htdocs/images/alert_restart.png index d8b951a..389efac 100644 Binary files a/web/htdocs/images/alert_restart.png and b/web/htdocs/images/alert_restart.png differ diff --git a/web/htdocs/images/alert_start.png b/web/htdocs/images/alert_start.png index a8bede9..b2da347 100644 Binary files a/web/htdocs/images/alert_start.png and b/web/htdocs/images/alert_start.png differ diff --git a/web/htdocs/images/alert_stop.png b/web/htdocs/images/alert_stop.png index fd1bbe6..646acf9 100644 Binary files a/web/htdocs/images/alert_stop.png and b/web/htdocs/images/alert_stop.png differ diff --git a/web/htdocs/images/alert_unknown.png b/web/htdocs/images/alert_unknown.png index 803d56d..36671a0 100644 Binary files a/web/htdocs/images/alert_unknown.png and b/web/htdocs/images/alert_unknown.png differ diff --git a/web/htdocs/images/alert_unreach.png b/web/htdocs/images/alert_unreach.png index 803d56d..36671a0 100644 Binary files a/web/htdocs/images/alert_unreach.png and b/web/htdocs/images/alert_unreach.png differ diff --git a/web/htdocs/images/alert_up.png b/web/htdocs/images/alert_up.png index 738a10e..df67814 100644 Binary files a/web/htdocs/images/alert_up.png and b/web/htdocs/images/alert_up.png differ diff --git a/web/htdocs/images/alert_warn.png b/web/htdocs/images/alert_warn.png index d895f86..39d297e 100644 Binary files a/web/htdocs/images/alert_warn.png and b/web/htdocs/images/alert_warn.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 0cf409b..172bbcf 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1764,7 +1764,7 @@ def paint_log_icon(row): elif log_type == "HOST ALERT": img = { 0: "up", 1: "down", 2:"unreach" }.get(row["log_state"]) elif "DOWNTIME" in log_type: - if row["log_state_type"] == "STOPPED": + if row["log_state_type"] in [ "END", "STOPPED" ]: img = "downtimestop" else: img = "downtime" @@ -1776,13 +1776,13 @@ def paint_log_icon(row): img = "restart" elif "starting..." in log_type: img = "start" - elif "shutdown..." in log_type: + elif "shutdown..." in log_type or "shutting down" in log_type: img = "stop" elif " FLAPPING " in log_type: img = "flapping" if img: - return "icon", '<img src="images/alert_%s.png">' % img + return "icon", '<img class=icon src="images/alert_%s.png">' % img else: return "icon", ""

9 years, 10 months

Check_MK Git: check_mk: parse_function: fixed exception when subchecks should use parsed data

by Andreas Boesl

Module: check_mk Branch: master Commit: 3614736a064012ec64222ba36953f4cf475d61b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3614736a064012… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 19 17:20:53 2014 +0100 parse_function: fixed exception when subchecks should use parsed data --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f37deaf..8b1b58a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2926,7 +2926,7 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals if checkname_base in check_info: # parse function must be define for base check parse_function = check_info[checkname_base]["parse_function"] if parse_function: - info = check_info[checkname]["parse_function"](info) + info = check_info[checkname_base]["parse_function"](info) except MKAgentError, e: # This special handling is needed for the inventory check. It needs special

9 years, 10 months

Check_MK Git: check_mk: #1506 FIX Fixed randomly hidden dashboard title

by Lars Michelsen

Module: check_mk Branch: master Commit: a8236feb565c1ced549ff10e1eb9716781367b04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8236feb565c1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 19 17:17:08 2014 +0100 #1506 FIX Fixed randomly hidden dashboard title When dashboards with title enabled and without title were opened after each other, it could happen randomly, that the dashboard with a title was hiding the title behind the dashlets. --- .werks/1506 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 5 +++-- web/plugins/dashboard/builtin.py | 3 +++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.werks/1506 b/.werks/1506 new file mode 100644 index 0000000..5626eaf --- /dev/null +++ b/.werks/1506 @@ -0,0 +1,12 @@ +Title: Fixed randomly hidden dashboard title +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416413736 + +When dashboards with title enabled and without title were opened after each other, +it could happen randomly, that the dashboard with a title was hiding the title +behind the dashlets. diff --git a/ChangeLog b/ChangeLog index 66bd4b3..25aa3db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * 1436 FIX: quicksearch: search with multiple patterns (h: / s:) no longer discards the host pattern... * 1438 FIX: quicksearch: fixed various non-working quicksearch filters... * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... + * 1506 FIX: Fixed randomly hidden dashboard title... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 20abdf6..77cd07c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -47,7 +47,6 @@ MAX = -1 # These settings might go into the config module, sometime in future, # in order to allow the user to customize this. -header_height = 60 # Distance from top of the screen to the lower border of the heading screen_margin = 5 # Distance from the left border of the main-frame to the dashboard area dashlet_padding = 21, 5, 5, 0, 4 # Margin (N, E, S, W, N w/o title) between outer border of dashlet and its content corner_overlap = 22 @@ -263,10 +262,12 @@ def render_dashboard(name): title = visuals.visual_title('dashboard', board) + # Distance from top of the screen to the lower border of the heading + header_height = 60 + # The title of the dashboard needs to be prefixed with the WATO path, # in order to make it clear to the user, that he is seeing only partial # data. - global header_height if not board.get('show_title'): # Remove the whole header line html.set_render_headfoot(False) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index a7f6672..e486289 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -28,6 +28,7 @@ builtin_dashboards["main"] = { "single_infos": [], "context" : {}, "mtime" : 0, + "show_title" : True, "title" : _("Main Overview"), "topic" : _("Overview"), "description" : _("This dashboard gives you a general overview on the state of your " @@ -198,6 +199,7 @@ if defaults.omd_site: "single_infos": [], "context" : {}, "mtime" : 0, + "show_title" : True, "title" : _("Network Topology"), "topic" : _("Overview"), "description" : _("This dashboard uses the parent relationships of your hosts to display a " @@ -220,6 +222,7 @@ builtin_dashboards["simple_problems"] = { "single_infos": [], "context" : {}, "mtime" : 0, + "show_title" : True, "title" : _("Host & Services Problems"), "topic" : _("Overview"), "description" : _("A compact dashboard which lists your unhandled host and service problems."),

9 years, 10 months

Check_MK Git: check_mk: #1505 FIX Snapshots are now bound to the used monitoring core

by Lars Michelsen

Module: check_mk Branch: master Commit: 4922b9f49696a0c2cacdb78c722a5b02f3c25ff6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4922b9f49696a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 19 14:20:51 2014 +0100 #1505 FIX Snapshots are now bound to the used monitoring core Snapshots created with CMC can not be restored on sites currently using another core and vice versa. If you need to restore a snapshot using another core, you might switch to this core, restore the snapshot and then switch back to your former core. --- .werks/1505 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 21 +++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.werks/1505 b/.werks/1505 new file mode 100644 index 0000000..5a3edb3 --- /dev/null +++ b/.werks/1505 @@ -0,0 +1,13 @@ +Title: Snapshots are now bound to the used monitoring core +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416403159 + +Snapshots created with CMC can not be restored on sites currently +using another core and vice versa. If you need to restore a snapshot +using another core, you might switch to this core, restore the snapshot +and then switch back to your former core. diff --git a/ChangeLog b/ChangeLog index b43a02d..66bd4b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 1492 FIX: Fixed too long URL bug when deleting a timeperiod right after creating one * 1498 FIX: Fixed displaying of global settings titles / help texts... * 1502 FIX: Fixed removing elements from ListOf choices during complain phase + * 1505 FIX: Snapshots are now bound to the used monitoring core... 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 432691f..c411961 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6436,6 +6436,22 @@ def get_snapshot_status(snapshot, validate_checksums = False): else: raise MKGeneralException(_("Invalid snapshot (missing file: %s)") % entry) + def check_core(): + if not defaults.omd_root: + return # Do not perform this check in non OMD environments + cmk_tar = cStringIO.StringIO(access_snapshot(lambda x: multitar.get_file_content(x, 'check_mk.tar.gz'))) + files = multitar.list_tar_content(cmk_tar) + using_cmc = os.path.exists(defaults.omd_root + '/etc/check_mk/conf.d/microcore.mk') + snapshot_cmc = 'conf.d/microcore.mk' in files + if using_cmc and not snapshot_cmc: + raise MKGeneralException(_('You are currently using the Check_MK Microcore, but this snapshot does not use the ' + 'Check_MK Microcore. If you need to migrate your data, you could consider changing ' + 'the core, restoring the snapshot and changing the core back again.')) + elif not using_cmc and snapshot_cmc: + raise MKGeneralException(_('You are currently not using the Check_MK Microcore, but this snapshot uses the ' + 'Check_MK Microcore. If you need to migrate your data, you could consider changing ' + 'the core, restoring the snapshot and changing the core back again.')) + def snapshot_secret(): path = defaults.default_config_dir + '/snapshot.secret' try: @@ -6525,6 +6541,7 @@ def get_snapshot_status(snapshot, validate_checksums = False): check_size() check_extension() check_content() + check_core() if validate_checksums: check_checksums() @@ -6606,10 +6623,10 @@ def mode_snapshot_detail(phase): html.write("<td>") if verify_checksum: - if values['checksum'] == True: + if values.get('checksum') == True: checksum_title = _('Checksum valid and signed') checksum_icon = '' - elif values['checksum'] == False: + elif values.get('checksum') == False: checksum_title = _('Checksum invalid and not signed') checksum_icon = 'p' else:

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits