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
Daniel Ehlers
b878028671
Fix link handling.
...
Accidental the LinkConnector object was used for checking the nodes,
this patch fixes this behaviour.
2013-11-21 01:24:44 +01:00
Daniel Ehlers
62413d81f3
Generate node stats with rrd.
...
We have an rrd for every active node. On every run we update
stats about client count and node state from nodes.json to the rrd
databases. After updating the rrds we are able to generate a stat
graph (image) for every node.
The rrds are stored in subdirectory "nodedb" of the scripts location and
the generated images in subdirectory "nodes" of the destination directory.
Both directorys must exist bevor starting the script.
2013-11-21 01:24:12 +01:00
Daniel Ehlers
1b0e830e16
Add destination directory argument and write content instead of piping.
2013-11-21 01:21:46 +01:00
Daniel Ehlers
9a85fd0c97
Fix utf-8 enforcing hack.
...
The function getdefaultlocale takes one optional argument,
so the replace should behave the same.
2013-11-21 01:17:44 +01:00
Nils Schneider
e58d0baec3
fix
2013-03-12 20:54:14 +01:00
Nils Schneider
0a1bd6ab8d
do not use microseconds
2013-03-12 20:52:20 +01:00
Nils Schneider
36c852b7bb
add meta.timestamp
2013-03-12 20:09:48 +01:00
Nils Schneider
9eb7da519b
do not repoen stdin, stderr, stdout
2013-03-11 09:24:57 +01:00
Nils Schneider
ec03ffe810
use fuzzy mac matching when importing aliases
2013-02-02 02:44:49 +01:00
Nils Schneider
d9a9927ecb
remove debug print
2013-02-02 01:29:11 +01:00
Nils Schneider
db4dec7270
handle aliases without names
2013-02-02 01:27:49 +01:00
Nils Schneider
3893963553
fix file format generated by ffhlwiki.py
2013-02-02 01:25:02 +01:00
Nils Schneider
46879f7caf
use batctl -n
2013-02-02 01:22:40 +01:00
Nils Schneider
3ffbac8136
remove wikiimport from nodedb, move to ffhlwiki.py and call it from mkmap.sh
2013-02-02 01:21:29 +01:00
Nils Schneider
9b236c462b
allow parsing of multiple aliases-files
2013-02-02 00:44:46 +01:00
Nils Schneider
78e8d4f6ff
output geo as floats, not strings
2013-01-17 22:13:20 +01:00
Nils Schneider
828b68ab34
add hostid module with mac_to_hostid function
2012-12-23 23:08:58 +01:00
Nils Schneider
5613fa2f61
include offline nodes from aliases.json in output
2012-11-22 02:35:14 +01:00
Nils Schneider
8e62ca2f37
Revert "add nodes2bathosts script"
...
This reverts commit 2ebf716ca9
2012-10-02 22:24:03 +02:00
Nils Schneider
be7b04234e
add aliases.json to .gitignore
2012-10-02 20:28:29 +02:00
Nils Schneider
32eb2da6eb
fix wiki url
2012-10-02 18:04:07 +02:00
Nils Schneider
bbf9b599fe
remove unused vpn flag
2012-09-21 02:49:27 +02:00
