Commit graph

281 commits

Author SHA1 Message Date
Jan-Philipp Litza
cd1329963a Alfred input: Pass -z switch to alfred-json 2014-09-23 22:31:51 +02:00
Jan-Philipp Litza
322860be7e Add MACs from mesh_interfaces as alises 2014-09-20 12:42:53 +02:00
Jan-Philipp Litza
66112061d6 Fix adding of nodes with multiple matching alises 2014-09-20 12:42:40 +02:00
Jan-Philipp Litza
f08aaaff4e Fix fuzzy MAC matching 2014-09-07 12:17:36 +02:00
Jan-Philipp Litza
6d452fc149 d3json: obscure client MACs 2014-09-07 12:17:22 +02:00
Jan-Philipp Litza
5fba69de7a d3json: make output more similar to pre-rewrite version 2014-07-31 16:31:14 +02:00
Jan-Philipp Litza
446bc98403 input alfred: unify nodeinfo and stats datatypes 2014-07-31 11:41:26 +02:00
Jan-Philipp Litza
e54e7467fc Create package ffmap, add wiki input, remove old code 2014-07-08 14:20:47 +02:00
Jan-Philipp Litza
f5e3705eec Began rewrite with more modular design 2014-07-07 23:27:21 +02:00
Jan-Philipp Litza
54402ce089 mkmap.sh: Add locking around script call 2014-07-06 20:09:42 +02:00
Jan-Philipp Litza
ee51547664 mkmap.sh: Remove Lübeck-specific stuff 2014-07-06 20:04:24 +02:00
Jan-Philipp Litza
89e4c63700 alfred.py: Make geo attribute setting more robust 2014-07-06 20:03:10 +02:00
Jan-Philipp Litza
7075d8481c NodeRRD: add many more DS, rrd.py: generate neighbor counts 2014-07-06 20:03:10 +02:00
Jan-Philipp Litza
43e70191f1 RRD: Fix updating of DS 2014-07-06 20:03:10 +02:00
Jan-Philipp Litza
6fc1423124 Make handling of node attributes more flexible.
This commit makes Nodes special dicts that return None-like objects for
inexistent keys, making it a dynamic attribute store.

Also, it removes the D3MapBuilder and moves its logic to the Node and
Link classes' newly introduced export() method. Only they need to be
changed to populate the final nodes.json with more attributes.
2014-07-06 20:03:10 +02:00
Nils Schneider
0ab4ce6e2b Merge pull request #28 from smoe/patch-1
Patch 1 - install instructions
2014-06-21 21:14:24 +02:00
Steffen Möller
a53715b554 Syntax 2014-06-21 20:18:41 +02:00
Steffen Möller
6664c0d53e Explained execution of mkmap.sh and crontab
Also improved markdown formatting ... slightly.
2014-06-21 20:16:52 +02:00
Steffen Möller
f4f619e52e Basic install instructions 2014-06-21 20:04:14 +02:00
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