external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-05 00:27:25 +00:00
Code Issues Releases Wiki Activity

Include IMAP connection records in overall db stats table

Browse Source
This commit is contained in:
downtownallday 2021-04-08 13:29:04 -04:00
parent 721dd1273f
commit b4c2cdef7d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
management/reporting/ui/capture-db-stats.js
View File

@ -6,7 +6,7 @@ Vue.component('capture-db-stats', {
template:'<div>'+ template:'<div>'+
'<template v-if="stats">'+ '<template v-if="stats">'+
'<caption class="text-nowrap">Database date range</caption><div class="ml-2">First: {{stats.mta_connect.connect_time.min_str}}</div><div class="ml-2">Last: {{stats.mta_connect.connect_time.max_str}}</div>'+ '<caption class="text-nowrap">Database date range</caption><div class="ml-2">First: {{stats.db_stats.connect_time.min_str}}</div><div class="ml-2">Last: {{stats.db_stats.connect_time.max_str}}</div>'+
'<div class="mt-2">'+ '<div class="mt-2">'+
' <b-table-lite small caption="Connections by disposition" caption-top :fields="row_counts.fields" :items=row_counts.items></b-table-lite>'+ ' <b-table-lite small caption="Connections by disposition" caption-top :fields="row_counts.fields" :items=row_counts.items></b-table-lite>'+
'</div>'+ '</div>'+
@ -37,9 +37,9 @@ Vue.component('capture-db-stats', {
// convert dates // convert dates
var parser = d3.utcParse(this.stats.date_parse_format); var parser = d3.utcParse(this.stats.date_parse_format);
[ 'min', 'max' ].forEach( k => { [ 'min', 'max' ].forEach( k => {
var d = parser(this.stats.mta_connect.connect_time[k]); var d = parser(this.stats.db_stats.connect_time[k]);
this.stats.mta_connect.connect_time[k] = d; this.stats.db_stats.connect_time[k] = d;
this.stats.mta_connect.connect_time[k+'_str'] = this.stats.db_stats.connect_time[k+'_str'] =
d==null ? '-' : DateFormatter.dt_long(d); d==null ? '-' : DateFormatter.dt_long(d);
}); });
@ -63,11 +63,11 @@ Vue.component('capture-db-stats', {
this.row_counts.fields[0].tdClass = 'text-capitalize'; this.row_counts.fields[0].tdClass = 'text-capitalize';
const total = this.stats.mta_connect.count; const total = this.stats.db_stats.count;
for (var name in this.stats.mta_connect.disposition) for (var name in this.stats.db_stats.disposition)
{ {
const count = const count =
this.stats.mta_connect.disposition[name].count; this.stats.db_stats.disposition[name].count;
this.row_counts.items.push({ this.row_counts.items.push({
name: name, name: name,
count: count, count: count,
@ -80,7 +80,7 @@ Vue.component('capture-db-stats', {
}) })
this.row_counts.items.push({ this.row_counts.items.push({
name:'Total', name:'Total',
count:this.stats.mta_connect.count, count:this.stats.db_stats.count,
percent:1, percent:1,
'_rowVariant': 'primary' '_rowVariant': 'primary'
}); });

8
management/reporting/uidata/capture_db_stats.py
View File

@ -17,10 +17,10 @@ def capture_db_stats(conn):
if stats: if stats:
return stats return stats
select_1 = 'SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM mta_connection' select_1 = 'SELECT min(`min`) AS `min`, max(`max`) AS `max`, sum(`count`) AS `count` FROM (SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM mta_connection UNION SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM imap_connection)'
# table scan # table scan
select_2 = 'SELECT disposition, count(*) AS `count` FROM mta_connection GROUP BY disposition' select_2 = 'SELECT disposition, sum(count) as `count` FROM (SELECT disposition, count(*) AS `count` FROM mta_connection GROUP BY disposition UNION SELECT disposition, count(*) AS `count` FROM imap_connection GROUP BY disposition) GROUP BY disposition'
c = conn.cursor() c = conn.cursor()
stats = { stats = {
@ -29,7 +29,7 @@ def capture_db_stats(conn):
} }
try: try:
row = c.execute(select_1).fetchone() row = c.execute(select_1).fetchone()
stats['mta_connect'] = { stats['db_stats'] = {
'connect_time': { 'connect_time': {
'min': row['min'], 'min': row['min'],
'max': row['max'], # YYYY-MM-DD HH:MM:SS (utc) 'max': row['max'], # YYYY-MM-DD HH:MM:SS (utc)
@ -39,7 +39,7 @@ def capture_db_stats(conn):
} }
for row in c.execute(select_2): for row in c.execute(select_2):
stats['mta_connect']['disposition'][row['disposition']] = { stats['db_stats']['disposition'][row['disposition']] = {
'count': row['count'] 'count': row['count']
} }