Repository: ambari Updated Branches: refs/heads/trunk a58078232 -> 03ce1907b
AMBARI-16122. Logsearch: Property changes not getting reflected at the backend (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03ce1907 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03ce1907 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03ce1907 Branch: refs/heads/trunk Commit: 03ce1907b795ee6bbd15b685eda4271e61feada9 Parents: a580782 Author: oleewere <oleew...@gmail.com> Authored: Tue Apr 26 16:37:52 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Wed Apr 27 13:19:00 2016 +0200 ---------------------------------------------------------------------- .../src/main/scripts/run.sh | 2 +- .../LoggingRequestHelperFactoryImpl.java | 10 +- .../logging/LoggingRequestHelperImpl.java | 6 +- .../common-services/LOGSEARCH/0.5.0/alerts.json | 4 +- .../0.5.0/configuration/logfeeder-env.xml | 17 --- .../configuration/logfeeder-properties.xml | 41 ++++++++ .../0.5.0/configuration/logfeeder-site.xml | 2 +- .../configuration/logsearch-admin-json.xml | 54 ++++++++++ .../logsearch-admin-properties.xml | 54 ---------- .../0.5.0/configuration/logsearch-env.xml | 7 ++ .../configuration/logsearch-properties.xml | 81 ++++++++++++++ .../0.5.0/configuration/logsearch-site.xml | 88 ---------------- .../LOGSEARCH/0.5.0/metainfo.xml | 4 +- .../0.5.0/package/scripts/logsearch.py | 2 +- .../LOGSEARCH/0.5.0/package/scripts/params.py | 48 ++++++--- .../0.5.0/package/scripts/setup_logsearch.py | 2 +- .../package/templates/logfeeder.properties.j2 | 5 + .../package/templates/logsearch.properties.j2 | 8 ++ .../0.5.0/properties/logsearch-env.sh.j2 | 2 + .../LOGSEARCH/0.5.0/quicklinks/quicklinks.json | 6 +- .../LoggingRequestHelperFactoryImplTest.java | 18 ++-- .../logging/LoggingRequestHelperImplTest.java | 8 +- .../stacks/2.4/LOGSEARCH/test_logsearch.py | 20 ++-- .../test/python/stacks/2.4/configs/default.json | 14 +-- ambari-web/app/data/HDP2/site_properties.js | 105 +++++++++++-------- ambari-web/app/models/quick_links.js | 6 +- 26 files changed, 340 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh b/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh index 99bc3df..460ea60 100755 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh @@ -87,5 +87,5 @@ LOGSEARCH_GC_OPTS="-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$LOGSEARCH echo "Starting logsearch. Output file=$LOGFILE pid_file=$PID_FILE" #LOGSEARCH_CLI_CLASSPATH= #set -x -nohup $JAVA -cp "$LOGSEARCH_CLI_CLASSPATH:$LOGSEARCH_CONF_DIR:$script_dir/libs/*:$script_dir/classes:$script_dir/LogProcessor.jar" $LOGSEARCH_GC_OPTS $LOGSEARCH_JAVA_MEM $LOGSEARCH_JAVA_OPTS $JMX org.apache.ambari.logsearch.LogSearch $* > $LOGFILE 2>&1 & +nohup $JAVA -cp "$LOGSEARCH_CLI_CLASSPATH:$LOGSEARCH_CONF_DIR:$script_dir/libs/*:$script_dir/classes:$script_dir/LogProcessor.jar" $LOGSEARCH_GC_OPTS $LOGSEARCH_JAVA_MEM $LOGSEARCH_JAVA_OPTS $JMX org.apache.ambari.logsearch.LogSearch $LOGSEARCH_PORT $* > $LOGFILE 2>&1 & echo $! > $PID_FILE http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java index f892f04..b7e6365 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImpl.java @@ -32,13 +32,13 @@ public class LoggingRequestHelperFactoryImpl implements LoggingRequestHelperFact private static final Logger LOG = Logger.getLogger(LoggingRequestHelperFactoryImpl.class); - private static final String LOGSEARCH_SITE_CONFIG_TYPE_NAME = "logsearch-site"; + private static final String LOGSEARCH_ENV_CONFIG_TYPE_NAME = "logsearch-env"; private static final String LOGSEARCH_SERVICE_NAME = "LOGSEARCH"; private static final String LOGSEARCH_SERVER_COMPONENT_NAME = "LOGSEARCH_SERVER"; - private static final String LOGSEARCH_UI_PORT_PROPERTY_NAME = "logsearch.ui.port"; + private static final String LOGSEARCH_UI_PORT_PROPERTY_NAME = "logsearch_ui_port"; @Override @@ -58,8 +58,8 @@ public class LoggingRequestHelperFactoryImpl implements LoggingRequestHelperFact return null; } - Config logSearchSiteConfig = - cluster.getDesiredConfigByType(LOGSEARCH_SITE_CONFIG_TYPE_NAME); + Config logSearchEnvConfig = + cluster.getDesiredConfigByType(LOGSEARCH_ENV_CONFIG_TYPE_NAME); List<ServiceComponentHost> listOfMatchingHosts = cluster.getServiceComponentHosts(LOGSEARCH_SERVICE_NAME, LOGSEARCH_SERVER_COMPONENT_NAME); @@ -84,7 +84,7 @@ public class LoggingRequestHelperFactoryImpl implements LoggingRequestHelperFact final String logSearchHostName = serviceComponentHost.getHostName(); final String logSearchPortNumber = - logSearchSiteConfig.getProperties().get(LOGSEARCH_UI_PORT_PROPERTY_NAME); + logSearchEnvConfig.getProperties().get(LOGSEARCH_UI_PORT_PROPERTY_NAME); return new LoggingRequestHelperImpl(logSearchHostName, logSearchPortNumber, ambariManagementController.getCredentialStoreService(), cluster); } http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java index 3fac655..c1afce0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java @@ -56,7 +56,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper { private static Logger LOG = Logger.getLogger(LoggingRequestHelperImpl.class); - private static final String LOGSEARCH_ADMIN_PROPERTIES_CONFIG_TYPE_NAME = "logsearch-admin-properties"; + private static final String LOGSEARCH_ADMIN_JSON_CONFIG_TYPE_NAME = "logsearch-admin-json"; private static final String LOGSEARCH_ADMIN_USERNAME_PROPERTY_NAME = "logsearch_admin_username"; @@ -153,7 +153,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper { private String getLogSearchAdminUser() { Config logSearchAdminConfig = - cluster.getDesiredConfigByType(LOGSEARCH_ADMIN_PROPERTIES_CONFIG_TYPE_NAME); + cluster.getDesiredConfigByType(LOGSEARCH_ADMIN_JSON_CONFIG_TYPE_NAME); if (logSearchAdminConfig != null) { return logSearchAdminConfig.getProperties().get(LOGSEARCH_ADMIN_USERNAME_PROPERTY_NAME); @@ -164,7 +164,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper { private String getLogSearchAdminPassword() { Config logSearchAdminConfig = - cluster.getDesiredConfigByType(LOGSEARCH_ADMIN_PROPERTIES_CONFIG_TYPE_NAME); + cluster.getDesiredConfigByType(LOGSEARCH_ADMIN_JSON_CONFIG_TYPE_NAME); if (logSearchAdminConfig != null) { return logSearchAdminConfig.getProperties().get(LOGSEARCH_ADMIN_PASSWORD_PROPERTY_NAME); http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json index c6c324f..6749c95 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json @@ -10,8 +10,8 @@ "source": { "type": "WEB", "uri": { - "http": "{{logsearch-site/logsearch.ui.port}}", - "https": "{{logsearch-site/logsearch.ui.port}}", + "http": "{{logsearch-env/logsearch_ui_port}}", + "https": "{{logsearch-env/logsearch_ui_port}}", "connection_timeout": 5.0, "default_port": 61888 }, http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml index aee3d16..190ee53 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml @@ -45,23 +45,6 @@ </property> <property> - <name>logfeeder_checkpoint_folder</name> - <value>/etc/ambari-logsearch-logfeeder/conf/checkpoints</value> - <description>Checkpoint folder for logfeeder</description> - <display-name>Logfeeder checkpoint dir</display-name> - <value-attributes> - <type>directory</type> - </value-attributes> - </property> - - <property> - <name>logfeeder_config_files</name> - <value>{{logfeeder_config_files}}</value> - <description>Comma separated config files in grok format</description> - <display-name>Logfeeder config files</display-name> - </property> - - <property> <name>logfeeder_user</name> <value>logfeeder</value> <property-type>USER</property-type> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml new file mode 100644 index 0000000..8283429 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration> + + <property> + <name>logfeeder.config.files</name> + <value>{{logfeeder_config_files}}</value> + <description>Comma separated config files in grok format</description> + <display-name>Logfeeder config files</display-name> + </property> + + <property> + <name>logfeeder.checkpoint.folder</name> + <value>/etc/ambari-logsearch-logfeeder/conf/checkpoints</value> + <description>Checkpoint folder for logfeeder</description> + <display-name>Logfeeder checkpoint dir</display-name> + <value-attributes> + <type>directory</type> + </value-attributes> + </property> + +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-site.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-site.xml index 8563e28..56552f2 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-site.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-site.xml @@ -19,7 +19,7 @@ * limitations under the License. */ --> -<configuration> +<configuration supports_adding_forbidden="true"> <property> <name>logfeeder.solr.service.logs.enable</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml new file mode 100644 index 0000000..ae2c90d --- /dev/null +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml @@ -0,0 +1,54 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration supports_adding_forbidden="true"> + + <property> + <name>logsearch_admin_username</name> + <value>admin</value> + <display-name>Admin username</display-name> + <description>LogSearch admin username</description> + </property> + + <property require-input="true"> + <name>logsearch_admin_password</name> + <value></value> + <property-type>PASSWORD</property-type> + <display-name>Admin password</display-name> + <description>LogSearch admin password</description> + <value-attributes> + <overridable>false</overridable> + <type>password</type> + </value-attributes> + </property> + + <property> + <name>content</name> + <description>This is the jinja template for user_pass.json file</description> + <value></value> + <property-type>VALUE_FROM_PROPERTY_FILE</property-type> + <value-attributes> + <property-file-name>user_pass.json.j2</property-file-name> + <property-file-type>text</property-file-type> + </value-attributes> + </property> + +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-properties.xml deleted file mode 100644 index ba6eb06..0000000 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-properties.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> -<configuration> - - <property> - <name>logsearch_admin_username</name> - <value>admin</value> - <display-name>Admin username</display-name> - <description>LogSearch admin username</description> - </property> - - <property require-input="true"> - <name>logsearch_admin_password</name> - <value></value> - <property-type>PASSWORD</property-type> - <display-name>Admin password</display-name> - <description>LogSearch admin password</description> - <value-attributes> - <overridable>false</overridable> - <type>password</type> - </value-attributes> - </property> - - <property> - <name>content</name> - <description>This is the jinja template for user_pass.json file</description> - <value></value> - <property-type>VALUE_FROM_PROPERTY_FILE</property-type> - <value-attributes> - <property-file-name>user_pass.json.j2</property-file-name> - <property-file-type>text</property-file-type> - </value-attributes> - </property> - -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml index b76e3d1..018cffd 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml @@ -23,6 +23,13 @@ <configuration supports_adding_forbidden="true"> <property> + <name>logsearch_ui_port</name> + <value>61888</value> + <description>Default port for LogSearch UI</description> + <display-name>Logsearch UI Port</display-name> + </property> + + <property> <name>logsearch_pid_dir</name> <value>/var/run/ambari-logsearch-portal</value> <description>Logsearch Process ID Directory</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml new file mode 100644 index 0000000..9dfbaf7 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml @@ -0,0 +1,81 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * 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. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<configuration> + + <property> + <name>logsearch.collection.numshards</name> + <value>5</value> + <display-name>Logsearch Solr Shards</display-name> + <description>Number of shards for Solr collections</description> + </property> + + <property> + <name>logsearch.collection.replication.factor</name> + <value>1</value> + <display-name>Logsearch Solr Replication Factor</display-name> + <description>Replication factor for Solr collections</description> + </property> + + <property> + <name>logsearch.solr.collection.service.logs</name> + <value>hadoop_logs</value> + <display-name>Logsearch Solr Service Logs Collection</display-name> + <description>Name for the service logs collection</description> + </property> + + <property> + <name>logsearch.solr.collection.audit.logs</name> + <value>audit_logs</value> + <display-name>Logsearch Solr Audit Logs Collection</display-name> + <description>Name for the audit logs collection</description> + </property> + + <property> + <name>logsearch.service.logs.fields</name> + <value>logtime,level,event_count,ip,type,seq_num,path,file,line_number,host,log_message,id</value> + <display-name>Logsearch Solr Service Logs Fields</display-name> + <description>Solr fields for service logs</description> + </property> + + <property> + <name>logsearch.service.logs.split.interval.mins</name> + <value>15</value> + <display-name>Logsearch Service Logs split interval</display-name> + <description>Will create multiple collections and use alias. Valid values are single,hour_week</description> + </property> + + <property> + <name>logsearch.audit.logs.split.interval.mins</name> + <value>15</value> + <display-name>Logsearch Audit Logs split interval</display-name> + <description>Will switch the shard after the interval specified. Valid values are none and greater than 1 + </description> + </property> + + <property> + <name>logsearch.logfeeder.include.default.level</name> + <value>fatal,error,warn</value> + <description>Include default Logfeeder log levels for Logsearch</description> + <display-name>Logfeeder log levels</display-name> + </property> + +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml deleted file mode 100644 index fb775bf..0000000 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-site.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> -<configuration> - - <property> - <name>logsearch.ui.port</name> - <value>61888</value> - <description>Default port for LogSearch UI</description> - <display-name>Logsearch UI Port</display-name> - </property> - - <property> - <name>logsearch.collection.numshards</name> - <value>5</value> - <display-name>Logsearch Solr Shards</display-name> - <description>Number of shards for Solr collections</description> - </property> - - <property> - <name>logsearch.collection.replication.factor</name> - <value>1</value> - <display-name>Logsearch Solr Replication Factor</display-name> - <description>Replication factor for Solr collections</description> - </property> - - <property> - <name>logsearch.solr.collection.service.logs</name> - <value>hadoop_logs</value> - <display-name>Logsearch Solr Service Logs Collection</display-name> - <description>Name for the service logs collection</description> - </property> - - <property> - <name>logsearch.solr.collection.audit.logs</name> - <value>audit_logs</value> - <display-name>Logsearch Solr Audit Logs Collection</display-name> - <description>Name for the audit logs collection</description> - </property> - - <property> - <name>logsearch.service.logs.fields</name> - <value>logtime,level,event_count,ip,type,seq_num,path,file,line_number,host,log_message,id</value> - <display-name>Logsearch Solr Service Logs Fields</display-name> - <description>Solr fields for service logs</description> - </property> - - <property> - <name>logsearch.service.logs.split.interval.mins</name> - <value>15</value> - <display-name>Logsearch Service Logs split interval</display-name> - <description>Will create multiple collections and use alias. Valid values are single,hour_week</description> - </property> - - <property> - <name>logsearch.audit.logs.split.interval.mins</name> - <value>15</value> - <display-name>Logsearch Audit Logs split interval</display-name> - <description>Will switch the shard after the interval specified. Valid values are none and greater than 1 - </description> - </property> - - <property> - <name>logsearch.logfeeder.include.default.level</name> - <value>fatal,error,warn</value> - <description>Include default Logfeeder log levels for Logsearch</description> - <display-name>Logfeeder log levels</display-name> - </property> - -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml index 0f17672..40c289e 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml @@ -167,8 +167,8 @@ </requiredServices> <configuration-dependencies> - <config-type>logsearch-site</config-type> - <config-type>solr-site</config-type> + <config-type>logsearch-properties</config-type> + <config-type>solr-xml</config-type> <config-type>logfeeder-site</config-type> </configuration-dependencies> <restartRequiredAfterChange>false</restartRequiredAfterChange> http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py index b3817da..2b5fdf7 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py @@ -42,7 +42,7 @@ class LogSearch(Script): env.set_params(params) self.configure(env) - Execute(format("{logsearch_dir}/run.sh {logsearch_ui_port}"), + Execute(format("{logsearch_dir}/run.sh"), environment={'LOGSEARCH_INCLUDE': format('{logsearch_server_conf}/logsearch-env.sh')}, user=params.logsearch_user ) http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/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 5e12dde..7ed5c42 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 @@ -96,15 +96,10 @@ logsearch_solr_data_resources_dir = os.path.join(logsearch_solr_datadir, 'resour logsearch_service_logs_max_retention = config['configurations']['logsearch-service_logs-solrconfig']['logsearch_service_logs_max_retention'] logsearch_audit_logs_max_retention = config['configurations']['logsearch-audit_logs-solrconfig']['logsearch_audit_logs_max_retention'] -logsearch_service_logs_fields = config['configurations']['logsearch-site']['logsearch.service.logs.fields'] +logsearch_service_logs_fields = config['configurations']['logsearch-properties']['logsearch.service.logs.fields'] -logsearch_ui_port = config['configurations']['logsearch-site']["logsearch.ui.port"] -logsearch_debug_enabled = str(config['configurations']['logsearch-env']["logsearch_debug_enabled"]).lower() -logsearch_debug_port = config['configurations']['logsearch-env']["logsearch_debug_port"] -logsearch_app_max_memory = config['configurations']['logsearch-env']['logsearch_app_max_memory'] - -audit_logs_collection_splits_interval_mins = config['configurations']['logsearch-site']['logsearch.audit.logs.split.interval.mins'] -service_logs_collection_splits_interval_mins = config['configurations']['logsearch-site']['logsearch.service.logs.split.interval.mins'] +audit_logs_collection_splits_interval_mins = config['configurations']['logsearch-properties']['logsearch.audit.logs.split.interval.mins'] +service_logs_collection_splits_interval_mins = config['configurations']['logsearch-properties']['logsearch.service.logs.split.interval.mins'] zookeeper_port = default('/configurations/zoo.cfg/clientPort', None) # get comma separated list of zookeeper hosts from clusterHostInfo @@ -138,18 +133,19 @@ solr_log4j_content = config['configurations']['logsearch-solr-log4j']['content'] # Logsearch configs ##################################### logsearch_dir = '/usr/lib/ambari-logsearch-portal' -logsearch_numshards_config = config['configurations']['logsearch-site']['logsearch.collection.numshards'] + +logsearch_numshards_config = config['configurations']['logsearch-properties']['logsearch.collection.numshards'] if logsearch_numshards_config > 0: logsearch_numshards = str(logsearch_numshards_config) else: logsearch_numshards = format(str(logsearch_solr_instance_count)) -logsearch_repfactor = str(config['configurations']['logsearch-site']['logsearch.collection.replication.factor']) +logsearch_repfactor = str(config['configurations']['logsearch-properties']['logsearch.collection.replication.factor']) -logsearch_solr_collection_service_logs = default('/configurations/logsearch-site/logsearch.solr.collection.service.logs', 'hadoop_logs') -logsearch_solr_collection_audit_logs = default('/configurations/logsearch-site/logsearch.solr.collection.audit.logs','audit_logs') -logsearch_logfeeder_log_level_include = default('/configurations/logsearch-site/logsearch.logfeeder.include.default.level', 'fatal,error,warn') +logsearch_solr_collection_service_logs = default('/configurations/logsearch-properties/logsearch.solr.collection.service.logs', 'hadoop_logs') +logsearch_solr_collection_audit_logs = default('/configurations/logsearch-properties/logsearch.solr.collection.audit.logs','audit_logs') +logsearch_logfeeder_log_level_include = default('/configurations/logsearch-properties/logsearch.logfeeder.include.default.level', 'fatal,error,warn') solr_audit_logs_use_ranger = default('/configurations/logsearch-env/logsearch_solr_audit_logs_use_ranger', False) solr_audit_logs_url = '' @@ -172,11 +168,26 @@ else: solr_audit_logs_zk_node = format(solr_audit_logs_zk_node) solr_audit_logs_zk_quorum = format(solr_audit_logs_zk_quorum) +# create custom properties - remove defaults +logsearch_custom_properties = dict(config['configurations']['logsearch-properties']) +logsearch_custom_properties.pop("logsearch.collection.numshards", None) +logsearch_custom_properties.pop("logsearch.collection.replication.factor", None) +logsearch_custom_properties.pop("logsearch.solr.collection.service.logs", None) +logsearch_custom_properties.pop("logsearch.solr.collection.audit.logs", None) +logsearch_custom_properties.pop("logsearch.service.logs.fields", None) +logsearch_custom_properties.pop("logsearch.service.logs.split.interval.mins", None) +logsearch_custom_properties.pop("logsearch.audit.logs.split.interval.mins", None) +logsearch_custom_properties.pop("logsearch.logfeeder.include.default.level", None) + # logsearch-env configs logsearch_user = config['configurations']['logsearch-env']['logsearch_user'] logsearch_group = config['configurations']['logsearch-env']['logsearch_group'] logsearch_log_dir = config['configurations']['logsearch-env']['logsearch_log_dir'] logsearch_log = logsearch_log_dir + '/logsearch.out' +logsearch_ui_port = config['configurations']['logsearch-env']["logsearch_ui_port"] +logsearch_debug_enabled = str(config['configurations']['logsearch-env']["logsearch_debug_enabled"]).lower() +logsearch_debug_port = config['configurations']['logsearch-env']["logsearch_debug_port"] +logsearch_app_max_memory = config['configurations']['logsearch-env']['logsearch_app_max_memory'] # store the log file for the service from the 'solr.log' property of the 'logsearch-env.xml' file logsearch_env_content = config['configurations']['logsearch-env']['content'] @@ -212,9 +223,10 @@ zk_log_dir = default('/configurations/zookeeper-env/zk_log_dir', '/var/log/zooke # Logsearch admin configs ##################################### -logsearch_admin_username = default('/configurations/logsearch-admin-properties/logsearch_admin_username', "admin") -logsearch_admin_password = default('/configurations/logsearch-admin-properties/logsearch_admin_password', "") -logsearch_admin_content = config['configurations']['logsearch-admin-properties']['content'] +logsearch_admin_credential_file = 'logsearch-admin.json' +logsearch_admin_username = default('/configurations/logsearch-admin-json/logsearch_admin_username', "admin") +logsearch_admin_password = default('/configurations/logsearch-admin-json/logsearch_admin_password', "") +logsearch_admin_content = config['configurations']['logsearch-admin-json']['content'] ##################################### # Logfeeder configs @@ -253,3 +265,7 @@ logfeeder_config_file_names = ['global.config.json', 'output.config.json'] + ['i logfeeder_supported_services] logfeeder_config_files = ','.join(logfeeder_config_file_names) + +logfeeder_custom_properties = dict(config['configurations']['logfeeder-properties']) +logfeeder_custom_properties.pop('logfeeder.config.files', None) +logfeeder_custom_properties.pop('logfeeder.checkpoint.folder', None) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py index 3598380..50018cb 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py @@ -59,7 +59,7 @@ def setup_logsearch(): owner=params.logsearch_user ) - File(format("{logsearch_server_conf}/user_pass.json"), + File(format("{logsearch_server_conf}/logsearch-admin.json"), content=InlineTemplate(params.logsearch_admin_content), owner=params.logsearch_user ) http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 index 1edf16a..b674e42 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logfeeder.properties.j2 @@ -16,3 +16,8 @@ logfeeder.checkpoint.folder={{logfeeder_checkpoint_folder}} metrics.collector.hosts={{metrics_collector_hosts}} config.files={{logfeeder_config_files}} + +# Custom properties +{% for key, value in logfeeder_custom_properties.items() %} +{{key}}={{value}} +{% endfor %} http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 index 190d4e2..ac731ce 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/logsearch.properties.j2 @@ -42,3 +42,11 @@ solr.history.replication_factor={{logsearch_repfactor}} #Logfeeder Settings logfeeder.include.default.level={{logsearch_logfeeder_log_level_include}} + +# logsearch-admin.json +logsearch.login.credentials.file={{logsearch_admin_credential_file}} + +# Custom properties +{% for key, value in logsearch_custom_properties.items() %} +{{key}}={{value}} +{% endfor %} http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 index be0f259..890a990 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 @@ -16,6 +16,8 @@ set -e +export LOGSEARCH_PORT={{logsearch_ui_port}} + # path containing LogSearch.jar file export LOGSEARCH_PATH={{logsearch_dir}} http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json index 13abc68..46447d8 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json @@ -13,12 +13,12 @@ "url": "%@://%@:%@", "requires_user_name": "false", "port": { - "http_property": "logsearch.ui.port", + "http_property": "logsearch_ui_port", "http_default_port": "8888", - "https_property": "logsearch.ui.port", + "https_property": "logsearch_ui_port", "https_default_port": "8888", "regex": "^(\\d+)$", - "site": "logsearch-site" + "site": "logsearch-env" } } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java index af84e92..3ca978c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java @@ -57,7 +57,7 @@ public class LoggingRequestHelperFactoryImplTest { Cluster clusterMock = mockSupport.createMock(Cluster.class); - Config logSearchSiteConfig = + Config logSearchEnvConfig = mockSupport.createMock(Config.class); ServiceComponentHost serviceComponentHostMock = @@ -68,15 +68,15 @@ public class LoggingRequestHelperFactoryImplTest { Map<String, String> testProperties = new HashMap<String, String>(); - testProperties.put("logsearch.ui.port", expectedPortNumber); + testProperties.put("logsearch_ui_port", expectedPortNumber); expect(controllerMock.getClusters()).andReturn(clustersMock).atLeastOnce(); expect(controllerMock.getCredentialStoreService()).andReturn(credentialStoreServiceMock).atLeastOnce(); expect(clustersMock.getCluster(expectedClusterName)).andReturn(clusterMock).atLeastOnce(); - expect(clusterMock.getDesiredConfigByType("logsearch-site")).andReturn(logSearchSiteConfig).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-env")).andReturn(logSearchEnvConfig).atLeastOnce(); expect(clusterMock.getServiceComponentHosts("LOGSEARCH", "LOGSEARCH_SERVER")).andReturn(Collections.singletonList(serviceComponentHostMock)).atLeastOnce(); expect(clusterMock.getServices()).andReturn(Collections.singletonMap("LOGSEARCH", (Service) null)).atLeastOnce(); - expect(logSearchSiteConfig.getProperties()).andReturn(testProperties).atLeastOnce(); + expect(logSearchEnvConfig.getProperties()).andReturn(testProperties).atLeastOnce(); expect(serviceComponentHostMock.getHostName()).andReturn(expectedHostName).atLeastOnce(); expect(serviceComponentHostMock.getState()).andReturn(State.STARTED).atLeastOnce(); @@ -115,7 +115,7 @@ public class LoggingRequestHelperFactoryImplTest { Cluster clusterMock = mockSupport.createMock(Cluster.class); - Config logSearchSiteConfig = + Config logSearchEnvConfig = mockSupport.createMock(Config.class); ServiceComponentHost serviceComponentHostMock = @@ -123,11 +123,11 @@ public class LoggingRequestHelperFactoryImplTest { Map<String, String> testProperties = new HashMap<String, String>(); - testProperties.put("logsearch.ui.port", expectedPortNumber); + testProperties.put("logsearch_ui_port", expectedPortNumber); expect(controllerMock.getClusters()).andReturn(clustersMock).atLeastOnce(); expect(clustersMock.getCluster(expectedClusterName)).andReturn(clusterMock).atLeastOnce(); - expect(clusterMock.getDesiredConfigByType("logsearch-site")).andReturn(logSearchSiteConfig).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-env")).andReturn(logSearchEnvConfig).atLeastOnce(); expect(clusterMock.getServiceComponentHosts("LOGSEARCH", "LOGSEARCH_SERVER")).andReturn(Collections.singletonList(serviceComponentHostMock)).atLeastOnce(); expect(clusterMock.getServices()).andReturn(Collections.singletonMap("LOGSEARCH", (Service) null)).atLeastOnce(); @@ -165,12 +165,12 @@ public class LoggingRequestHelperFactoryImplTest { Cluster clusterMock = mockSupport.createMock(Cluster.class); - Config logSearchSiteConfig = + Config logSearchEnvConfig = mockSupport.createMock(Config.class); expect(controllerMock.getClusters()).andReturn(clustersMock).atLeastOnce(); expect(clustersMock.getCluster(expectedClusterName)).andReturn(clusterMock).atLeastOnce(); - expect(clusterMock.getDesiredConfigByType("logsearch-site")).andReturn(logSearchSiteConfig).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-env")).andReturn(logSearchEnvConfig).atLeastOnce(); expect(clusterMock.getServiceComponentHosts("LOGSEARCH", "LOGSEARCH_SERVER")).andReturn(Collections.<ServiceComponentHost>emptyList()).atLeastOnce(); expect(clusterMock.getServices()).andReturn(Collections.singletonMap("LOGSEARCH", (Service)null)).atLeastOnce(); http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java index ceb11d8..0a7e8f2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java @@ -147,7 +147,7 @@ public class LoggingRequestHelperImplTest { Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>(); Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>(); - expect(clusterMock.getDesiredConfigByType("logsearch-admin-properties")).andReturn(adminPropertiesConfigMock).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce(); expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce(); expect(networkConnectionMock.readQueryResponseFromServer(capture(captureURLConnection))).andReturn(new StringBuffer(TEST_JSON_INPUT_TWO_LIST_ENTRIES)).atLeastOnce(); @@ -325,7 +325,7 @@ public class LoggingRequestHelperImplTest { Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>(); Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>(); - expect(clusterMock.getDesiredConfigByType("logsearch-admin-properties")).andReturn(adminPropertiesConfigMock).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce(); expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce(); expect(networkConnectionMock.readQueryResponseFromServer(capture(captureURLConnection))).andReturn(new StringBuffer(TEST_JSON_INPUT_LOG_LEVEL_QUERY)).atLeastOnce(); @@ -417,7 +417,7 @@ public class LoggingRequestHelperImplTest { Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>(); Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>(); - expect(clusterMock.getDesiredConfigByType("logsearch-admin-properties")).andReturn(adminPropertiesConfigMock).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce(); expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce(); expect(networkConnectionMock.readQueryResponseFromServer(capture(captureURLConnection))).andReturn(new StringBuffer(TEST_JSON_INPUT_TWO_LIST_ENTRIES)).atLeastOnce(); @@ -498,7 +498,7 @@ public class LoggingRequestHelperImplTest { Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>(); Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>(); - expect(clusterMock.getDesiredConfigByType("logsearch-admin-properties")).andReturn(adminPropertiesConfigMock).atLeastOnce(); + expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce(); expect(clusterMock.getClusterName()).andReturn(expectedClusterName).atLeastOnce(); expect(adminPropertiesConfigMock.getProperties()).andReturn(Collections.<String, String>emptyMap()).atLeastOnce(); expect(networkConnectionMock.readQueryResponseFromServer(capture(captureURLConnection))).andReturn(new StringBuffer(TEST_JSON_INPUT_TWO_LIST_ENTRIES)).atLeastOnce(); http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/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 156a731..f1e5efd 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 @@ -26,7 +26,7 @@ from resource_management.libraries.script.config_dictionary import UnknownConfig class TestLogSearch(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "LOGSEARCH/0.5.0/package" STACK_VERSION = "2.4" - + def configureResourcesCalled(self): self.assertResourceCalled('Directory', '/var/log/ambari-logsearch-portal', owner = 'logsearch', @@ -63,7 +63,7 @@ class TestLogSearch(RMFTestCase): cd_access = 'a', mode = 0755 ) - + self.assertResourceCalled('File', '/var/log/ambari-logsearch-portal/logsearch.out', owner = 'logsearch', group = 'logsearch', @@ -84,9 +84,9 @@ class TestLogSearch(RMFTestCase): owner = "logsearch" ) - self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/user_pass.json', + self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/logsearch-admin.json', owner = 'logsearch', - content = InlineTemplate(self.getConfig()['configurations']['logsearch-admin-properties']['content']) + content = InlineTemplate(self.getConfig()['configurations']['logsearch-admin-json']['content']) ) self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/solr_configsets/hadoop_logs/conf/solrconfig.xml', owner = 'logsearch', @@ -96,7 +96,7 @@ class TestLogSearch(RMFTestCase): owner = 'logsearch', content = InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['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/logsearch --download-config -d /tmp/solr_config_hadoop_logs_0.[0-9]* -cs hadoop_logs -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/logsearch --upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/hadoop_logs/conf -cs hadoop_logs -rt 5 -i 10') @@ -109,7 +109,7 @@ class TestLogSearch(RMFTestCase): self.assertResourceCalled('Execute', ('chmod', '-R', 'ugo+r', '/etc/ambari-logsearch-portal/conf/solr_configsets'), sudo=True ) - + def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/logsearch.py", classname = "LogSearch", @@ -118,10 +118,10 @@ class TestLogSearch(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - + self.configureResourcesCalled() self.assertNoMoreResources() - + def test_start_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/logsearch.py", classname = "LogSearch", @@ -130,9 +130,9 @@ class TestLogSearch(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - + self.configureResourcesCalled() - self.assertResourceCalled('Execute', "/usr/lib/ambari-logsearch-portal/run.sh 61888", + self.assertResourceCalled('Execute', "/usr/lib/ambari-logsearch-portal/run.sh", environment = {'LOGSEARCH_INCLUDE': '/etc/ambari-logsearch-portal/conf/logsearch-env.sh'}, user = "logsearch" ) http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-server/src/test/python/stacks/2.4/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json index 8445c2b..e528797 100644 --- a/ambari-server/src/test/python/stacks/2.4/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json @@ -221,7 +221,7 @@ "ranger-env": { "xml_configurations_supported" : "true" }, - "logsearch-admin-properties" : { + "logsearch-admin-json" : { "logsearch_admin_username" : "admin", "logsearch_admin_password" : "admin", "content": "admin json content" @@ -246,12 +246,6 @@ "logsearch-solr-log4j": { "content": "\n# Logging level\nsolr.log={{solr_log_dir}}\n#log4j.rootLogger=INFO, file, CONSOLE\nlog4j.rootLogger=INFO, file\n\nlog4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender\n\nlog4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout\nlog4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x [%X{collection} %X{shard} %X{replica} %X{core}] \\u2013 %m%n\n\n#- size rotation with log cleanup.\nlog4j.appender.file=org.apache.log4j.RollingFileAppender\nlog4j.appender.file.MaxFileSize=10MB\nlog4j.appender.file.MaxBackupIndex=9\n\n#- File to log to and log format\nlog4j.appender.file.File=${solr.log}/solr.log\nlog4j.appender.file.layout=org.apache.log4j.PatternLayout\nlog4j.appender.file.layout.ConversionPattern=%d{ISO8601} [%t] %-5p [%X{collection} %X{shard} %X{replica} %X{core}] %C (%F:%L) - %m%n\n\nlog4j.logger.org.apache.zookeeper=WARN\nlog4j.logger.org.apache.hadoop=WARN\n\n# set to INFO to enable infostream log messages\nlog4j.logger.org.apache.solr.u pdate.LoggingInfoStream=OFF" }, - "solr-zoo-env": { - "content": "\n# The number of milliseconds of each tick\ntickTime=2000\n# The number of ticks that the initial\n# synchronization phase can take\ninitLimit=10\n# The number of ticks that can pass between\n# sending a request and getting an acknowledgement\nsyncLimit=5\n\n# the directory where the snapshot is stored.\n# dataDir=/opt/zookeeper/data\n# NOTE: Solr defaults the dataDir to $solrHome/zoo_data\n\n# the port at which the clients will connect\n# clientPort=2181\n# NOTE: Solr sets this based on zkRun / zkHost params" - }, - "solr-sh": { - "content": "\n#!/bin/bash\n# Licensed to the Apache Software Foundation (ASF) under one or more\n# contributor license agreements. See the NOTICE file distributed with\n# this work for additional information regarding copyright ownership.\n# The ASF licenses this file to You under the Apache License, Version 2.0\n# (the \"License\"); you may not use this file except in compliance with\n# the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n#This script is a wrapper for calling bin/solr but using custom properties\nSOLR_INCLUDE={{logsearch_solr_conf}}/solr.in.sh {{solr_bindir}}/solr $*" - }, "logsearch-env": { "logsearch_user": "logsearch", "logsearch_group": "logsearch", @@ -271,13 +265,15 @@ "logsearch-log4j": { "content": "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<!--\n Licensed to the Apache Software Foundation (ASF) under one or more\n contributor license agreements. See the NOTICE file distributed with\n this work for additional information regarding copyright ownership.\n The ASF licenses this file to You under the Apache License, Version 2.0\n (the \"License\"); you may not use this file except in compliance with\n the License. You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n-->\n<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">\n<log4j:configuration xmlns:log4j=\"http://jakarta. apache.org/log4j/\">\n <appender name=\"console\" class=\"org.apache.log4j.ConsoleAppender\">\n <param name=\"Target\" value=\"System.out\" />\n <layout class=\"org.apache.log4j.PatternLayout\">\n <param name=\"ConversionPattern\" value=\"%d [%t] %-5p %C{6} (%F:%L) - %m%n\" />\n </layout>\n </appender>\n\n <appender name=\"rolling_file\" class=\"org.apache.log4j.RollingFileAppender\"> \n <param name=\"file\" value=\"{{logsearch_log_dir}}/logsearch.log\" /> \n <param name=\"append\" value=\"true\" /> \n <param name=\"maxFileSize\" value=\"10MB\" /> \n <param name=\"maxBackupIndex\" value=\"10\" /> \n <layout class=\"org.apache.log4j.PatternLayout\"> \n <param name=\"ConversionPattern\" value=\"%d [%t] %-5p %C{6} (%F:%L) - %m%n\"/> \n </layout> \n </appender> \n\n <appender name=\"performance_analyzer\" class=\"org.apache.log4j.RollingFileAppender\" >\n <param name=\"file\" value=\"{{logsearch_log_dir}}/logsearch-performance.log\" />\n <param name=\"Threshold\" value=\"info\" />\n <param name=\"append\" value=\"true\" />\n <param name=\"maxFileSize\" value=\"10MB\" /> \n <param name=\"maxBackupIndex\" value=\"10\" /> \n <layout class=\"org.apache.log4j.PatternLayout\">\n <param name=\"ConversionPattern\" value=\"%d [%t] %-5p %C{6} (%F:%L) - %m%n\" />\n </layout>\n </appender>\n \n <logger name=\"org.apache.ambari.logsearch.perfomance\" additivity=\"false\">\n <appender-ref ref=\"performance_analyzer\" />\n </logger>\n\n <category name=\"org.apache.ambari.logsearch\" additivity=\"false\">\n <priority value=\"info\" />\n <appender-ref ref=\"rolling_file\" />\n </category>\n\n <root>\n <priority value=\"warn\" />\n <appender-ref ref=\"rolling_file\" />\n </root>\ n</log4j:configuration>" }, - "logsearch-site": { - "logsearch.ui.port": "61888", + "logsearch-properties": { "logsearch.collection.numshards": "10", "logsearch.collection.replication.factor": "1", "logsearch.app.max.memory": "1g" }, + "logfeeder-properties": { + }, "logfeeder-env": { + "logsearch_ui_port": "61888", "logfeeder_user": "logfeeder", "logfeeder_group": "logfeeder", "logfeeder_pid_dir": "/var/run/ambari-logsearch-logfeeder", http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/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 92509d9..8851a78 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1875,6 +1875,21 @@ var hdp2properties = [ "index": 12 }, /************************************************LOGSEARCH******************************************/ + /*logfeeder-properties*/ + { + "name": "logfeeder.config.files", + "serviceName": "LOGSEARCH", + "filename": "logfeeder-properties.xml", + "category": "Advanced logfeeder-properties", + "index": 1 + }, + { + "name": "logfeeder.checkpoint.folder", + "serviceName": "LOGSEARCH", + "filename": "logfeeder-properties.xml", + "category": "Advanced logfeeder-properties", + "index": 2 + }, /*logfeeder-env*/ { "name": "logfeeder_log_dir", @@ -1884,21 +1899,21 @@ var hdp2properties = [ "index": 1 }, { - "name": "logfeeder_checkpoint_folder", + "name": "logfeeder_pid_dir", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 2 }, { - "name": "logfeeder_pid_dir", + "name": "logfeeder_user", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", "index": 3 }, { - "name": "logfeeder_config_files", + "name": "logfeeder_group", "serviceName": "LOGSEARCH", "filename": "logfeeder-env.xml", "category": "Advanced logfeeder-env", @@ -1990,26 +2005,26 @@ var hdp2properties = [ "category": "Advanced logfeeder-site", "index": 9 }, - /*logsearch-admin-properties*/ + /*logsearch-admin-json*/ { "name": "logsearch_admin_username", "serviceName": "LOGSEARCH", - "filename": "logsearch-admin-properties.xml", - "category": "Advanced logsearch-admin-properties", + "filename": "logsearch-admin-json.xml", + "category": "Advanced logsearch-admin-json", "index": 1 }, { "name": "logsearch_admin_password", "serviceName": "LOGSEARCH", - "filename": "logsearch-admin-properties.xml", - "category": "Advanced logsearch-admin-properties", + "filename": "logsearch-admin-json.xml", + "category": "Advanced logsearch-admin-json", "index": 2 }, { "name": "content", "serviceName": "LOGSEARCH", - "filename": "logsearch-admin-properties.xml", - "category": "Advanced logsearch-admin-properties", + "filename": "logsearch-admin-json.xml", + "category": "Advanced logsearch-admin-json", "index": 3 }, /*logsearch-audit_logs-solrconfig*/ @@ -2029,68 +2044,75 @@ var hdp2properties = [ }, /*logsearch-env*/ { - "name": "logsearch_log_dir", + "name": "logsearch_ui_port", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 1 }, { - "name": "logsearch_pid_dir", + "name": "logsearch_log_dir", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 2 }, { - "name": "logsearch_app_max_memory", + "name": "logsearch_pid_dir", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 3 }, { - "name": "logsearch_solr_audit_logs_zk_node", + "name": "logsearch_app_max_memory", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 4 }, { - "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": 5 }, { - "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": 6 }, { - "name": "logsearch_debug_enabled", + "name": "logsearch_solr_audit_logs_use_ranger", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 7 }, { - "name": "logsearch_debug_port", + "name": "logsearch_debug_enabled", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 8 }, { - "name": "content", + "name": "logsearch_debug_port", "serviceName": "LOGSEARCH", "filename": "logsearch-env.xml", "category": "Advanced logsearch-env", "index": 9 }, + { + "name": "content", + "serviceName": "LOGSEARCH", + "filename": "logsearch-env.xml", + "category": "Advanced logsearch-env", + "index": 10 + }, /*logsearch-log4j*/ { "name": "content", @@ -2114,68 +2136,61 @@ var hdp2properties = [ "category": "Advanced logsearch-service_logs-solrconfig", "index": 2 }, - /*logsearch-site*/ - { - "name": "logsearch.ui.port", - "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", - "index": 1 - }, + /*logsearch-properties*/ { "name": "logsearch.collection.numshards", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", - "index": 2 + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", + "index": 1 }, { "name": "logsearch.collection.replication.factor", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", - "index": 3 + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", + "index": 2 }, { "name": "logsearch.solr.collection.service.logs", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 4 }, { "name": "logsearch.service.logs.fields", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 5 }, { "name": "logsearch.service.logs.split.interval.mins", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 6 }, { "name": "logsearch.solr.collection.audit.logs", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 7 }, { "name": "logsearch.audit.logs.split.interval.mins", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 8 }, { "name": "logsearch.logfeeder.include.default.level", "serviceName": "LOGSEARCH", - "filename": "logsearch-site.xml", - "category": "Advanced logsearch-site", + "filename": "logsearch-properties.xml", + "category": "Advanced logsearch-properties", "index": 9 }, /*logsearch-solr-env*/ http://git-wip-us.apache.org/repos/asf/ambari/blob/03ce1907/ambari-web/app/models/quick_links.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js index b7ad1ce..b062895 100644 --- a/ambari-web/app/models/quick_links.js +++ b/ambari-web/app/models/quick_links.js @@ -362,9 +362,9 @@ App.QuickLinks.FIXTURES = [ url:'%@://%@:%@', service_id: 'LOGSEARCH', template:'%@://%@:%@', - http_config: 'logsearch.ui.port', - https_config: 'logsearch.ui.port', - site: 'logsearch-site', + http_config: 'logsearch_ui_port', + https_config: 'logsearch_ui_port', + site: 'logsearch-env', regex: '^(\\d+)$', default_http_port: 61888, default_https_port: 61888
