1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud_admin.git synced 2025-03-09 23:38:52 +00:00
This commit is contained in:
topilski 2019-06-06 02:51:42 -04:00
parent 4b10a56fe2
commit 3a423b0ff2

View file

@ -15,7 +15,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
width: 20%; width: 20%;
} }
th.stream_type { th.stream_type {
width: 8%; width: 5%;
} }
th.stream_status { th.stream_status {
width: 5%; width: 5%;
@ -27,13 +27,13 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
width: 5%; width: 5%;
} }
th.stream_rss { th.stream_rss {
width: 5%; width: 6%;
} }
th.stream_inbps { th.stream_inbps {
width: 5%; width: 6%;
} }
th.stream_outbps { th.stream_outbps {
width: 5%; width: 6%;
} }
th.stream_work_time { th.stream_work_time {
width: 10%; width: 10%;
@ -44,6 +44,7 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
th.stream_actions { th.stream_actions {
width: 25%; width: 25%;
} }
</style> </style>
{{super()}} {{super()}}
{% endblock %} {% endblock %}
@ -262,8 +263,8 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<th class="stream_restarts">{% trans %}Restarts{% endtrans %}</th> <th class="stream_restarts">{% trans %}Restarts{% endtrans %}</th>
<th class="stream_cpu">{% trans %}CPU{% endtrans %}</th> <th class="stream_cpu">{% trans %}CPU{% endtrans %}</th>
<th class="stream_rss">{% trans %}RSS (MB){% endtrans %}</th> <th class="stream_rss">{% trans %}RSS (MB){% endtrans %}</th>
<th class="stream_inbps">{% trans %}In BPS{% endtrans %}</th> <th class="stream_inbps">{% trans %}In (Mbps){% endtrans %}</th>
<th class="stream_outbps">{% trans %}Out BPS{% endtrans %}</th> <th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th>
<th class="stream_work_time">{% trans %}In work time{% endtrans %}</th> <th class="stream_work_time">{% trans %}In work time{% endtrans %}</th>
<th class="stream_live_time">{% trans %}Live time{% endtrans %}</th> <th class="stream_live_time">{% trans %}Live time{% endtrans %}</th>
<th class="stream_actions">{% trans %}Actions{% endtrans %}</th> <th class="stream_actions">{% trans %}Actions{% endtrans %}</th>
@ -286,8 +287,12 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<td>{{ rev.restarts }}</td> <td>{{ rev.restarts }}</td>
<td>{{ rev.cpu }}</td> <td>{{ rev.cpu }}</td>
<td>{{ (rev.rss / (1024 * 1024)) | round(4, 'floor') }}</td> <td>{{ (rev.rss / (1024 * 1024)) | round(4, 'floor') }}</td>
<td>{{ rev.input_streams|sum(attribute='bps') }}</td> <td>{{ rev.input_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4,
<td>{{ rev.output_streams|sum(attribute='bps') }}</td> 'floor') }}
</td>
<td>{{ rev.output_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4,
'floor') }}
</td>
<td>{{ rev.timestamp - rev.start_time }}</td> <td>{{ rev.timestamp - rev.start_time }}</td>
<td>{{ rev.timestamp - rev.loop_start_time }}</td> <td>{{ rev.timestamp - rev.loop_start_time }}</td>
<td> <td>
@ -398,8 +403,8 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
<th class="stream_restarts">{% trans %}Restarts{% endtrans %}</th> <th class="stream_restarts">{% trans %}Restarts{% endtrans %}</th>
<th class="stream_cpu">{% trans %}CPU{% endtrans %}</th> <th class="stream_cpu">{% trans %}CPU{% endtrans %}</th>
<th class="stream_rss">{% trans %}RSS (MB){% endtrans %}</th> <th class="stream_rss">{% trans %}RSS (MB){% endtrans %}</th>
<th class="stream_inbps">{% trans %}In BPS{% endtrans %}</th> <th class="stream_inbps">{% trans %}In (Mbps){% endtrans %}</th>
<th class="stream_outbps">{% trans %}Out BPS{% endtrans %}</th> <th class="stream_outbps">{% trans %}Out (Mbps){% endtrans %}</th>
<th class="stream_work_time">{% trans %}In work time{% endtrans %}</th> <th class="stream_work_time">{% trans %}In work time{% endtrans %}</th>
<th class="stream_live_time">{% trans %}Live time{% endtrans %}</th> <th class="stream_live_time">{% trans %}Live time{% endtrans %}</th>
<th class="stream_actions">{% trans %}Actions{% endtrans %}</th> <th class="stream_actions">{% trans %}Actions{% endtrans %}</th>
@ -421,9 +426,13 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</td> </td>
<td>{{ vod.restarts }}</td> <td>{{ vod.restarts }}</td>
<td>{{ vod.cpu }}</td> <td>{{ vod.cpu }}</td>
<td>{{ vod.rss }}</td> <td>{{ (rev.rss / (1024 * 1024)) | round(4, 'floor') }}</td>
<td>{{ vod.input_streams|sum(attribute='bps') }}</td> <td>{{ vod.input_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4,
<td>{{ vod.output_streams|sum(attribute='bps') }}</td> 'floor')}}
</td>
<td>{{ vod.output_streams|sum(attribute='bps') / (1024 * 1024 / 8) | round(4,
'floor') }}
</td>
<td>{{ vod.timestamp - vod.start_time }}</td> <td>{{ vod.timestamp - vod.start_time }}</td>
<td>{{ vod.timestamp - vod.loop_start_time }}</td> <td>{{ vod.timestamp - vod.loop_start_time }}</td>
<td> <td>
@ -517,12 +526,12 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
for(var i in stream.input_streams) { for(var i in stream.input_streams) {
in_bps += stream.input_streams[i].bps; in_bps += stream.input_streams[i].bps;
} }
row.eq(7).text(in_bps); row.eq(7).text(in_bps / (1024 * 1024 / 8));
var out_bps = 0; var out_bps = 0;
for(var i in stream.output_streams) { for(var i in stream.output_streams) {
out_bps += stream.output_streams[i].bps; out_bps += stream.output_streams[i].bps;
} }
row.eq(8).text(out_bps); row.eq(8).text(out_bps / (1024 * 1024 / 8));
row.eq(9).text(stream.timestamp - stream.start_time); row.eq(9).text(stream.timestamp - stream.start_time);
row.eq(10).text(stream.timestamp - stream.loop_start_time); row.eq(10).text(stream.timestamp - stream.loop_start_time);
}); });
@ -805,5 +814,6 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</script> </script>
{% endblock %} {% endblock %}