Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Added icons for new acknowledgment event in monitoring log

by Mathias Kettner

Module: check_mk Branch: master Commit: e9dc63617e3f8dbc6d809e17fa87097bb415bf78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9dc63617e3f8d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 9 17:07:21 2015 +0100 Added icons for new acknowledgment event in monitoring log --- web/htdocs/images/alert_ack.png | Bin 0 -> 3881 bytes web/htdocs/images/alert_ackstop.png | Bin 0 -> 3985 bytes web/plugins/views/painters.py | 5 +++++ 3 files changed, 5 insertions(+) diff --git a/web/htdocs/images/alert_ack.png b/web/htdocs/images/alert_ack.png new file mode 100644 index 0000000..7bee2d7 Binary files /dev/null and b/web/htdocs/images/alert_ack.png differ diff --git a/web/htdocs/images/alert_ackstop.png b/web/htdocs/images/alert_ackstop.png new file mode 100644 index 0000000..a84d268 Binary files /dev/null and b/web/htdocs/images/alert_ackstop.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 76cf45d..a155e3e 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1825,6 +1825,11 @@ def paint_log_icon(row): img = "stop" elif " FLAPPING " in log_type: img = "flapping" + elif "ACKNOWLEDGE ALERT" in log_type: + if row["log_state_type"] == "STARTED": + img = "ack" + else: + img = "ackstop" if img: return "icon", '<img class=icon src="images/alert_%s.png">' % img

9 years, 8 months

Check_MK Git: check_mk: #1840 FIX oracle_tablespaces: fix implementation of magic factor

by Mathias Kettner

Module: check_mk Branch: master Commit: c3dc5d7d42590795ef4ad3bd40ff1fe3ba9b853c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3dc5d7d425907… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 9 16:07:27 2015 +0100 #1840 FIX oracle_tablespaces: fix implementation of magic factor --- .werks/1840 | 10 ++++ ChangeLog | 1 + checkman/oracle_tablespaces | 9 ++-- checks/oracle_tablespaces | 87 +++++++++++++++------------------- web/plugins/wato/check_parameters.py | 23 +++++---- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c3dc5d7d42…

9 years, 8 months

Check_MK Git: check_mk: two more fixes to netscaler_ha and netscaler_mem

by Goetz Golla

Module: check_mk Branch: master Commit: 875a0802a72ed23cd0d24b70a7795b7a5846f676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=875a0802a72ed2… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 15:52:58 2015 +0100 two more fixes to netscaler_ha and netscaler_mem --- checks/netscaler_ha | 2 +- checks/netscaler_mem | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/netscaler_ha b/checks/netscaler_ha index dfb47fe..88cb903 100644 --- a/checks/netscaler_ha +++ b/checks/netscaler_ha @@ -78,7 +78,7 @@ def check_netscaler_ha(_no_item, _no_params, info): infotext = "Mode: %s, State: %s" % ( netscaler_ha_peer_mode[peer_state][0], netscaler_ha_cur_states[cur_state][0], ) - state = max(netscaler_ha_cur_states[cur_state][1], netscaler_ha_peer_mode[peer_state)[1]) + state = max(netscaler_ha_cur_states[cur_state][1], netscaler_ha_peer_mode[peer_state][1]) return state, infotext diff --git a/checks/netscaler_mem b/checks/netscaler_mem index 9bb54b1..b869e07 100644 --- a/checks/netscaler_mem +++ b/checks/netscaler_mem @@ -46,9 +46,9 @@ def check_netscaler_mem(_no_item, params, info): state = 0 if used_mem >= crit: state = 2 - infotext += " (levels at %.1f%%/%.1f%%)" % (warn_perc, crit_perc) elif used_mem >= warn: state = 1 + if state > 0: infotext += " (levels at %.1f%%/%.1f%%)" % (warn_perc, crit_perc) return state, infotext, perfdata

9 years, 8 months

Check_MK Git: check_mk: netscaler_ha: modified the way state is calculated

by Goetz Golla

Module: check_mk Branch: master Commit: b288ad45d5a64fa3f21777717e624b3cc1a86c71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b288ad45d5a64f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 15:20:24 2015 +0100 netscaler_ha: modified the way state is calculated --- checkman/netscaler_ha | 6 +++--- checks/netscaler_ha | 17 ++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/checkman/netscaler_ha b/checkman/netscaler_ha index f07a9d0..e973319 100644 --- a/checkman/netscaler_ha +++ b/checkman/netscaler_ha @@ -12,9 +12,9 @@ description: The check is in the state OK when the system is not setup for ha, or {haCurState} is up/funtional. It is in the state WARN when the system is manually configured not to participate in a HA cluster, or initializing to - become a cluster member, or when {haCurState} is {monitorFAIL} or {monitorOK}, - because these two states are not documented in the MIB. It is critical in - other states {haCurState} can be. + become a cluster member, or when {haCurState} is {monitorFAIL}, {monitorOK}, + or {unkown} because these states are not documented in the MIB. It is + critical in other states {haCurState} can be. inventory: One service per host will be created. diff --git a/checks/netscaler_ha b/checks/netscaler_ha index 927cba4..dfb47fe 100644 --- a/checks/netscaler_ha +++ b/checks/netscaler_ha @@ -30,7 +30,7 @@ # .1.3.6.1.4.1.5951.4.1.1.23.24.0 3 netscaler_ha_cur_states = { - 0: ("unknown", 3), + 0: ("unknown", 1), 1: ("initializing", 1), # Indicates that the node is in the process of becoming part of the high # availability configuration. 2: ("down", 2), # undocumented @@ -75,19 +75,10 @@ def check_netscaler_ha(_no_item, _no_params, info): if cur_status == 0: infotext = "System not setup for HA" else: - infotext = "Mode: %s, State: %s" % ( netscaler_ha_peer_mode.get(peer_state)[0], - netscaler_ha_cur_states.get(cur_state)[0], + infotext = "Mode: %s, State: %s" % ( netscaler_ha_peer_mode[peer_state][0], + netscaler_ha_cur_states[cur_state][0], ) - # severity: 2, 1, 3, 0, the worst one wins - if netscaler_ha_cur_states.get(cur_state)[1] == 2 or \ - netscaler_ha_cur_states.get(cur_state)[1] == 2: - state = 2 - elif netscaler_ha_cur_states.get(cur_state)[1] == 1 or \ - netscaler_ha_cur_states.get(cur_state)[1] == 1: - state = 1 - elif netscaler_ha_cur_states.get(cur_state)[1] == 3 or \ - netscaler_ha_cur_states.get(cur_state)[1] == 3: - state = 3 + state = max(netscaler_ha_cur_states[cur_state][1], netscaler_ha_peer_mode[peer_state)[1]) return state, infotext

9 years, 8 months

Check_MK Git: check_mk: #1806 FIX services check was not recognizing configured state when no service was found

by Lars Michelsen

Module: check_mk Branch: master Commit: e6a8c5aebf49ad4630e51baebf2bad792764b995 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6a8c5aebf49ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 9 15:10:39 2015 +0100 #1806 FIX services check was not recognizing configured state when no service was found --- .werks/1806 | 10 ++++++++++ ChangeLog | 1 + checks/services | 5 ++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1806 b/.werks/1806 new file mode 100644 index 0000000..64bfeaa --- /dev/null +++ b/.werks/1806 @@ -0,0 +1,10 @@ +Title: services check was not recognizing configured state when no service was found +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420812618 + + diff --git a/ChangeLog b/ChangeLog index 6572cb7..e0fa59f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ NOTE: Please refer to the migration notes! * 1833 FIX: jolokia_metrics.gc: fix recently introduced exception for missing variable * 1463 FIX: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed + * 1806 FIX: services check was not recognizing configured state when no service was found Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/services b/checks/services index 4ffaaf7..49d72a9 100644 --- a/checks/services +++ b/checks/services @@ -198,9 +198,8 @@ def check_windows_services(item, params, info): start_type = "unknown" found.append((line[0], state, start_type, " ".join(line[3:]))) - if len(found) == 0: - return (3, "service not found") - + if not found: + return params["else"], "service not found" # We take the best found state (neccessary for clusters) best_state = None

9 years, 8 months

Check_MK Git: check_mk: #1464 netscaler_mem: new check to monitor the memory usage of Citrix Netscaler Appliances

by Goetz Golla

Module: check_mk Branch: master Commit: 03b0dbddcdd4dfa1cc3fd6ab5465404ac59659c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03b0dbddcdd4df… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 14:38:25 2015 +0100 #1464 netscaler_mem: new check to monitor the memory usage of Citrix Netscaler Appliances --- .werks/1464 | 9 ++++ ChangeLog | 1 + checkman/netscaler_mem | 27 ++++++++++++ checks/netscaler_mem | 67 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-netscaler_mem.php | 1 + web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 15 +++++++ 7 files changed, 121 insertions(+) diff --git a/.werks/1464 b/.werks/1464 new file mode 100644 index 0000000..7bc83da --- /dev/null +++ b/.werks/1464 @@ -0,0 +1,9 @@ +Title: netscaler_mem: new check to monitor the memory usage of Citrix Netscaler Appliances +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1420810662 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6211340..6572cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 1831 diskstat: detect multipath devices and handle them instead of the physical paths... * 1462 netscaler_ha: new check to monitor the HA state of Citrix Netscaler appliances * 1838 emc_datadomain_mtree: New check for EMC Datadomain MTrees... + * 1464 netscaler_mem: new check to monitor the memory usage of Citrix Netscaler Appliances * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/netscaler_mem b/checkman/netscaler_mem new file mode 100644 index 0000000..970479a --- /dev/null +++ b/checkman/netscaler_mem @@ -0,0 +1,27 @@ +title: Citrix Netscaler Memory Utilization +agents: snmp +catalog: app/netscaler +license: GPL +distribution: check_mk +description: + + This check monitors the Memmory utilization on the Citrix Netscaler + Appliance. It uses the NS-ROOT-MIB to access the amount of used memory + {resMemUsage} in percent and the total installed memory {memSizeMB}. + + Warning and critical levels can be configured for the check. + +inventory: + One service per appliance will be created. + +perfdata: + The memory utilization value + +[parameters] +warning (float): The percentage of memory usage that triggers a warning level. +critical (float): The percentage of memory usage that triggers a critical level. + +[configuration] +netscaler_mem_default_levels (float, float): Default levels for warning and critical used + by inventorized checks. This is preset to {(80.0, 90.0)} + diff --git a/checks/netscaler_mem b/checks/netscaler_mem new file mode 100644 index 0000000..9bb54b1 --- /dev/null +++ b/checks/netscaler_mem @@ -0,0 +1,67 @@ +#!/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. +# +# Example Output: +# .1.3.6.1.4.1.5951.4.1.1.41.2.0 13 +# .1.3.6.1.4.1.5951.4.1.1.41.4.0 7902 + +netscaler_mem_default_levels = (80.0, 90.0) + +def inventory_netscaler_mem(info): + if info: + return [ (None, 'netscaler_mem_default_levels') ] + +def check_netscaler_mem(_no_item, params, info): + used_mem_perc, total_mem_mb = map(float, info[0]) + warn_perc, crit_perc = params + total_mem = total_mem_mb * 1024 * 1024 + warn, crit, used_mem = map(lambda s: s * total_mem / 100.0, params + (used_mem_perc,) ) + infotext = "%s (%d%%) of %s" % ( get_bytes_human_readable(used_mem), used_mem_perc, + get_bytes_human_readable(total_mem) ) + perfdata = [ ("mem", used_mem, warn, crit, 0, total_mem ) ] + + state = 0 + if used_mem >= crit: + state = 2 + infotext += " (levels at %.1f%%/%.1f%%)" % (warn_perc, crit_perc) + elif used_mem >= warn: + state = 1 + infotext += " (levels at %.1f%%/%.1f%%)" % (warn_perc, crit_perc) + + return state, infotext, perfdata + +check_info["netscaler_mem"] = { + "check_function" : check_netscaler_mem, + "inventory_function" : inventory_netscaler_mem, + "service_description" : "Memory used", + "has_perfdata" : True, + "group" : "netscaler_mem", + "snmp_info" : (".1.3.6.1.4.1.5951.4.1.1.41", [ # nsResourceGroup + 2, # resMemUsage + 4, # memSizeMB + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), +} diff --git a/pnp-templates/check_mk-netscaler_mem.php b/pnp-templates/check_mk-netscaler_mem.php new file mode 120000 index 0000000..64bb7b4 --- /dev/null +++ b/pnp-templates/check_mk-netscaler_mem.php @@ -0,0 +1 @@ +check_mk-juniper_screenos_mem.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 52ae655..37da111 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -956,6 +956,7 @@ perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem perfometers['check_mk-brocade_mlx.module_mem'] = perfometer_simple_mem_usage perfometers['check_mk-innovaphone_mem'] = perfometer_simple_mem_usage perfometers['check_mk-juniper_screenos_mem'] = perfometer_simple_mem_usage +perfometers['check_mk-netscaler_mem'] = perfometer_simple_mem_usage perfometers['check_mk-arris_cmts_mem'] = perfometer_simple_mem_usage perfometers["check_mk-juniper_trpz_mem"] = perfometer_simple_mem_usage diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3a394a9..e6e9fa8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2620,6 +2620,21 @@ register_check_parameters( register_check_parameters( subgroup_os, + "netscaler_mem", + _("Netscaler Memory Usage"), + Tuple( + title = _("Specify levels in percentage of total memory usage"), + elements = [ + Percentage(title = _("Warning at a usage of"), unit =_("% of RAM"), default_value = 80.0, maxvalue = 100.0 ), + Percentage(title = _("Critical at a usage of"), unit =_("% of RAM"), default_value = 90.0, maxvalue = 100.0 ) + ] + ), + None, + "first" +) + +register_check_parameters( + subgroup_os, "general_flash_usage", _("Flash Space Usage"), Alternative(

9 years, 8 months

Check_MK Git: check_mk: minor wording fix

by Goetz Golla

Module: check_mk Branch: master Commit: 98dc50cb42b7175b40152c9729438f94ec92aef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98dc50cb42b717… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 14:31:57 2015 +0100 minor wording fix --- checkman/domino_users | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/domino_users b/checkman/domino_users index 84f1c95..8d727f7 100644 --- a/checkman/domino_users +++ b/checkman/domino_users @@ -11,7 +11,7 @@ perfdata: The number of users inventory: - One check per Lotus Domino Server is created. + One service is created per Lotus Domino Server. [parameters] parameters(tuple): parameters is a tuple of two values

9 years, 8 months

Check_MK Git: check_mk: #1463 FIX juniper_screenos_mem, juniper_trpz_mem: pnp template fixed

by Goetz Golla

Module: check_mk Branch: master Commit: 5fd0ed5a72b2dc0b03ca3b9b31fec290083077d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fd0ed5a72b2dc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 9 14:30:35 2015 +0100 #1463 FIX juniper_screenos_mem, juniper_trpz_mem: pnp template fixed --- .werks/1463 | 9 +++++++ ChangeLog | 1 + pnp-templates/check_mk-juniper_screenos_mem.php | 30 +++++++++++++++++------ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.werks/1463 b/.werks/1463 new file mode 100644 index 0000000..4fd25ac --- /dev/null +++ b/.werks/1463 @@ -0,0 +1,9 @@ +Title: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1420810131 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9f4eae1..f3a6d62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 1819 FIX: dell_poweredge_temp: Make output and service description consistent with other temperature checks... NOTE: Please refer to the migration notes! * 1833 FIX: jolokia_metrics.gc: fix recently introduced exception for missing variable + * 1463 FIX: juniper_screenos_mem, juniper_trpz_mem: pnp template fixed Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/pnp-templates/check_mk-juniper_screenos_mem.php b/pnp-templates/check_mk-juniper_screenos_mem.php index 2eac2f2..8756a5e 100644 --- a/pnp-templates/check_mk-juniper_screenos_mem.php +++ b/pnp-templates/check_mk-juniper_screenos_mem.php @@ -23,13 +23,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label 'MB' -l 0 --title \"Main Memory (RAM)\" "; +if ($MAX[1]/1024/1024 > 10000) { + $scale = 1024 * 1024 * 1024; + $unit = 'GB'; +} +else { + $scale = 1024 * 1024; + $unit = 'MB'; +} + +$total = sprintf("%.2f", $MAX[1] / $scale); +$warn = sprintf("%.2f", $WARN[1] / $scale); +$crit = sprintf("%.2f", $CRIT[1] / $scale); + +$opt[1] = "--vertical-label $unit -l 0 --title \"Main Memory (RAM)\" -X0 --upper-limit " . $total; # -$def[1] = "DEF:used=$RRDFILE[1]:$DS[1]:AVERAGE " ; + +$def[1] = "DEF:used_bytes=$RRDFILE[1]:$DS[1]:AVERAGE " ; +$def[1] .= "CDEF:used=used_bytes,$scale,/ "; $def[1] .= "AREA:used#60f020:\"Used\" " ; -$def[1] .= "GPRINT:used:MIN:\"Min\: %2.0lf MB\" " ; -$def[1] .= "GPRINT:used:MAX:\"Max\: %2.0lf MB\" " ; -$def[1] .= "GPRINT:used:LAST:\"Last\: %2.0lf MB\\n\" " ; -$def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warn\" "; -$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Crit\\n\" "; +$def[1] .= "GPRINT:used:MIN:\"Min\: %2.1lf $unit\" " ; +$def[1] .= "GPRINT:used:MAX:\"Max\: %2.1lf $unit\" " ; +$def[1] .= "GPRINT:used:LAST:\"Last\: %2.1lf $unit\\n\" " ; +$def[1] .= "HRULE:$warn#FFFF00:\"Warn\" "; +$def[1] .= "HRULE:$crit#FF0000:\"Crit\" "; +$def[1] .= "HRULE:$total#000000:\"RAM installed $total $unit\\n\" "; ?>

9 years, 8 months

Check_MK Git: check_mk: #1805 FIX Changing roles marks sites where users can login dirty for sync now

by Lars Michelsen

Module: check_mk Branch: master Commit: 8959734e45179e4287ebd5ee442fdc82d30e437d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8959734e45179e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 9 14:10:16 2015 +0100 #1805 FIX Changing roles marks sites where users can login dirty for sync now Previously a change to the roles did not result in a pending change for remote sites in a distributed WATO setup. To have these changes synchronized one needed to make another change to mark the sites dirty and make the sync possible. This has been changed now. Each site can now be configured to make "user logins to Web GUI possible", which is enabled by default. Those sites will be marked as dirty now which will make the admin able to trigger a synchronisation right after modifying a role. --- .werks/1805 | 17 +++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 20 +++++++++++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.werks/1805 b/.werks/1805 new file mode 100644 index 0000000..e82d289 --- /dev/null +++ b/.werks/1805 @@ -0,0 +1,17 @@ +Title: Changing roles marks sites where users can login dirty for sync now +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420808847 + +Previously a change to the roles did not result in a pending change for remote +sites in a distributed WATO setup. To have these changes synchronized one needed +to make another change to mark the sites dirty and make the sync possible. + +This has been changed now. Each site can now be configured to make "user logins +to Web GUI possible", which is enabled by default. Those sites will be marked as +dirty now which will make the admin able to trigger a synchronisation right +after modifying a role. diff --git a/ChangeLog b/ChangeLog index e78e400..6353871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 1789 FIX: Fix preview of passive checks in WATO list of services * 1790 FIX: Fix WATO parameters page for passive checks... * 1794 FIX: Fix exception in WATO service list in case of vanished checks + * 1805 FIX: Changing roles marks sites where users can login dirty for sync now... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2609339..4a2163f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10524,6 +10524,12 @@ def mode_edit_site(phase): html.help( _('This might be needed to make the synchronization accept problems with ' 'SSL certificates when using an SSL secured connection.')) + forms.section(_('Direct login to Web GUI allowed'), simple=True) + html.checkbox('user_login', site.get('user_login', True), + label = _('Users are allowed to directly login into the Web GUI of this site')) + html.help(_('When enabled, this site is marked for synchronisation every time a Web GUI ' + 'related option is changed in the master site.')) + forms.end() html.button("save", _("Save")) @@ -10886,6 +10892,11 @@ def update_replication_status(site_id, vars, times = {}): save_replication_status(repstatus) os.close(fd) +def update_login_sites_replication_status(): + for siteid, site in config.sites.items(): + if site.get('user_login', True) and not site_is_local(siteid): + update_replication_status(siteid, {'need_sync': True}) + def global_replication_state(): repstatus = load_replication_status() some_dirty = False @@ -12357,7 +12368,8 @@ def mode_roles(phase): rename_user_role(delid, None) # Remove from existing users del roles[delid] save_roles(roles) - log_pending(False, None, "edit-roles", _("Deleted role '%s'" % delid)) + update_login_sites_replication_status() + log_pending(AFFECTED, None, "edit-roles", _("Deleted role '%s'" % delid)) elif c == False: return "" elif html.var("_clone"): @@ -12374,7 +12386,8 @@ def mode_roles(phase): new_role["basedon"] = cloneid roles[newid] = new_role save_roles(roles) - log_pending(False, None, "edit-roles", _("Created new role '%s'" % newid)) + update_login_sites_replication_status() + log_pending(AFFECTED, None, "edit-roles", _("Created new role '%s'" % newid)) return table.begin("roles") @@ -12484,7 +12497,8 @@ def mode_edit_role(phase): rename_user_role(id, new_id) save_roles(roles) - log_pending(False, None, "edit-roles", _("Modified user role '%s'" % new_id)) + update_login_sites_replication_status() + log_pending(AFFECTED, None, "edit-roles", _("Modified user role '%s'" % new_id)) return "roles" html.begin_form("role", method="POST")

9 years, 8 months

Check_MK Git: check_mk: #1839 FIX Fix exception when notifying EC alert into monitoring for traps (because PID is missing)

by Mathias Kettner

Module: check_mk Branch: master Commit: 110c4385802fa946118f9ee4e7efcd260153973f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=110c4385802fa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 9 13:02:19 2015 +0100 #1839 FIX Fix exception when notifying EC alert into monitoring for traps (because PID is missing) --- .werks/1839 | 10 ++++++++++ ChangeLog | 3 +++ mkeventd/bin/mkeventd | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1839 b/.werks/1839 new file mode 100644 index 0000000..493eb28 --- /dev/null +++ b/.werks/1839 @@ -0,0 +1,10 @@ +Title: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1420804907 + + diff --git a/ChangeLog b/ChangeLog index 9f4eae1..e78e400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,9 @@ BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used + Event Console: + * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) + 1.2.6b1: Core & Setup: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 9b81150..39b6564 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3091,7 +3091,7 @@ def do_notify(event, username, is_cancelling): "EC_PHASE": event["phase"], "EC_COMMENT": event.get("comment", ""), "EC_OWNER": event.get("owner", ""), - "EC_PID": str(event["pid"]), + "EC_PID": str(event.get("pid", 0)), "EC_MATCH_GROUPS": "\t".join(event["match_groups"]), "EC_CONTACT_GROUPS": event["contact_groups"] and " ".join(event["contact_groups"]) or "", }

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015