zfs_mgmt 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf232dcb9239cd6f1858e5f26430227bf19c8c33a8b537708fa9cfe1ac7fcde4
-  data.tar.gz: beaf85ba9e0fcadd8dd03962989592b1d33415cbafadfbf0b3c654f243fc7c0e
+  metadata.gz: bce5f90411d08b54334f8694e7956f718c1e63995f2c799b95cb170b302c2c8a
+  data.tar.gz: 1d82a41657f40fe371814210be392d8c34be333816530fcff6a67ae778dc120b
 SHA512:
-  metadata.gz: 831fb028c42c67942afbac8b35ec6b908ab10c0c9acb3183b19facd32e009ea512629c86af2ad3bc7f8dff9a2c31cf90e4e0317a4c1e32f72a297da3fc826b19
-  data.tar.gz: 7a3d8b9c734302d828298b6507d31f1539cc34739f41ff0fc8adddd1c3842a78dbd62b8ba5876ab0893ffb5f8295e187ba1e4232f6aaadfd211fffb0d00f0d0e
+  metadata.gz: e500b4cc3b155528c470c5aa26338a948e783a5f951a7a5e0d6c05b6739c07cccd6bfe0a1dd001a34722f47e611cc85e2f931d8e3cbca58e37b0f3b0d23606da
+  data.tar.gz: d3ca6969f760260449f85d99e05133f542700f9d0322a84f771cd157d3ec0729c2e86dc33f0326c53b1f35065cb28b879bbad85c6e422c4bae95b20cc9d21f06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.3.4)
+    zfs_mgmt (0.3.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -180,7 +180,11 @@ oldest and unless the property is set to youngest oldest will be used.
 ### zfsmgmt:snapshot
 If this property is 'true' then create a snapshot in the format of
 zfsmgmt-%FT%T%z.  If this property is 'recursive' then create a
-recursive snapshot of this zfs.
+recursive snapshot of this zfs, but only on zfs where this property is
+local.  If this property is set to the string 'local' and the property
+is set locally, it will create a snapshot.  The intention is that you
+would use 'local' when you want a zfs snapshot for the filesystem, but
+NOT it's descendant filesystems.
 
 ### zfsmgmt:snap_prefix
 Change the zfsmgmt portion of created snapshots, ie: 'autosnap' would

data/bin/zfsmgr

@@ -36,7 +36,9 @@ class ZfsMgr < Thor
   desc "snapshot SUBCOMMAND ...ARGS", "manage snapshots"
   subcommand "snapshot", Snapshot
   desc "list SUBCOMMAND ...ARGS", "list filesystems"
-  subcommand "list", ZfsMgrList
+  subcommand "list", ZfsMgmtList
+  desc "restic SUBCOMMAND ...ARGS", "backup zfs to restic"
+  subcommand "restic", ZfsMgmtRestic
 end
 
 ZfsMgr.start(ARGV)

data/lib/zfs_mgmt.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require "zfs_mgmt/version"
+require "zfs_mgmt/restic"
 require 'pp'
 require 'date'
 require 'logger'
@@ -310,8 +311,15 @@ module ZfsMgmt
     end
     dt = DateTime.now
     zfsget(properties: custom_properties()).each do |zfs,props|
+      unless /#{filter}/ =~ zfs
+        next
+      end
       # zfs must have snapshot set to true or recursive
-      if props.has_key?('zfsmgmt:snapshot') and props['zfsmgmt:snapshot'] == 'true' or ( props['zfsmgmt:snapshot'] == 'recursive' and props['zfsmgmt:snapshot@source'] == 'local' )
+      if props.has_key?('zfsmgmt:snapshot') and
+        props['zfsmgmt:snapshot'] == 'true' or
+        ( props['zfsmgmt:snapshot'] == 'recursive' and props['zfsmgmt:snapshot@source'] == 'local' ) or
+        ( props['zfsmgmt:snapshot'] == 'local' and props['zfsmgmt:snapshot@source'] == 'local' )
+        
         prefix = ( props.has_key?('zfsmgmt:snap_prefix') ? props['zfsmgmt:snap_prefix'] : 'zfsmgmt' )
         ts = ( props.has_key?('zfsmgmt:snap_timestamp') ? props['zfsmgmt:snap_timestamp'] : '%FT%T%z' )
         com = ['zfs','snapshot']
@@ -325,7 +333,7 @@ module ZfsMgmt
     end
   end
 end
-class ZfsMgrList < Thor
+class ZfsMgmtList < Thor
   class_option :filter, :type => :string, :default => '.+',
                :desc => 'only act on zfs matching this regexp'
   desc "stale", "list all zfs with stale snapshots"
@@ -340,7 +348,7 @@ class ZfsMgrList < Thor
       last = snaps.keys.sort { |a,b| snaps[a]['creation'] <=> snaps[b]['creation'] }.last
       snap_time = Time.at(snaps[last]['creation'])
       if snap_time < cutoff
-        table.rows << [zfs,last,snap_time]
+        table.rows << [zfs,last.split('@')[1],snap_time]
       end
     end
     if table.rows.count > 0

data/lib/zfs_mgmt/restic.rb

@@ -0,0 +1,33 @@
+
+module ZfsMgmt::Restic
+  def self.backup(backup_type: 'incremental', force: false, filter: '.+')
+    pp backup_type, force, filter
+  end
+end
+
+class ZfsMgmtResticBackup < Thor
+  class_option :filter, :type => :string, :default => '.+',
+               :desc => 'only act on zfs matching this regexp'
+  class_option :force, :type => :boolean, :default => false,
+               :desc => 'force create this backup type, fail if it cannot be forced'
+  desc "incremental", "perform incremental backup"
+  def incremental()
+    ZfsMgmt::Restic.backup(backup_type: 'incremental', force: options[:force])
+  end
+  desc "differential", "perform differential backup"
+  def differential()
+    ZfsMgmt::Restic.backup(backup_type: 'differential', force: options[:force])
+  end
+  desc "full", "perform full backup"
+  def full()
+    ZfsMgmt::Restic.backup(backup_type: 'full', force: options[:force])
+  end
+end
+
+class ZfsMgmtRestic < Thor
+  desc "restic SUBCOMMAND ...ARGS", "backup all configured zfs to restic"
+  subcommand "backup", ZfsMgmtResticBackup
+
+end
+
+  

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - bin/zfssendman
 - bin/zfssnapman
 - lib/zfs_mgmt.rb
+- lib/zfs_mgmt/restic.rb
 - lib/zfs_mgmt/version.rb
 - zfs_mgmt.gemspec
 homepage: https://github.com/aranc23/zfs_mgmt