196 Commits

Author SHA1 Message Date
Raf
6cde365b82 Revert to defaults from upstream 2018-05-12 13:08:10 +02:00
Raf
852cc43567 - Option to stack IPv4 and IPv6 together
- defaults update
2018-05-10 13:19:25 +02:00
Manuel Kasper
5b1f2af37a Merge pull request #67 from JackSlateur/master
Support optional IP to ASN mapping for netflow v5 / sFlow
2017-04-02 15:47:09 +02:00
jack
2017097b30
Fix typo
Signed-off-by: jack <jack@k-net.pro>
2017-04-02 14:08:17 +02:00
jack
d0599e60ae
Support optional IP to ASN mapping for sFlow
Signed-off-by: jack <jack@k-net.pro>
2017-03-16 15:54:06 +01:00
jack
fc2a0bfb8c
Update README
Signed-off-by: jack <jack@k-net.pro>
2017-03-10 15:12:24 +01:00
jack
c447f9d096
Support optional IP to ASN mapping for netflow v5
Signed-off-by: jack <jack@k-net.pro>
2017-03-10 15:11:05 +01:00
Manuel Kasper
104d4c38b7 Merge pull request #60 from maxlareo/master
generate-asinfo.py: get country code from last field
2017-02-28 09:50:55 +01:00
Manuel Kasper
1e27922c1d Merge pull request #59 from JackSlateur/master
Allow links selection on graphs
2017-02-28 09:50:36 +01:00
jack
152ea16ced
Drop unused files
Signed-off-by: jack <jack@k-net.pro>
2017-02-25 23:51:16 +01:00
jack
903dd3b36f
Update readme
Signed-off-by: jack <jack@k-net.pro>
2017-02-25 16:41:58 +01:00
jack
d6c4c0ff95
Store statistics into a sqlite3 database. This way, we can quickly filter links on the top page, deprecating the linkusage page
Signed-off-by: jack <jack@k-net.pro>
2017-02-25 15:58:28 +01:00
Manuel Kasper
f8fe1b74bf Add note about current status 2017-02-15 18:26:08 +01:00
Maxime Lareo
a715324929
generate-asinfo.py: get country code from last field 2017-02-15 16:42:56 +01:00
Manuel Kasper
fa8f3c8ac9 Merge pull request #55 from JackSlateur/master
sFlow: handle multiple ASN, if you want to merge the statistics when …
2017-01-20 21:09:48 +00:00
jack
84931f2eca Don't set asn as value, but key, thanks manuelkasper
Signed-off-by: jack <jack@k-net.pro>
2017-01-20 20:44:05 +01:00
jack
79abab60d3 sFlow: handle multiple ASN, if you want to merge the statistics when you own more than a single network
Signed-off-by: jack <jack@k-net.pro>
2017-01-19 15:02:21 +01:00
Manuel Kasper
ee65b8dd82 Merge pull request #54 from JackSlateur/master
Support extendedflow
2016-11-18 18:21:41 +01:00
jack
d649faf8d8 Forgot that code ..
Signed-off-by: jack <jack@k-net.pro>
2016-11-18 17:44:24 +01:00
jack
fc940ce20f Support extendedflow
Signed-off-by: jack <jack@k-net.pro>
2016-11-18 17:39:27 +01:00
Manuel Kasper
523578f432 Merge pull request #49 from clobrother/master
Don't include v6 stats inside v4
2016-06-21 08:57:10 +02:00
jack
26a77d1d9d Don't include v6 stats inside v4 2016-06-20 22:21:35 +02:00
Manuel Kasper
b0e9ea47de Merge pull request #48 from ShaneMcC/separate-samplerate
Allow separate samplerates for in/out traffic
2016-04-15 16:54:20 +02:00
Shane Mc Cormack
586e5f2d2c Allow separate samplerates for in/out traffic 2016-04-15 15:13:24 +01:00
Manuel Kasper
fafb2417f4 Merge pull request #47 from twiddern/master
New ASINFO.txt & changed external links
2016-03-21 08:56:01 +01:00
twiddern
0fe537c0e5 fixed new qrator url sheme 2016-03-20 02:05:09 +01:00
twiddern
06d24985dd Changed some links
PeeringDB fixed for new URL sheme and added https
robtex added https
euro-IX removed since URL search is not working anymore
added CIDR report v4+v6
2016-03-20 02:00:54 +01:00
twiddern
759565626d Updated asinfo again and removed some empty entries 2016-03-20 01:47:56 +01:00
twiddern
78ba165bde Updated asinfo 2016-03-20 01:44:31 +01:00
Manuel Kasper
cb6f4c317b Fix missing stats entries
Fix for link tags that are substrings of other link tags.
2015-11-24 09:14:09 +01:00
Manuel Kasper
47714febb6 Merge pull request #44 from green525/master
Move customlinks for AS-SET view
2015-02-24 09:29:35 +01:00
Andre Grueneberg
395ac2b374 Move customlinks for AS-SET view 2015-02-23 21:51:25 +01:00
Manuel Kasper
745d6f7d03 Merge pull request #43 from steveglen/master
Fix add_ds_proc index into new datasource array
2015-02-02 09:35:47 +01:00
root
7998b721de Fix add_ds_proc index into new datasource array
This patch makes add_ds_proc actually add the new datasource names, instead of adding blank names in some situations.

Signed-off-by: Steve Glendinning <steve@warwicknet.com>
2015-01-30 14:47:51 +00:00
Manuel Kasper
70d471a724 Fix JunOS IPFIX example
Input provided by Vitaly Egorov
2015-01-25 13:33:15 +01:00
Manuel Kasper
7e63b3b350 Fix PHP warning
Reported by Philippe Mächler
2015-01-21 21:51:30 +01:00
Manuel Kasper
91c577decb Merge pull request #41 from green525/master
Fix title for peer usage (include time period)
2015-01-15 20:54:37 +01:00
Andre Grueneberg
5297bc5578 Fix title for peer usage (include time period) 2015-01-15 20:19:47 +01:00
Manuel Kasper
782be693d0 Merge pull request #40 from green525/master
Fix little link glitch
2015-01-15 09:13:49 +01:00
Andre Grueneberg
f87c1946d8 Fix little link glitch 2015-01-15 00:18:02 +01:00
Manuel Kasper
3f2111e23b Merge pull request #39 from clobrother/master
- Add qrator radar in custom links
2014-12-04 17:15:22 +01:00
jack
e823c0ea36 - Add qrator radar in custom links 2014-12-04 16:59:43 +01:00
Manuel Kasper
51bda95d72 Fix PHP warnings 2014-11-18 13:19:11 +01:00
Manuel Kasper
cec7cf2de0 Update README.md 2014-09-12 15:22:46 +02:00
Manuel Kasper
5ed451d03f Update AS info and bump version
* fix resetting number of hours to 24 when changing number of AS
v1.6
2014-09-12 14:20:25 +02:00
Manuel Kasper
586834f7df Configurable stats intervals for link usage
* use configurable stats intervals for link usage too
* fix label in top AS when short_open_tag is off
* refactor statsfile/label handling
2014-09-11 18:38:33 +02:00
Manuel Kasper
77bc8aa73f Remove 4/12 hour clutter
* clarify extractstats
* remove 4/12 hour stats as it’s unnecessary clutter, and by default
there is only a 24 hours stats file so the sort order and the aggregate
stats are wrong anyway, and besides the RRD resolution is too low by
default. If users want this, they can add it properly now.
2014-09-11 15:24:58 +02:00
Manuel Kasper
5bf3c07994 Make top N AS intervals configurable
* make top N AS intervals configurable (see config.inc), and allow
separate top stats file to be used per interval (enables e.g. proper
weekly/monthly stats)
* add Terabyte formatting
2014-09-11 15:12:58 +02:00
Manuel Kasper
ac2faaf01b peer-as improvements
* add warning when trying to use peer-as stats with NetFlow
* slightly optimize packet handling when peer-as is disabled
* default peer-as stats to disable
2014-09-11 14:59:24 +02:00
Manuel Kasper
1777ee0aad Merge pull request #37 from clobrother/peeras
add missing file
2014-06-27 10:49:36 +02:00