Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

WIP: Feature/expanded flow sample #7

Open
wants to merge 174 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
174 commits
Select commit Hold shift + click to select a range
95e915d
Fixing import paths and documentation
May 25, 2017
6b3691d
Update README.md
mellowdrifter May 27, 2017
df7418b
Update README.md
mellowdrifter May 27, 2017
508ba60
Add Travis CI and Coveralls
corny Aug 6, 2017
2ddadf9
Add badges
corny Aug 6, 2017
21a8e54
Fixing unit test
Aug 7, 2017
9f63c7a
Merge pull request #2 from corny/travis
taktv6 Aug 7, 2017
bbcb777
Merge pull request #1 from mellowdrifter/master
taktv6 Aug 7, 2017
3a08dd5
Fixing nf9 decoder tests
Aug 7, 2017
b8a5c39
Merge branch 'master' of github.com:taktv6/tflow2
Aug 7, 2017
e055b65
Fixed tests
Aug 7, 2017
2a73171
Updating copyright holders
Aug 7, 2017
91eb9fb
Add Close methods to NetflowServer and IPFIXServer
corny Aug 6, 2017
624b308
Clean up code
corny Aug 6, 2017
83bb310
Clean up more
corny Aug 7, 2017
9adaff0
Merge pull request #3 from corny/db_refactoring
taktv6 Aug 7, 2017
816b99e
Fixing nil pointer deref
Aug 7, 2017
c286730
Fix spelling mistakes
corny Aug 7, 2017
90c4cb7
Simplify query parsing
corny Aug 7, 2017
fca634e
Merge pull request #5 from corny/spelling_mistakes
taktv6 Aug 7, 2017
41586e0
Compare net.IP using Equals()
corny Aug 7, 2017
f4f46f4
Add mapTree for indexing flows
corny Aug 7, 2017
27a15ff
Merge pull request #4 from corny/db_refactoring
taktv6 Aug 7, 2017
99762dd
Refactored database RunQuery() function
Aug 7, 2017
9b22969
Merge pull request #6 from corny/query_parsing
taktv6 Aug 7, 2017
1b7c809
Use CSV to receive graph data in the frontend
corny Aug 7, 2017
15f7f95
Merge pull request #7 from corny/csv
taktv6 Aug 8, 2017
cb4278b
Clean up getResultByTS()
corny Aug 7, 2017
ac75276
Add currentTimeslot()
corny Aug 8, 2017
15c6705
Refactor getTimeGroup()
corny Aug 8, 2017
edc06b7
Optimize incrementation of counters
corny Aug 8, 2017
65c5e75
Simplify switch+case
corny Aug 8, 2017
fb2adda
Use $.getJSON instead of $.get
corny Aug 8, 2017
59941ea
Merge pull request #8 from corny/cleanup
taktv6 Aug 8, 2017
665d11e
Add CurrentTimeslot() and AggregationPeriod()
corny Aug 8, 2017
fe3360c
Simplify building of keys
corny Aug 8, 2017
ddb856a
Merge pull request #9 from corny/cleanup
taktv6 Aug 8, 2017
fc98e09
Fix JS
corny Aug 8, 2017
109fab5
Huge refactoring and Prometheus integration
corny Aug 8, 2017
be4ba8d
Add pfx.ToIPNet() to PFX
corny Aug 10, 2017
387d111
Fix timeslot conditions
corny Aug 17, 2017
12c96fa
Merge pull request #10 from corny/prometheus
taktv6 Aug 17, 2017
e021298
Implementing OpEqual for TS
Aug 17, 2017
05d9a47
Merge branch 'master' of github.com:taktv6/tflow2
Aug 17, 2017
91a4723
Changing prom queries to OpEqual
Aug 17, 2017
55847ca
Fixing TS condition on main query loop
Aug 17, 2017
f769342
Fixing breakdown naming and making bd resolution more reliable
Aug 17, 2017
dbfee1f
Fixed race condition in BIRD annotator
Aug 17, 2017
55f50e2
Improve panic message and add tests for createKey
Aug 17, 2017
6468123
Merge pull request #11 from corny/panic-message
taktv6 Aug 18, 2017
045e040
Fixing test
Aug 18, 2017
d4e40a4
Implemented frontend CSV parsing using papaparse.com
Aug 18, 2017
f3a4213
Fix panic caused by unsupported key type
corny Aug 22, 2017
39d6e86
Merge pull request #13 from taktv6/fix-panic
taktv6 Aug 23, 2017
d4f608f
Refactoring of query parameters
corny Aug 22, 2017
8d08657
Split translateQuery
corny Aug 22, 2017
7cd4990
Respond with 204 for empty results
corny Aug 23, 2017
a8729bd
Add more tests
corny Aug 23, 2017
c0dfc37
Clean up Javascript and pass breakdown as array
corny Aug 22, 2017
4aeccf7
Restart Field values at zero
corny Aug 23, 2017
32e15b1
Add support for breakdown by family
corny Aug 23, 2017
7120a1d
Remove promhttp library
corny Aug 23, 2017
5fefbe1
Move code to test files
corny Aug 23, 2017
4896f25
Use other HTTP status codes
corny Aug 23, 2017
04560f1
Improve error handling in javascript
corny Aug 23, 2017
711c879
Merge pull request #12 from taktv6/query_parameters
taktv6 Aug 24, 2017
91191b0
Add test for prometheus handler
corny Aug 24, 2017
1cb36ad
Merge pull request #14 from taktv6/prometheus_test
taktv6 Aug 24, 2017
58e2166
Improving error handling
Aug 24, 2017
57f7a5a
Cleanup
Aug 24, 2017
28526e7
Remove convert.IntByte
corny Aug 25, 2017
9959aab
Query refactoring
corny Aug 24, 2017
f3224a3
Use same query parameters for prometheus
corny Aug 24, 2017
3fd4131
Remove breakdown fields for Router
corny Aug 25, 2017
1ce7266
Increase test coverage
corny Aug 25, 2017
495a76e
Allow form validation and require value in router
corny Aug 25, 2017
db4ca47
Add Join() method for breakdown keys
corny Aug 25, 2017
d63a458
Merge pull request #16 from taktv6/convert-int
taktv6 Aug 30, 2017
1bed201
Merge pull request #15 from taktv6/query-refactoring
taktv6 Aug 30, 2017
51113da
Fix spelling mistakes
corny Sep 12, 2017
62f76e6
Update README
corny Sep 12, 2017
b4589d5
Added sFlow support
Sep 29, 2017
81b45ce
Merge pull request #17 from taktv6/spelling-mistakes
taktv6 Sep 29, 2017
0e4189b
Fixing imports
Sep 29, 2017
80fba90
Reworked configuration options from flags into a yaml file and added …
Oct 7, 2017
f55b4d9
Fxing default in example config
Oct 7, 2017
2f90cc2
Fixing config handler
Oct 7, 2017
8d35d7f
Cleaning up config package
Oct 7, 2017
5000bfc
Implemented SNMP base interface/ID mapping and reworked the webinterf…
Oct 7, 2017
b999b3f
Updating README
Oct 7, 2017
a32e3ca
Added EXARING as Author
Oct 7, 2017
2e97fc4
Fixing imports
Oct 7, 2017
3aee7b5
Fixing unsafe map access
Oct 7, 2017
a7c0e2b
Added Option Template parsing to nf9 package. Removed global smaplera…
Oct 8, 2017
d067faa
Finished sampling rate option support in Netflow v9 and moved sampler…
Oct 8, 2017
77d09c5
Fixing static samplerate for IPFIX
Oct 9, 2017
b1372d8
Changes /varz and /metrics endpoints. Added source validation right a…
Oct 9, 2017
4f8b4ea
Unified config handling by flow receivers
Oct 9, 2017
8b97526
Unified config handling for frontend.
Oct 9, 2017
492c1d7
Fixing timezone offset issue in frontend
Oct 9, 2017
25d95a3
Fix
Oct 9, 2017
10d7f17
Fixing database breakdown parameters
Oct 9, 2017
6c52d6a
Removing debug outputs
Oct 9, 2017
aff87c1
Cleanup
Oct 9, 2017
7f870e1
Addind sample rate cache
Oct 9, 2017
c687b77
frontend/prometheus.go:57: invalid type assertion: result.Timestamps[…
Oct 12, 2017
f7fe415
Added database integration test
Oct 12, 2017
9b4b3a4
Cleaning up database test
Oct 12, 2017
8064af2
Fixing database query time measurement
Oct 12, 2017
6b5eb51
Fixing datbase storage layer
Oct 12, 2017
e989b40
Fixing storage layer
Oct 12, 2017
005d81a
Reworked AVL tree to handle key collisions properly.
Oct 12, 2017
2a785c6
Added gRPC interface for external flow annotators
Oct 13, 2017
c025c0c
Cleanup
Oct 13, 2017
f17d295
Cleanup
Oct 13, 2017
549ddec
Renamend annotator package to annotation
Oct 13, 2017
4e7ae4d
Adding annotation layer
Oct 16, 2017
f20daa4
Cleanup
Nov 9, 2017
43e954e
Fix tests
corny Jan 13, 2018
fb189f2
Fixing sample rate
Apr 3, 2018
29f45a8
Added test
Apr 25, 2018
593ab54
[FIX] the function TreeNode.minValue() always returns nil
cedi Apr 30, 2018
9cbc43a
Merge branch 'master' of https://github.com/taktv6/tflow2
cedi Apr 30, 2018
4a9e4e4
replace for with if
Apr 30, 2018
ac923fb
Merge pull request #24 from cedi/master
taktv6 Apr 30, 2018
6cd304b
Merge pull request #22 from taktv6/fix-tests
taktv6 Jul 30, 2018
605331d
Switch to CircleCI
corny Jul 30, 2018
7df7984
Add Coveralls
corny Jul 31, 2018
c319597
Add dep for dependency management
corny Jul 31, 2018
eab5a75
Relax dependency versions
corny Jul 31, 2018
c05b18b
Merge pull request #26 from taktv6/circleci
taktv6 Sep 9, 2018
9fa30e7
Update README.md
Sep 9, 2018
fc0970b
Adopting new import paths
Sep 9, 2018
78816b7
Wrap errors
corny Jan 2, 2018
724d4f9
Change CI badge to CircleCI
corny Sep 9, 2018
ce04dad
Move taktv6/tflow2 to bio-routing/tflow2
corny Dec 30, 2018
dd62437
Run tests with Go 1.11
corny Dec 30, 2018
f08d9d2
Switch to Covecov
corny Dec 30, 2018
b432252
Fix build
corny Dec 30, 2018
3122531
Update dependencies
corny Dec 30, 2018
d2f2e2c
Fix misspells
corny Jan 13, 2018
b0db056
Simplify code with `gofmt -s -w .`
corny Jan 13, 2018
2e308a4
Add checks to Circle CI
corny Jan 13, 2018
c11ae93
Switch to Go modules
corny Jan 2, 2019
bab0f63
Drop BIRD annotator. Fix logging from glog to logrus.
Apr 23, 2019
b0e351c
Add support for 802.1q in Sflow
Apr 23, 2019
fab434b
Use TopN for prometheus output (#28)
l3akage Apr 29, 2019
c07c7b5
Fix merge conflict in README
corny Apr 25, 2019
3adf1e1
Fix sflow
May 22, 2019
abf3de8
Fix build
May 22, 2019
677d99a
Update dependencies
corny May 28, 2019
1296a84
Use Go 1.12 for testing
corny May 28, 2019
a9ecc3a
Increase usage of github.com/pkg/errors
corny May 21, 2019
da2cb1c
Fix typo on string #85 (#31)
kant May 28, 2019
04a90cd
Restore example config.
SuperQ Jul 8, 2019
d6463be
Build with Go 1.13
corny Sep 12, 2019
9b895f9
Implement RIS annotator
May 29, 2019
d49d605
Fix flow size
Jul 12, 2019
aa15c07
Add src lookup
Aug 16, 2019
68f32c9
Add ASN support
Sep 16, 2019
566d301
Drop binary
Sep 16, 2019
fb8a933
Remove debug output
Sep 16, 2019
a179af5
Fix ASN filter
Sep 16, 2019
d470c7d
Make SNMP walk timeout configurable. Fix race condition in interface
Sep 17, 2019
66ba1c0
Add support for flow metric to sflow server
Sep 21, 2019
4cdf82b
Add agent label to prom interface
Sep 22, 2019
b24a635
Fix NF9 buffer
taktv6 Jan 22, 2020
8992419
Merge pull request #45 from bio-routing/fix/nf9
awlx Jan 22, 2020
830ced9
Add support for expanded flow sample format
May 5, 2020
ff2a123
Fix absence of extended router data
May 5, 2020
6b0f7c7
Debugging
May 5, 2020
e455526
Debug
May 5, 2020
f6bd6e9
Fix aligning
May 5, 2020
178aefb
Cleanup
May 5, 2020
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
Improving error handling
Oliver Herms committed Aug 24, 2017
commit 58e21663a38732aafb7cb3b6759c5d4d170d7ed3
4 changes: 2 additions & 2 deletions database/database_query.go
Original file line number Diff line number Diff line change
@@ -328,14 +328,14 @@ func (fdb *FlowDatabase) RunQuery(q *Query) (*Result, error) {

start, end, err := fdb.getStartEndTimes(q)
if err != nil {
return nil, err
return nil, fmt.Errorf("Failed to Start/End times: %v", err)
}

glog.Infof("RunQuery: start=%d end=%d current=%d", start, end, fdb.CurrentTimeslot())

rtr, err := fdb.getRouter(q)
if err != nil {
return nil, err
return nil, fmt.Errorf("Failed to get router: %v", err)
}

resSum := &concurrentResSum{}