You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by mw...@apache.org on 2016/07/25 09:36:44 UTC
[07/47] incubator-eagle git commit: EAGLE-254 HdfsAuditLog topology
keeps alerting for one piece of log
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/master
Commit: d8be43f1f7ea22fccf8478dc335bbde42ce856f4
Parents: a725ea5
Author: Zhao, Qingwen <qi...@ebay.com>
Authored: Tue May 3 10:35:26 2016 +0800
Committer: Zhao, Qingwen <qi...@ebay.com>
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<String, String> 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();