189 Commits

Author SHA1 Message Date
jack
3162e367b7 use getHTML* function 2014-06-25 16:55:52 +02:00
jack
0d5a6b0dc7 use getHTML* function 2014-06-25 16:52:28 +02:00
jack
a649e2e659 add function to generate images html 2014-06-25 16:39:24 +02:00
jack
f60103604f add function to generate images html 2014-06-25 16:34:30 +02:00
jack
d491b993f4 fix title for v6 linkusage 2014-06-25 16:26:27 +02:00
jack
0063facbb8 add the forgotten 'type' in recursive handflow() 2014-06-25 16:17:06 +02:00
jack
a7ccd7568d wait for children before exit; avoid a 'socket already used' issue on restart; 2014-06-25 15:32:19 +02:00
jack
3050e0bbe5 add a filter in find, so it won't look for deeper sub-tree (another "rrd-tree" stored in the same root) 2014-06-25 15:31:06 +02:00
jack
cf5a549db0 Revert "wait for children before exit; avoid a 'socket already used' issue on restart;"
This reverts commit 86ddfe44b48afd55f741c6bcce91a2e5627d80a4.
2014-06-25 15:28:07 +02:00
jack
faaec24eca Revert "store peer-as in /peeras/* (only for sFlow)"
This reverts commit 4662f2f75dab181ce05bfb60bc903704dab88b15.
2014-06-25 15:28:06 +02:00
jack
f3f697399e Revert "add a filter in find, so it will count as OR peeras, not both of them (same tree..)"
This reverts commit 7920698595fa2447ec38b6f0d0dd70a9e1105c17.
2014-06-25 15:28:05 +02:00
jack
e8009e9e00 Revert "fix help info to add the 'n' switch"
This reverts commit c67e0bc0d9b5f53545a9c087126a7c2fa34dd9de.
2014-06-25 15:27:31 +02:00
jack
c67e0bc0d9 fix help info to add the 'n' switch 2014-06-20 13:53:29 +02:00
jack
7920698595 add a filter in find, so it will count as OR peeras, not both of them (same tree..) 2014-06-20 13:46:07 +02:00
jack
4662f2f75d store peer-as in /peeras/* (only for sFlow) 2014-06-20 13:34:48 +02:00
jack
86ddfe44b4 wait for children before exit; avoid a 'socket already used' issue on restart; 2014-06-20 13:23:42 +02:00
Manuel Kasper
18deb09a3a Fix graph sizing, improve config
Use full-size-graph option in recent RRDTool versions to avoid scaled
graphs. Introduce config defaults file to avoid hairy isset() logic for
new options. Make graph sizes configurable.
2014-06-17 17:33:50 +02:00
Manuel Kasper
e69a14a878 Fix config backward compatibility 2014-06-17 10:52:31 +02:00
Manuel Kasper
6bc8516e65 Merge pull request #33 from green525/master
Align legend with brightening
2014-06-17 10:49:55 +02:00
Andre Grueneberg
350227fa1b Align legend with brightening 2014-06-16 23:04:46 +02:00
Manuel Kasper
3a68236a88 Rename "decolore" option
Make its function clearer, and also keep previous behavior if the
config option is not defined.
2014-06-16 15:49:03 +02:00
Manuel Kasper
28db9b73df Merge pull request #32 from clobrother/master
Few patchs to merge our codebase
2014-06-16 15:41:40 +02:00
Alexandre Bruyelles
788bdc338f flush cache on exit 2014-06-16 12:26:27 +02:00
Alexandre Bruyelles
705e1687ff fix bug: GatewayIpVersionNextHopRouter is 255.255.255.255 sometimes 2014-06-16 11:28:42 +02:00
Alexandre Bruyelles
ee24f5cced add an option to not decolore graph 2014-06-16 10:50:12 +02:00
Manuel Kasper
f3bd9f36bd Merge pull request #31 from green525/master
Support VLANs to distinguish different logical links
2014-06-15 08:07:59 +02:00
Andre Grueneberg
b14b2ff392 Avoid warnings about undefined values 2014-06-14 20:31:07 +02:00
Andre Grueneberg
cde7650819 Corrected paramters to handleflow() 2014-06-14 20:25:58 +02:00
Andre Grueneberg
5c84c03765 Add support for multiple VLANs per ifIndex
sFlow and Netflow v9/v10 may provide VLAN information in flows, so
one can distinguish between different logical links on the same
physical connection (e.g. transit via private VLAN over IXP).
2014-06-14 20:16:05 +02:00
Manuel Kasper
3a44e2448d Clarify procedure to add new links
From user networkmaster
2014-06-13 12:42:28 +02:00
Manuel Kasper
4824de3038 Add AS23456 to asinfo.txt
32-bit Transition AS number.
Fixes issue #29.
2014-06-03 17:20:51 +02:00
Manuel Kasper
ddbcfa17aa Avoid short_open_tag requirement
Fixes issue #28.
2014-06-03 17:17:35 +02:00
Manuel Kasper
3cce4051ea Merge pull request #27 from nshopik/patch-1
fix graphs size downscaling in asset view
2014-05-20 21:16:31 +02:00
Nikolay Shopik
7396374db5 fix graphs size downscaling in asset view 2014-05-20 17:55:17 +04:00
Manuel Kasper
d0dec50833 Merge pull request #25 from nshopik/master
fix graphs size downscaling
2014-03-13 14:49:32 +01:00
Nikolay Shopik
557036deb8 fix graphs size downscaling 2014-03-13 16:03:32 +03:00
Manuel Kasper
949a0c1711 Merge pull request #24 from nshopik/patch-1
fix IOS-XR example config
2014-03-12 16:17:32 +01:00
Nikolay Shopik
67f1ba93da fix IOS-XR example config 2014-03-12 17:55:53 +03:00
Manuel Kasper
812b653dc7 Merge pull request #23 from buchtajz/master
Added new freebsd startup script reflecting merged netflow/sflow-asstatd...
2014-03-12 14:06:50 +01:00
Manuel Kasper
c40a7fff28 Various fixes
Fix command line injection. Make number of hours in top.php a parameter
instead of duplicating file. Add config setting for compatibility with
old (< 1.3) RRDtool versions. Move contributed shell scripts to subdir.
2014-03-12 14:05:29 +01:00
Manuel Kasper
2cb4585ea1 Merge pull request #22
manually fixed merge conflict
2014-03-12 13:45:30 +01:00
Michal Buchtik
cf1fe62427 Added new freebsd startup script reflecting merged netflow/sflow-asstatd.pl
Removed old freebsd startup scripts
2014-03-11 13:18:11 +01:00
Manuel Kasper
f3eb7618f0 Merge pull request #21
with some slight changes
2014-03-06 23:44:02 +08:00
Manuel Kasper
c39d874b2a Form Focus Addd
Added form.focus to the page to make it easier when pasting text into
the page.
2014-03-05 20:01:41 +11:00
Datatech UK Ltd
7293d4f4b5 View an AS - remove AS or Space on text paste
View an AS - Remove 'AS' or ' ' (Space) on text paste into text box
2014-03-04 18:54:42 +00:00
Manuel Kasper
79ec0dbcf3 Add RIPEstat, make v4/v6 bytes display the same
Contributed by Erik Sundberg
2014-03-04 11:24:59 +11:00
Manuel Kasper
ddc230b00d Merge pull request #19 from clobrother/master
Add 95th line on graph
2014-02-13 00:10:57 +11:00
root
2058bfeb7a add cool vertical label 2014-02-11 16:08:36 +01:00
root
ed64edab88 show 95th on graph 2014-02-11 16:07:22 +01:00
Manuel Kasper
6265d11ff5 Clarify allowed characters in interface tags 2014-02-08 18:32:33 +01:00