Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

replace opensoc-streaming version 0.4BETA with 0.6BETA 8e7a6b4ad9febbc… #2

Merged
merged 1 commit into from
Dec 17, 2015
Merged

replace opensoc-streaming version 0.4BETA with 0.6BETA 8e7a6b4ad9febbc… #2

merged 1 commit into from
Dec 17, 2015

Conversation

charlesporter
Copy link
Contributor

…4ea47ba7810c42cc94d4dee37

@charlesporter
Copy link
Contributor Author

Can someone have a look this? I would like it if this could get merged very soon.

It simply contains the tip of opensoc-streaming from the cisco opensource

This is the point from which the hortonworks forks started.

Owen had indicated that we cannot easily start from the hortonworks repo .

He had created metron from a very old versio because that is what was hard-linked as sub-repos in the top-level opensoc repo.

We need to get this Pull Request ok's and merged before we can start on even the most basic improvements, like making it work with recent builds of the hadoop infrastructure .

@james-sirota
Copy link

I actually don't have permissions to approve this pull request. let me see if i can figure out how to add the PMC members to a group that has these privs

@omalley
Copy link
Contributor

omalley commented Dec 15, 2015

Since you guys picked RTC, you should get a review of it to ensure that it matches the code from https://github.com/OpenSOC/opensoc-streaming at 8e7a6b4ad9febbc4ea47ba7810c42cc94d4dee37

@ptgoetz
Copy link
Member

ptgoetz commented Dec 15, 2015

@james-sirota The github mirrors of apache repos are read-only. You can comment, etc. but you can't use the "merge" button. To merge you have to pull from the repo of the person that opened the request, then push the result to the official apache repo.

@omalley
Copy link
Contributor

omalley commented Dec 15, 2015

Yeah, you need a commit that includes "closes #2" in the commit message.

@@ -185,10 +184,10 @@ public void execute(Tuple tuple) {
JSONArray uuid_list = new JSONArray();

if (alerts_list == null || alerts_list.isEmpty()) {
LOG.trace("[OpenSOC] No alerts detected in: "
System.out.println("[OpenSOC] No alerts detected in: "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would we replace LOG.trace with System.out.println? Isn't that exactly the opposite of what we want?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a piece of debugging that someone forgot to comment out. We can ignore this

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

James, do you mean that this particular line will be reverted back to LOG.trace? We as a group should not have code in the master branch with System.out.*

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok to have system.outs in the runners that launch the topology, but it shouldn't exist in the bolts themselves. you are correct. we should change it back to log.trace

@omalley
Copy link
Contributor

omalley commented Dec 16, 2015

Yeah, System.exit is exactly right when a thread has failed and can't recover. You want to bring down the whole process and not leave the process partially running.

@james-sirota
Copy link

hi can anyone walk me through how to commit this the first time i do it? then i'll publish a wiki so everyone can do it. i want to make sure i don't screw it up the first time

@ptgoetz
Copy link
Member

ptgoetz commented Dec 17, 2015

@james-sirota

Here's the process:

  1. Add the official Apache repo as a remote in your local clone (one time step):
    git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-metron.git
  2. checkout whatever branch you want to merge it into:
    git checkout master
  3. Merge the pull request:
    git pull git@github.com:charlesporter/incubator-metron.git master
  4. Push the results to the Apache repo:
    git push apache master

A git hook will automatically close the github pull request when the repos get synced.

If there is a pull request that you want to close without merging, you can simply ask the person who opened it to close it. If that doesn't work, you can use a commit message to close it.

To do that, make a trivial change, like adding a space to README.md, and commit and push the change. In the commit message add the text "this closes #N" where N is the number of the pull request. When the repos sync, the pull request will get closed.

@asfgit asfgit merged commit a919cc1 into apache:master Dec 17, 2015
dlyle65535 referenced this pull request in dlyle65535/metron Apr 5, 2016
mmiklavc referenced this pull request in mmiklavc/metron Oct 21, 2016
exclude hadoop-common deps from management pom
sardell referenced this pull request in sardell/metron Jul 23, 2018
METRON-1662: Integrate download services
ruffle1986 referenced this pull request in ruffle1986/metron Jul 27, 2018
Fixed case of missing ports and added more error handling
DimDroll added a commit to DimDroll/incubator-metron that referenced this pull request Jan 10, 2020
DimDroll pushed a commit to DimDroll/incubator-metron that referenced this pull request Jan 13, 2020
This reverts commit ac52b42.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants