freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity
590 Commits 2 Branches 1 Tag 1.7 MiB
Commit Graph

590 Commits

Author SHA1 Message Date
Adrian Schmutzler 36e99bec52 Changelog: Update 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:53:21 +02:00
Adrian Schmutzler c83c4eb860 api/alfred: Mask public IPv6 addresses 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:53:02 +02:00
Adrian Schmutzler a591554b3b v2routers: Select V2 hoods in history 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:52:55 +02:00
Adrian Schmutzler 71802221a0 Remove hoodsv1 table and corresponding interface with KeyXchangeV1 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:52:32 +02:00
Adrian Schmutzler 98af250294 api/get_routers_by_keyxchange_id: Switch to V2 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:52:04 +02:00
Adrian Schmutzler 0d320259e9 map: Remove V1 hood layer 
This removes the layer which used to show the hood borders, not
the one with the V1 routers.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:51:59 +02:00
Adrian Schmutzler 6efd0bda59 api/alfred: Only use single hood for V1 
This removes code to evaluate the position of a V1 router.

Distinction between Default and NoCoordinates is dropped.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:51:53 +02:00
Adrian Schmutzler 49cefe2767 api/alfred: Keep old hood if empty field is sent 
This suppresses hood change events if hood is lost due to
disconnection.

Normally, disconnects should be indicated by other events like
online/offline.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:51:47 +02:00
Adrian Schmutzler fae6e858b7 map: Also include map layer in URL 
So far, only the overlay layers had been included.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:51:41 +02:00
Adrian Schmutzler 2afc9e549d Changelog: Update 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:51:28 +02:00
Adrian Schmutzler 64d0177a4f setup.py: Update link to GitHub for service 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:43 +02:00
Adrian Schmutzler 8eb4b75e28 router.html: Link to router list for various properties 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:36 +02:00
Adrian Schmutzler f74aabe0cb router_list: Add query keys for os,batman,kernel,nodewatcher 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:31 +02:00
Adrian Schmutzler 39988c6ffc router.html: Add link to hood stats 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:26 +02:00
Adrian Schmutzler 06a4a9dcfc router/statistics.html: Swap stats and router list for hoods/GWs 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:20 +02:00
Adrian Schmutzler c5291413f1 map: Add Polyhood support 
This actually implements polyhood support for the MAP.

This is not connected to the earlier commit which provides
database support for polyhoods. This patch will work
independent of the earlier one.

Although the KeyXchange does not provide polyhood data so far,
the Monitoring's implementation can already be put in place and
will take up the data as soon as it's there.

Note that since we only provide an additional layer for the
map, the overall footprint of this change is relatively small.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:15 +02:00
Adrian Schmutzler 61e2e4600b MySQL: Make all hood IDs unsigned 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:08 +02:00
Adrian Schmutzler bb61351fbf Polyhoods: Introduce database support and read functions 
Polyhoods need to be read manually. Running
scripts/readpolyhoods.py will erase both tables and reread data.

At the moment, the URL points to a test setup.

This requires changes to the MySQL database!

This is meant for later use and does NOT add any data to the
Monitoring at the moment.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:50:03 +02:00
Adrian Schmutzler b8409d3abe api/alfred and api/alfred2: Return status also when error occurs 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:56 +02:00
Adrian Schmutzler 4c52271897 api/alfred: Treat empty hood element as V2 
To get rid of V2 <-> V1 hood changes, an empty hood element is
treated as V2, while a missing one is treated as V1.

This requires a firmware update to work.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:50 +02:00
Adrian Schmutzler 2ee6da55e9 v2routers: Use hoodid to identify V1 hoods 
All V1 hoods are assigned to IDs 10xxx in the hoods table.
Since no new hoods are added, they are contained in this range.

In addition, the hoods table is forever, so deleted V1 hoods
stay there. This makes the hoodid a perfect WHERE criterion for
the v2routers page, so it does not have to be updated for every
deleted hood.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:45 +02:00
Adrian Schmutzler 1f1d04abc8 map: Adjust default position 
Adjust map initial position and zoom to cover whole Freifunk
Franken area.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:37 +02:00
Adrian Schmutzler 103a404eea api/alfred2: Introduce alfred mode WITHOUT fetch_id 
Read alfred data without surrounding {"64":"<data>"},
so just <data> can be sent.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:31 +02:00
Adrian Schmutzler dc9b71ae01 router/router_list/user.html: Indicate missing coordinates 
This also indicates missing coordinates without a previous reset.

The router detail page shows different messages for both cases
(missing coords and reset). The lists show the "Reset!"
warning in both cases (previously only for real reset).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:26 +02:00
Adrian Schmutzler 24e934b66c map: Include layer selection in URL 
This provides a permalink which includes the map settings.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:20 +02:00
Adrian Schmutzler f26f01f73c statistics.html/gws.html: Show gwinfo version of gateways 
This requires changes to the MySQL database!

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:14 +02:00
Adrian Schmutzler 0bdb90d020 gwinfo: Actually use rewritten stats_page variable 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:09 +02:00
Adrian Schmutzler d651af1aae router_list.html: Highlight missing contact addresses 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2019-05-11 23:49:03 +02:00
Adrian Schmutzler f701fa55e9 Put git branch logic explanation into README.md 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler 3fe6ba79cb Changelog: Update 
In addition: Search/replace for all auml/ouml/uuml.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler 95a67bf0a4 db/*: Add quotes for all tables and fields 
This is a cosmetic change only meant to harmonize style.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler c6fdf34a0a MySQL: Increase size of field gw_class 
Former field seemed to cut certain values.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler c218072ac1 filters.py: Catch ValueError in case of malformatted IP address 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler c23561a8f8 user_list.html: Show V2 router percentage as column 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:14:10 +01:00
Adrian Schmutzler 0f82f43385 router_list.html: Add filter for V1/V2/Local 
Usage: network:<local|v2|v1>

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 14:13:50 +01:00
Adrian Schmutzler f99f05fb71 hoodstatistics: Make possible to show stats for deleted hood 
At the moment, this requires the user to know the internal
hood ID.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:15:21 +01:00
Adrian Schmutzler 339122bc0c api: Merge code for different node lists 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler e495b200eb config: Increase orphan threshold to 10 days 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler c657f1544f user.html: Make uptime sortable (as in router_list.html) 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 5c4360b944 router_list.html/user.html: Make status column sortable 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler bdff2b74b0 statistics.html: Add option to hide hoods by type (V1/V2/local) 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 7d2488bcc5 v2routers: Added page for V1/V2 comparison 
Selection of deleted hoods for V1 is a dirty walkaround and
needs to be adjusted for every new deleted hood. Since this is
an undocumented page, this is okay ...

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 4c2b4f1628 gateways: Add new page with gateway data (IPs, DHCP ranges) 
Shows all interfaces without checking vpnif.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 4d638c3744 gwinfo: Fix IPv4/IPv6 sed (leading space in match pattern, v1.4.6) 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 7e34a20451 gwinfo: Delete IP addresses for old netif entries 
This ensures that only the latest addresses are shown on the
gateway overview page.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler b0165a4c9c gwinfo: Bump to 1.4.5 (further DHCP fix) 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler a56ff652d1 gwinfo: Bump to 1.4.4 (two DHCP processing fixes) 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler c26c5e79e4 gwinfo: Make grep silent 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 2b8b267ed2 gwinfo: Bump to version 1.4.3 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00
Adrian Schmutzler 424b944254 gwinfo: Update to 1.4.2 and add gateway firmware version 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2018-11-23 13:14:51 +01:00