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
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
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
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
870785ede8
Merge pull request #74 from adridolf/ulalink
...
Use ULA for WebUI link
2017-10-14 16:47:04 +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
547416ae9c
No legacy anymore
2017-10-07 23:07:04 +02:00
058bed9a2e
Implement loadavg graph data collection for #55
2017-09-11 16:31:57 +02:00
Adrian Schmutzler
fc4e4f3026
Add loadavg graph for routers
...
Fixes #55
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-09-10 12:24:36 +02:00
f51d0ae5fd
Add index for "created" routerdb field ( fixes #65 )
2017-08-31 13:16:56 +02:00
f8c5913ad1
Commit unstaged changes from production instance
2017-08-21 11:49:26 +02:00
Adrian Schmutzler
bd855abd0d
Add explanation page for API functions
...
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-19 02:52:10 +02:00
Adrian Schmutzler
b013533dfe
Add API script to output JSON list of routers with MAC address
...
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-18 14:38:57 +02:00
8f7a55042a
Fix code style
2017-08-18 14:24:20 +02:00
Adrian Schmutzler
5f65d38908
Add WifiAnalyzer alias file output
...
Syntax: /api/wifianal/<hood>
This returns raw text.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-18 13:20:47 +02:00
Adrian Schmutzler
2a3cd94619
Harmonize tab style in api.py
...
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-17 23:36:06 +02:00
96a8466e7a
Merge pull request #58 from adridolf/consistent_hoodnames
...
Make capitalization and spelling of hoods consistent
2017-07-25 10:51:19 +02:00
216b0ec801
Projekt Hoodteilung extremo #9
...
Add Hood Erlenbach
2017-07-25 09:20:24 +02:00
Adrian Schmutzler
46dbde5c72
Make capitalization and spelling of hoods consistent
...
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-07-24 23:49:07 +02:00
a3115c54d0
Projekt Hoodteilung extremo #8
...
Add Hood Coburg
2017-07-20 18:16:03 +02:00
db4cd7d57f
Projekt Hoodteilung extremo #7
...
Add Hood Lauf
2017-07-20 15:16:38 +02:00
a1e7cf2650
Projekt Hoodteilung extremo #6
...
Add Hood Ebern
Re-positioned Hood Aschaffenburg
2017-07-19 17:10:17 +02:00
3e567ba07a
Projekt Hoodteilung extremo #5
...
Add Hood Ebern
HoodID 25 is reserved for Coburg, it is created in the next steps
2017-07-17 20:31:34 +02:00
096c3a48fa
Projekt Hoodteilung extremo #4
...
Re-positioned Hood Markredwitz
Re-positioned Hood Hof
Add Hood Fichtelberg
Add Hood Rehau
2017-07-17 16:20:19 +02:00
12384f2f5a
Projekt Hoodteilung extremo #3
...
Add Hood Bayreuth
HoodID 21 is reserved for Lauf, it is created in the next steps
2017-07-17 10:56:43 +02:00
e15c8908bf
Projekt Hoodteilung extremo #2
...
Add Hood Ebermannstadt
2017-07-16 22:34:32 +02:00
d9e70533ca
Projekt Hoodteilung extremo #1
...
Re-positioned Hood Adelsdorf
Re-positioned Hood Forchheim
Add Hood ErlangenWest
2017-07-16 11:55:10 +02:00
0ac862411a
Set WAN uplink based on new nodewatcher xml entry and for L2TP
...
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-06-17 21:48:08 +02:00
93d0ab13c7
Added FFF link to nav bar ( fixes #44 )
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-06-12 19:29:42 +02:00
576c8dd0c0
adding hood Schweinfurt to hoods.py
2017-05-19 22:56:07 +02:00
b1b6ed540f
Fixed map display in Internet Explorer 11
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-05-09 21:35:28 +02:00
37f47eabdb
Removed padding for link local addresses
...
See https://mantis.freifunk-franken.de/view.php?id=42 for more information.
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-05-08 19:02:57 +02:00
3318794d0f
Added support for layer 3 links ( fixes #38 )
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-04-17 13:31:31 +02:00
138c8c81b8
Added hood Adelsdorf.
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-03-23 19:24:49 +01:00
5ad3111745
Add hood link to router page
2017-03-22 23:27:42 +01:00
ff4b8ebd8f
- deleted functionality to fetch data from Netmon
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-03-22 18:14:54 +01:00
3f0052bdfe
- do not show links to Netmon anymore
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-03-22 18:12:54 +01:00
2e4eaf2a18
Remove netmon resync code
...
See #34
2017-03-21 15:42:16 +01:00
682d62d852
Netmon Sync Button entfernt
...
Netmon Sync Button auf Route Seite entfernt
2017-03-21 14:48:04 +01:00
158eb2585e
Link from statistics page to hood router list
...
Fixes #32
2017-03-21 11:07:23 +01:00
b16199c8db
Use Hood from Router XML if provided
...
Fixes #31
2017-03-21 10:06:59 +01:00
4b09731360
Added general exception handler for function 'import_nodewatcher_xml'
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2017-01-28 18:20:36 +01:00
6cadfaa848
- fixed exception: caused by deleting a router without an owner
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-09-25 19:46:41 +02:00
3db647d40f
Re-positioned hood HassbergeSued
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-09-17 09:53:58 +02:00
4a7c41260c
Escape HTML in router map popup
2016-07-26 22:23:37 +02:00
d940526f79
Get chipset value only if XML key exists
2016-07-26 22:20:59 +02:00
da42ef018c
Add in memory router rate limit
...
This is some kind of tmp hack to reduce db load
2016-07-26 22:17:39 +02:00
797b67ee40
Record smaller stat timespan to reduce db load
2016-07-26 22:16:33 +02:00
7845b007b5
Make E-Mails more verbose to avoid SPAM flag
2016-07-26 22:14:13 +02:00
955d265231
use https instead of http for attribution link
2016-07-23 14:55:20 +02:00
ad9564dd04
zwei weitere tilelayer hinzugefuegt, so dass jetzt drei auswaehlbar sind.
...
Der Stil von openstreetmap.org, der Stil der auf openstreetmap.de verwendet wird, und Thunderforest Outdoors.
2016-07-23 14:13:54 +02:00
626595ad17
Re-positioned hood Hof
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-13 18:10:09 +02:00
a8b38bc808
Added hood Muenchberg
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-13 18:10:09 +02:00
392d6adce8
Added hood Forchheim
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-13 18:10:09 +02:00
1698047715
Added hood Bamberg
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-13 18:09:44 +02:00
d95604688d
Added hood Marktredwitz
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-02 19:13:56 +02:00
9ec37e715b
Added hood Aschaffenburg
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-07-02 19:13:56 +02:00
3bf3445c51
Merge pull request #18 from kratz00/empty_mac
...
Added workaround for empty 'mac_addr' element in nodewatcher data.
2016-05-16 17:03:24 +02:00
45943a5246
Added workaround for empty 'chipset' element in nodewatcher data.
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-05-16 12:20:03 +02:00
c42dc9b92f
Added workaround for empty 'mac_addr' element in nodewatcher data.
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-05-16 12:17:49 +02:00
0ef01992ed
Added nodelist API endpoint.
...
Signed-off-by: Steffen Pankratz <kratz00@gmx.de>
2016-05-03 22:24:34 +02:00
ae75d547f9
Add hood: hof
2016-04-28 17:43:55 +02:00
698998cec5
Fix fork warning
2016-04-28 17:33:45 +02:00
cfc65780ee
Add missing misc.py
2016-04-22 10:09:20 +02:00
39d30c7021
Some ipv6 detection fix
2016-04-19 19:34:51 +02:00
c894f91abb
Add option to delete a user account
2016-04-10 14:48:43 +02:00
1c1dea66ff
Add !not search operator
2016-03-16 22:32:37 +01:00
7921ac6d90
Move datetime.utcnow().replace(tz... into function
2016-03-10 14:22:23 +01:00
e1d2217d79
Allow searching for netif
2016-03-10 14:04:37 +01:00
95179df2c0
Handle IntOverflows and save unknown-status reason
2016-03-10 14:03:27 +01:00
b7584486ff
Small XML parsing performance optimisation
2016-03-10 14:01:54 +01:00
179c403787
Don't ask netmon for WebUI router's position
2016-03-10 14:00:12 +01:00
d8bbbf1213
Make session survive application restart
2016-03-10 13:57:36 +01:00
5d59a208bb
View the best links on the top
...
Sort links.csv by link quality
2016-03-10 13:56:06 +01:00
af2a80f5ee
Delete routers with last_contact > 100 days ago
2016-03-10 13:55:15 +01:00
5fee464680
Handle l2tp tunnels
2016-03-07 12:27:43 +01:00
c7436cdea2
Add link to change Avatar
2016-03-02 16:00:09 +01:00
c5c0e15c19
Double (clickable) pointer radius on 2k displays
...
The actual pointer image will keep its size
2016-02-29 22:22:04 +01:00
b3a0131b63
Add alfred_leagcy_provider
...
It gets a list of pre-0.5.1 routers from netmon mysql db,
crawls them and sends the results to a (patched) alfred master.
2016-02-29 19:16:49 +01:00
19329ef85c
User Accounts, Legacy Routers, Delete Routers
2016-02-29 18:51:58 +01:00
c34246f3a8
Let MongoClient be tz_aware
...
- output datetime objects from mongodb are now tz_aware with tzinfo=utc
- fixes #11
2016-02-15 18:51:40 +01:00
4cddcbfec3
Fix MAC Address redirect
2016-02-06 11:42:11 +01:00
b508f5031c
Remove trailing whitespaces from IP Addrs
2016-01-30 14:56:25 +01:00
5a11a4083a
Use new URL
2016-01-30 14:49:14 +01:00
688b90f3f6
Show ipv4 and ipv6 addresses
2016-01-30 14:48:48 +01:00
4984d614e7
Implement /get_router_by_mac/<mac>
...
- To allow hotlink from router webui
- Will redirect to router page when there is
exactly one router with this mac
- Otherwise redirect to router list with mac
set as filter
2016-01-25 16:49:14 +01:00
1e9f43fe0c
Nice title
2016-01-23 22:08:25 +01:00
c85ba1d403
Add fw info
2016-01-22 21:21:30 +01:00
cef52d187e
Rename to "FFF Monitoring", Add Index.
2016-01-22 21:08:27 +01:00
495c4d4512
Add scale to map
2016-01-22 20:37:31 +01:00
44a50ecafb
Reduce stat range to 2 Weeks ( #3 )
2016-01-22 20:33:41 +01:00
c81e8328cd
use description, position,... from nodewatcher XML
2016-01-07 23:08:23 +01:00
e56336b106
rename position.comment to position_comment
2016-01-06 19:06:43 +01:00
818ad5fc75
show data fetch hint in netmon event
2015-12-30 00:33:57 +01:00
0cde57178f
allow to filter by community
2015-12-30 00:33:36 +01:00
a8851609f5
show statustext
2015-12-22 10:35:17 +01:00
e9e53b1344
show router community
2015-12-22 10:06:14 +01:00
c888bf28b9
show router uptime
2015-12-22 09:20:48 +01:00
d40b374e3d
Fix handling junk data
2015-12-14 00:05:37 +01:00
a3ff3bc4c8
fix datatables css reference
...
see issue #2 and #5
2015-12-11 13:18:04 +01:00
59769571fb
Merge branch 'master' of https://github.com/kratz00/ff-map
2015-12-11 11:54:45 +01:00
4d06d1fd2f
Do not rely on CDNs for accessing bootstrap, jquery etc. ( fixes #2 )
...
- upgrade to Leaflet 0.7.7
2015-12-11 11:18:07 +01:00
0c7c9772df
remove timezone (doesn't work anyway)
2015-12-11 00:01:12 +01:00
30d5a6f302
uwsgi catch exceptions
2015-12-10 23:57:18 +01:00
a7cfa33d3d
handle status_text
2015-12-10 23:56:23 +01:00
431b4a62dd
add map zoom permalink
2015-12-10 23:51:58 +01:00
166e72b072
fix filtering by mac address
2015-12-09 19:57:15 +01:00
850c474371
fix js graph autoscale and Others section
2015-12-09 19:47:02 +01:00
c0bf36f4fb
fix netmon_id query
2015-12-09 19:16:12 +01:00
df79b4268f
netmon api tells old pos comment if changed to ""
...
so let's interpret a single space as an unset position comment
and allow users to set their position comment to a single space
in order to delete it
2015-12-06 00:39:56 +01:00
79526f600f
add favicon
2015-12-06 00:39:35 +01:00
594ee53194
neighbours function doesn't like empty neighbours
2015-12-01 14:54:09 +01:00
36938ad60a
new hood: nbgland
2015-11-27 15:59:09 +01:00
b19335d3f8
fix hood updater and add hw name normalizer
2015-11-27 15:58:35 +01:00
ece780c309
fix hood total router couter & make tbl responsive
2015-11-27 15:57:17 +01:00
d137f99d45
allow spaces in hardware.name query (use _)
2015-11-27 15:56:35 +01:00
0716ed945a
show netif on multiple links to same neighbour
...
fixes #1
2015-11-27 15:49:02 +01:00
1762f095a7
escape dots in regex; allow querying netmon id
2015-11-19 22:39:34 +01:00
02c094aab2
allow users to trigger netmon resync
2015-11-19 22:37:06 +01:00
016a9b4f70
clean routertools; add hood/hostname change event
2015-11-19 22:05:37 +01:00
a6dad73b91
don't show links originating from offline routers
...
mainly because the neighbour positions might be outdated
2015-11-19 14:16:12 +01:00
b5b4ff60fe
filter/search router_list
2015-11-18 14:48:14 +01:00
5b8609102a
strip spaces around ip addr
2015-11-16 09:59:49 +01:00
3eb8793e26
improve parser logic
2015-11-15 20:49:52 +01:00
0a9e255802
add titles and make ui more responsible
2015-11-15 20:48:55 +01:00
b442d33954
make router list nice and filterable
2015-11-15 20:47:43 +01:00
1d0ef0f321
make js pie look nicer
2015-11-15 20:45:26 +01:00
70f821872f
fill total routers col
2015-11-12 22:27:54 +01:00
6c385b3408
add statistics page
2015-11-11 15:27:50 +01:00
3e4debab4a
make graphs hideable
2015-11-09 12:01:15 +01:00
8bb4c8ce82
assert 0 if no quality data is available
2015-11-08 21:58:51 +01:00
9cf93e8c18
add "router not found" error msg
2015-11-06 18:19:21 +01:00
09c0f4abc2
add created property without netmon sync
2015-11-06 18:18:27 +01:00
cb1215ac8a
multirow graph legend
2015-11-06 18:06:31 +01:00
e6c94c35fa
use more efficient bson2json for stats
2015-11-05 15:47:40 +01:00
3daee38a7c
show wan uplink (also for aux)
2015-11-05 15:46:27 +01:00
72e3b4a5e2
remove old chipset db init
2015-11-05 15:44:58 +01:00
00e0779fa5
performance tweaks to increase alfred import speed
2015-11-04 17:21:15 +01:00
455f1710d5
fix graphs on mobile devices
2015-11-04 00:30:31 +01:00
f495283208
add statistics
2015-11-03 23:55:33 +01:00
88904b184d
hide graph reset button before selection
2015-11-03 16:13:37 +01:00
8dc6760ccc
add network statistics
2015-11-03 16:03:14 +01:00
9a84c44145
fix double router bug
2015-10-22 20:53:25 +02:00
771a49bb03
changes for router view and data fetch
...
- show router update event
- show time since last contact
- re-fetch netmon data when netmon_id is unset
- gracefully handle missing router data
2015-10-22 19:26:03 +02:00
1d0cde5a98
fix creation event
2015-10-21 11:04:54 +02:00
8975d01100
fix event list
2015-10-21 11:01:24 +02:00
99b7a39fde
use new hardware model name
2015-10-20 23:29:30 +02:00
8ba835eae8
minimum unit is KiB
2015-10-20 21:45:26 +02:00
2dc2ba8158
calc fe80 ip from mac, if there is no ip in the db
2015-10-20 21:44:36 +02:00
b69df7b1a1
auto reload map
2015-10-19 14:09:34 +02:00
75d7722797
fix the $slice issue (hopefully) the last time
...
$each must be the first item in the dict and python dicts are
not ordered - so use bson.SON
2015-10-16 18:08:14 +02:00
c83ae6657c
fix network interface speed calc bug
2015-10-16 17:03:00 +02:00
2c51271143
use tilestache insted of tilelite for rendering
2015-10-16 17:02:45 +02:00
3f3f0f31d7
fix mobile layout
2015-10-16 09:51:05 +02:00
cd6b00940c
don't slice events when setting router offline
...
update_many doesn't seem to like $each
2015-10-13 15:28:31 +02:00
d69bb8a622
show network interfaces
2015-10-12 18:09:39 +02:00
84cf486269
reorganize folder structure
2015-10-12 15:08:28 +02:00
943bbefb83
add ?json to routers page url to view raw db doc
2015-10-12 14:57:41 +02:00
f9a4e783f5
fix event slicing bug
2015-10-12 14:36:39 +02:00
0306e02052
use ssl cdn to allow using https
2015-10-12 14:36:39 +02:00
934d2851e5
add alfred support and dynamic map creation
2015-10-10 17:42:44 +02:00
Adrian Schmutzler
Dominik Heidler