Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ElasticSearch support to Kippo #135

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Add ElasticSearch support to Kippo #135

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a6071e1
Add proper .gitignore for Python project
ikoniaris Jul 26, 2014
5c04489
Add ElasticSearch section to config file
ikoniaris Jul 26, 2014
05d3207
Add ElasticSearch logger
ikoniaris Jul 26, 2014
b62a527
Implement handleClientVersion to get the version from args
ikoniaris Jul 26, 2014
c714820
Convert id from long to string in ES mapping
ikoniaris Jul 26, 2014
aa25f14
Fix timestamp format for ElasticSearch logging
ikoniaris Jul 26, 2014
ac4c908
Add local GeoIP.dat file
ikoniaris Jul 26, 2014
5f4a8bd
Add private and public key files to gitignore
ikoniaris Jul 26, 2014
c1a4561
Remove redundant lines from kippo config file
ikoniaris Jul 26, 2014
544b895
Fix variable name
ikoniaris Jul 26, 2014
025dea6
Remove commented out code and move GeoIP to run()
ikoniaris Jul 26, 2014
e985616
Remove id from ES mapping and json indexing
ikoniaris Jul 26, 2014
b10f06f
Comment out the ES config section
ikoniaris Jul 26, 2014
7f4692e
Use os.path to open the GeoIP.dat file
ikoniaris Jul 26, 2014
9b43565
Update from upstream
ikoniaris Jul 19, 2015
d02bf97
Merge branch 'desaster-master'
ikoniaris Jul 19, 2015
6d14761
Get uname -a from host system
ikoniaris Jul 22, 2015
222cdd5
Change ES type to "kippo" in config
ikoniaris Jul 23, 2015
d5c32df
Add Elasticsearch output for commands
ikoniaris Jul 23, 2015
16deba4
Add Elasticsearch output for downloads
ikoniaris Jul 23, 2015
8621ce3
Add outfile and url to mapping, use ip type for ip and boolean for su…
ikoniaris Jul 23, 2015
89e977a
Make ES' ip field a multi field
ikoniaris Jul 23, 2015
1ad1a5e
Use new way of defining multi_fields
ikoniaris Jul 23, 2015
4d846e2
Switch ip to string, add new ip.ipv4 field to it
ikoniaris Jul 23, 2015
c768af6
Add generic send_to_elasticsearch method
ikoniaris Jul 23, 2015
db31eb3
Fix index() function
ikoniaris Jul 23, 2015
269348e
Remove ES exception handling, fix variable name
ikoniaris Jul 23, 2015
5ea4b9b
Convert timestampts to UTC
ikoniaris Jul 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add private and public key files to gitignore
  • Loading branch information
@ikoniaris
ikoniaris committed Jul 26, 2014
commit 5f4a8bda510fa8ea14c18e8e1afa1621889e5824
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ data/ssh_host_rsa_key.pub
dl/*
log/kippo.log
log/tty/*
private.key
public.key

# Created by .gitignore support plugin (hsz.mobi)

Expand Down