ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject ambari git commit: AMBARI-18523. Use 'enabled' suffix instead of 'enable' for auth properties (oleewere) [Forced Update!]
Date Tue, 04 Oct 2016 13:14:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/logsearch-ga 80dffe0fe -> a9a89d894 (forced update)


AMBARI-18523. Use 'enabled' suffix instead of 'enable' for auth properties (oleewere)

Change-Id: I582a9b4e5f5f3671079c4e64a22158411c6953e1


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9a89d89
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9a89d89
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9a89d89

Branch: refs/heads/logsearch-ga
Commit: a9a89d8948c1dc89797bf8c21e28afd508219ebb
Parents: 0feea87
Author: oleewere <oleewere@gmail.com>
Authored: Tue Oct 4 12:08:54 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Tue Oct 4 15:07:59 2016 +0200

----------------------------------------------------------------------
 .../org/apache/ambari/logsearch/conf/AuthPropsConfig.java |  8 ++++----
 .../java/org/apache/ambari/logsearch/conf/SolrConfig.java |  5 +++++
 .../apache/ambari/logsearch/dao/UserConfigSolrDao.java    |  2 +-
 .../webapp/scripts/views/tabs/HierarchyTabLayoutView.js   |  1 -
 .../LOGSEARCH/0.5.0/package/scripts/params.py             | 10 +++++-----
 .../test/python/stacks/2.4/LOGSEARCH/test_logsearch.py    |  6 +++---
 6 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/AuthPropsConfig.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/AuthPropsConfig.java
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/AuthPropsConfig.java
index 11b1cda..67ddd1f 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/AuthPropsConfig.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/AuthPropsConfig.java
@@ -24,13 +24,13 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class AuthPropsConfig {
 
-  @Value("${logsearch.auth.file.enable:true}")
+  @Value("${logsearch.auth.file.enabled:true}")
   boolean authFileEnabled;
-  @Value("${logsearch.auth.ldap.enable:false}")
+  @Value("${logsearch.auth.ldap.enabled:false}")
   boolean authLdapEnabled;
-  @Value("${logsearch.auth.simple.enable:false}")
+  @Value("${logsearch.auth.simple.enabled:false}")
   boolean authSimpleEnabled;
-  @Value("${logsearch.auth.external_auth.enable:false}")
+  @Value("${logsearch.auth.external_auth.enabled:false}")
   boolean authExternalEnabled;
   @Value("${logsearch.auth.external_auth.host_url:'http://ip:port'}")
   private String externalAuthHostUrl;

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
index 4868409..79df3c2 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
@@ -90,6 +90,11 @@ public class SolrConfig {
     return new SolrSchemaFieldDao();
   }
 
+  @Bean(name = "userConfigSolrFieldDao")
+  public SolrSchemaFieldDao userConfigSolrFieldDao() {
+    return new SolrSchemaFieldDao();
+  }
+
   private CloudSolrClient createClient(String solrUrl, String zookeeperConnectString, String
defaultCollection) {
     if (StringUtils.isNotEmpty(zookeeperConnectString)) {
       CloudSolrClient cloudSolrClient = new CloudSolrClient(zookeeperConnectString);

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java
index a6ea77c..58337f7 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java
@@ -73,7 +73,7 @@ public class UserConfigSolrDao extends SolrDaoBase {
   private SolrCollectionDao solrCollectionDao;
 
   @Inject
-  @Named("serviceSolrFieldDao")
+  @Named("userConfigSolrFieldDao")
   private SolrSchemaFieldDao solrSchemaFieldDao;
 
   @Inject

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
index 605560e..c504afa 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/HierarchyTabLayoutView.js
@@ -276,7 +276,6 @@ define(['require',
         require(['views/tabs/VisualSearchView'], function (VisualSearchView) {
           var data = _.values(Globals.serviceLogsColumns);
           var columns = _.without(data, _.findWhere(data, "logtime"));
-          console.log("service columns: " + JSON.stringify(columns))
           that.RVisualSearchIncCol.show(new VisualSearchView({
             viewName: "includeServiceColumns",
             placeholder: "Include Search",

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index 7200d7b..63bc21f 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
@@ -215,17 +215,17 @@ logsearch_properties['logsearch.solr.metrics.collector.hosts'] = format(logsearc
 logsearch_properties['logsearch.solr.jmx.port'] = infra_solr_jmx_port
 
 logsearch_properties['logsearch.login.credentials.file'] = logsearch_admin_credential_file
-logsearch_properties['logsearch.auth.file.enable'] = 'true'
-logsearch_properties['logsearch.auth.ldap.enable'] = 'false'
-logsearch_properties['logsearch.auth.simple.enable'] = 'false'
+logsearch_properties['logsearch.auth.file.enabled'] = 'true'
+logsearch_properties['logsearch.auth.ldap.enabled'] = 'false'
+logsearch_properties['logsearch.auth.simple.enabled'] = 'false'
 logsearch_properties['logsearch.roles.allowed'] = 'AMBARI.ADMINISTRATOR'
 logsearch_properties['logsearch.auth.external_auth.host_url'] = format(logsearch_properties['logsearch.auth.external_auth.host_url'])
 
 logsearch_properties['logsearch.protocol'] = logsearch_ui_protocol
 
 if security_enabled:
-  logfeeder_properties['logsearch.solr.kerberos.enable'] = 'true'
-  logfeeder_properties['logsearch.solr.jaas.file'] = logsearch_jaas_file
+  logsearch_properties['logsearch.solr.kerberos.enable'] = 'true'
+  logsearch_properties['logsearch.solr.jaas.file'] = logsearch_jaas_file
 
 
 logsearch_solr_collection_service_logs = logsearch_properties['logsearch.solr.collection.service.logs']

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9a89d89/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
index 0378a94..8c0ed16 100644
--- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
+++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
@@ -75,9 +75,9 @@ class TestLogSearch(RMFTestCase):
                                             'logsearch.auth.external_auth.enabled': 'false',
                                             'logsearch.auth.external_auth.host_url': 'http://c6401.ambari.apache.org:8080',
                                             'logsearch.auth.external_auth.login_url': '/api/v1/users/$USERNAME/privileges?fields=*',
-                                            'logsearch.auth.file.enable': 'true',
-                                            'logsearch.auth.ldap.enable': 'false',
-                                            'logsearch.auth.simple.enable': 'false',
+                                            'logsearch.auth.file.enabled': 'true',
+                                            'logsearch.auth.ldap.enabled': 'false',
+                                            'logsearch.auth.simple.enabled': 'false',
                                             'logsearch.collection.audit.logs.numshards':
'10',
                                             'logsearch.collection.audit.logs.replication.factor':
'1',
                                             'logsearch.collection.history.replication.factor':
'1',


Mime
View raw message