Repository: ambari Updated Branches: refs/heads/branch-2.5 6a0074881 -> 6adc5856c
AMBARI-20766 Log Feeder fill cluster name if it is not set (mgergely) Change-Id: I3220c6257d468dab965ff30bed808c4ad91e8399 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6adc5856 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6adc5856 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6adc5856 Branch: refs/heads/branch-2.5 Commit: 6adc5856c50af2daf750f93c328ad3e018939d94 Parents: 6a00748 Author: Miklos Gergely <mgerg...@hortonworks.com> Authored: Fri Apr 21 18:23:01 2017 +0200 Committer: Miklos Gergely <mgerg...@hortonworks.com> Committed: Fri Apr 21 18:23:44 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/logfeeder/output/OutputManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6adc5856/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputManager.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputManager.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputManager.java index 3c80e50..8bf6ae3 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputManager.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputManager.java @@ -78,7 +78,7 @@ public class OutputManager { // Update the block with the context fields for (Map.Entry<String, String> entry : input.getContextFields().entrySet()) { - if (jsonObj.get(entry.getKey()) == null) { + if (jsonObj.get(entry.getKey()) == null || entry.getKey().equals("cluster") && "null".equals(jsonObj.get(entry.getKey()))) { jsonObj.put(entry.getKey(), entry.getValue()); } }
