Skip to content

Conversation

@helderfernandes1279
Copy link
Contributor

No description provided.

@SYNchroACK
Copy link
Contributor

@helderfernandes1279 , Is it possible for you to make different pull requests for the different features:

Pull request 1 (TCP Collector):
intelmq/bots/collectors/tcp/__init__.py
intelmq/bots/collectors/tcp/collector.py

Note: this bot is bot named 'intelmqlistner' that you commit in this pull req
Pull request 2 (UDP Collector):
intelmq/bots/collectors/udp/__init__.py
intelmq/bots/collectors/udp/collector.py

Note: this bot is bot named 'syslog' that you commit in this pull req
Pull request 3 (XMPP Collector):
intelmq/bots/collectors/xmpp/__init__.py
intelmq/bots/collectors/xmpp/collector.py
Pull request 4 (TCP Output):
intelmq/bots/outputs/tcp/__init__.py
intelmq/bots/outputs/tcp/output.py

Note: this bot is bot named 'IntelMQAgent' that you commit in this pull req

We rest of the commits we can discuss after we handle all the pull request mentioned before. Its a lot of work for eeryone to test and check your awesome work! ;D

Thank you @helderfernandes1279

@SYNchroACK SYNchroACK self-assigned this Jul 7, 2015
@SYNchroACK SYNchroACK force-pushed the master branch 2 times, most recently from 3f570cf to 237ea69 Compare August 13, 2015 11:25
@robcza
Copy link
Contributor

robcza commented Sep 21, 2015

@helderfernandes1279 will this eventually be fixed for the recent state of IntelMQ? Missing the Shadowserver parsers a lot

@sebix
Copy link
Member

sebix commented Sep 21, 2015

@robcza You can cherry-pick cc446fc into a branch of your fork, rebase on master, add tests :), and create a PR.

@robcza
Copy link
Contributor

robcza commented Sep 21, 2015

@sebix just making sure whether there is anything going on or not :) Direct cherry-picking seems to be a problem as I'm not able to find the source repo/branch. I can do it manually however it does not feel appropriate

@sebix
Copy link
Member

sebix commented Sep 21, 2015

@robcza We don't have feedback since half a year, so I think it's ok. Already did it the same with some other PRs.

git remote add helderfernandes1279 [email protected]:helderfernandes1279/intelmq.git
git remote update
git checkout -b shadowserver
git cherry-pick cc446fc

And follow the instructions, they are basically the same as for rebasing.

@helderfernandes1279
Copy link
Contributor Author

I didn't check this latest version yet, but I think that I wil check that as soon as possible.......

@robcza
Copy link
Contributor

robcza commented Oct 2, 2015

@sebix can not deal with fatal: bad revision 'cc446fc' while cherry-picking
I believe, it is a problem with cherry-picking a commit from pull request, which is described in here: https://it-offshore.co.uk/code/47-git-cherry-pick-pull-request-fatal-bad-revision However, proposed solution doe not work for me either :) Any idea?

@sebix
Copy link
Member

sebix commented Oct 2, 2015

Please show your remotes:

git remote -v

Btw: git remote update fetches all sources from all remote repositories

@robcza
Copy link
Contributor

robcza commented Oct 2, 2015

git remote -v
helderfernandes1279 https://github.com/helderfernandes1279/intelmq.git (fetch)
helderfernandes1279 https://github.com/helderfernandes1279/intelmq.git (push)
origin  https://github.com/robcza/intelmq.git (fetch)
origin  https://github.com/robcza/intelmq.git (push)
upstream    https://github.com/certtools/intelmq.git (fetch)
upstream    https://github.com/certtools/intelmq.git (push)

@sebix
Copy link
Member

sebix commented Nov 24, 2015

I'm working on some shadowserver parsers in my feature branch, I used the existing ones in v0.9 branch as base, using:

git checkout v0.9 intelmq/bots/parsers/shadowserver

That pulls in the given files into the current branch.

https://github.com/sebix/intelmq/tree/bugfixes

@sebix sebix added this to the Release 1 - v1.0 milestone Nov 24, 2015
@sebix sebix added feature Indicates new feature requests or new features help wanted Indicates that a maintainer wants help on an issue or pull request component: bots labels Nov 24, 2015
@sebix
Copy link
Member

sebix commented Sep 14, 2016

  • XMPP collector: we have one
  • shadowserver parser: in master too
  • Syslog collector, we want this, but we can postpone it to 1.1 0666a81
  • Intelmq collector: basically a tcp collector, opening a local port, can be postponed to 1.1 d64673f
  • intelmq output, basically the tcp output, but sending b64-encoded data, not json
  • phishtank parser fixes: in master too

@sebix sebix modified the milestones: Release v1.1, Release v1.0 Sep 14, 2016
@SYNchroACK
Copy link
Contributor

I talked with @helderfernandes1279 and we decided that is ok to close this pull request. However, I created two new issues ( #848 and #849 ) tagged as 'feature request' for v1.1 milestone.

@SYNchroACK SYNchroACK closed this Jan 18, 2017
@ghost ghost modified the milestones: v1.1 Feature release, v1.0 Stable Release Jul 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component: bots feature Indicates new feature requests or new features help wanted Indicates that a maintainer wants help on an issue or pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants