Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Refactored some rulespecs to new mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 147b68785c7fd2b669753e8deed7bca14287615a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=147b68785c7fd2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 08:02:54 2019 +0100 Refactored some rulespecs to new mechanism CMK-1572 Change-Id: I82bc4e8c7f715ef4a8df5f0dc9b5f67e515bf57a --- .../wato/check_parameters/acme_certificates.py | 52 ++++-- .../plugins/wato/check_parameters/acme_sbc_snmp.py | 54 ++++-- .../wato/check_parameters/ad_replication.py | 50 ++++-- cmk/gui/plugins/wato/check_parameters/adva_ifs.py | 70 +++++--- cmk/gui/plugins/wato/check_parameters/airflow.py | 92 ++++++---- .../wato/check_parameters/airflow_deviation.py | 46 +++-- .../wato/check_parameters/antivir_update_age.py | 34 ++-- .../plugins/wato/check_parameters/apache_status.py | 77 +++++--- .../wato/check_parameters/apc_ats_output.py | 103 ++++++----- cmk/gui/plugins/wato/check_parameters/apc_power.py | 65 ++++--- .../plugins/wato/check_parameters/apc_symentra.py | 193 +++++++++++---------- .../wato/check_parameters/apc_system_events.py | 44 +++-- cmk/gui/plugins/wato/check_parameters/apt.py | 56 +++--- .../wato/check_parameters/asa_svc_sessions.py | 51 ++++-- .../plugins/wato/check_parameters/asm_diskgroup.py | 77 +++++--- .../wato/check_parameters/backup_timemachine.py | 49 ++++-- .../plugins/wato/check_parameters/blank_tapes.py | 37 ++-- .../check_parameters/bluecat_command_server.py | 81 +++++---- .../wato/check_parameters/threepar_remotecopy.py | 95 ++++++---- 19 files changed, 842 insertions(+), 484 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=147b68785c…

5 years, 8 months

Refactored remaining old style snapins to SidebarSnapin

by Lars Michelsen

Module: check_mk Branch: master Commit: af719c37b7963831c249deb30f5e14964ab09224 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af719c37b79638… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 20:17:04 2019 +0100 Refactored remaining old style snapins to SidebarSnapin Change-Id: I3c4c852a33db241b856fc6f44eade1b477986ed6 --- cmk/gui/plugins/sidebar/__init__.py | 1 - cmk/gui/plugins/sidebar/bi.py | 156 +++++++-------- cmk/gui/plugins/sidebar/mkeventd.py | 168 ++++++++-------- cmk/gui/plugins/sidebar/utils.py | 1 - cmk/gui/plugins/sidebar/wato.py | 299 ++++++++++++++++------------- cmk/gui/sidebar.py | 9 +- doc/treasures/sidebar_tactical_overview.py | 31 --- omd/packages/cma/webconf_snapin.py | 63 ++++-- 8 files changed, 379 insertions(+), 349 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=af719c37b7…

5 years, 8 months

Refactored LDAP user sync plugins to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d6ec28b8b1dc7a81ef937585501a599711a6ecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d6ec28b8b1dc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 26 21:49:03 2019 +0100 Refactored LDAP user sync plugins to plugin registry * Clarified plugin API * Reduced special cases * Fixed localization of plugin titles / help texts * Added tests for plugin registration * Added no migration code for legacy plugins. A warning will be shown when legacy plugins are found. You will have to migrate them after update to 1.6 CMK-1572 Change-Id: I5dc54a112a2a1843b6dd27c851a8011c2d8d7136 --- cmk/gui/plugins/userdb/ldap_connector.py | 1139 +++++++++++++--------- cmk/gui/plugins/wato/utils/__init__.py | 3 - cmk/gui/userdb.py | 8 +- cmk/gui/wato/pages/ldap.py | 4 +- tests/unit/cmk/gui/test_userdb.py | 55 ++ tests/unit/cmk/gui/test_userdb_ldap_connector.py | 129 ++- 6 files changed, 810 insertions(+), 528 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d6ec28b8b…

5 years, 8 months

Fixed various unlocalizable _() calls on module level

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e3de8d9a7e46112ccf15005f60f7f9040368df4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e3de8d9a7e461… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 25 07:01:23 2019 +0100 Fixed various unlocalizable _() calls on module level Change-Id: Iec8af2254b6544171fba3f19e92a4bdca4d260d1 --- cmk/gui/availability.py | 110 +++++++++++---------- cmk/gui/bi.py | 36 +++---- cmk/gui/mkeventd.py | 6 +- cmk/gui/notify.py | 26 ++--- cmk/gui/plugins/views/inventory.py | 43 +++++---- cmk/gui/userdb.py | 5 +- cmk/gui/wato/__init__.py | 5 +- cmk/gui/wato/mkeventd.py | 192 +++++++++++++++++++------------------ cmk/gui/wato/pages/host_rename.py | 5 +- cmk/gui/wato/pages/parentscan.py | 5 +- cmk/gui/wato/pages/services.py | 6 +- cmk/gui/watolib/bulk_discovery.py | 5 +- 12 files changed, 233 insertions(+), 211 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8e3de8d9a7…

5 years, 8 months

7077 FIX omd create: Only use --admin-password when it has an actual value

by Lars Michelsen

Module: check_mk Branch: master Commit: 11e589b56ba2f9a5d6d7144f07663a42301c3854 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e589b56ba2f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 23:32:25 2019 +0100 7077 FIX omd create: Only use --admin-password when it has an actual value Change-Id: Icf075de434ef879b5420a9d21d66f868acbfde89 --- .werks/7077 | 10 ++++++++++ omd/packages/omd/omdlib/main.py | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7077 b/.werks/7077 new file mode 100644 index 0000000..efcadfc --- /dev/null +++ b/.werks/7077 @@ -0,0 +1,10 @@ +Title: omd create: Only use --admin-password when it has an actual value +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548714687 +Class: fix + + diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index 62dde00..b96e6bb 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -710,7 +710,9 @@ def create_version_symlink(site, version): def calculate_admin_password(options): - return options.get("admin-password", random_password()) + if options.get("admin-password"): + return options["admin-password"] + return random_password() def set_admin_password(site, pw):

5 years, 8 months

7078 FIX Docker container: Don' t print missleading initial password with CMK_PASSWORD

by Lars Michelsen

Module: check_mk Branch: master Commit: 4404711fb4a3d916dd798e20527a26cd9824600a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4404711fb4a3d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 23:42:07 2019 +0100 7078 FIX Docker container: Don't print missleading initial password with CMK_PASSWORD When using the environment option CMK_PASSWORD to set an initial password, the previous docker containers showed the default "welcome message" after site creation with a random initial password. The initial password was set afterwards leaving the missleading password in the log. The initial password is now set during site creation which makes the output don't show the wrong password anymore. Change-Id: I747cca73798b2ac052815440e96e686eb71ad434 --- .werks/7078 | 16 ++++++++++++++++ docker/docker-entrypoint.sh | 7 +------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/7078 b/.werks/7078 new file mode 100644 index 0000000..f6c297c --- /dev/null +++ b/.werks/7078 @@ -0,0 +1,16 @@ +Title: Docker container: Don't print missleading initial password with CMK_PASSWORD +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548715130 +Class: fix + +When using the environment option CMK_PASSWORD to set an initial password, +the previous docker containers showed the default "welcome message" after +site creation with a random initial password. The initial password was set +afterwards leaving the missleading password in the log. + +The initial password is now set during site creation which makes the output +don't show the wrong password anymore. diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 985a2ee..b17e7fa 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -34,18 +34,13 @@ fi # site tmpfs below tmp. if [ ! -d "/opt/omd/sites/$CMK_SITE_ID/etc" ] ; then echo "### CREATING SITE '$CMK_SITE_ID'" - omd create --no-tmpfs -u 1000 -g 1000 "$CMK_SITE_ID" + omd create --no-tmpfs -u 1000 -g 1000 --admin-password "$CMK_PASSWORD" "$CMK_SITE_ID" omd config "$CMK_SITE_ID" set APACHE_TCP_ADDR 0.0.0.0 omd config "$CMK_SITE_ID" set APACHE_TCP_PORT 5000 if [ "$CMK_LIVESTATUS_TCP" = "on" ]; then omd config "$CMK_SITE_ID" set LIVESTATUS_TCP on fi - - if [ -n "$CMK_PASSWORD" ]; then - echo "### SETTING PASSWORD OF 'cmkadmin'" - htpasswd -b -m "/omd/sites/$CMK_SITE_ID/etc/htpasswd" cmkadmin "$CMK_PASSWORD" - fi fi # In case of an update (see update procedure docs) the container is started

5 years, 8 months

Add support for pre-created site directory with tmpfs

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dfb88f2b1a86c94254481f60f062275939f74b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dfb88f2b1a86c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 23:24:44 2019 +0100 Add support for pre-created site directory with tmpfs In dockerized environments the tmpfs may be managed by docker using the --tmpfs option). In this case the site directory created as parent of the tmp directory to mount the tmpfs container initialization. Detect this situation and don't treat the site as existing in that case. Change-Id: Iaef722a67e385fd7c42d34e49c17c679a0dc8970 --- docker/docker-entrypoint.sh | 6 +++++- omd/packages/omd/omdlib/main.py | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index d334c62..985a2ee 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -28,7 +28,11 @@ if [ ! -z "$MAIL_RELAY_HOST" ]; then fi # Create the site in case it does not exist -if [ ! -d "/opt/omd/sites/$CMK_SITE_ID" ] ; then +# +# Check for a file in the directory because the directory itself might have +# been pre-created by docker when the --tmpfs option is used to create a +# site tmpfs below tmp. +if [ ! -d "/opt/omd/sites/$CMK_SITE_ID/etc" ] ; then echo "### CREATING SITE '$CMK_SITE_ID'" omd create --no-tmpfs -u 1000 -g 1000 "$CMK_SITE_ID" omd config "$CMK_SITE_ID" set APACHE_TCP_ADDR 0.0.0.0 diff --git a/omd/packages/omd/omdlib/main.py b/omd/packages/omd/omdlib/main.py index e5bc7ae..62dde00 100644 --- a/omd/packages/omd/omdlib/main.py +++ b/omd/packages/omd/omdlib/main.py @@ -2868,7 +2868,11 @@ def main_rm(site, args, options=None): def create_site_dir(site): - os.makedirs(site.dir) + try: + os.makedirs(site.dir) + except OSError as e: + if e.errno != errno.EEXIST: + raise os.chown(site.dir, user_id(site.name), group_id(site.name)) @@ -4217,6 +4221,18 @@ class SiteContext(AbstractSiteContext): return config def exists(self): + # In dockerized environments the tmpfs may be managed by docker (when + # using the --tmpfs option). In this case the site directory is + # created as parent of the tmp directory to mount the tmpfs during + # container initialization. Detect this situation and don't treat the + # site as existing in that case. + if is_dockerized(): + if not os.path.exists(self.dir): + return False + if os.listdir(self.dir) == ["tmp"]: + return False + return True + return os.path.exists(self.dir) def is_empty(self):

5 years, 8 months

Exclude mk_jolokia.pyc from permission test

by Lars Michelsen

Module: check_mk Branch: master Commit: c053f474169b90b5209f5e22a9019559b0df855d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c053f474169b90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 20:31:59 2019 +0100 Exclude mk_jolokia.pyc from permission test Change-Id: Ic79f72bda342147e3bb35dd489a3465aad5ba868 --- tests/git/test_permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 591009d..895e39c 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -20,7 +20,7 @@ permissions = [ ('agents/special/agent_*', is_executable, []), ('agents/special/lib/*', is_not_executable, []), ('agents/check_mk_agent.*', is_executable, ['check_mk_agent.spec']), - ('agents/plugins/*', is_executable, ['README', 'mk_filestats.pyc']), + ('agents/plugins/*', is_executable, ['README', 'mk_filestats.pyc', 'mk_jolokia.pyc']), ('checks/*', is_not_executable, []), ('checkman/*', is_not_executable, []), ('inventory/*', is_not_executable, []),

5 years, 8 months

aws_s3_summary: Add performance data for bucket size and number of objects

by Simon Betz

Module: check_mk Branch: master Commit: 76da94fb88089ac2cce984cf3c314507c1de7c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76da94fb88089a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 28 18:38:16 2019 +0100 aws_s3_summary: Add performance data for bucket size and number of objects Change-Id: I807b5540d1a5e508b7c747ece966555b658a2f70 --- checks/aws_s3_summary | 5 +++-- cmk/gui/plugins/metrics/check_mk.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/checks/aws_s3_summary b/checks/aws_s3_summary index 93c5d8a..330f1b9 100644 --- a/checks/aws_s3_summary +++ b/checks/aws_s3_summary @@ -104,8 +104,8 @@ def check_aws_s3_summary_objects(item, params, metrics): if size >= largest_size: largest = row['Key'] largest_size = size - yield 0, 'Bucket size: %s' % get_bytes_human_readable(sum_size) - yield 0, 'Number of objects: %s' % num_objects + yield 0, 'Bucket size: %s' % get_bytes_human_readable(sum_size), [('bucket_size', sum_size)] + yield 0, 'Number of objects: %s' % num_objects, [('num_objects', num_objects)] if largest: yield 0, 'Largest object: %s, %s' % (largest, get_bytes_human_readable(largest_size)) @@ -114,4 +114,5 @@ check_info['aws_s3_summary.objects'] = { 'inventory_function': discover(), 'check_function': check_aws_s3_summary_objects, 'service_description': 'AWS/S3 Objects %s', + 'has_perfdata': True, } diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 725a28c..25577d6 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4782,6 +4782,36 @@ metric_info['aws_costs_unblended'] = { 'color': '11/a', } +metric_info['num_objects'] = { + 'title': _('Numer of objects'), + 'unit': 'count', + 'color': '21/a', +} + +metric_info['bucket_size'] = { + 'title': _('Bucket size'), + 'unit': 'bytes', + 'color': '15/a', +} + +metric_info['surge_queue_length'] = { + 'title': _('Surge queue length'), + 'unit': 'count', + 'color': '12/a', +} + +metric_info['spillover'] = { + 'title': _('Spillover'), + 'unit': 'count', + 'color': '13/a', +} + +metric_info['backend_connection_errors'] = { + 'title': _('Backend connection errors'), + 'unit': '1/s', + 'color': '15/a', +} + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ |

5 years, 8 months

fix werk text

by Moritz Kiemer

Module: check_mk Branch: master Commit: 41c5abce984d9bb83b5568389370b143f12dfedb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c5abce984d9b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jan 28 11:45:27 2019 +0100 fix werk text Change-Id: Ib287887702c293bac1b3c711c1ae660ea55847f1 --- .werks/7131 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/7131 b/.werks/7131 index eec885d..988537a 100644 --- a/.werks/7131 +++ b/.werks/7131 @@ -1,4 +1,4 @@ -Title: win.mem: Fix incorrect representation of absolute memory levels in graphs +Title: mem.win: Fix incorrect representation of absolute memory levels in graphs Level: 1 Component: checks Compatible: compat

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019