135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

half work of updating web stats page to use stats table

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-28 13:16:52 +01:00
parent 47bf38568e
commit ccd279d918
2 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/App/Netdisco/Web/Statistics.pm
View File

@@ -6,79 +6,14 @@ use Dancer::Plugin::Auth::Extensible;
get '/ajax/content/statistics' => require_login sub {
my $time1 = time;
my $schema = schema('netdisco');
my $devices = $schema->resultset('Device');
my $stats = schema('netdisco')->resultset('Statistics')
->search(undef, { order_by => { -desc => 'day' }, rows => 1 });
# used only to get the PostgreSQL version
my $users = $schema->resultset('User')->search(
{},
{ select => [ { version => '' } ],
as => [qw/ version /],
}
);
my $device_count = $devices->count;
my $device_port_count = $schema->resultset('DevicePort')->count;
my $device_ip_count = $schema->resultset('DeviceIp')
->search( undef, { columns => [qw/ alias /] } )->count;
my $nodes = $schema->resultset('Node')->search(
{},
{ columns => [qw/mac/],
distinct => 1
}
);
my $node_count = $nodes->count;
my $node_table_count = $schema->resultset('Node')->count;
my $nodes_ips = $schema->resultset('NodeIp')->search(
{},
{ columns => [qw/ip/],
distinct => 1
}
);
my $ip_count = $nodes_ips->count;
my $ip_table_count
= $schema->resultset('NodeIp')->search( {}, { columns => [qw/ip/] } )
->count;
my $device_links = $schema->resultset('DevicePort')
->search( { 'remote_ip' => { '!=', undef } } )->count;
my $schema_version = $schema->get_db_version;
my $target_version = $schema->schema_version;
my $time2 = time;
my $process_time = $time2 - $time1;
my $disco_ver = $App::Netdisco::VERSION;
my $db_version = $users->next->get_column('version');
my $dbi_ver = $DBI::VERSION;
my $dbdpg_ver = $DBD::Pg::VERSION;
eval { require SNMP::Info };
my $snmpinfo_ver = ($@ ? 'n/a' : $SNMP::Info::VERSION);
$stats = ($stats->count ? $stats->first->hri : undef);
var( nav => 'statistics' );
template 'ajax/statistics.tt',
{
device_count => $device_count,
device_ip_count => $device_ip_count,
device_links => $device_links,
device_port_count => $device_port_count,
ip_count => $ip_count,
ip_table_count => $ip_table_count,
node_count => $node_count,
node_table_count => $node_table_count,
process_time => $process_time,
disco_ver => $disco_ver,
db_version => $db_version,
dbi_ver => $dbi_ver,
dbdpg_ver => $dbdpg_ver,
snmpinfo_ver => $snmpinfo_ver,
schema_ver => $schema_version,
},
{ stats => $stats },
{ layout => undef };
};