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

295 Commits

Author SHA1 Message Date
Adrian Schmutzler 9e3236f593 gitignore: Add mysqlconfig 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:59:12 +01:00
Adrian Schmutzler 58b6bc34f9 helpers/api: Fix MAC search 
This fixes searching for MAC addresses in the router list and
via api/get_router_by_mac/

Additionally, regex is enabled for MAC addresses.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:41:19 +01:00
Adrian Schmutzler b2541fe40e api/alfred: Write time and duration of alfred calls to file 
Attention: This contains a hardcoded path!

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:40:08 +01:00
Adrian Schmutzler af545d8194 config: Introduce path for debug output 
Includes update of file names for debug files.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:36:43 +01:00
Adrian Schmutzler 5e75f9cad0 config: Move config to a single, separate file 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:30:39 +01:00
Adrian Schmutzler 5d8e1f9fce Changelog: Update 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:26:46 +01:00
Adrian Schmutzler 595810150c routertools: Reduce offline delay to 15 minutes 
This is possible due to the optimized alfred proxy cron
triggers.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:26:35 +01:00
Adrian Schmutzler fd07427007 scripts: Run statistics cron jobs every 5+3 minutes 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:26:22 +01:00
Adrian Schmutzler 9fc96ea103 filters.py: Change blue color for L3-Links and neighbors 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:24:52 +01:00
Adrian Schmutzler cc61b43316 router.html: Sort neighbors by quality 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:24:39 +01:00
Adrian Schmutzler 4f4afeb69f router.html: Show neighbors without associated router 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:24:30 +01:00
Adrian Schmutzler 8f0ac9520e application.py: Remove debug output for user page 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-19 15:21:20 +01:00
Adrian Schmutzler 3604b4f9b8 Changelog: Introduce changelog 
This feature is planned to be permanent and updated.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:43:35 +01:00
Adrian Schmutzler 46266c9cb5 Show orphans in statistics 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:43:08 +01:00
Adrian Schmutzler 5be67936d6 Use different colors for router dots of v1 and v2 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:42:07 +01:00
Adrian Schmutzler 9e5965054d Remove mapnik/mkcsv.py 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:42:00 +01:00
Adrian Schmutzler f2f8538500 Rename hoodsv2 to hoods_v2 for consistency 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:41:52 +01:00
Adrian Schmutzler 73895af3d9 Separate hoods into layers 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:41:46 +01:00
Adrian Schmutzler 3fd731a5a2 Introduced orphaned state between offline and deletion 
After 7 days of being offline, a router enters the orphaned
state with a grey icon. It is only deleted after a longer period
of 180 days.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:41:38 +01:00
Adrian Schmutzler 6f61cc6fdc Optimize MySQL commit for /api/alfred plus some debugging 
Signed-off-by: Adrian Schmutzler <adsc@monitoring.freifunk-franken.de>
 2017-11-16 20:40:45 +01:00
Adrian Schmutzler 39bf2032f4 routertools: Aggregate INSERT commands using executemany 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:37:26 +01:00
Adrian Schmutzler 39ab0b1f7c application.py: Fix left-over cur reference 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 20:35:49 +01:00
Adrian Schmutzler 8dc3633246 Fix missing timezone awareness of immutable data types 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 15:05:24 +01:00
Adrian Schmutzler a65873c2ee Global stats put into separate scripts and run by cron 
Most of the processes is executed every five minutes, but
deleting can be done only once per day ...

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 15:00:12 +01:00
Adrian Schmutzler 50445edb79 scripts: Move copyusers.py to scripts folder 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 14:53:34 +01:00
Adrian Schmutzler ece82c44f4 routertools: Remove direct references to mysql cursor 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 14:50:16 +01:00
Adrian Schmutzler bf1d1b8b2a router.html: Fix long loading times 
The mysql queries had been executed in a for loop, this is
moved to a single query now.

Side effect may be a little more JavaScript execution time.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 14:44:28 +01:00
Adrian Schmutzler b89468d655 Update README to include changes due to MySQL and python3 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:09:14 +01:00
Adrian Schmutzler 60501ac775 router.html: Fix omitting coordinates if not set 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:07:31 +01:00
Adrian Schmutzler 9d167bdb86 Respect case in database and code 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:06:25 +01:00
Adrian Schmutzler 003fcbcebe routertools/stattools: Implement default hood as str "Default" 
If the default is NULL (as previously), we have ugly problems
with indexing and queries. To circumvent this, the hood is
set to "Default" right at the beginning.

For old data, we add an if to the hood stats calculation.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:05:48 +01:00
Adrian Schmutzler 48cb9f0033 routertools: Remove lower() for hood name 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:04:47 +01:00
Adrian Schmutzler 3be0cd12b3 helpers: Treat spaces in query string more correctly 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:04:09 +01:00
Adrian Schmutzler a16c50124c Reintroduce regex for search strings in router list 
Includes tidying-up query string helpers

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:03:40 +01:00
Adrian Schmutzler 92cd0e00a8 routertools: Treat missing XML elements better 
This particularly fixes the case of missing coordinates.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:02:03 +01:00
Adrian Schmutzler e34daa118d Migrate TileStache to python3 
Requires TileStache to be in absolute path

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:01:49 +01:00
Adrian Schmutzler 9a32c7bffd Delete old router events 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:01:26 +01:00
Adrian Schmutzler 5262a4e14f Provide fffconfig output option for routers 
If ?fffconfig is specified after a routers ID, a config file
with the router's data is return. This can directly be copied
to /etc/config/fff on the device and thus easily recover a
lost configuration.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:01:18 +01:00
Adrian Schmutzler 412203a946 api: Add wifianalall (all hoods) 
Puts reused code into a helper function

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:01:01 +01:00
Adrian Schmutzler 87093a9066 Add hood-specific statistics 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:00:48 +01:00
Adrian Schmutzler e3fe995407 MySQL: alpha3 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-11-16 00:00:07 +01:00
Dominik Heidler 1b4ae0fe51 Merge pull request #75 from adridolf/mapv2 
fff-map: Add layer for KeyExchange v2
 2017-10-16 12:10:00 +02:00
Adrian Schmutzler 78a8a1b65e fff-map: Add layer for KeyExchange v2 
Draft version. On my local setup, I had to create CSVs manually
with mkcsv.py and copy them to /var/...

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-10-16 12:07:34 +02:00
Dominik Heidler 870785ede8 Merge pull request #74 from adridolf/ulalink 
Use ULA for WebUI link
 2017-10-14 16:47:04 +02:00
Dominik Heidler e11be0be71 Merge pull request #73 from adridolf/fixfirmware 
No legacy anymore: Fix missing firmware
 2017-10-14 16:44:56 +02:00
Adrian Schmutzler 3d4d005a17 Use ULA for WebUI link 
For v2-hoods, the ULA should be used, which enables routing across
hoods.

Fixes #72

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-10-14 15:11:56 +02:00
Adrian Schmutzler 88e040af00 No legacy anymore: Fix missing firmware 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
 2017-10-14 14:59:37 +02:00
Dominik Heidler 547416ae9c No legacy anymore 2017-10-07 23:07:04 +02:00
Dominik Heidler 058bed9a2e Implement loadavg graph data collection for #55 2017-09-11 16:31:57 +02:00
Dominik Heidler 35625fce59 Merge pull request #68 from adridolf/loadavg 
Add loadavg graph for routers
 2017-09-11 11:55:10 +02:00