[ambari] branch trunk updated: AMBARI-24662. Log Search: Ldap default fixes.
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new a06742b AMBARI-24662. Log Search: Ldap default fixes.
a06742b is described below
commit a06742b217874289de907f845266c4d63d7f2f81
Author: Oliver Szabo
AuthorDate: Fri Sep 21 00:20:57 2018 +0200
AMBARI-24662. Log Search: Ldap default fixes.
---
.../apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
index 6e633b4..5218062 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
@@ -28,7 +28,7 @@ import static
org.apache.ambari.logsearch.common.LogSearchConstants.LOGSEARCH_PR
@Configuration
public class LogSearchLdapAuthConfig {
- @Value("${logsearch.auth.ldap.url:ldap://localhost:389};)
+ @Value("${logsearch.auth.ldap.url:}")
@LogSearchPropertyDescription(
name = "logsearch.auth.ldap.url",
description = "URL of LDAP database.",
@@ -38,7 +38,7 @@ public class LogSearchLdapAuthConfig {
)
private String ldapUrl;
- @Value("${logsearch.auth.ldap.manager.dn:cn=admin,dc=planetexpress,dc=com}")
+ @Value("${logsearch.auth.ldap.manager.dn:}")
@LogSearchPropertyDescription(
name = "logsearch.auth.ldap.manager.dn",
description = "DN of the LDAP manger user (it is a must if LDAP groups are
used).",
@@ -98,7 +98,7 @@ public class LogSearchLdapAuthConfig {
)
private String ldapUserSearchFilter;
- @Value("${logsearch.auth.ldap.group.search.base:ou=people}")
+ @Value("${logsearch.auth.ldap.group.search.base:}")
@LogSearchPropertyDescription(
name = "logsearch.auth.ldap.group.search.base",
description = "Group search base - defines where to find LDAP groups.
Won't do any authority/role mapping if this field is empty.",
@@ -108,7 +108,7 @@ public class LogSearchLdapAuthConfig {
)
private String ldapGroupSearchBase;
- @Value("${logsearch.auth.ldap.group.search.filter:(member={0})}")
+ @Value("${logsearch.auth.ldap.group.search.filter:}")
@LogSearchPropertyDescription(
name = "logsearch.auth.ldap.group.search.filter",
description = "Group search filter which is used to get membership data
for a specific user",
@@ -118,7 +118,7 @@ public class LogSearchLdapAuthConfig {
)
private String ldapGroupSearchFilter;
- @Value("${logsearch.auth.ldap.group.role.attribute:cn}")
+ @Value("${logsearch.auth.ldap.group.role.attribute:}")
@LogSearchPropertyDescription(
name = "logsearch.auth.ldap.group.role.attribute",
description = "Attribute for identifying LDAP groups (group name)",
[ambari] branch branch-feature-AMBARI-23466 updated (4dc1c06 -> b04fa97)
This is an automated email from the ASF dual-hosted git repository. ishanbha pushed a change to branch branch-feature-AMBARI-23466 in repository https://gitbox.apache.org/repos/asf/ambari.git. from 4dc1c06 [AMBARI-24665] Migrating grafana plugin for 5.x use. new c11e713 Revert "[AMBARI-24665] Migrating grafana plugin for 5.x use." new b04fa97 [AMBARI-24665] Migrating grafana plugin for 5.x use. (Prajwal Rao, Ishan Bhatt via Ishan Bhatt) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../ambari-metrics-grafana/ambari-metrics/config_ctrl.ts| 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) copy ambari-logsearch/ambari-logsearch-web/src/app/classes/models/filter.ts => ambari-metrics/ambari-metrics-grafana/ambari-metrics/config_ctrl.ts (79%)
[ambari] branch trunk updated: AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when master_key is not persisted (#2348)
This is an automated email from the ASF dual-hosted git repository.
dmitriusan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5f6e502 AMBARI-24646 'ambari-server setup-ldap' fails with
AttributeError when master_key is not persisted (#2348)
5f6e502 is described below
commit 5f6e50203f745891d7685bac027279083b5b640a
Author: Lisnichenko Dmitro
AuthorDate: Thu Sep 20 18:33:35 2018 +0300
AMBARI-24646 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (#2348)
* AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (+ fix for AMBARI-24663)(dlysnichenko)
* AMBARI-24646. 'ambari-server setup-ldap' fails with AttributeError when
master_key is not persisted (+ fix for AMBARI-24663) - codestyle (dlysnichenko)
---
.../python/ambari_server/serverConfiguration.py| 44 +-
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index ca140d4..fb0e0a2 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -908,9 +908,9 @@ def read_passwd_for_alias(alias, masterKey="",
options=None):
with open(tempFilePath, 'w+'):
os.chmod(tempFilePath, stat.S_IREAD | stat.S_IWRITE)
-if options is not None and options.master_key is not None and
options.master_key:
+if options is not None and hasattr(options, 'master_key') and
options.master_key:
masterKey = options.master_key
-if masterKey is None or masterKey == "":
+if not masterKey:
masterKey = "None"
serverClassPath =
ambari_server.serverClassPath.ServerClassPath(get_ambari_properties(), None)
@@ -1017,17 +1017,8 @@ def get_web_server_startup_timeout(properties):
def get_original_master_key(properties, options = None):
input = True
masterKey = None
+ env_master_key = os.environ.get(SECURITY_KEY_ENV_VAR_NAME)
while(input):
-try:
- if options is not None and options.master_key is not None and
options.master_key:
-masterKey = options.master_key
- if masterKey is None:
-masterKey = get_validated_string_input('Enter current Master Key: ',
- "", ".*", "", True, False)
-except KeyboardInterrupt:
- print_warning_msg('Exiting...')
- sys.exit(1)
-
# Find an alias that exists
alias = None
property = properties.get_property(JDBC_PASSWORD_PROPERTY)
@@ -1045,11 +1036,30 @@ def get_original_master_key(properties, options = None):
alias = SSL_TRUSTSTORE_PASSWORD_ALIAS
# Decrypt alias with master to validate it, if no master return
-if alias and masterKey:
- password = read_passwd_for_alias(alias, masterKey, options)
- if not password:
-print_error_msg ("ERROR: Master key does not match.")
-continue
+password = None
+if alias and env_master_key and env_master_key is not "" and
env_master_key != "None":
+ password = read_passwd_for_alias(alias, env_master_key, options)
+if not password:
+ try:
+if options is not None and hasattr(options, 'master_key') and
options.master_key:
+ masterKey = options.master_key
+if not masterKey:
+ masterKey = get_validated_string_input('Enter current Master Key: ',
+ "", ".*", "", True, False)
+ if options is not None:
+options.master_key = masterKey
+ except KeyboardInterrupt:
+print_warning_msg('Exiting...')
+sys.exit(1)
+ if alias and masterKey:
+password = read_passwd_for_alias(alias, masterKey, options)
+if not password:
+ masterKey = None
+ if options is not None:
+options.master_key = None
+ print_error_msg ("ERROR: Master key does not match")
+
+ continue
input = False
[ambari] branch trunk updated: AMBARI-24666 Implement data visualization color palette. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new f45cfa1 AMBARI-24666 Implement data visualization color palette. (ababiichuk) f45cfa1 is described below commit f45cfa1d6afebd7cac75f1086adb218071999fe7 Author: ababiichuk AuthorDate: Thu Sep 20 14:37:56 2018 +0300 AMBARI-24666 Implement data visualization color palette. (ababiichuk) --- ambari-web/app/assets/img/widget-gauge.png | Bin 6444 -> 3563 bytes ambari-web/app/assets/img/widget-graph.png | Bin 9778 -> 3844 bytes ambari-web/app/assets/img/widget-number.png| Bin 5297 -> 3209 bytes ambari-web/app/assets/img/widget-template.png | Bin 4834 -> 2574 bytes ambari-web/app/assets/test/tests.js| 2 +- ambari-web/app/config.js | 2 ++ ambari-web/app/utils/chart_utils.js| 29 ambari-web/app/views/common/chart/linear_time.js | 3 +- ambari-web/app/views/common/chart/pie.js | 7 ++-- .../app/views/common/widget/gauge_widget_view.js | 9 ++--- .../views/main/dashboard/cluster_metrics/cpu.js| 7 .../main/dashboard/widgets/pie_chart_widget.js | 9 ++--- ambari-web/app/views/main/host/metrics/cpu.js | 7 .../service/info/metrics/flume/channel_size_mma.js | 11 -- .../info/metrics/flume/flume_incoming_mma.js | 12 --- .../info/metrics/flume/flume_outgoing_mma.js | 12 --- .../app/views/main/service/services/onefs.js | 3 +- ambari-web/test/utils/chart_utils_test.js | 38 + 18 files changed, 89 insertions(+), 62 deletions(-) diff --git a/ambari-web/app/assets/img/widget-gauge.png b/ambari-web/app/assets/img/widget-gauge.png index a923247..4715115 100644 Binary files a/ambari-web/app/assets/img/widget-gauge.png and b/ambari-web/app/assets/img/widget-gauge.png differ diff --git a/ambari-web/app/assets/img/widget-graph.png b/ambari-web/app/assets/img/widget-graph.png index 97f5d8a..1da664e 100644 Binary files a/ambari-web/app/assets/img/widget-graph.png and b/ambari-web/app/assets/img/widget-graph.png differ diff --git a/ambari-web/app/assets/img/widget-number.png b/ambari-web/app/assets/img/widget-number.png index 84b7bb6..f2d6b0e 100644 Binary files a/ambari-web/app/assets/img/widget-number.png and b/ambari-web/app/assets/img/widget-number.png differ diff --git a/ambari-web/app/assets/img/widget-template.png b/ambari-web/app/assets/img/widget-template.png index 59fef8d..98b79f2 100644 Binary files a/ambari-web/app/assets/img/widget-template.png and b/ambari-web/app/assets/img/widget-template.png differ diff --git a/ambari-web/app/assets/test/tests.js b/ambari-web/app/assets/test/tests.js index 5cd18f7..58b0744 100644 --- a/ambari-web/app/assets/test/tests.js +++ b/ambari-web/app/assets/test/tests.js @@ -222,13 +222,13 @@ var files = [ 'test/utils/array_utils_test', 'test/utils/batch_scheduled_requests_test', 'test/utils/blueprint_test', + 'test/utils/chart_utils_test', 'test/utils/config_test', 'test/utils/configs_collection_test', 'test/utils/credentials_test', 'test/utils/date/date_test', 'test/utils/date/timezone_test', 'test/utils/data_manipulation_test', - 'test/utils/config_test', 'test/utils/db_test', 'test/utils/ember_computed_test', 'test/utils/ember_reopen_test', diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index c5bf5f0..807b841 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -57,6 +57,8 @@ App.healthStatusRed = '#EF6162'; App.healthStatusGreen = '#1EB475'; App.healthStatusOrange = '#E98A40'; App.widgetContentColor = '#66'; +App.gaugeWidgetRemainingAreaColor = '#DD'; +App.dataVisualizationColorScheme = ['#41bfae', '#79e3d1', '#63c2e5', '#c4aeff', '#b991d9', '#ffb9bf', '#ffae65', '#f6d151', '#a7cf82', '#abdfd5', '#3aac9c', '#6dccbc', '#59aece', '#b09ce5', '#a682c3', '#e5a6ac', '#e59c5b', '#ddbc49', '#96ba75', '#9ac8bf', '#83d5ca', '#a8ede1', '#99d7ee', '#d9caff', '#d1b7e6', '#ffd1d5', '#ffca9b', '#f9e18e', '#c6e0ae', '#c8eae4']; App.inactivityRemainTime = 60; // in seconds App.enableLogger = true; App.stackVersionsAvailable = true; diff --git a/ambari-web/app/utils/chart_utils.js b/ambari-web/app/utils/chart_utils.js new file mode 100644 index 000..a8dcb79 --- /dev/null +++ b/ambari-web/app/utils/chart_utils.js @@ -0,0 +1,29 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License.
