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/08 17:42:03 UTC
ambari git commit: Revert "AMBARI-17086. Log Search capability for
Nifi (Miklos Gergely via oleewere)"
Repository: ambari
Updated Branches:
refs/heads/trunk 5eabceb82 -> 6a4cd4774
Revert "AMBARI-17086. Log Search capability for Nifi (Miklos Gergely via oleewere)"
This reverts commit de44995464af2901f214e74e730341b0c1aa61ac.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a4cd477
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a4cd477
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a4cd477
Branch: refs/heads/trunk
Commit: 6a4cd477449a1d78c7863ccb6a27dbdbe40fe516
Parents: 5eabceb
Author: oleewere <ol...@gmail.com>
Authored: Wed Jun 8 19:36:46 2016 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Wed Jun 8 19:41:38 2016 +0200
----------------------------------------------------------------------
.../LOGSEARCH/0.5.0/package/scripts/params.py | 4 +-
.../package/templates/input.config-nifi.json.j2 | 98 --------------------
2 files changed, 1 insertion(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a4cd477/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 7acdec2..34583ba 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
@@ -230,8 +230,6 @@ 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')
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')
@@ -310,7 +308,7 @@ logfeeder_log_filter_enable = str(default('/configurations/logfeeder-properties/
logfeeder_solr_config_interval = default('/configurations/logfeeder-properties/logfeeder.solr.config.interval', 5)
logfeeder_supported_services = ['accumulo', 'ambari', 'ams', 'atlas', 'falcon', 'hbase', 'hdfs', 'hive', 'kafka',
- 'knox', 'logsearch', 'nifi', 'oozie', 'ranger', 'storm', 'yarn', 'zookeeper']
+ 'knox', 'logsearch', 'oozie', 'ranger', 'storm', 'yarn', 'zookeeper']
logfeeder_config_file_names = ['global.config.json', 'output.config.json'] + ['input.config-%s.json' % (tag) for tag in
logfeeder_supported_services]
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a4cd477/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
deleted file mode 100644
index 1bbab20..0000000
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-nifi.json.j2
+++ /dev/null
@@ -1,98 +0,0 @@
-{#
- # 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.
- #}
-{
- "input":[
- {
- "type":"nifi_app_master",
- "rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-app.log"
- },
- {
- "type":"nifi_bootstrap_master",
- "rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-bootstrap.log"
- },
- {
- "type":"nifi_setup_master",
- "rowtype":"service",
- "path":"{{nifi_master_log_dir}}/nifi-setup.log"
- },
- {
- "type":"nifi_user_master",
- "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"
- }
-
- ],
- "filter":[
- {
- "filter":"grok",
- "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"
- ]
-
- }
-
- },
- "log4j_format":"",
- "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})",
- "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{GREEDYDATA:log_message}",
- "post_map_values":{
- "logtime":{
- "map_date":{
- "date_pattern":"yyyy-MM-dd HH:mm:ss,SSS"
- }
-
- }
-
- }
-
- }
-
- ]
-
-}