Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 16df5ff4c59336aedb5df4d2d09feb16e5c0ad2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16df5ff4c59336… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 18 11:20:06 2015 +0100 renamed incorrect argument --- doc/treasures/active_checks/check_mail_loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index 8d4ba58..8f5217c 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -93,7 +93,7 @@ OPTIONS: short_options = 'dh' long_options = ['smtp-server=', 'smtp-port=', 'smtp-username=', 'smtp-password=', - 'smtp-tls', 'fetch-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', + 'smtp-tls', 'imap-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', 'fetch-password=', 'fetch-ssl', 'mail-from=', 'mail-to=', 'warning=', 'critical=', 'connect-timeout=', 'delete-messages', 'help', 'status-dir=', 'status-suffix=', "debug", ]

8 years, 9 months

#2880 Automatically detect changes in local web/plugins, no Apache restart needed anymore

by Mathias Kettner

Module: check_mk Branch: master Commit: 56859e07c1bab8a0bd13ba2088056903eef88848 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56859e07c1bab8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 11:13:25 2015 +0100 #2880 Automatically detect changes in local web/plugins, no Apache restart needed anymore If you add, remove or modify any extensions in <tt>local/share/check_mk/web/plugins</tt> then a restart of your local Apache is not neccessary anymore. Check_MK will detect such changes by looking at the time stamps of the contained files and subdirectories of <tt>plugins</tt>. --- .werks/2880 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 4 ++-- web/htdocs/config.py | 6 +++--- web/htdocs/cron.py | 4 ++-- web/htdocs/dashboard.py | 4 ++-- web/htdocs/default_permissions.py | 4 ++-- web/htdocs/hooks.py | 4 ++-- web/htdocs/lib.py | 34 ++++++++++++++++++++++++++++++++++ web/htdocs/metrics.py | 5 ++--- web/htdocs/modules.py | 6 ++++-- web/htdocs/notify.py | 4 ++-- web/htdocs/sidebar.py | 4 ++-- web/htdocs/userdb.py | 4 ++-- web/htdocs/views.py | 4 ++-- web/htdocs/visuals.py | 4 ++-- web/htdocs/wato.py | 4 ++-- web/htdocs/webapi.py | 4 ++-- 18 files changed, 79 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=56859e07c1…

8 years, 9 months

#2820 FIX winperf_phydisk: fixed invalid performance data for read/ write ios

by Andreas Boesl

Module: check_mk Branch: master Commit: b2d8b4674679d4f409d558c937218e0e7693bc54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2d8b4674679d4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 18 10:56:48 2015 +0100 #2820 FIX winperf_phydisk: fixed invalid performance data for read/write ios --- .werks/2820 | 9 +++++++++ ChangeLog | 1 + checks/winperf_phydisk | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/2820 b/.werks/2820 new file mode 100644 index 0000000..99ea525 --- /dev/null +++ b/.werks/2820 @@ -0,0 +1,9 @@ +Title: winperf_phydisk: fixed invalid performance data for read/write ios +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450432589 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4f336df..7d1c200 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 2813 FIX: agent_netapp: fixed missing environmental sensor information and exception with snapshot volumes... * 2818 FIX: check_mail_loop: now only deletes expected mails and not all mails matching a specific pattern... * 2819 FIX: netapp_api_if: now able to detect even more interfaces... + * 2820 FIX: winperf_phydisk: fixed invalid performance data for read/write ios Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index cca658b..91636e0 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -163,9 +163,9 @@ def check_winperf_phydisk(item, params, info): result[disk[1]] = { 'node' : disk[0], - 'read_ios' : disk[4], + 'read_ios' : get_rate("readios_" + disk_id, this_time, disk[4]), 'read_throughput' : get_rate("readtp_" + disk_id, this_time, disk[2]), - 'write_ios' : disk[5], + 'write_ios' : get_rate("writeios_" + disk_id, this_time, disk[5]), 'write_throughput' : get_rate("writetp_" + disk_id, this_time, disk[3]), } if frequency:

8 years, 9 months

#2896 FIX Improved handling of wrong encoded input strings

by Lars Michelsen

Module: check_mk Branch: master Commit: ad80249fc13e6da3f7dd6ce7c30555ffe1e1665b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad80249fc13e6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 18 09:58:11 2015 +0100 #2896 FIX Improved handling of wrong encoded input strings When a user submitted non UTF-8 encoded strings, for example latin-1 encoded ones, where we expect to get a UTF-8 encoded string, this resulted in a cryptic exception. This has been fixed now by raising an understandable error message in most places. --- .werks/2896 | 11 ++++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 4 ++-- web/htdocs/actions.py | 4 ++-- web/htdocs/bi.py | 12 +++++------ web/htdocs/htmllib.py | 11 +++++++++- web/htdocs/login.py | 4 ++-- web/htdocs/table.py | 2 +- web/htdocs/valuespec.py | 4 ++-- web/htdocs/visuals.py | 2 +- web/htdocs/wato.py | 36 ++++++++++++++++---------------- web/htdocs/watolib.py | 2 +- web/htdocs/weblib.py | 2 +- web/plugins/views/commands.py | 10 ++++----- web/plugins/visuals/bi.py | 8 +++---- web/plugins/visuals/filters.py | 2 +- web/plugins/visuals/inventory.py | 2 +- 17 files changed, 69 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ad80249fc1…

8 years, 9 months

#2879 WATO-Replication of MKPs and files in the local/ hierarchy

by Mathias Kettner

Module: check_mk Branch: master Commit: 51657a8b638c9b19a1449f500b779e9cc384a372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51657a8b638c9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 09:37:19 2015 +0100 #2879 WATO-Replication of MKPs and files in the local/ hierarchy Distributed WATO now offers a new checkbox Replicate extensions (MKPs and files in ~/local/) in the settings of a site. When you check this then all MKP extension packages and files below the <tt>~/local/</tt> filesystem on the site will be replicated to the slaves. Note: existing files and MKPs on the slave will be removed, so you have an exact replication. Extension replication is activated per default now if you create a new site connection. Your existing connections are not touched so this is a compatible change. Extension replication only works with CEE and CRE. Manual setups (<tt>./setup.sh</tt>) are not supported. --- .werks/2879 | 20 ++++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 18 +++++++++++++++++- web/htdocs/watolib.py | 9 +++++++++ web/plugins/wato/backup_domains.py | 10 +++++++++- 5 files changed, 56 insertions(+), 2 deletions(-) diff --git a/.werks/2879 b/.werks/2879 new file mode 100644 index 0000000..0b80a9b --- /dev/null +++ b/.werks/2879 @@ -0,0 +1,20 @@ +Title: WATO-Replication of MKPs and files in the local/ hierarchy +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1450427671 +Class: feature + +Distributed WATO now offers a new checkbox Replicate extensions (MKPs and +files in ~/local/) in the settings of a site. When you check this then +all MKP extension packages and files below the <tt>~/local/</tt> filesystem +on the site will be replicated to the slaves. Note: existing files and MKPs +on the slave will be removed, so you have an exact replication. + +Extension replication is activated per default now if you create a new +site connection. Your existing connections are not touched so this is a +compatible change. + +Extension replication only works with CEE and CRE. Manual setups +(<tt>./setup.sh</tt>) are not supported. diff --git a/ChangeLog b/ChangeLog index 63824c2..7e4b3ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -200,6 +200,7 @@ * 1302 Added new WATO permission to deactivate the function rename of hosts... * 1311 netapp_api_volumes: Added option to configure inode levels in wato * 2878 Rework of host search in WATO - allow all bulk operations on search results... + * 2879 WATO-Replication of MKPs and files in the local/ hierarchy... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6cc74b7..5c2c731 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8699,6 +8699,8 @@ def mode_sites(phase): repl = _("Slave") if site.get("replicate_ec"): repl += ", " + _("EC") + if site.get("replicate_mkps") and defaults.omd_root: + repl += ", " + _("MKPs") else: repl = "" table.cell(_("Replication"), repl) @@ -8798,7 +8800,10 @@ def mode_edit_site(phase): if cloneid: site = sites[cloneid] elif new: - site = {} + if defaults.omd_root: + site = { "replicate_mkps" : True } + else: + site = { } else: site = sites.get(siteid, {}) @@ -9006,6 +9011,10 @@ def mode_edit_site(phase): # Event Console Replication new_site["replicate_ec"] = html.get_checkbox("replicate_ec") + # MKPs and ~/local/ + if defaults.omd_root: + new_site["replicate_mkps"] = html.get_checkbox("replicate_mkps") + # Secret is not checked here, just kept if not new and "secret" in old_site: new_site["secret"] = old_site["secret"] @@ -9175,6 +9184,13 @@ def mode_edit_site(phase): "as need sync. A synchronization will automatically reload the Event Console of " "the remote site.")) + if defaults.omd_root: + forms.section(_("Extensions"), simple=True) + html.checkbox("replicate_mkps", site.get("replicate_mkps", False), label = _("Replicate extensions (MKPs and files in <tt>~/local/</tt>)")) + html.help(_("If you enable the replication of MKPs then during each Activate Changes MKPs " + "that are installed on your master site and all other files below the <tt>~/local/</tt> " + "directory will be also transferred to the " + "slave site. Note: all other MKPs and files below <tt>~/local/</tt> on the slave will be removed.")) forms.end() html.button("save", _("Save")) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3c5afe2..e0fafa4 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -64,6 +64,11 @@ def initialize_before_loading_plugins(): # know. ( "dir", "usersettings", defaults.var_dir + "/web" ), ] + if defaults.omd_root: + replication_paths += [ + ( "dir", "mkps", defaults.var_dir + "/packages" ), + ( "dir", "local", defaults.omd_root + "/local" ), + ] # Directories and files for backup & restore global backup_paths @@ -3186,6 +3191,10 @@ def create_sync_snapshot(site_id): if not config.sites[site_id].get("replicate_ec"): paths = [ e for e in paths if e[1] != "mkeventd" ] + # Remove extensions if site does not want them + if not config.sites[site_id].get("replicate_mkps"): + paths = [ e for e in paths if e[1] not in [ "local", "mkps" ] ] + multitar.create(tmp_path, paths) shutil.rmtree(site_tmp_dir) os.rename(tmp_path, path) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index 8822ab5..1948883 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -218,7 +218,15 @@ else: ], "default" : True }, - + "extensions" : { + "title" : _("Extensions in <tt>~/local/</tt> and MKPs"), + "prefix" : defaults.omd_root, + "paths" : [ + ("dir", "var/check_mk/packages" ), + ("dir", "local" ), + ], + "default" : True, + }, "dokuwiki": { "title" : _("Doku Wiki Pages and Settings"), "prefix" : defaults.omd_root,

8 years, 9 months

Add missing new RRD directory to WATO backup

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ab8a6fd08166d3929b89425a72b8f03eb753205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ab8a6fd08166d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 09:18:16 2015 +0100 Add missing new RRD directory to WATO backup --- web/plugins/wato/backup_domains.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index bbaeb2e..8822ab5 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -192,6 +192,7 @@ else: "paths" : [ ("dir", "var/pnp4nagios/perfdata"), ("dir", "var/rrdcached"), + ("dir", "var/check_mk/rrd"), ], "pre_restore" : lambda: performancedata_restore(pre_restore = True), "post_restore" : lambda: performancedata_restore(pre_restore = False),

8 years, 9 months

Updated bug entries #2416

by Mathias Kettner

Module: check_mk Branch: master Commit: bb29488e4bbd18dbde44af9ab0514665c029aa67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb29488e4bbd18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 09:17:46 2015 +0100 Updated bug entries #2416 --- .bugs/2416 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2416 b/.bugs/2416 new file mode 100644 index 0000000..8c29dec --- /dev/null +++ b/.bugs/2416 @@ -0,0 +1,9 @@ +Title: Move SNMP MIBs to var/check_mk/mibs +Component: wato +State: open +Date: 2015-12-18 09:08:17 +Targetversion: future +Class: bug + +Currently they are in local/. This is inconsistent. And this leads to a conflict +in the backup module that now has a section for local/ as a whole.

8 years, 9 months

fixed comment

by Andreas Boesl

Module: check_mk Branch: master Commit: a303a7d27a236dbd3172c64672381b3f12ca6d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a303a7d27a236d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 17 17:55:30 2015 +0100 fixed comment --- doc/treasures/active_checks/check_mail_loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index acf8936..8d4ba58 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -51,7 +51,7 @@ OPTIONS: (leave empty for anonymous SMTP) --smtp-password PW Password to authenticate SMTP --smtp-tls Use TLS over SMTP (disabled by default) - --imap-tls Use TLS for IMAP authentification (disabled by default) + --imap-tls Use TLS for IMAP authentification (disabled by default) --fetch-protocol PROTO Set to "IMAP" or "POP3", depending on your mailserver (defaults to IMAP)

8 years, 9 months

New automation for removing unpackaged files

by Mathias Kettner

Module: check_mk Branch: master Commit: dbd98b91ec123d7f89c2290fa8864bf5f11a5d14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbd98b91ec123d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 16:16:43 2015 +0100 New automation for removing unpackaged files --- modules/automation.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/automation.py b/modules/automation.py index 4cca757..8622454 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -58,6 +58,8 @@ def do_automation(cmd, args): result = automation_remove_or_release_package(args, "remove") elif cmd == "release-package": result = automation_remove_or_release_package(args, "release") + elif cmd == "remove-unpackaged-file": + result = automation_remove_unpackaged_file(args) elif cmd == "notification-get-bulks": result = automation_get_bulks(args) else: @@ -1361,3 +1363,21 @@ def automation_remove_or_release_package(args, mode): remove_package(package) else: remove_package_info(package_name) + + +def automation_remove_unpackaged_file(args): + load_module("packaging") + part_name = args[0] + if part_name not in [ p[0] for p in package_parts ]: + raise MKAutomationError("Invalid package part") + + rel_path = args[1] + if "../" in rel_path or rel_path.startswith("/"): + raise MKAutomationError("Invalid file name") + + for part, title, perm, dir in package_parts: + if part == part_name: + abspath = dir + "/" + rel_path + if not os.path.isfile(abspath): + raise MKAutomationError("No such file") + os.remove(abspath)

8 years, 9 months

Fixed vertical size of DualListChoice in Filters

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a72232a8eea51ed596c381e3dda71671cd10039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a72232a8eea51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 17 15:52:43 2015 +0100 Fixed vertical size of DualListChoice in Filters --- web/plugins/visuals/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 9cb6aeb..722f98d 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -247,7 +247,7 @@ class FilterMultigroup(Filter): return True def valuespec(self): - return DualListChoice(choices = all_groups(self.what), autoheight=False, enlarge_active=True) + return DualListChoice(choices = all_groups(self.what), rows=4, autoheight=False, enlarge_active=True) def selection(self): current = html.var(self.htmlvar, "").strip().split("|")

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015