diff --git a/lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm b/lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm index e27e6d90..fa1f10a8 100644 --- a/lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm +++ b/lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm @@ -79,17 +79,11 @@ sub expire { ip_active_count => $schema->resultset('NodeIp')->search({-bool => 'active'}, {columns => 'ip', distinct => 1})->count_rs->as_query, - ip_count => - $schema->resultset('NodeIp')->search(undef, - {columns => 'ip', distinct => 1})->count_rs->as_query, node_table_count => $schema->resultset('Node')->count_rs->as_query, node_active_count => $schema->resultset('Node')->search({-bool => 'active'}, {columns => 'mac', distinct => 1})->count_rs->as_query, - node_count => - $schema->resultset('Node')->search(undef, - {columns => 'mac', distinct => 1})->count_rs->as_query, netdisco_ver => pretty_version($App::Netdisco::VERSION, 3), snmpinfo_ver => $snmpinfo_ver, diff --git a/lib/App/Netdisco/DB/Result/Statistics.pm b/lib/App/Netdisco/DB/Result/Statistics.pm index 091687ae..a288dcbe 100644 --- a/lib/App/Netdisco/DB/Result/Statistics.pm +++ b/lib/App/Netdisco/DB/Result/Statistics.pm @@ -24,14 +24,10 @@ __PACKAGE__->add_columns( { data_type => "integer", is_nullable => 0 }, "ip_active_count", { data_type => "integer", is_nullable => 0 }, - "ip_count", - { data_type => "integer", is_nullable => 0 }, "node_table_count", { data_type => "integer", is_nullable => 0 }, "node_active_count", { data_type => "integer", is_nullable => 0 }, - "node_count", - { data_type => "integer", is_nullable => 0 }, "netdisco_ver", { data_type => "text", is_nullable => 1 }, diff --git a/share/schema_versions/App-Netdisco-DB-43-44-PostgreSQL.sql b/share/schema_versions/App-Netdisco-DB-43-44-PostgreSQL.sql index c495df72..91d392ba 100644 --- a/share/schema_versions/App-Netdisco-DB-43-44-PostgreSQL.sql +++ b/share/schema_versions/App-Netdisco-DB-43-44-PostgreSQL.sql @@ -10,10 +10,8 @@ CREATE TABLE "statistics" ( "device_port_up_count" integer NOT NULL, "ip_table_count" integer NOT NULL, "ip_active_count" integer NOT NULL, - "ip_count" integer NOT NULL, "node_table_count" integer NOT NULL, "node_active_count" integer NOT NULL, - "node_count" integer NOT NULL, "netdisco_ver" text, "snmpinfo_ver" text, diff --git a/share/views/ajax/statistics.tt b/share/views/ajax/statistics.tt index 5d06253d..524f390d 100644 --- a/share/views/ajax/statistics.tt +++ b/share/views/ajax/statistics.tt @@ -21,10 +21,10 @@ [% stats.device_link_count| format_number %] layer 2 links between devices - [% stats.node_table_count | format_number %] nodes of which [% stats.node_active_count | format_number %] are active + [% stats.node_table_count | format_number %] nodes logged, of which [% stats.node_active_count | format_number %] are active - [% stats.ip_table_count | format_number %] IPs of which [% stats.ip_active_count | format_number %] are active + [% stats.ip_table_count | format_number %] IPs logged, of which [% stats.ip_active_count | format_number %] are active Statistics last generated on [% stats.day %]