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 441202009D9 for ; Tue, 3 May 2016 04:38:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4295A1609B0; Tue, 3 May 2016 04:38:34 +0200 (CEST) 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 888001602C5 for ; Tue, 3 May 2016 04:38:33 +0200 (CEST) Received: (qmail 32735 invoked by uid 500); 3 May 2016 02:38:32 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 32726 invoked by uid 99); 3 May 2016 02:38:32 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 02:38:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 241DCC08FB for ; Tue, 3 May 2016 02:38:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id LV_OtHMZwTNF for ; Tue, 3 May 2016 02:38:31 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 723C75F24F for ; Tue, 3 May 2016 02:38:30 +0000 (UTC) Received: (qmail 32690 invoked by uid 99); 3 May 2016 02:38:29 -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; Tue, 03 May 2016 02:38:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB252DFDCF; Tue, 3 May 2016 02:38:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: qingwzhao@apache.org To: commits@eagle.incubator.apache.org Message-Id: <9eec0c2f70134606840fbb2307a155f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-eagle git commit: EAGLE-254 HdfsAuditLog topology keeps alerting for one piece of log Date: Tue, 3 May 2016 02:38:29 +0000 (UTC) archived-at: Tue, 03 May 2016 02:38:34 -0000 Repository: incubator-eagle Updated Branches: refs/heads/dev a725ea557 -> d8be43f1f EAGLE-254 HdfsAuditLog topology keeps alerting for one piece of log https://issues.apache.org/jira/browse/EAGLE-254 Fixed two bugs: HdfsAuditLog topology keeps alerting for one piece of log update invalid links in email template Author: Qingwen Zhao Closes #167 Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/d8be43f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/d8be43f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/d8be43f1 Branch: refs/heads/dev Commit: d8be43f1f7ea22fccf8478dc335bbde42ce856f4 Parents: a725ea5 Author: Zhao, Qingwen Authored: Tue May 3 10:35:26 2016 +0800 Committer: Zhao, Qingwen Committed: Tue May 3 10:35:26 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/eagle/policy/common/UrlBuilder.java | 4 ++-- eagle-hadoop-metric/src/main/resources/log4j.properties | 5 ----- .../security/auditlog/HdfsAuditLogProcessorMain.java | 12 ++++++------ 3 files changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d8be43f1/eagle-core/eagle-policy/eagle-policy-base/src/main/java/org/apache/eagle/policy/common/UrlBuilder.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-policy/eagle-policy-base/src/main/java/org/apache/eagle/policy/common/UrlBuilder.java b/eagle-core/eagle-policy/eagle-policy-base/src/main/java/org/apache/eagle/policy/common/UrlBuilder.java index b10c6c8..1267e93 100644 --- a/eagle-core/eagle-policy/eagle-policy-base/src/main/java/org/apache/eagle/policy/common/UrlBuilder.java +++ b/eagle-core/eagle-policy/eagle-policy-base/src/main/java/org/apache/eagle/policy/common/UrlBuilder.java @@ -39,7 +39,7 @@ public class UrlBuilder { } public static String buildAlertDetailUrl(String host, int port, AlertAPIEntity entity) { - String baseUrl = "http://" + host + ":" + String.valueOf(port) + "/eagle-service/#/dam/alertDetail/"; + String baseUrl = "http://" + host + ":" + String.valueOf(port) + "/eagle-service/ui/#/common/alertDetail/"; try { return baseUrl + UrlEncoded.encodeString(getEncodedRowkey(entity)); } @@ -50,7 +50,7 @@ public class UrlBuilder { } public static String buiildPolicyDetailUrl(String host, int port, Map tags) { - String baseUrl = "http://" + host + ":" + String.valueOf(port) + "/eagle-service/#/dam/policyDetail?"; + String baseUrl = "http://" + host + ":" + String.valueOf(port) + "/eagle-service/ui/#/common/policyDetail/?"; String format = "policy=%s&site=%s&executor=%s"; String policy = tags.get(Constants.POLICY_ID); String site = tags.get(EagleConfigConstants.SITE); http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d8be43f1/eagle-hadoop-metric/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/eagle-hadoop-metric/src/main/resources/log4j.properties b/eagle-hadoop-metric/src/main/resources/log4j.properties index 07f8402..149caa7 100644 --- a/eagle-hadoop-metric/src/main/resources/log4j.properties +++ b/eagle-hadoop-metric/src/main/resources/log4j.properties @@ -18,11 +18,6 @@ log4j.rootLogger=INFO, stdout, DRFA eagle.log.dir=./logs eagle.log.file=eagle.log - -#log4j.logger.org.apache.eagle.security.auditlog.IPZoneDataJoinExecutor=DEBUG -#log4j.logger.org.apache.eagle.security.auditlog.FileSensitivityDataJoinExecutor=DEBUG -log4j.logger.org.apache.eagle.security.auditlog.HdfsUserCommandReassembler=DEBUG -#log4j.logger.org.apache.eagle.executor.AlertExecutor=DEBUG # standard output log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d8be43f1/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogProcessorMain.java ---------------------------------------------------------------------- diff --git a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogProcessorMain.java b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogProcessorMain.java index f63a9be..60b0e36 100644 --- a/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogProcessorMain.java +++ b/eagle-security/eagle-security-hdfs-auditlog/src/main/java/org/apache/eagle/security/auditlog/HdfsAuditLogProcessorMain.java @@ -80,9 +80,9 @@ public class HdfsAuditLogProcessorMain { @SuppressWarnings("unchecked") public static void execWithDefaultPartition(StormExecutionEnvironment env, KafkaSourcedSpoutProvider provider) { StreamProducer source = env.fromSpout(provider).withOutputFields(2).nameAs("kafkaMsgConsumer").groupBy(Arrays.asList(0)); - StreamProducer reassembler = source.flatMap(new HdfsUserCommandReassembler()).groupBy(Arrays.asList(0)); - source.streamUnion(reassembler) - .flatMap(new FileSensitivityDataJoinExecutor()).groupBy(Arrays.asList(0)) + //StreamProducer reassembler = source.flatMap(new HdfsUserCommandReassembler()).groupBy(Arrays.asList(0)); + //source.streamUnion(reassembler) + source.flatMap(new FileSensitivityDataJoinExecutor()).groupBy(Arrays.asList(0)) .flatMap(new IPZoneDataJoinExecutor()) .alertWithConsumer("hdfsAuditLogEventStream", "hdfsAuditLogAlertExecutor"); env.execute(); @@ -92,9 +92,9 @@ public class HdfsAuditLogProcessorMain { public static void execWithBalancedPartition(StormExecutionEnvironment env, KafkaSourcedSpoutProvider provider) { PartitionStrategy strategy = createStrategy(env.getConfig()); StreamProducer source = env.fromSpout(provider).withOutputFields(2).nameAs("kafkaMsgConsumer").groupBy(strategy); - StreamProducer reassembler = source.flatMap(new HdfsUserCommandReassembler()).groupBy(Arrays.asList(0)); - source.streamUnion(reassembler) - .flatMap(new FileSensitivityDataJoinExecutor()).groupBy(Arrays.asList(0)) + //StreamProducer reassembler = source.flatMap(new HdfsUserCommandReassembler()).groupBy(Arrays.asList(0)); + //source.streamUnion(reassembler) + source.flatMap(new FileSensitivityDataJoinExecutor()).groupBy(Arrays.asList(0)) .flatMap(new IPZoneDataJoinExecutor()) .alertWithConsumer("hdfsAuditLogEventStream", "hdfsAuditLogAlertExecutor"); env.execute();