Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

Fixed configuring synchronous SMTP mail notifications after GUI modularization

by Lars Michelsen

Module: check_mk Branch: master Commit: e06718d784d6f211fda115dca28441c9fa464f56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e06718d784d6f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 24 20:00:52 2018 +0200 Fixed configuring synchronous SMTP mail notifications after GUI modularization Change-Id: I2bc2c8896edfcb219b64a773b8fbe5465957f2f5 --- cmk/gui/plugins/wato/notifications.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/notifications.py b/cmk/gui/plugins/wato/notifications.py index d5f39fa..b014aa8 100644 --- a/cmk/gui/plugins/wato/notifications.py +++ b/cmk/gui/plugins/wato/notifications.py @@ -26,6 +26,7 @@ import socket +import cmk import cmk.gui.mkeventd as mkeventd import cmk.gui.config as config from cmk.gui.valuespec import * @@ -182,10 +183,10 @@ def html_email_parameter_elements(): ), ] - try: - return elements + cee_html_mail_smtp_sync_option - except NameError: - return elements + if not cmk.is_raw_edition(): + elements += cmk.gui.cee.plugins.wato.syncsmtp.cee_html_mail_smtp_sync_option + + return elements register_notification_parameters(

5 years, 10 months

Cleaned up several function level imports

by Lars Michelsen

Module: check_mk Branch: master Commit: 441b41cde174d1594383d4b7c0ffad9e6fb542a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=441b41cde174d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 15 21:40:37 2018 +0200 Cleaned up several function level imports Change-Id: I5a5c13f5861caf1ad762768c3a521edfb52b3aa6 --- cmk/gui/background_job.py | 2 +- cmk/gui/crash_reporting.py | 2 +- cmk/gui/dashboard.py | 2 +- cmk/gui/gui_background_job.py | 2 +- cmk/gui/hooks.py | 4 ++-- cmk/gui/inventory.py | 13 +++---------- cmk/gui/multitar.py | 2 +- cmk/gui/plugins/userdb/htpasswd.py | 2 +- cmk/gui/plugins/wato/check_mk_configuration.py | 3 +-- cmk/gui/plugins/webapi/webapi.py | 2 +- cmk/gui/sidebar.py | 2 +- cmk/gui/userdb.py | 2 +- cmk/gui/utils.py | 4 ++-- cmk/gui/wato/__init__.py | 2 +- cmk/gui/wato/pages/analyze_configuration.py | 2 +- cmk/gui/watolib.py | 8 ++++---- 16 files changed, 23 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=441b41cde1…

5 years, 10 months

Replaced more simplejson imports with json module

by Lars Michelsen

Module: check_mk Branch: master Commit: 1b4869522ce5a2702f29a5b1736307ae414825cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b4869522ce5a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 15 21:57:09 2018 +0200 Replaced more simplejson imports with json module Change-Id: Idda1ddcaf9d7efc7064ce6048a608a90f6ed4954 --- bin/mkbackup | 6 +----- checks/ceph_status | 5 +---- checks/mkbackup | 5 +---- checks/mkeventd_status | 5 +---- checks/salesforce_instances | 5 +---- cmk/crash_reporting.py | 6 +----- notifications/mail | 6 +----- tests/testlib/__init__.py | 6 +----- 8 files changed, 8 insertions(+), 36 deletions(-) diff --git a/bin/mkbackup b/bin/mkbackup index f461c6f..b9b6f26 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -49,6 +49,7 @@ import textwrap import time import threading import traceback +import json from tarfile import TarFile, ReadError from hashlib import md5 @@ -57,11 +58,6 @@ from Cryptodome.Cipher import AES, PKCS1_OAEP from Cryptodome.PublicKey import RSA import Cryptodome.Util.number -try: - import simplejson as json -except ImportError: - import json - import cmk.daemon as daemon import cmk.render as render import cmk.schedule as schedule diff --git a/checks/ceph_status b/checks/ceph_status index a2948ae..85caa18 100644 --- a/checks/ceph_status +++ b/checks/ceph_status @@ -26,10 +26,7 @@ def parse_ceph_status(info): - try: - import json - except: - import simplejson as json + import json parsed = "" for line in info: diff --git a/checks/mkbackup b/checks/mkbackup index 3f1da6d..5726a4f 100644 --- a/checks/mkbackup +++ b/checks/mkbackup @@ -53,10 +53,7 @@ # TODO: Refactor this. def parse_mkbackup(info): - try: - import simplejson as json - except ImportError: - import json + import json parsed = {} diff --git a/checks/mkeventd_status b/checks/mkeventd_status index 4b32955..0b69e2e 100644 --- a/checks/mkeventd_status +++ b/checks/mkeventd_status @@ -31,10 +31,7 @@ def parse_mkeventd_status(info): - try: - import simplejson as json - except ImportError: - import json + import json parsed, site = {}, None for line in info: diff --git a/checks/salesforce_instances b/checks/salesforce_instances index 7a08bfa..8cb5578 100644 --- a/checks/salesforce_instances +++ b/checks/salesforce_instances @@ -26,10 +26,7 @@ def parse_salesforce(info): - try: - import simplejson as json - except ImportError: - import json + import json pre_parsed = [] for line in info: diff --git a/cmk/crash_reporting.py b/cmk/crash_reporting.py index 414ec73..57e5436 100644 --- a/cmk/crash_reporting.py +++ b/cmk/crash_reporting.py @@ -36,11 +36,7 @@ import sys import time import traceback import subprocess - -try: - import simplejson as json -except ImportError: - import json +import json import cmk diff --git a/notifications/mail b/notifications/mail index 7657f6b..c66d0dc 100755 --- a/notifications/mail +++ b/notifications/mail @@ -43,16 +43,12 @@ import subprocess import sys import urllib import urllib2 +import json from email.mime.application import MIMEApplication from email.mime.image import MIMEImage from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -try: - from simplejson import json -except ImportError: - import json - def tmpl_head_html(html_section): return ''' <html> diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 55c88f4..42a1dd3 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -18,6 +18,7 @@ import lockfile import ast import abc import urllib3 +import json from urlparse import urlparse from bs4 import BeautifulSoup @@ -25,11 +26,6 @@ from bs4 import BeautifulSoup # Disable insecure requests warning message during SSL testing urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) -try: - import simplejson as json -except ImportError: - import json - def repo_path(): return os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))

5 years, 10 months

Fix import loop: Move mkeventd stuff from plugin to internal

by Lars Michelsen

Module: check_mk Branch: master Commit: 31fca44dfa2236194b0f0410bb4a2e42f4ec465d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31fca44dfa2236… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 10:43:18 2018 +0200 Fix import loop: Move mkeventd stuff from plugin to internal Change-Id: I98826d754ba3dc68cd2f78bdc6db041779361abf --- cmk/gui/sidebar.py | 3 +- cmk/gui/wato/__init__.py | 14 ++--- cmk/gui/{plugins => }/wato/mkeventd.py | 98 +++++++++++++++++----------------- cmk/gui/wato/pages/timeperiods.py | 3 +- 4 files changed, 60 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=31fca44dfa…

5 years, 10 months

6455 FIX LDAP: Multiple sync processes could be running at the same time

by Lars Michelsen

Module: check_mk Branch: master Commit: 30e3490696407a6f222b47a60556e06273beeac7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30e3490696407a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 27 22:17:51 2018 +0200 6455 FIX LDAP: Multiple sync processes could be running at the same time Since 1.5.0b2 (#5986) the user synchronization is executed as background job. Because of a broken locking the sync could be executed multiple times in parallel. This issue did not lead to corrupted data, there were multiple jobs running in parallel overwriting each others results. Change-Id: I3c38897ec82b4878ac55ec4a426cfa60cbd7faf6 --- .werks/6455 | 14 ++++++++++++++ cmk/gui/userdb.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6455 b/.werks/6455 new file mode 100644 index 0000000..b27956e --- /dev/null +++ b/.werks/6455 @@ -0,0 +1,14 @@ +Title: LDAP: Multiple sync processes could be running at the same time +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535400789 + +Since 1.5.0b2 (#5986) the user synchronization is executed as background +job. Because of a broken locking the sync could be executed multiple times +in parallel. This issue did not lead to corrupted data, there were multiple +jobs running in parallel overwriting each others results. diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index f1850fe..5d48d99 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1247,7 +1247,8 @@ def execute_userdb_job(): job = UserSyncBackgroundJob() if job.is_running(): - logger.debug("Another synchronization job is already running") + logger.debug("Another synchronization job is already running: Skipping this sync") + return job.set_function(job.do_sync, add_to_changelog=False, enforce_sync=False) job.start()

5 years, 10 months

Improved error handling when clicking on "Sync users" multiple times

by Lars Michelsen

Module: check_mk Branch: master Commit: b12f1d7e1edf4d9ce6dde59ae07552c991849b9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b12f1d7e1edf4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 08:41:40 2018 +0200 Improved error handling when clicking on "Sync users" multiple times Change-Id: I98133fccc0eaf8f34da6c22d2e0b93df9f3aa8bc --- cmk/gui/wato/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index f399c8c..8f03251 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -8858,9 +8858,8 @@ class ModeUsers(WatoMode): elif c == False: return "" - elif html.var('_sync'): + elif html.var('_sync') and html.check_transaction(): try: - html.check_transaction() job = userdb.UserSyncBackgroundJob() if job.is_running():

5 years, 10 months

Refactoring: Use standard toggle renderer for view checkbox enable/ disable button

by Lars Michelsen

Module: check_mk Branch: master Commit: aa1972d94cea014cbb2c342437714f12c1686260 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1972d94cea01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 27 18:51:47 2018 +0200 Refactoring: Use standard toggle renderer for view checkbox enable/disable button Change-Id: I2b59b701d2b42bd0dc03b6064c81cc66bfa2e005 --- cmk/gui/views.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 09ab6cf..ff6b89d 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1390,15 +1390,6 @@ def view_optiondial(view, option, choices, help): def view_optiondial_off(option): html.div('', class_=["optiondial", "off", option]) -# FIXME: Consolidate with html.toggle_button() rendering functions -# TODO: Replace hard coded icon path with dynamic path to old or new theme -def toggler(id, icon, help, onclick, value, hidden = False): - html.begin_context_buttons() # just to be sure - hide = ' style="display:none"' if hidden else '' - html.write('<div id="%s_on" title="%s" class="togglebutton %s %s" %s>' - '<a href="javascript:void(0)" onclick="%s"><img src="images/icon_%s.png"></a></div>' % ( - id, help, icon, value and "down" or "up", hide, onclick, icon)) - # Will be called when the user presses the upper button, in order # to persist the new setting - and to make it active before the @@ -1457,9 +1448,14 @@ def show_context_links(thisview, datasource, show_filters, selection_enabled = enable_checkboxes if enable_commands else thisview.get('force_checkboxes') if not thisview.get("force_checkboxes"): - toggler("checkbox", "checkbox", _("Enable/Disable checkboxes for selecting rows for commands"), - "location.href='%s';" % html.makeuri([('show_checkboxes', show_checkboxes and '0' or '1')]), - show_checkboxes, hidden = True) # not selection_enabled) + html.toggle_button( + id="checkbox", + icon="checkbox", + help=_("Enable/Disable checkboxes for selecting rows for commands"), + onclick="location.href='%s';" % html.makeuri([('show_checkboxes', show_checkboxes and '0' or '1')]), + isopen=show_checkboxes, + hidden=True, + ) html.toggle_button("checkbox", False, "checkbox", "", hidden=not thisview.get("force_checkboxes"), disabled=True) html.javascript('g_selection_enabled = %s;' % ('true' if selection_enabled else 'false'))

5 years, 10 months

change lnx_service to systemd_units.service

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7f437dfec07c231f2b9cf513ec48c5bc218d0776 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f437dfec07c23… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Aug 27 10:55:33 2018 +0200 change lnx_service to systemd_units.service Change-Id: I1b55955d7a32a5e4d7a0d88af0311efb482098ee --- .werks/6213 | 2 +- agents/check_mk_agent.linux | 6 +- checkman/{lnx_services => systemd_units.services} | 2 +- ...ices.summary => systemd_units.services_summary} | 2 +- checks/systemd_units | 86 ++++++++++++++++++ checks/{lnx_services => systemd_units.services} | 100 +++++++-------------- cmk/gui/plugins/wato/check_parameters.py | 8 +- ...n.py => systemd_units_services_1_regression.py} | 35 ++++---- 8 files changed, 147 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7f437dfec0…

5 years, 10 months

Fixed werk searching in master branch since dc9c7af705b

by Lars Michelsen

Module: check_mk Branch: master Commit: 114c5f82f9bd4f82bd057ab9d3d2e951e6d44b48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=114c5f82f9bd4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 27 17:34:36 2018 +0200 Fixed werk searching in master branch since dc9c7af705b Change-Id: I2b392240741d9b37dfb1edc4efb84c25c550939a --- cmk/gui/werks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index bf1bf1e..9e1de58 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -215,9 +215,10 @@ def werk_table_option_entries(): ), ( "id", "single", - Integer( + TextAscii( title = _("Werk ID"), label = "#", + regex = "[0-9]{4}", allow_empty = True, size = 4, ),

5 years, 10 months

6290 FIX Werk list can be limited by number of groups (default: 20 versions)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0acd2856fd875a50ee5541e9ec7f768c5e33c6a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0acd2856fd875a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 16 13:30:35 2018 +0200 6290 FIX Werk list can be limited by number of groups (default: 20 versions) To prevent a too long loading page by default the number of werks shown on the werk list (release notes) page can now bw limited by the number of groups to be shown. By default the grouping is done by version and limited to 20 versions now. Change-Id: I3170548359502b19c437ec69522a8b8cf2f68ba9 --- .werks/6290 | 16 ++++++++++++++++ cmk/gui/werks.py | 15 ++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.werks/6290 b/.werks/6290 new file mode 100644 index 0000000..6cb0634 --- /dev/null +++ b/.werks/6290 @@ -0,0 +1,16 @@ +Title: Limit the output of the werk list to the number of groups +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1534418929 + +To circumvent a long loading time the number of werks on the werk list (release +notes) page is now limited to the number of groups to be shown. By default the +grouping is done by version and limited to 20 versions. + +You can change the grouping and limit options using the "Searching & Filtering" +form when viewing the page. diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py index cd7c5e5..19cadfe 100644 --- a/cmk/gui/werks.py +++ b/cmk/gui/werks.py @@ -293,6 +293,15 @@ def werk_table_option_entries(): ), "version", ), + ( "group_limit", + "single", + Integer( + title = _("Show number of groups"), + unit = _("groups"), + minvalue = 1, + ), + 20, + ), ] @@ -321,7 +330,7 @@ def render_werks_table(): werk_table_options = default_werk_table_options() werk_table_options["compatibility"] = [ "incomp_unack" ] - current_group = False + current_group, number_of_groups = False, 0 def begin_group(title): table.begin(title=title, limit=None, searchable = False, sortable = False, css="werks") @@ -337,6 +346,10 @@ def render_werks_table(): if werk_matches_options(werk, werk_table_options): group = werk_group_value(werk, werk_table_options["grouping"]) if group != current_group: + if number_of_groups >= werk_table_options["group_limit"]: + break + number_of_groups += 1 + if current_group != False: table.end() begin_group(group)

5 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018