Repository: ambari Updated Branches: refs/heads/branch-2.4 d1462e117 -> a39a5ce89
http://git-wip-us.apache.org/repos/asf/ambari/blob/a39a5ce8/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py index 2d4b7cd..fe6dd31 100644 --- a/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py +++ b/ambari-server/src/test/python/stacks/2.5/ATLAS/test_atlas_server.py @@ -150,12 +150,12 @@ class TestAtlasServer(RMFTestCase): content = '' ) - self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch --download-config -d /tmp/solr_config_basic_configs_0.[0-9]* -cs basic_configs -rt 30 -i 5') - self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch --upload-config -d /etc/atlas/conf/solr -cs basic_configs -rt 30 -i 5') + self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/logsearch --download-config --config-dir /tmp/solr_config_basic_configs_0.[0-9]* --config-set basic_configs --retry 30 --interval 5') + self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/logsearch --upload-config --config-dir /etc/atlas/conf/solr --config-set basic_configs --retry 30 --interval 5') - self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch --create-collection -c vertex_index -cs basic_configs -s 1 -r 1 -m 1 -rt 5 -i 10') - self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch --create-collection -c edge_index -cs basic_configs -s 1 -r 1 -m 1 -rt 5 -i 10') - self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch --create-collection -c fulltext_index -cs basic_configs -s 1 -r 1 -m 1 -rt 5 -i 10') + self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/logsearch --create-collection --collection vertex_index --config-set basic_configs --shards 1 --replication 1 --max-shards 1 --retry 5 --interval 10') + self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/logsearch --create-collection --collection edge_index --config-set basic_configs --shards 1 --replication 1 --max-shards 1 --retry 5 --interval 10') + self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/logsearch --create-collection --collection fulltext_index --config-set basic_configs --shards 1 --replication 1 --max-shards 1 --retry 5 --interval 10') def test_configure_default(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/a39a5ce8/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index e1adbb9..8aa92a1 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1864,42 +1864,42 @@ var hdp2properties = [ "index": 6 }, { - "name": "logfeeder_solr_ssl_client_truststore_location", + "name": "logfeeder_truststore_location", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 7 }, { - "name": "logfeeder_solr_ssl_client_truststore_type", + "name": "logfeeder_truststore_type", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 8 }, { - "name": "logfeeder_solr_ssl_client_truststore_password", + "name": "logfeeder_truststore_password", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 9 }, { - "name": "logfeeder_solr_ssl_client_keystore_location", + "name": "logfeeder_keystore_location", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 10 }, { - "name": "logfeeder_solr_ssl_client_keystore_type", + "name": "logfeeder_keystore_type", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 11 }, { - "name": "logfeeder_solr_ssl_client_keystore_password", + "name": "logfeeder_keystore_password", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", @@ -1980,131 +1980,138 @@ var hdp2properties = [ }, /*logsearch-env*/ { - "name": "logsearch_ui_port", + "name": "logsearch_ui_protocol", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 1 }, { - "name": "logsearch_log_dir", + "name": "logsearch_ui_port", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 2 }, { - "name": "logsearch_pid_dir", + "name": "logsearch_log_dir", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 3 }, { - "name": "logsearch_app_max_memory", + "name": "logsearch_pid_dir", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 4 }, { - "name": "logsearch_solr_audit_logs_zk_node", + "name": "logsearch_app_max_memory", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 5 }, { - "name": "logsearch_solr_audit_logs_zk_quorum", + "name": "logsearch_solr_audit_logs_zk_node", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 6 }, { - "name": "logsearch_solr_audit_logs_use_ranger", + "name": "logsearch_solr_audit_logs_zk_quorum", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 7 }, { - "name": "logsearch_debug_enabled", + "name": "logsearch_solr_audit_logs_use_ranger", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 8 }, { - "name": "logsearch_debug_port", + "name": "logsearch_debug_enabled", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 9 }, { - "name": "logsearch_solr_ssl_client_truststore_location", + "name": "logsearch_debug_port", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 10 }, { - "name": "logsearch_solr_ssl_client_truststore_type", + "name": "logsearch_truststore_location", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 11 }, { - "name": "logsearch_solr_ssl_client_truststore_password", + "name": "logsearch_truststore_type", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 12 }, { - "name": "logsearch_solr_ssl_client_keystore_location", + "name": "logsearch_truststore_password", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 13 }, { - "name": "logsearch_solr_ssl_client_keystore_type", + "name": "logsearch_keystore_location", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 14 }, { - "name": "logsearch_solr_ssl_client_keystore_password", + "name": "logsearch_keystore_type", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 15 }, { - "name": "logsearch_kerberos_keytab", + "name": "logsearch_keystore_password", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 16 }, { - "name": "logsearch_kerberos_principal", + "name": "logsearch_kerberos_keytab", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 17 }, { - "name": "content", + "name": "logsearch_kerberos_principal", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 18 }, + { + "name": "content", + "serviceName": "LOGSEARCH", + "filename": "logsearch-env.xml", + "category": "Advanced logsearch-env", + "index": 19 + }, /*logsearch-log4j*/ { "name": "content", @@ -2250,42 +2257,42 @@ var hdp2properties = [ "index": 6 }, { - "name": "logsearch_solr_ssl_server_truststore_location", + "name": "logsearch_solr_truststore_location", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env", "index": 7 }, { - "name": "logsearch_solr_ssl_server_truststore_type", + "name": "logsearch_solr_truststore_type", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env", "index": 8 }, { - "name": "logsearch_solr_ssl_server_truststore_password", + "name": "logsearch_solr_truststore_password", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env", "index": 9 }, { - "name": "logsearch_solr_ssl_server_keystore_location", + "name": "logsearch_solr_keystore_location", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env", "index": 10 }, { - "name": "logsearch_solr_ssl_server_keystore_type", + "name": "logsearch_solr_keystore_type", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env", "index": 11 }, { - "name": "logsearch_solr_ssl_server_keystore_password", + "name": "logsearch_solr_keystore_password", "serviceName": "LOGSEARCH", "filename": "logsearch-solr-env.xml", "category": "Advanced logsearch-solr-env",
