Support for expire_devices, expire_nodes, and expire_nodes_archive

Netdisco/lib/App/Netdisco/Daemon/Queue.pm

@@ -22,7 +22,7 @@ sub capacity_for {
   debug "checking local capacity for action $action";
 
   my $action_map = {
-    Poller => [qw/discoverall discover arpwalk arpnip macwalk macsuck/],
+    Poller => [qw/discoverall discover arpwalk arpnip macwalk macsuck expiry/],
     Interactive => [qw/location contact portcontrol portname vlan power/],
   };
 

Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm

@@ -13,7 +13,7 @@ my $fqdn = hostfqdn || 'localhost';
 
 my $role_map = {
   (map {$_ => 'Poller'}
-      qw/discoverall discover arpwalk arpnip macwalk macsuck/),
+      qw/discoverall discover arpwalk arpnip macwalk macsuck expiry/),
   (map {$_ => 'Interactive'}
       qw/location contact portcontrol portname vlan power/)
 };

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm

@@ -9,7 +9,8 @@ with 'App::Netdisco::Daemon::Worker::Common';
 # add dispatch methods for poller tasks
 with 'App::Netdisco::Daemon::Worker::Poller::Device',
      'App::Netdisco::Daemon::Worker::Poller::Arpnip',
-     'App::Netdisco::Daemon::Worker::Poller::Macsuck';
+     'App::Netdisco::Daemon::Worker::Poller::Macsuck',
+     'App::Netdisco::Daemon::Worker::Poller::Expiry';
 
 sub worker_type { 'pol' }
 sub worker_name { 'Poller' }

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm

@@ -0,0 +1,46 @@
+package App::Netdisco::Daemon::Worker::Poller::Expiry;
+
+use Dancer qw/:moose :syntax :script/;
+use Dancer::Plugin::DBIC 'schema';
+
+use App::Netdisco::Daemon::Util ':all';
+
+use Role::Tiny;
+use namespace::clean;
+
+# expire devices and nodes according to config
+sub expiry {
+  my ($self, $job) = @_;
+
+  if (setting('expire_devices') and setting('expire_devices') > 0) {
+      schema('netdisco')->txn_do(sub {
+        schema('netdisco')->resultset('Device')->search({
+          last_discover => \[q/< (now() - ?::interval)/,
+              (setting('expire_devices') * 86400)],
+        })->delete();
+      });
+  }
+
+  if (setting('expire_nodes') and setting('expire_nodes') > 0) {
+      schema('netdisco')->txn_do(sub {
+        schema('netdisco')->resultset('Node')->search({
+          time_last => \[q/< (now() - ?::interval)/,
+              (setting('expire_nodes') * 86400)],
+        })->delete();
+      });
+  }
+
+  if (setting('expire_nodes_archive') and setting('expire_nodes_archive') > 0) {
+      schema('netdisco')->txn_do(sub {
+        schema('netdisco')->resultset('Node')->search({
+          -not_bool => 'active',
+          time_last => \[q/< (now() - ?::interval)/,
+              (setting('expire_nodes_archive') * 86400)],
+        })->delete();
+      });
+  }
+
+  return job_done("Checked expiry for all Devices and Nodes");
+}
+
+1;

Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm

@@ -14,6 +14,7 @@ my $jobactions = {
       discoverall
       arpwalk
       macwalk
+      expiry
   /
 #    saveconfigs
 #    nbtwalk