You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2016/09/22 15:15:31 UTC
incubator-metron git commit: METRON-437 Profile Definition's
'inputTopic' field is Extraneous (nickwallen) closes
apache/incubator-metron#264
Repository: incubator-metron
Updated Branches:
refs/heads/master ed34d9e69 -> c10a53eb8
METRON-437 Profile Definition's 'inputTopic' field is Extraneous (nickwallen) closes apache/incubator-metron#264
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/c10a53eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/c10a53eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/c10a53eb
Branch: refs/heads/master
Commit: c10a53eb89f7ec90aff6e8da5121f62f2f0e7eed
Parents: ed34d9e
Author: nickwallen <ni...@nickallen.org>
Authored: Thu Sep 22 11:13:39 2016 -0400
Committer: Nick Allen <ni...@nickallen.org>
Committed: Thu Sep 22 11:13:39 2016 -0400
----------------------------------------------------------------------
metron-analytics/metron-profiler/README.md | 4 ----
.../config/zookeeper/percentiles/profiler.json | 1 -
.../zookeeper/readme-example-1/profiler.json | 1 -
.../zookeeper/readme-example-2/profiler.json | 1 -
.../zookeeper/readme-example-3/profiler.json | 1 -
.../zookeeper/write-integer/profiler.json | 1 -
.../profiler/bolt/ProfileSplitterBoltTest.java | 4 ----
.../configuration/profiler/ProfilerConfig.java | 20 +-------------------
8 files changed, 1 insertion(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/README.md
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/README.md b/metron-analytics/metron-profiler/README.md
index d1884af..6822b61 100644
--- a/metron-analytics/metron-profiler/README.md
+++ b/metron-analytics/metron-profiler/README.md
@@ -125,7 +125,6 @@ The total number of bytes of HTTP data for each host. The following configuratio
```
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example1",
@@ -159,7 +158,6 @@ The ratio of DNS traffic to HTTP traffic for each host. The following configurat
```
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example2",
@@ -193,7 +191,6 @@ The average of the `length` field of HTTP traffic. The following configuration w
```
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example3",
@@ -261,7 +258,6 @@ This section will describe the steps required to get your first profile running.
5. Create the Profiler definition in a file located at `/usr/metron/0.2.0BETA/config/zookeeper/profiler.json`. The following JSON will create a profile that simply counts the number of messages.
```
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "test",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/config/zookeeper/percentiles/profiler.json
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/config/zookeeper/percentiles/profiler.json b/metron-analytics/metron-profiler/src/test/config/zookeeper/percentiles/profiler.json
index 8ef4352..8a54834 100644
--- a/metron-analytics/metron-profiler/src/test/config/zookeeper/percentiles/profiler.json
+++ b/metron-analytics/metron-profiler/src/test/config/zookeeper/percentiles/profiler.json
@@ -1,5 +1,4 @@
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "percentiles",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-1/profiler.json
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-1/profiler.json b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-1/profiler.json
index ebc56fd..96c60a1 100644
--- a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-1/profiler.json
+++ b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-1/profiler.json
@@ -1,5 +1,4 @@
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example1",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-2/profiler.json
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-2/profiler.json b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-2/profiler.json
index c17c6da..1a8a1b7 100644
--- a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-2/profiler.json
+++ b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-2/profiler.json
@@ -1,5 +1,4 @@
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example2",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-3/profiler.json
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-3/profiler.json b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-3/profiler.json
index 25670c5..67cdefd 100644
--- a/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-3/profiler.json
+++ b/metron-analytics/metron-profiler/src/test/config/zookeeper/readme-example-3/profiler.json
@@ -1,5 +1,4 @@
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example3",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/config/zookeeper/write-integer/profiler.json
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/config/zookeeper/write-integer/profiler.json b/metron-analytics/metron-profiler/src/test/config/zookeeper/write-integer/profiler.json
index ae5e6c7..bf78365 100644
--- a/metron-analytics/metron-profiler/src/test/config/zookeeper/write-integer/profiler.json
+++ b/metron-analytics/metron-profiler/src/test/config/zookeeper/write-integer/profiler.json
@@ -1,5 +1,4 @@
{
- "inputTopic": "indexing",
"profiles": [
{
"profile": "example1",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java
index 67c1ba3..31ff279 100644
--- a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java
+++ b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java
@@ -56,7 +56,6 @@ public class ProfileSplitterBoltTest extends BaseBoltTest {
/**
* {
- * "inputTopic": "enrichment",
* "profiles": [
* {
* "profile": "test",
@@ -74,7 +73,6 @@ public class ProfileSplitterBoltTest extends BaseBoltTest {
/**
* {
- * "inputTopic": "enrichment",
* "profiles": [
* {
* "profile": "test",
@@ -92,7 +90,6 @@ public class ProfileSplitterBoltTest extends BaseBoltTest {
/**
* {
- * "inputTopic": "enrichment",
* "profiles": [
* {
* "profile": "test",
@@ -109,7 +106,6 @@ public class ProfileSplitterBoltTest extends BaseBoltTest {
/**
* {
- * "inputTopic": "enrichment",
* "profiles": [
* {
* "profile": "test",
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/c10a53eb/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/profiler/ProfilerConfig.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/profiler/ProfilerConfig.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/profiler/ProfilerConfig.java
index 8263d39..fcc03fd 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/profiler/ProfilerConfig.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/profiler/ProfilerConfig.java
@@ -27,23 +27,10 @@ import java.util.List;
public class ProfilerConfig implements Serializable {
/**
- * The input topic from which messages will be read.
- */
- private String inputTopic;
-
- /**
* One or more profile definitions.
*/
private List<ProfileConfig> profiles = new ArrayList<>();
- public String getInputTopic() {
- return inputTopic;
- }
-
- public void setInputTopic(String inputTopic) {
- this.inputTopic = inputTopic;
- }
-
public List<ProfileConfig> getProfiles() {
return profiles;
}
@@ -58,16 +45,11 @@ public class ProfilerConfig implements Serializable {
if (o == null || getClass() != o.getClass()) return false;
ProfilerConfig that = (ProfilerConfig) o;
-
- if (inputTopic != null ? !inputTopic.equals(that.inputTopic) : that.inputTopic != null) return false;
return profiles != null ? profiles.equals(that.profiles) : that.profiles == null;
-
}
@Override
public int hashCode() {
- int result = inputTopic != null ? inputTopic.hashCode() : 0;
- result = 31 * result + (profiles != null ? profiles.hashCode() : 0);
- return result;
+ return profiles != null ? profiles.hashCode() : 0;
}
}