Nils Schneider
f18d0b38a9
bugs
2014-05-31 14:53:38 +02:00
Nils Schneider
26fc2a9aef
alfred: use network.mac as ID if present
2014-05-02 10:49:32 +02:00
Nils Schneider
b3a921347c
Merge pull request #26 from T-X/for-upstream
...
try non-fuzzy prior fuzzy mac matching
2014-05-02 08:55:19 +02:00
Linus Lüssing
605765cd12
try non-fuzzy prior fuzzy mac matching
...
Fuzzy matching should only be tried if there's no exact match. Otherwise
a node in the map might get the wrong label.
2014-05-02 04:10:39 +02:00
Nils Schneider
ac3366ff13
count clients and add clientcount attribute to each node
2014-04-10 17:17:11 +02:00
Nils Schneider
fbc5c636df
alfred.py: ignore non-parseable locations
2014-03-30 13:20:15 +02:00
Nils Schneider
d6bd31f8d0
Merge pull request #20 from FreifunkBremen/RRD-module
...
RRD module
2014-02-21 15:06:04 +01:00
Jan-Philipp Litza
ca2ab676b3
Modularize global and node rrd definitions and graphings
2014-02-16 16:54:10 +01:00
Jan-Philipp Litza
17fcf10b74
Offload rrdtool calls and model to separate module
2014-02-16 16:52:59 +01:00
Nils Schneider
791947234c
rrd: do not define RRAs twice
2014-02-11 12:22:53 +01:00
Nils Schneider
7f49d93311
bat2nodes: deal with rrd after creating nodes.json
2014-02-11 11:36:05 +01:00
Nils Schneider
0918b5a3b1
rrd: fixes
2014-02-11 11:35:18 +01:00
Nils Schneider
2ad0deda40
rrd: saner RRAs for global
2014-02-11 11:23:06 +01:00
Nils Schneider
35f42dbcf1
rrd: saner RRAs
2014-02-11 11:19:53 +01:00
Nils Schneider
8c0e367f3d
rrd.py: remove unused argument
2014-02-09 16:55:50 +01:00
Nils Schneider
37db42b51e
mkmap.sh: enable alfred
2014-02-07 11:03:27 +01:00
Nils Schneider
baa123c25e
mkmap.sh: $GWS was not set
2014-02-07 11:03:02 +01:00
Nils Schneider
352d00e7a4
mkmap.sh: cd into directory instead of dirname everywhere
2014-02-07 10:53:22 +01:00
Nils Schneider
ef9d762c93
Merge pull request #16 from sargon/optimize-nodedb-py
...
nodedb.py: stop similar mac address check when parts are not equal
2014-02-04 13:02:38 -08:00
Daniel Ehlers
613fa425ed
nodedb.py: stop similar mac address check when parts are not equal
2014-02-04 15:54:04 +01:00
Nils Schneider
914836eb9a
alfred.py: pass firmware version to nodes.json
2014-02-02 23:30:16 +01:00
Nils Schneider
bd19e5f18c
Merge pull request #15 from freifunkhamburg/obfuscation-fixes
...
Obfuscation fixes
2014-02-01 19:27:29 -08:00
Andreas Baldeau
ddf7e4f8db
Fixed variable name and catches only KeyErrors to not hide other errors.
2014-01-31 22:15:30 +01:00
Andreas Baldeau
cd743ff46c
Fixes client mac obfuscation. Node to node links stay untouched now.
2014-01-31 22:15:30 +01:00
Nils Schneider
634b37fee2
Merge pull request #14 from sargon/master
...
alfred: Retrieve aliases from alfred and integrate batadv-vis.
2014-01-30 13:44:15 -08:00
Daniel Ehlers
319b071fd8
alfred: Make the alfred based batadv-vis data source optional.
2014-01-30 22:31:00 +01:00
Daniel Ehlers
4c4e8d846b
rrd: Only decrease client count for legacy nodes.
2014-01-30 22:29:09 +01:00
Daniel Ehlers
d9451e2ea7
alfred: Mark all nodes from legacy support.
2014-01-30 22:12:33 +01:00
Daniel Ehlers
2c79b1d91c
alfred: Retrieve aliases from alfred and integrate batadv-vis.
...
Extending the visualisation data sources by the new batadv-vis,
which itself base ontop of alfred. Also extending the aliases import
by parsing informations from alfred. The last part is possible
through the preprocessing of data with alfred-json, so we don't
need to process the 'broken' format alfred itself supports.
This patch needs batadv-vis and tcatm/alfred-json in the PATH.
2014-01-30 22:11:01 +01:00
Nils Schneider
64918cb092
Merge pull request #11 from toppoint/obscure-clients
...
Fixes and nodes.json consistency
2014-01-04 00:32:57 -08:00
Daniel Ehlers
33d7b3aefc
Write new file to a temporary and move it afterwards.
2014-01-02 01:46:49 +01:00
Daniel Ehlers
53d8f4bcf2
Fix exception handling and remove debug output
2013-12-29 20:20:33 +01:00
Nils Schneider
4894e1792a
Merge pull request #10 from toppoint/obscure-clients
...
Obscure clients
2013-12-29 04:49:43 -08:00
Andreas Baldeau
a0c234ea05
Add client mac obscuring methods.
2013-12-29 13:11:53 +01:00
Daniel Ehlers
3557e471e1
Add client macs obscure option handling
2013-12-29 04:15:40 +01:00
Daniel Ehlers
90106313eb
Method for searching a node by id.
2013-12-29 04:14:07 +01:00
Nils Schneider
86485bc7df
rrd.py: fix isfile check
2013-11-25 13:17:53 +01:00
Nils Schneider
7e498c4197
rrd.py: skip non-files
2013-11-23 23:17:04 +01:00
Nils Schneider
a47345d51b
rrd.py: clientCount -= 1 might not be needed with gluon/alfred
2013-11-23 22:22:29 +01:00
Nils Schneider
8ee4cbcf24
rrd.py: create output directory if it does not exist yet
2013-11-23 22:16:35 +01:00
Nils Schneider
4f889b102f
create nodedb/ directory
2013-11-23 22:11:46 +01:00
Nils Schneider
b722639f1f
more merge fixes
2013-11-23 22:10:46 +01:00
Nils Schneider
573d32c29d
write nodes.json directly without creating nodes.json.new first
2013-11-23 22:09:27 +01:00
Nils Schneider
d38670a5a1
fix mkmap.sh
2013-11-23 22:08:26 +01:00
Nils Schneider
7b36d62c64
Merge branch 'toppoint-rrdstats'
2013-11-23 22:06:56 +01:00
Nils Schneider
ccf0a753fb
Merge branch 'rrdstats' of https://github.com/toppoint/ffmap-backend into toppoint-rrdstats
...
Conflicts:
bat2nodes.py
mkmap.sh
2013-11-23 22:05:52 +01:00
Nils Schneider
e0f1fa2b01
Merge pull request #8 from toppoint/utf8-fix
...
Fix utf-8 enforcing hack.
2013-11-23 13:03:31 -08:00
Daniel Ehlers
44c92ff65f
Refactor batctl calls into python class.
...
This drastically reduces the logic implement in mkmap.sh and also
supports multiple batman mesh interfaces.
2013-11-21 01:27:13 +01:00
Daniel Ehlers
ca3c436813
Reduce clientCounter for every node.
...
We have an ghost client for every node, we don't want them in the global
client measurement.
2013-11-21 01:25:22 +01:00
Wilfried Klaebe
94dba3399c
Beautify node stats.
...
Also display both rrdb fields in one graph.
2013-11-21 01:25:01 +01:00
