mirror of
https://github.com/FreifunkFranken/fff-monitoring.git
synced 2024-06-15 20:04:03 +02:00
statistics.html: Show details about selected gateway
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
452aa5a009
commit
a9912dccd2
|
@ -248,6 +248,19 @@ def gws_info(mysql,selecthood=None):
|
|||
d["batX"] = gw_bat(d)
|
||||
return data
|
||||
|
||||
def gws_admin(mysql,selectgw):
|
||||
if not selectgw:
|
||||
return None
|
||||
|
||||
data = mysql.fetchall("""
|
||||
SELECT gw_admin.name
|
||||
FROM gw_netif
|
||||
INNER JOIN gw_admin ON gw_netif.gw = gw_admin.gw
|
||||
WHERE mac = %s
|
||||
ORDER BY prio ASC
|
||||
""",(selectgw,),"name")
|
||||
return data
|
||||
|
||||
def record_global_stats(mysql):
|
||||
threshold=(utcnow() - datetime.timedelta(days=CONFIG["global_stat_days"])).timestamp()
|
||||
time = mysql.utctimestamp()
|
||||
|
|
|
@ -392,6 +392,7 @@ def helper_statistics(mysql,stats,selecthood,selectgw):
|
|||
gws = stattools.gws(mysql,selecthood)
|
||||
gws_sum = stattools.gws_sum(mysql,selecthood)
|
||||
gws_info = stattools.gws_info(mysql,selecthood)
|
||||
gws_admin = stattools.gws_admin(mysql,selectgw)
|
||||
mysql.close()
|
||||
|
||||
return render_template("statistics.html",
|
||||
|
@ -407,7 +408,8 @@ def helper_statistics(mysql,stats,selecthood,selectgw):
|
|||
newest_routers = newest_routers,
|
||||
gws = gws,
|
||||
gws_sum = gws_sum,
|
||||
gws_info = gws_info
|
||||
gws_info = gws_info,
|
||||
gws_admin = gws_admin
|
||||
)
|
||||
except Exception as e:
|
||||
writelog(CONFIG["debug_dir"] + "/fail_stats.txt", str(e))
|
||||
|
|
|
@ -152,6 +152,25 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6">
|
||||
{%- if selectgw %}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Gateway-Details</div>
|
||||
<div class="panel-body">
|
||||
<table class="table table-condensed">
|
||||
<tr><th>Gateway</th><td>{{ gws_info[selectgw]["gw"] }}</td></tr>
|
||||
<tr><th>Interface</th><td>{{ gws_info[selectgw]["gwif"] }}</td></tr>
|
||||
<tr><th>MAC address</th><td>{{ selectgw }}</td></tr>
|
||||
<tr><th>BatX interface</th><td>{{ gws_info[selectgw]["batX"] }}</td></tr>
|
||||
{%- if gws_info[selectgw]["stats_page"] %}
|
||||
<tr><th>Stats page</th><td>{{ gws_info[selectgw]["stats_page"] }}</td></tr>
|
||||
{%- endif %}
|
||||
{%- for a in gws_admin %}
|
||||
<tr><th>Admin</th><td>{{ a }}</td></tr>
|
||||
{%- endfor %}
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{%- endif %}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Router Firmwares{%- if selecthood %} @ {{ selecthood }}{%- endif -%}{%- if selectgw %} @ {{ selectgw }}{%- endif -%}</div>
|
||||
<div class="panel-body">
|
||||
|
|
Loading…
Reference in New Issue
Block a user