Nils Schneider
431d46e191
change nodes.json format to version 2
2015-07-30 19:21:56 +02:00
Nils Schneider
823b64b8ba
memory_usage: assume buffers and cached to be free
2015-07-13 17:43:41 +02:00
Nils Schneider
f2214ab130
Merge pull request #62 from kantorkel/firstseen
...
add firstseen to nodelist.json
2015-07-12 18:44:53 +02:00
kantorkel
c5b321430e
fixed 'blank line contains whitespace'
...
lib/nodelist.py:18:1: W293 blank line contains whitespace. fixed.
2015-07-12 18:08:17 +02:00
kantorkel
ee84327b5c
add firstseen to nodelist.json
2015-07-06 15:26:41 +02:00
Nils Schneider
dcd6609030
Merge pull request #61 from Freifunk-Troisdorf/master
...
Added traffic to Statistics
2015-06-08 11:50:49 +02:00
stebifan
64dee31ebb
Added traffic to Statistics
2015-06-07 23:52:32 +02:00
Nils Schneider
b53a94ec0a
Merge pull request #59 from ffnord/feature-ffmap-d3-jq
...
Added jq filter to convert new format to old format
2015-05-16 13:21:23 +02:00
Jan-Philipp Litza
11ef32178d
Added jq filter to convert new format to old format
...
This makes it easily possible to continue using the legacy ffmap-d3
front end with the new backend while migrating.
2015-05-16 13:10:55 +02:00
Jan-Philipp Litza
71ced22b0f
README.md: Extend dependencies
2015-05-15 18:20:49 +02:00
Nils Schneider
dafad3df4c
update aliases.json_sample
2015-05-09 22:16:44 +02:00
Nils Schneider
8fd0b73418
remove dependency on mesh_interfaces
2015-05-09 22:04:45 +02:00
Nils Schneider
3caf00be07
extract VPN interfaces from nodeinfo
2015-05-09 21:54:54 +02:00
Nils Schneider
1141aa766f
nodes.py: catch ZeroDivisionError in statistics
2015-05-03 13:16:26 +02:00
Nils Schneider
1835abac7f
basic nodeinfo validation (location)
2015-05-03 13:11:22 +02:00
Nils Schneider
8b8b2cc324
Merge pull request #57 from foertel/master
...
[DOC] include dependencies
2015-04-30 17:43:50 +02:00
Felix Oertel
dccfb8c27a
[DOC] include dependencies
2015-04-30 17:37:19 +02:00
Nils Schneider
e3b15f61df
Merge pull request #55 from mweinelt/master
...
Fixes a regression in --aliases argument, create env used for subprocess
2015-04-12 20:13:20 +02:00
Martin Weinelt
dfcb9a3940
batman: ensure /usr/sbin and /usr/local/sbin are in PATH
2015-04-12 19:59:04 +02:00
Martin Weinelt
1ee17c0440
partially revert 3ec0874b77
2015-04-12 19:38:21 +02:00
Nils Schneider
4071a67541
Merge pull request #54 from mweinelt/master
...
Update README.md, Change --aliases to nargs=+
2015-04-12 19:29:37 +02:00
Martin Weinelt
3ec0874b77
Update --aliases (-a) switch to use nargs=+
...
This breaks calls with multiple --aliases params specified and
introduces --aliases FILE1 FILE2 FILE3 [...] instead
2015-04-12 19:26:45 +02:00
Martin Weinelt
6f97932ea2
README.md: add instructions to run under unprivileged user
2015-04-12 19:24:40 +02:00
Nils Schneider
5a891c1232
Merge pull request #53 from mweinelt/master
...
batman: prefix sudo for batctl if not executed as root
2015-04-12 19:13:16 +02:00
Martin Weinelt
7322a14274
batman: prefix sudo for batctl if not executed as root
...
depends on proper sudo rule, like:
mapuser ALL = NOPASSWD: /usr/sbin/batctl
2015-04-12 18:59:10 +02:00
Nils Schneider
9a652c429c
README: use new --vpn syntax
2015-04-12 12:07:48 +02:00
Nils Schneider
fa740273bb
output nodelist.json
2015-04-08 12:54:46 +02:00
Nils Schneider
4b88a196ac
README: drop sudo explanation
2015-04-02 18:52:00 +02:00
Nils Schneider
428a9731e0
README: removing owner info using jq
2015-04-01 23:33:00 +02:00
Nils Schneider
7f198980b6
introduce GRAPH_VERSION and NODES_VERSION
2015-04-01 18:06:12 +02:00
Nils Schneider
c9098b1793
set version of nodes.json to 1
2015-04-01 17:55:27 +02:00
Nils Schneider
ebde2fcba2
create dest_dir if needed
...
fixes #48
2015-04-01 17:41:40 +02:00
Nils Schneider
bb2aa112c3
make pep8 happy
2015-04-01 17:34:35 +02:00
Nils Schneider
29e2647ad5
ignored the wrong pep8 error code
2015-04-01 17:16:32 +02:00
Nils Schneider
206ea3d6ef
update travis.yml to ignore PEP8 E113 Line-Length
2015-04-01 01:50:35 +02:00
Nils Schneider
dd8f6b92af
drop batctl vd json legacy support
...
fixes #47
2015-04-01 01:36:31 +02:00
Nils Schneider
98d4618156
fix pruning
2015-03-26 14:21:11 +01:00
Nils Schneider
c93d6c0192
Merge pull request #45 from mweinelt/pull2
...
Update argument parser
2015-03-26 14:14:34 +01:00
Martin Weinelt
5b5f4a5d74
fix pep8 line-length in argparser help
2015-03-26 14:12:50 +01:00
Martin Weinelt
a1fe27fc51
Update argument parser
...
* --mesh (-m) now accepts the interface:alfred_sock syntax to add multiple batman/alfred instances. Also multiple instances can be added at once now. Only one interface can be added without alfred socket support (available since 2014.4.0) though.
* --alfred-sock (-s) was dropped in favor of the new --mesh syntax, which adds the interface to socket relationship
* --vpn (-V) now accepts multiple mac addresses, ATTENTION: update your calls accordingly
* --prune defaults to int now
* --with-rrd was renamed from --rrd, to better reflect its boolean/toggle like state
2015-03-26 01:53:44 +01:00
Nils Schneider
e9c693c4c0
Merge pull request #43 from mweinelt/master
...
update batman interface handling in backend.py, add commenting
2015-03-25 15:38:03 +01:00
Martin Weinelt
9df369e88a
update batman interface handling in backend.py, add commenting
2015-03-25 15:14:58 +01:00
Nils Schneider
30670feb31
Merge pull request #42 from mweinelt/master
...
pep8, batadv-vis socket support, batman gateway handling refactored
2015-03-25 14:43:04 +01:00
Martin Weinelt
eb26ea9a5f
pep8: fix remaining line length issues and update travis to include lib/*.py
2015-03-25 14:33:54 +01:00
Martin Weinelt
8d4856db56
lib/batman: refactor gateway handling
2015-03-25 14:11:00 +01:00
Martin Weinelt
e3e5ae1615
Merge branch 'master' of https://github.com/ffnord/ffmap-backend
2015-03-25 14:07:45 +01:00
Martin Weinelt
b143e3f2e5
batman: add batadv-vis socket support, needs at least alfred 2014.4.0
2015-03-25 13:27:54 +01:00
Nils Schneider
dfccd01b69
Merge pull request #41 from mweinelt/master
...
fix regressions in alfred.py
2015-03-24 23:26:55 +01:00
Martin Weinelt
90ab26d50b
fix regressions in alfred.py
2015-03-24 23:17:24 +01:00
Nils Schneider
79ec0eb9d9
Merge pull request #40 from mweinelt/master
...
Update package structure, add alfred socket support
2015-03-24 22:50:51 +01:00