Repository: ambari Updated Branches: refs/heads/branch-2.5 00b2c42cc -> 404cd853f
AMBARI-19650. Remove hard coded smartsense Log Feeder config from Log Search stack (oleewere) Change-Id: I187622ca0df92eba2b462f0362d16641e529a55c Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/404cd853 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/404cd853 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/404cd853 Branch: refs/heads/branch-2.5 Commit: 404cd853f9267bde05a393475c007cf4676f0ad2 Parents: 00b2c42 Author: oleewere <[email protected]> Authored: Fri Jan 20 14:17:28 2017 +0100 Committer: oleewere <[email protected]> Committed: Fri Jan 20 16:34:39 2017 +0100 ---------------------------------------------------------------------- .../LOGSEARCH/0.5.0/package/scripts/params.py | 2 - .../package/templates/input.config-hst.json.j2 | 102 ------------------- 2 files changed, 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/404cd853/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 7f502d7..08c0a7b 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 @@ -187,8 +187,6 @@ logsearch_app_log4j_content = config['configurations']['logsearch-log4j']['conte # Log dirs ambari_server_log_dir = '/var/log/ambari-server' ambari_agent_log_dir = '/var/log/ambari-agent' -hst_log_dir = '/var/log/hst' -hst_activity_log_dir = '/var/log/smartsense-activity' nifi_log_dir = default('/configurations/nifi-env/nifi_node_log_dir', '/var/log/nifi') # System logs http://git-wip-us.apache.org/repos/asf/ambari/blob/404cd853/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 deleted file mode 100644 index 33a41a6..0000000 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/templates/input.config-hst.json.j2 +++ /dev/null @@ -1,102 +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":"hst_server", - "rowtype":"service", - "path":"{{hst_log_dir}}/hst-server.log" - }, - { - "type":"hst_agent", - "rowtype":"service", - "path":"{{hst_log_dir}}/hst-agent.log" - }, - { - "type":"activity_analyzer", - "rowtype":"service", - "path":"{{hst_activity_log_dir}}/activity-analyzer.log" - }, - { - "type":"activity_explorer", - "rowtype":"service", - "path":"{{hst_activity_log_dir}}/activity-explorer.log" - } - ], - "filter":[ - { - "filter":"grok", - "conditions":{ - "fields":{ - "type":[ - "hst_agent" - ] - } - }, - "log4j_format":"", - "multiline_pattern":"^(%{CUSTOM_DATESTAMP:logtime})", - "message_pattern":"(?m)^%{CUSTOM_DATESTAMP:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}", - "post_map_values":{ - "logtime":{ - "map_date":{ - "target_date_pattern":"dd MMM yyyy HH:mm:ss" - } - }, - "level":{ - "map_fieldvalue":{ - "pre_value":"WARNING", - "post_value":"WARN" - } - } - } - }, - { - "filter":"grok", - "conditions":{ - "fields":{ - "type":[ - "hst_server", - "activity_analyzer", - "activity_explorer" - ] - } - }, - "log4j_format":"", - "multiline_pattern":"^(%{CUSTOM_DATESTAMP:logtime})", - "message_pattern":"(?m)^%{CUSTOM_DATESTAMP:logtime}%{SPACE}%{LOGLEVEL:level}%{SPACE}\\[%{DATA:thread_name}\\]%{SPACE}%{JAVAFILE:file}:%{INT:line_number}%{SPACE}-%{SPACE}%{GREEDYDATA:log_message}", - "post_map_values":{ - "logtime":{ - "map_date":{ - "target_date_pattern":"dd MMM yyyy HH:mm:ss,SSS" - } - - }, - "level":{ - "map_fieldvalue":{ - "pre_value":"WARNING", - "post_value":"WARN" - } - } - - } - } - - ] - - }
