Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64410 discussions

Check_MK Git: check_mk: Added option to enforce lower User-IDs during LDAP sync

by Lars Michelsen

Module: check_mk Branch: master Commit: b239f0c835093a7fcdec5a74f54d8234cc757830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b239f0c835093a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 14:33:19 2013 +0100 Added option to enforce lower User-IDs during LDAP sync --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 6 +++++- web/plugins/wato/check_mk_configuration.py | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bfbe10..f136a48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * Added host filter for "last host state change" and "last host check" * FIX: Preventing autocomplete in password fields of "edit profile" dialog * The ldap member attribute of groups is now configruable via WATO + * Added option to enforce lower User-IDs during LDAP sync BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 2755f9a..bb8f4cc 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -84,7 +84,7 @@ ldap_filter_map = { def ldap_log(s): if config.ldap_debug_log is not None: - file(config.ldap_debug_log, "a").write('%s\n' % s) + file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s\n' % s) class MKLDAPException(MKGeneralException): pass @@ -289,6 +289,10 @@ def ldap_get_users(add_filter = None): raise MKLDAPException(_('The configured User-ID attribute "%s" does not ' 'exist for the user "%s"') % (ldap_user_id_attr(), dn)) user_id = ldap_user[ldap_user_id_attr()][0] + + if config.ldap_userspec.get('lower_user_ids', False): + user_id = user_id.lower() + result[user_id] = ldap_user return result diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 59a773d..4f99b10 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -430,8 +430,14 @@ register_configvar(group, "attribute."), default_value = lambda: userdb.ldap_attr('user_id'), )), + ("lower_user_ids", FixedValue( + title = _("Lower Case User-IDs"), + help = _("Convert imported User-IDs to lower case during synchronisation."), + value = True, + totext = _("Enforce lower case User-IDs."), + )), ], - optional_keys = ['scope', 'filter', 'user_id'], + optional_keys = ['scope', 'filter', 'user_id', 'lower_user_ids'], ), domain = "multisite", )

11 years, 7 months

Check_MK Git: check_mk: FIX: "Sync & Restart" did not perform restart in distributed WATO setups

by Lars Michelsen

Module: check_mk Branch: master Commit: bf18ca026473d996c137dcf840d6add52a97bf99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf18ca026473d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 08:36:47 2013 +0100 FIX: "Sync & Restart" did not perform restart in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d66e87..968a874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ case of distributed WATO setups * Added oracle_tablespaces configuration to the application checkgroup * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups + * FIX: "Sync & Restart" did not perform restart in distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 52e5954..491a1a2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3462,7 +3462,7 @@ def mode_changelog(phase): # can be optimized in future but is the save way for now. site = config.site(site_id) if action in [ "sync", "sync_restart" ]: - response = synchronize_site(site, restart = action == "restart") + response = synchronize_site(site, restart = action == "sync_restart") else: try: restart_site(site)

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: f9cef5a88b0f4d5d0ba5b8ad47f129a71d8ddcdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9cef5a88b0f4d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 13:21:11 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: fix: lnx_bonding remove extra info from primary slave entry

by Andreas Boesl

Module: check_mk Branch: master Commit: f570b4c29701f1ae970346e69b02b63a837bf56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f570b4c29701f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 13:20:57 2013 +0100 fix: lnx_bonding remove extra info from primary slave entry --- checks/lnx_bonding | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/lnx_bonding b/checks/lnx_bonding index 14106d2..4538bef 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -106,7 +106,7 @@ def parse_lnx_bonding(info): } converted[bond] = { "status" : status["main"]["MII Status"], - "primary" : status["main"].get("Primary Slave"), + "primary" : status["main"].get("Primary Slave").split()[0], "active" : status["main"].get("Currently Active Slave"), "mode" : status["main"]["Bonding Mode"].split('(')[0].strip(), "interfaces" : interfaces,

11 years, 7 months

Check_MK Git: check_mk: livestatus: new comments_with_extra_info column in

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f2e6f830115a7790e213675b526451f034d2699 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f2e6f830115a7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 11:05:24 2013 +0100 livestatus: new comments_with_extra_info column in hosts/services table --- ChangeLog | 4 ++++ livestatus/src/DownCommColumn.cc | 6 ++++++ livestatus/src/DownCommColumn.h | 5 +++-- livestatus/src/TableHosts.cc | 10 ++++++---- livestatus/src/TableServices.cc | 10 ++++++---- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d66e87..28c7887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,10 @@ * Add: if check now able to handle interface groups (if_groups) * Add: winperf_phydisk can now output IOPS * Add: oracle_tablespace now with flexible warn/crit levels(magic number) + + Livestatus: + * Add: new column in hosts/services table: comments_with_extra_info + Adds the entry type and entry time Multisite: * Added comment painter to notification related views diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 7b8ef34..2a42e0c 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -69,6 +69,12 @@ void DownCommColumn::output(void *data, Query *query) query->outputString(dt->_author_name); query->outputSublistSeparator(); query->outputString(dt->_comment); + query->outputSublistSeparator(); + if(_with_extra_info && !_is_downtime) { + query->outputInteger(((Comment*)dt)->_entry_type); + query->outputSublistSeparator(); + query->outputTime(dt->_entry_time); + } query->outputEndSublist(); } else diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index dc5cf3b..de0437c 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -36,9 +36,10 @@ class DownCommColumn : public ListColumn { bool _is_downtime; bool _with_info; + bool _with_extra_info; // provides date and type public: - DownCommColumn(string name, string description, int indirect_offset, bool is_downtime, bool with_info) - : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info) {} + DownCommColumn(string name, string description, int indirect_offset, bool is_downtime, bool with_info, bool with_extra_info) + : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info), _with_extra_info(with_extra_info) {} int type() { return COLTYPE_LIST; } void output(void *, Query *); void *getNagiosObject(char *name); diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 50f0876..731160b 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -241,13 +241,15 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) table->addColumn(new HostContactsColumn(prefix + "contacts", "A list of all contacts of this host, either direct or via a contact group", indirect_offset)); table->addColumn(new DownCommColumn(prefix + "downtimes", - "A list of the ids of all scheduled downtimes of this host", indirect_offset, true, false)); + "A list of the ids of all scheduled downtimes of this host", indirect_offset, true, false, false)); table->addColumn(new DownCommColumn(prefix + "downtimes_with_info", - "A list of the all scheduled downtimes of the host with id, author and comment", indirect_offset, true, true)); + "A list of the all scheduled downtimes of the host with id, author and comment", indirect_offset, true, true, false)); table->addColumn(new DownCommColumn(prefix + "comments", - "A list of the ids of all comments of this host", indirect_offset, false, false)); + "A list of the ids of all comments of this host", indirect_offset, false, false, false)); table->addColumn(new DownCommColumn(prefix + "comments_with_info", - "A list of all comments of the host with id, author and comment", indirect_offset, false, true)); + "A list of all comments of the host with id, author and comment", indirect_offset, false, true, false)); + table->addColumn(new DownCommColumn(prefix + "comments_with_extra_info", + "A list of all comments of the host with id, author, comment, entry type and entry time", indirect_offset, false, true, true)); table->addColumn(new CustomVarsColumn(prefix + "custom_variable_names", "A list of the names of all custom variables", (char *)(&hst.custom_variables) - ref, indirect_offset, CVT_VARNAMES)); diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 025cb0f..2154461 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -339,13 +339,15 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, table->addColumn(new ServiceContactsColumn(prefix + "contacts", "A list of all contacts of the service, either direct or via a contact group", indirect_offset)); table->addColumn(new DownCommColumn(prefix + "downtimes", - "A list of all downtime ids of the service", indirect_offset, true, false)); + "A list of all downtime ids of the service", indirect_offset, true, false, false)); table->addColumn(new DownCommColumn(prefix + "downtimes_with_info", - "A list of all downtimes of the service with id, author and comment", indirect_offset, true, true)); + "A list of all downtimes of the service with id, author and comment", indirect_offset, true, true, false)); table->addColumn(new DownCommColumn(prefix + "comments", - "A list of all comment ids of the service", indirect_offset, false, false)); + "A list of all comment ids of the service", indirect_offset, false, false, false)); table->addColumn(new DownCommColumn(prefix + "comments_with_info", - "A list of all comments of the service with id, author and comment", indirect_offset, false, true)); + "A list of all comments of the service with id, author and comment", indirect_offset, false, true, false)); + table->addColumn(new DownCommColumn(prefix + "comments_with_extra_info", + "A list of all comments of the service with id, author, comment, entry type and entry time", indirect_offset, false, true, true)); if (add_hosts) g_table_hosts->addColumns(this, "host_", (char *)(&svc.host_ptr) - ref);

11 years, 7 months

Check_MK Git: check_mk: oracle_tablespaces: little checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 44518f1a677bbbad9a529c9ee894847735b62e12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44518f1a677bbb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:24:41 2013 +0100 oracle_tablespaces: little checkman update --- checkman/oracle_tablespaces | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 3623754..4139c57 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -105,3 +105,5 @@ oracle_tablespaces_check_default_increment(bool): This setting does not all checks, not only newly inventorized ones. Per default it is set to {True}. That way the check will warn if the table space has its increment size set to {1} (the ORACLE default value). + +oracle_tablespaces_default_levels(dict): A dictionary with the optional keys mentioned in parameters

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c7460103efdc722ce3ac21d054eef52df882e5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7460103efdc7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:17:04 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: oracle_tablespace: checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 1e0e8a8a97d1b56ecbdca07616cc9a0421fe4a56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e0e8a8a97d1b5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:16:55 2013 +0100 oracle_tablespace: checkman update --- checkman/oracle_tablespaces | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 8be4f84..3623754 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -23,7 +23,7 @@ description: {Increment size}: If the configuration parameter {oracle_tablespaces_check_default_increment} is set to - {True} (which is the defaut), then the check will warn + {True} (which is the default), then the check will warn you, if the increment size is set to the ORACLE default value of {1} (which is generally considered as a non-optimal setting). @@ -52,8 +52,13 @@ item: examples: # Set levels for free space to 20% (WARN) and 10% (CRIT) - # of maximum tablespace size - oracle_tablespaces_default_levels = (20.0, 10.0) + # of maximum tablespace size and deactivate check of autoextend + + + oracle_tablespaces_default_levels = { + "levels" : (20.0, 10.0), + "autoextend" : None + } perfdata: Three values in bytes: the current size, the used size of the tablespace @@ -64,18 +69,29 @@ inventory: which is {ONLINE}. [parameters] -autoextend(bool): Either {True} or {False} - depending on - wether auto extension is expected to be on or off. -warn(int / float): Warning level for free space. If this is a float, - it is considered as percentage of the maximum size of the tablespace. - If it is an integer, it is considered to be MB of free space. If the - space drops to this level or below, the check will get into warning state. -crit(int / float): The critical level for free space. +parameters (dict): -[configuration] -oracle_tablespaces_default_levels(int/float, int/float): The default warning and critical levels - used for inventorized checks. This is preset to {(10.0, 5.0)}. + {"autoextend"}: Either {True} or {False} - depending on whether auto extension is + expected to be on or off + + {"levels"}: A tuple containing the warn and crit levels for free space. + Supported types (int / float). If this is a float, it is considered as + percentage of the maximum size of the tablespace. If it is an integer, + it is considered to be MB of free space. If the space drops to this level or below, + the check will get into warning state. Default is {(10.0, 5.0)} + {"magic"}: The magic number, which scales the levels according to the tablespace size. + Default is a factor of 1.0, which does no adaptation. A factor less than 1.0 raises the levels + for large tablespaces and lowers them for small ones. Please look at online documentation + for more details about magic factor. + + {"magic_normsize"}: Norm size of a tablespace for the magic computation + The default for this is {1000}. It is measured in {MB}. + + {"levels_low"}: Minimum levels if using magic factor. The warn / crit levels will never fall below + these numbers. The preset is set to (0.0, 0.0) (deactivated) + +[configuration] oracle_tablespaces_check_autoext(bool): This boolean setting determines, whether inventory should activate monitoring of the auto extension setting. Per default this is set to {True}, so the current state of the auto extension will be

11 years, 7 months

Check_MK Git: check_mk: Add: winperf_phydisk can now output IOPS

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ce61a4a7db11b854883fd247344203ec69b8f51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ce61a4a7db11b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 14:29:51 2013 +0100 Add: winperf_phydisk can now output IOPS --- ChangeLog | 1 + checkman/winperf_phydisk | 4 ++++ checks/diskstat.include | 19 +++++++++++++------ checks/winperf_phydisk | 16 ++++++++++------ 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0f9ecc..2aa33a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * if: Inventory settings can now be set host based * FIX: lnx_bonding/ovs_bonding: correct definition of bonding.include * Add: if check now able to handle interface groups (if_groups) + * Add: winperf_phydisk can now output IOPS Multisite: * Added comment painter to notification related views diff --git a/checkman/winperf_phydisk b/checkman/winperf_phydisk index f14bb0e..d89a342 100644 --- a/checkman/winperf_phydisk +++ b/checkman/winperf_phydisk @@ -28,6 +28,8 @@ description: it possible to ignore short "peaks" and only trigger and longer phases of high disk activity. + The check also gives info on the IOPS. + item: Either {"SUMMARY"} for a summarized check of alls disks or the name of the disk device, e.g. {"C:"}. @@ -62,6 +64,8 @@ perfdata: In the legacy mode only one variable: the throughput since the last check in in bytes(!) per second, either for read or for write. + The IOPS are returned if {"latency_perfdata"} is set to True. + inventory: The inventory is configured via {diskstat_inventory_mode}. If this is set to {"single"} (the default), then one check will be created for each diff --git a/checks/diskstat.include b/checks/diskstat.include index 553ab76..4c84054 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -130,17 +130,25 @@ def check_diskstat_line(this_time, item, params, line): if average_range != None: perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ] - # Do Latency computation if this information is available: - if len(line) >= 6 and line[3] >= 0: - reads, writes, timems = map(int, line[3:6]) - ios = reads + writes + # Process IOs when available + if line[3] >= 0 and line[4] > 0: + reads, writes = map(int, line[3:5]) + ios = reads + writes timedif, ios_per_sec = get_counter(countername + ".ios", this_time, ios) + infos.append("IOs: %.2f/sec" % ios_per_sec) + + if params.get("latency_perfdata"): + perfdata.append(("ios", ios_per_sec)) + + # Do Latency computation if this information is available: + if len(line) >= 6 and line[5] >= 0: + timems = int(line[5]) timedif, timems_per_sec = get_counter(countername + ".time", this_time, timems) if not ios_per_sec: latency = 0.0 else: latency = timems_per_sec / ios_per_sec - infos.append("IOs: %.2f/sec, Latency: %.2fms" % (ios_per_sec, latency)) + infos.append("Latency: %.2fms" % latency) if "latency" in params: warn, crit = params["latency"] if latency >= crit: @@ -153,7 +161,6 @@ def check_diskstat_line(this_time, item, params, line): warn, crit = None, None if params.get("latency_perfdata"): - perfdata.append(("ios", ios_per_sec)) perfdata.append(("latency", latency, warn, crit)) # Queue Lengths (currently only Windows). Windows uses counters here. diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 052325a..f113775 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -45,8 +45,8 @@ # -24 1638326933 1638326933 average_timer # -24 18448 18448 average_base # -22 36283 36283 counter -# -20 17835 17835 counter -# -18 18448 18448 counter +# -20 17835 17835 counter ----> Disk Reads/sec +# -18 18448 18448 counter ----> Disk Writes/sec # -16 1315437056 1315437056 bulk_count # -14 672711680 672711680 bulk_count ----> Disk Read Bytes/sec # -12 642725376 642725376 bulk_count ----> Disk Write Bytes/sec @@ -66,11 +66,15 @@ def winperf_phydisk_convert(info): disks = [ d.split('_')[-1] for d in info[1][2:-1] ] for line in info[2:]: if line[0] == '-14': - disk_reads = [ int(x) / 512 for x in line[1:-2] ] + disk_read_bytes = [ int(x) / 512 for x in line[1:-2] ] elif line[0] == '-12': - disk_writes = [ int(x) / 512 for x in line[1:-2] ] + disk_write_bytes = [ int(x) / 512 for x in line[1:-2] ] + elif line[0] == '-20': + disk_reads = [ int(x) for x in line[1:-2] ] + elif line[0] == '-18': + disk_writes = [ int(x) for x in line[1:-2] ] elif line[0] == '1168': # Average Disk Read Queue Length - disk_readq_ctrs = [ int(x) for x in line[1:-2] ] + disk_readq_ctrs = [ int(x) for x in line[1:-2] ] elif line[0] == '1170': # Average Disk Read Queue Length disk_writeq_ctrs = [ int(x) for x in line[1:-2] ] @@ -78,7 +82,7 @@ def winperf_phydisk_convert(info): # information) empty = [ -1 for x in disks ] - return zip(disks, disk_reads, disk_writes, empty, empty, empty, disk_readq_ctrs, disk_writeq_ctrs) + return zip(disks, disk_read_bytes, disk_write_bytes, reads, writes, empty, disk_readq_ctrs, disk_writeq_ctrs) def inventory_winperf_phydisk(info): return inventory_diskstat_generic(winperf_phydisk_convert(info))

11 years, 7 months

Check_MK Git: check_mk: WATO: Added hook to make the mkeventd reload in distributed WATO setups during " activate changes" process

by Lars Michelsen

Module: check_mk Branch: master Commit: a2b9f6bce9c2ce857d7a68e1698bab0766bbea78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2b9f6bce9c2ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 6 08:44:34 2013 +0100 WATO: Added hook to make the mkeventd reload in distributed WATO setups during "activate changes" process --- ChangeLog | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a242c02..a9548df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,8 @@ * Speed up rule matches in some special cases by factor of 100 and more * Init-Script: Improved handling of stale pidfiles * Init-Script: Detecting and reporting already running processes + * WATO: Added hook to make the mkeventd reload in distributed WATO setups + during "activate changes" process 1.2.1i5: Core: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 3cfe729..8c13832 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1078,6 +1078,14 @@ def mode_mkeventd_edit_rule(phase): html.hidden_fields() html.end_form() +def mkeventd_reload(): + mkeventd.query("COMMAND RELOAD") + try: + os.remove(log_dir + "mkeventd.log") + except OSError: + pass # ignore not existing logfile + log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) + def mode_mkeventd_changes(phase): if phase == "title": return _("Event Console - Pending Changes") @@ -1088,14 +1096,12 @@ def mode_mkeventd_changes(phase): if config.may("mkeventd.activate") and parse_audit_log("mkeventd") and mkeventd.daemon_running(): html.context_button(_("Activate Changes!"), html.makeactionuri([("_activate", "now")]), "apply", hot=True) - + elif phase == "action": if html.check_transaction(): - mkeventd.query("COMMAND RELOAD") - os.remove(log_dir + "mkeventd.log") - log_audit(None, "mkeventd-activate", _("Activated changes of event console configuration")) + mkeventd_reload() return "mkeventd_rules", _("Changes successfully activated.") - + else: if not mkeventd.daemon_running(): warning = _("The Event Console Daemon is currently not running. ") @@ -1864,3 +1870,7 @@ define command { api.register_hook("pre-activate-changes", mkeventd_update_notifiation_configuration) +# Only register the reload hook when mkeventd is enabled +if mkeventd_enabled: + api.register_hook("activate-changes", lambda hosts: mkeventd_reload()) +

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits