Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C899A200D71 for ; Wed, 20 Dec 2017 18:05:17 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C6C7C160BF9; Wed, 20 Dec 2017 17:05:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1AA0D160C15 for ; Wed, 20 Dec 2017 18:05:16 +0100 (CET) Received: (qmail 84332 invoked by uid 500); 20 Dec 2017 17:05:16 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 84323 invoked by uid 99); 20 Dec 2017 17:05:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2017 17:05:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 266C8DFF72; Wed, 20 Dec 2017 17:05:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Wed, 20 Dec 2017 17:05:16 -0000 Message-Id: <77db5ad2090e4c6d9786c6d8e62caab0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-22630. Update the default storm log search configuration (use wildcards) (oleewere) archived-at: Wed, 20 Dec 2017 17:05:18 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.6 e1d95ff63 -> 0cf1defb1 AMBARI-22630. Update the default storm log search configuration (use wildcards) (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0cf1defb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0cf1defb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0cf1defb Branch: refs/heads/branch-2.6 Commit: 0cf1defb1a3fc62a752ca1287393d33290b6d8f6 Parents: ab71b5a Author: Oliver Szabo Authored: Tue Dec 12 16:59:33 2017 +0100 Committer: Oliver Szabo Committed: Wed Dec 20 18:03:23 2017 +0100 ---------------------------------------------------------------------- .../configuration/storm-logsearch-conf.xml | 104 +++++++++++++------ 1 file changed, 75 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0cf1defb/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-logsearch-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-logsearch-conf.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-logsearch-conf.xml index d485017..0c3e38d 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-logsearch-conf.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-logsearch-conf.xml @@ -65,46 +65,92 @@ "type":"storm_ui", "rowtype":"service", "path":"{{default('/configurations/storm-env/storm_log_dir', '/var/log/storm')}}/ui.log" - }, - { + } + {# + ,{ "type":"storm_worker", "rowtype":"service", - "path":"{{default('/configurations/storm-env/storm_log_dir', '/var/log/storm')}}/*worker*.log" + "path":"{{default('/configurations/storm-env/storm_log_dir', '/var/log/storm')}}/workers-artifacts/*/*/worker.log", + "init_default_fields": "true" } + #} ], - "filter":[ - { - "filter":"grok", - "conditions":{ - "fields":{ - "type":[ - "storm_drpc", - "storm_logviewer", - "storm_nimbus", - "storm_supervisor", - "storm_ui", - "storm_worker" - ] + "filter":[ + { + "filter":"grok", + "sort_order": 1, + "conditions":{ + "fields":{ + "type":[ + "storm_nimbus", + "storm_supervisor", + "storm_logviewer", + "storm_drpc", + "storm_ui", + "storm_worker" + ] + } + }, + "log4j_format":"", + "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", + "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{JAVACLASS:logger_name}\\s%{GREEDYDATA:thread_name}\\s\\[%{LOGLEVEL:level}\\]\\s%{GREEDYDATA:log_message}", + "post_map_values":{ + "logtime":{ + "map_date":{ + "target_date_pattern":"yyyy-MM-dd HH:mm:ss.SSS" + } + } } }, - "log4j_format":"", - "multiline_pattern":"^(%{TIMESTAMP_ISO8601:logtime})", - "message_pattern":"(?m)^%{TIMESTAMP_ISO8601:logtime}%{SPACE}%{JAVACLASS:logger_name}%{SPACE}\\[%{LOGLEVEL:level}\\]%{SPACE}%{SPACE}%{GREEDYDATA:log_message}", - "post_map_values":{ - "logtime":{ - "map_date":{ - "target_date_pattern":"yyyy-MM-dd HH:mm:ss.SSS" - } - } + { + "filter":"grok", + "sort_order": 2, + "conditions":{ + "fields":{ + "type":[ + "storm_worker" + ] + } + }, + "source_field": "thread_name", + "remove_source_field": "false", + "message_pattern":"(Thread\\-[0-9]+\\-[0-9]+\\-%{DATA:sdi_streamline_component_name}\\-executor%{DATA}|%{DATA:thread_name})" + }, + { + "filter":"grok", + "sort_order": 3, + "conditions":{ + "fields":{ + "type":[ + "storm_worker" + ] + } + }, + "source_field": "path", + "remove_source_field": "false", + "message_pattern":"{{default('/configurations/storm-env/storm_log_dir', '/var/log/storm')}}/workers-artifacts/%{DATA:sdi_storm_topology_id}/%{DATA:sdi_storm_worker_port}/worker\\.log" + }, + { + "filter":"grok", + "sort_order": 4, + "conditions":{ + "fields":{ + "type":[ + "storm_worker" + ] + } + }, + "source_field": "sdi_storm_topology_id", + "remove_source_field": "false", + "message_pattern":"(streamline\\-%{DATA:sdi_streamline_topology_id}\\-%{DATA:sdi_streamline_topology_name}\\-[0-9]+\\-[0-9]+)|(%{DATA:sdi_storm_topology_id})" } - } - ] - } + ] + } content false - +