[ambari] branch trunk updated: AMBARI-23652. LogFeeder: lowercase cluster name (writing docs & znode generation) (#1066)

[oleewere]

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 baff299  AMBARI-23652. LogFeeder: lowercase cluster name (writing docs 
& znode generation) (#1066)
baff299 is described below

commit baff299f3902b8e9e160616d2a935bed11f0b04d
Author: Olivér Szabó <oleew...@gmail.com>
AuthorDate: Mon Apr 23 11:20:41 2018 +0200

    AMBARI-23652. LogFeeder: lowercase cluster name (writing docs & znode 
generation) (#1066)
---
 .../org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java  | 2 +-
 .../src/main/java/org/apache/ambari/logfeeder/conf/LogFeederProps.java  | 2 +-
 ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
index c74fad3..8b2c17d 100644
--- 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
+++ 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
@@ -98,7 +98,7 @@ public class LogSearchConfigFactory {
         logSearchConfig = defaultClass.newInstance();
       }
       if (init) {
-        logSearchConfig.init(properties, clusterName);
+        logSearchConfig.init(properties, clusterName == null ? "null" : 
clusterName.toLowerCase());
       }
       return logSearchConfig;
     } catch (Exception e) {
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederProps.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederProps.java
index 9a40e70..a75b2d6 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederProps.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederProps.java
@@ -50,7 +50,7 @@ public class LogFeederProps implements LogFeederProperties {
     examples = {"cl1"},
     sources = {LogFeederConstants.LOGFEEDER_PROPERTIES_FILE}
   )
-  @Value("${" + LogFeederConstants.CLUSTER_NAME_PROPERTY + "}")
+  @Value("#{'${" + LogFeederConstants.CLUSTER_NAME_PROPERTY + 
"}'.toLowerCase()}")
   private String clusterName;
 
   @LogSearchPropertyDescription(
diff --git a/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties 
b/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties
index 028cb9f..16cbb0f 100644
--- a/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties
+++ b/ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cluster.name=cl1
+cluster.name=CL1
 logfeeder.checkpoint.folder=/root/checkpoints
 logfeeder.metrics.collector.hosts=
 logfeeder.config.dir=/root/config/logfeeder/shipper-conf/

-- 
To stop receiving notification emails like this one, please contact
oleew...@apache.org.