You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by le...@apache.org on 2017/10/25 21:41:05 UTC
metron git commit: METRON-1280 0.4.1 -> 0.4.2 missed a couple of
projects (cestella via justinleet) closes apache/metron#816
Repository: metron
Updated Branches:
refs/heads/master 1c12e22df -> 128d4e7a8
METRON-1280 0.4.1 -> 0.4.2 missed a couple of projects (cestella via justinleet) closes apache/metron#816
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/128d4e7a
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/128d4e7a
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/128d4e7a
Branch: refs/heads/master
Commit: 128d4e7a823ae63800c1828908ed33757ca0857d
Parents: 1c12e22
Author: cestella <ce...@gmail.com>
Authored: Wed Oct 25 17:40:40 2017 -0400
Committer: leet <le...@apache.org>
Committed: Wed Oct 25 17:40:40 2017 -0400
----------------------------------------------------------------------
.../metron-profiler-client/README.md | 2 +-
metron-analytics/metron-profiler/README.md | 22 ++++++++++----------
...orParserConfigControllerIntegrationTest.java | 4 ++--
metron-platform/metron-zookeeper/pom.xml | 2 +-
.../stellar-3rd-party-example/pom.xml | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/128d4e7a/metron-analytics/metron-profiler-client/README.md
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler-client/README.md b/metron-analytics/metron-profiler-client/README.md
index 63d0cd4..a15ccf8 100644
--- a/metron-analytics/metron-profiler-client/README.md
+++ b/metron-analytics/metron-profiler-client/README.md
@@ -361,7 +361,7 @@ These instructions step through the process of using the Stellar Client API on a
To validate that everything is working, login to the server hosting Metron. We will use the Stellar Shell to replicate the execution environment of Stellar running in a Storm topology, like Metron's Parser or Enrichment topology. Replace 'node1:2181' with the URL to a Zookeeper Broker.
```
-[root@node1 0.4.1]# bin/stellar -z node1:2181
+[root@node1 0.4.2]# bin/stellar -z node1:2181
Stellar, Go!
Please note that functions are loading lazily in the background and will be unavailable until loaded fully.
{es.clustername=metron, es.ip=node1, es.port=9300, es.date.format=yyyy.MM.dd.HH}
http://git-wip-us.apache.org/repos/asf/metron/blob/128d4e7a/metron-analytics/metron-profiler/README.md
----------------------------------------------------------------------
diff --git a/metron-analytics/metron-profiler/README.md b/metron-analytics/metron-profiler/README.md
index 6a8329c..a24e3cf 100644
--- a/metron-analytics/metron-profiler/README.md
+++ b/metron-analytics/metron-profiler/README.md
@@ -58,16 +58,16 @@ This section will describe the steps necessary to manually install the Profiler
```
[root@node1 ~]# rpm -ql metron-profiler
/usr/metron
- /usr/metron/0.4.1
- /usr/metron/0.4.1/bin
- /usr/metron/0.4.1/bin/start_profiler_topology.sh
- /usr/metron/0.4.1/config
- /usr/metron/0.4.1/config/profiler.properties
- /usr/metron/0.4.1/flux
- /usr/metron/0.4.1/flux/profiler
- /usr/metron/0.4.1/flux/profiler/remote.yaml
- /usr/metron/0.4.1/lib
- /usr/metron/0.4.1/lib/metron-profiler-0.4.1-uber.jar
+ /usr/metron/0.4.2
+ /usr/metron/0.4.2/bin
+ /usr/metron/0.4.2/bin/start_profiler_topology.sh
+ /usr/metron/0.4.2/config
+ /usr/metron/0.4.2/config/profiler.properties
+ /usr/metron/0.4.2/flux
+ /usr/metron/0.4.2/flux/profiler
+ /usr/metron/0.4.2/flux/profiler/remote.yaml
+ /usr/metron/0.4.2/lib
+ /usr/metron/0.4.2/lib/metron-profiler-0.4.2-uber.jar
```
1. Edit the configuration file located at `$METRON_HOME/config/profiler.properties`.
@@ -745,4 +745,4 @@ The Profiler is implemented as a Storm topology using the following bolts and sp
* `ProfileBuilderBolt` - This bolt maintains all of the state required to build a profile. When the window period expires, the data is summarized as a `ProfileMeasurement`, all state is flushed, and the `ProfileMeasurement` is emitted. Each instance of this bolt is responsible for maintaining the state for a single Profile-Entity pair.
-* `HBaseBolt` - A bolt that is responsible for writing to HBase. Most profiles will be flushed every 15 minutes or so. If each `ProfileBuilderBolt` were responsible for writing to HBase itself, there would be little to no opportunity to optimize these writes. By aggregating the writes from multiple Profile-Entity pairs these writes can be batched, for example.
\ No newline at end of file
+* `HBaseBolt` - A bolt that is responsible for writing to HBase. Most profiles will be flushed every 15 minutes or so. If each `ProfileBuilderBolt` were responsible for writing to HBase itself, there would be little to no opportunity to optimize these writes. By aggregating the writes from multiple Profile-Entity pairs these writes can be batched, for example.
http://git-wip-us.apache.org/repos/asf/metron/blob/128d4e7a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java
index 785c083..88e5355 100644
--- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java
+++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java
@@ -263,7 +263,7 @@ public class SensorParserConfigControllerIntegrationTest {
.andExpect(jsonPath("$.mergeMetadata").value("true"))
.andExpect(jsonPath("$.parserConfig").isEmpty());
- this.mockMvc.perform(post(sensorParserConfigUrl).with(httpBasic(user, password)).with(csrf()).contentType(MediaType.parseMediaType("application/json;charset=UTF-8")).content(broJson))
+ assertEventually(() -> this.mockMvc.perform(post(sensorParserConfigUrl).with(httpBasic(user, password)).with(csrf()).contentType(MediaType.parseMediaType("application/json;charset=UTF-8")).content(broJson))
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.parseMediaType("application/json;charset=UTF-8")))
.andExpect(jsonPath("$.*", hasSize(numFields.get())))
@@ -271,7 +271,7 @@ public class SensorParserConfigControllerIntegrationTest {
.andExpect(jsonPath("$.sensorTopic").value("broTest"))
.andExpect(jsonPath("$.readMetadata").value("true"))
.andExpect(jsonPath("$.mergeMetadata").value("true"))
- .andExpect(jsonPath("$.parserConfig").isEmpty());
+ .andExpect(jsonPath("$.parserConfig").isEmpty()));
this.mockMvc.perform(get(sensorParserConfigUrl).with(httpBasic(user,password)))
.andExpect(status().isOk())
http://git-wip-us.apache.org/repos/asf/metron/blob/128d4e7a/metron-platform/metron-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/metron-platform/metron-zookeeper/pom.xml b/metron-platform/metron-zookeeper/pom.xml
index e02cafd..b1f87ad 100644
--- a/metron-platform/metron-zookeeper/pom.xml
+++ b/metron-platform/metron-zookeeper/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.metron</groupId>
<artifactId>metron-platform</artifactId>
- <version>0.4.1</version>
+ <version>0.4.2</version>
</parent>
<artifactId>metron-zookeeper</artifactId>
<name>metron-zookeeper</name>
http://git-wip-us.apache.org/repos/asf/metron/blob/128d4e7a/metron-stellar/stellar-3rd-party-example/pom.xml
----------------------------------------------------------------------
diff --git a/metron-stellar/stellar-3rd-party-example/pom.xml b/metron-stellar/stellar-3rd-party-example/pom.xml
index 119892c..9467094 100644
--- a/metron-stellar/stellar-3rd-party-example/pom.xml
+++ b/metron-stellar/stellar-3rd-party-example/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>metron-stellar</artifactId>
<groupId>org.apache.metron</groupId>
- <version>0.4.1</version>
+ <version>0.4.2</version>
</parent>
<artifactId>stellar-3rd-party-example</artifactId>
<packaging>jar</packaging>