You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2016/06/21 17:36:54 UTC
ambari git commit: AMBARI-17323. Follow up NiFi log changes in the
LogFeeder config (Miklos Gergely via oleewere)
Repository: ambari
Updated Branches:
refs/heads/trunk 78037086e -> 4f0c4a9ea
AMBARI-17323. Follow up NiFi log changes in the LogFeeder config (Miklos Gergely via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f0c4a9e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f0c4a9e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f0c4a9e
Branch: refs/heads/trunk
Commit: 4f0c4a9ea865fb75918023bed1c497ed054753d2
Parents: 7803708
Author: Miklos Gergely <mg...@hortonwork.com>
Authored: Tue Jun 21 19:34:57 2016 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Tue Jun 21 19:36:07 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/HadoopServiceConfig.json | 20 ++------
.../LOGSEARCH/0.5.0/package/scripts/params.py | 3 +-
.../package/templates/input.config-nifi.json.j2 | 48 +++++---------------
3 files changed, 17 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f0c4a9e/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json
index 71a4c1c..73400e3 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/HadoopServiceConfig.json
@@ -230,28 +230,16 @@
"label":"NiFi",
"components":[
{
- "name":"nifi_app_master"
+ "name":"nifi_app"
},
{
- "name":"nifi_bootstrap_master"
+ "name":"nifi_bootstrap"
},
{
- "name":"nifi_setup_master"
+ "name":"nifi_setup"
},
{
- "name":"nifi_user_master"
- },
- {
- "name":"nifi_app_node"
- },
- {
- "name":"nifi_bootstrap_node"
- },
- {
- "name":"nifi_setup_node"
- },
- {
- "name":"nifi_user_node"
+ "name":"nifi_user"
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f0c4a9e/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 b70f38f..d21a97f 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
@@ -251,8 +251,7 @@ hbase_log_dir = default('/configurations/hbase-env/hbase_log_dir', '/var/log/hba
hdfs_log_dir_prefix = default('/configurations/hadoop-env/hdfs_log_dir_prefix', '/var/log/hadoop')
hive_log_dir = default('/configurations/hive-env/hive_log_dir', '/var/log/hive')
kafka_log_dir = default('/configurations/kafka-env/kafka_log_dir', '/var/log/kafka')
-nifi_master_log_dir = default('/configurations/nifi-bootstrap-env/nifi_master_log_dir', '/var/log/nifi_master')
-nifi_node_log_dir = default('/configurations/nifi-bootstrap-env/nifi_nod_log_dir', '/var/log/nifi_node')
+nifi_log_dir = default('/configurations/nifi-env/nifi_node_log_dir', '/var/log/nifi')
oozie_log_dir = default('/configurations/oozie-env/oozie_log_dir', '/var/log/oozie')
ranger_usersync_log_dir = default('/configurations/ranger-env/ranger_usersync_log_dir', '/var/log/ranger/usersync')
ranger_admin_log_dir = default('/configurations/ranger-env/ranger_admin_log_dir', '/var/log/ranger/admin')
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f0c4a9e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
index 1bbab20..64c69a7 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
@@ -18,44 +18,24 @@
{
"input":[
{
- "type":"nifi_app_master",
+ "type":"nifi_app",
"rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-app.log"
+ "path":"{{nifi_log_dir}}/nifi-app.log"
},
{
- "type":"nifi_bootstrap_master",
+ "type":"nifi_bootstrap",
"rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-bootstrap.log"
+ "path":"{{nifi_log_dir}}/nifi-bootstrap.log"
},
{
- "type":"nifi_setup_master",
+ "type":"nifi_setup",
"rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-setup.log"
+ "path":"{{nifi_log_dir}}/nifi-setup.log"
},
{
- "type":"nifi_user_master",
+ "type":"nifi_user",
"rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-user.log"
- },
- {
- "type":"nifi_app_node",
- "rowtype":"service",
- "path":"{{nifi_node_log_dir}}/nifi-app.log"
- },
- {
- "type":"nifi_bootstrap_node",
- "rowtype":"service",
- "path":"{{nifi_node_log_dir}}/nifi-bootstrap.log"
- },
- {
- "type":"nifi_setup_node",
- "rowtype":"service",
- "path":"{{nifi_node_log_dir}}/nifi-setup.log"
- },
- {
- "type":"nifi_user_node",
- "rowtype":"service",
- "path":"{{nifi_node_log_dir}}/nifi-user.log"
+ "path":"{{nifi_log_dir}}/nifi-user.log"
}
],
@@ -65,14 +45,10 @@
"conditions":{
"fields":{
"type":[
- "nifi_app_master",
- "nifi_bootstrap_master",
- "nifi_setup_master",
- "nifi_user_master",
- "nifi_app_node",
- "nifi_bootstrap_node",
- "nifi_setup_node",
- "nifi_user_node"
+ "nifi_app",
+ "nifi_bootstrap",
+ "nifi_setup",
+ "nifi_user",
]
}