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

Jump to bottom

Introduction of Appflow support and JSON data-output support for collector (templates still to DB) - json_milestone_1 #1

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

Introduction of Appflow support and JSON data-output support for collector (templates still to DB) - json_milestone_1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0661844
Added some build artifacts and cscope to .gitignore
cameronkerrnz Feb 15, 2015
d5e55d8
Converted Netscaler IEs into source format for creating libipfix C st…
cameronkerrnz Feb 15, 2015
d81061a
Correct some errors in generated IEs for Netscaler.
cameronkerrnz Feb 16, 2015
8e44c6f
Continuing to integrate and test; some IEs are not being mapped and
cameronkerrnz Feb 16, 2015
0339cbd
Changed AWK script so it didn't use a comma to separate entries
cameronkerrnz Feb 16, 2015
01f52bd
Change linking order to avoid segfault when my_inet_ntoa is called.
cameronkerrnz Feb 16, 2015
bf1f0a9
Ignore paddingOctet (210 == 0xD2) when created table columns, to prevent
cameronkerrnz Feb 16, 2015
d747dde
Resolved issue #2 "[ipfix_decode_trecord] warning: ipfix_get_template…
cameronkerrnz Feb 16, 2015
8b051e4
Prevent 'reverse ' prefix from creating invalid syntax when IENAME_CO…
cameronkerrnz Feb 17, 2015
0412c84
Resolve issue: Remove "reverse " prefix for generated attribute names…
cameronkerrnz Feb 17, 2015
5ab7a4f
Add --jsonfile argument, but it doesn't really do anything yet.
cameronkerrnz Feb 17, 2015
7b21bfb
Adding optional jsonfile argument to ipfix_col_init_mysqlexport (may …
cameronkerrnz Feb 17, 2015
08b2389
Plumbing in --jsonlines argument. Should be ready to write the JSON e…
cameronkerrnz Feb 17, 2015
bf9c7b2
Prevent compiler warnings of implicitly declared functions
cameronkerrnz Feb 18, 2015
65914dd
Add include for mlog.h to stop use of implicitly defined function
cameronkerrnz Feb 18, 2015
cf7d2bd
JSON emmission now working for (u)ints, strings and bytes
cameronkerrnz Feb 18, 2015
26b49e8
IP addresses supported in JSON output.
cameronkerrnz Feb 18, 2015
d22a064
NTP timestamps are now supported (as RFC3306) for JSON output
cameronkerrnz Feb 18, 2015
bff9bfd
Fixed bugs and imperfections in spacing for JSON BYTES
cameronkerrnz Feb 18, 2015
dd317d1
Resolve #10 Allow --jsonfile to be given '-' as an argument to mean s…
cameronkerrnz Feb 18, 2015
a038b20
Support for pkg-config
bluca Feb 18, 2015
7939314
Merge pull request #13 from bluca/pkg-config
cameronkerrnz Feb 18, 2015
05bcbc4
Ignore some files used/generated in testing, and pkgconfig artifacts
cameronkerrnz Feb 18, 2015
9cc4f60
Resolve #4 Get database credentials from secure file instead of comma…
cameronkerrnz Feb 18, 2015
18f65e2
Resolve #11 Listen for SIGHUP to reopen JSON datafile
cameronkerrnz Feb 19, 2015
15d180b
Added a beginning of a template name mapping input file
cameronkerrnz Feb 25, 2015
0efca83
Divorce the JSON collector from the MySQL collector.
cameronkerrnz Feb 26, 2015
d38f0e7
Resolve #15 Log IP address of exporting device
cameronkerrnz Mar 3, 2015
6ad746f
Resolve #22 Exit JSON for 'no template for XXX, skip data set'
cameronkerrnz Mar 3, 2015
f9f5433
Fix invalid-JSON output for bytes for 'no template for set' messages
cameronkerrnz Mar 4, 2015
b12d85e
Resolve #25 Omit JSON attributes if value is empty
cameronkerrnz Mar 5, 2015
3e1c5d4
Remove misplaced declaration of ipfix_export_drecord_jsonfile
cameronkerrnz Mar 5, 2015
9b557c4
Fixed up faulty declaration leading to invalid pointer assignment
cameronkerrnz Mar 5, 2015
f53e296
Resolve #27 Print correct timestamps in ipfix_print_newmsg
cameronkerrnz Mar 5, 2015
9505085
Renamed function that didn't match with expected pattern
cameronkerrnz Mar 5, 2015
5ae50a1
Resolve #26 Timestamps now included
cameronkerrnz Mar 5, 2015
5ec4a0a
Resolve #28 'set_bytes' attribute only send if requested
cameronkerrnz Mar 5, 2015
5cb7480
Ignore *.swp files
cameronkerrnz Mar 9, 2015
41cffa2
Corrected some faulty #ifdef nesting in collector.c
cameronkerrnz Mar 9, 2015
7986526
Resolve #24 Fall back to selected set of templates
cameronkerrnz Mar 11, 2015
dbf2c33
Started on some release documentation
cameronkerrnz Mar 26, 2015
c9884c2
Continued on some release documentation
cameronkerrnz Mar 26, 2015
12a2b93
Added a Kibana3 dashboard (will move to Kibana 4 soon)
cameronkerrnz Mar 26, 2015
ecabe4c
Added ipfix_init_with_start_time function
Apr 22, 2015
ed128ad
Remove my username from the checkout documentation
cameronkerrnz Mar 30, 2017
b9e7892
Merge pull request #29 from JammyStuff/init-with-start-time
cameronkerrnz Mar 30, 2017
7f9e8ae
DISCONTINUING IN FAVOUR OF LOGSTASH NETFLOW CODEC
cameronkerrnz Apr 10, 2017
31a83c5
Resolve #31
cameronkerrnz Nov 18, 2017
7da105c
Added supervisord example configuration
cameronkerrnz Nov 18, 2017
8c1013e
Update documentation with recent changes
cameronkerrnz Nov 18, 2017
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
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Makefile
config.status
collector/ipfix_collector
examples/example_collector
examples/example_collector_db
examples/example_exporter
lib/ipfix_def_fokus.h
lib/ipfix_fields_fokus.h
Expand All @@ -10,3 +11,13 @@ lib/libipfix.so*
libmisc/libmisc.so*
probe/ipfix_probe
config.h
cscope.*
*.[oa]
10.*.*.*
.depend
config.log
libipfix.pc
netscaler_ipfix.pw
data.json
autom4te.cache
*.swp
14 changes: 12 additions & 2 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ prefix = @prefix@

SUBDIRS = lib libmisc examples collector probe

pkgconfigdir = @libdir@/pkgconfig
INST_PKGCONFIG = libipfix.pc

.PHONY: subdirs $(SUBDIRS)

all: subdirs
Expand All @@ -25,10 +28,17 @@ examples collector probe: lib libmisc
$(SUBDIRS):
$(MAKE) -C $@ $(filter-out $(SUBDIRS),$(MAKECMDGOALS))

clean install uninstall: subdirs
install: subdirs
@[ -d $(DESTDIR)/${pkgconfigdir} ] || (mkdir -p $(DESTDIR)/${pkgconfigdir}; chmod 755 $(DESTDIR)/${pkgconfigdir})
cp $(INST_PKGCONFIG) $(DESTDIR)/${pkgconfigdir}/

clean: subdirs

uninstall: subdirs
rm -f $(addprefix $(DESTDIR)${pkgconfigdir}/, $(INST_PKGCONFIG))

distclean: subdirs
rm -rf config.status config.log Makefile
rm -rf config.status config.log Makefile config.h libipfix.pc

# build binary package
# to build signed package remove -us -uc
Expand Down
23 changes: 0 additions & 23 deletions README
View file
Open in desktop

This file was deleted.

Loading