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-17649. Fix logfeeder inputs for hbase and hdfs (oleewere)
Date Mon, 11 Jul 2016 14:47:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8e3b1ff61 -> 15e58ecc2


AMBARI-17649. Fix logfeeder inputs for hbase and hdfs (oleewere)


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

Branch: refs/heads/trunk
Commit: 15e58ecc283b32458920ed1c167e746ba335a05e
Parents: 8e3b1ff
Author: oleewere <oleewere@gmail.com>
Authored: Mon Jul 11 13:30:08 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Mon Jul 11 16:43:37 2016 +0200

----------------------------------------------------------------------
 .../0.5.0/package/templates/input.config-hbase.json.j2         | 6 +++---
 .../0.5.0/package/templates/input.config-hdfs.json.j2          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/15e58ecc/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hbase.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hbase.json.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hbase.json.j2
index 42c5683..78204c7 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hbase.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hbase.json.j2
@@ -20,17 +20,17 @@
     {
       "type":"hbase_master",
       "rowtype":"service",
-      "path":"{{hbase_log_dir}}/hbase-hbase-master-*.log"
+      "path":"{{hbase_log_dir}}/hbase-*-master-*.log"
     },
     {
       "type":"hbase_regionserver",
       "rowtype":"service",
-      "path":"{{hbase_log_dir}}/hbase-hbase-regionserver-*.log"
+      "path":"{{hbase_log_dir}}/hbase-*-regionserver-*.log"
     },
     {
       "type":"hbase_phoenix_server",
       "rowtype":"service",
-      "path":"{{hbase_log_dir}}/phoenix-hbase-server.log"
+      "path":"{{hbase_log_dir}}/phoenix-*-server.log"
     }
 
   ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/15e58ecc/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hdfs.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hdfs.json.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hdfs.json.j2
index 639b4f5..2222171 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hdfs.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hdfs.json.j2
@@ -57,7 +57,7 @@
         "repoType":"1",
         "repo":"hdfs"
       },
-      "path":"{{hdfs_log_dir_prefix}}/{hdfs_user}}/hdfs-audit.log"
+      "path":"{{hdfs_log_dir_prefix}}/{{hdfs_user}}/hdfs-audit.log"
     }
 
   ],


Mime
View raw message