oxidized 0.36.0 → 0.37.0

data/lib/oxidized/model/truenas.rb

@@ -9,19 +9,70 @@ class TrueNAS < Oxidized::Model
   # for TrueNAS SCALE machines, make sure the user you use to connect can run
   # this command, or if needed, with passwordless sudo. Try putting this in
   # /etc/sudoers
-  #    oxidized ALL=(ALL) NOPASSWD: /usr/bin/sqlite3 file\:///data/freenas-v1.db?mode\=ro&immutable\=1 .dump
+  #    oxidized ALL=(ALL) NOPASSWD: /usr/bin/find /mnt/.ix-apps/app_configs *, /usr/bin/sqlite3 -readonly file\:/data/freenas-v1.db *
 
-  cmd("sqlite3 'file:///data/freenas-v1.db?mode=ro&immutable=1' .dump") do |cfg|
+  cmd("sqlite3 -readonly 'file:/data/freenas-v1.db' .dump") do |cfg|
     if cfg.include? "Error: unable to open database"
-      cfg = cmd("sudo sqlite3 'file:///data/freenas-v1.db?mode=ro&immutable=1' .dump")
+      # retry with sudo
+      cfg = cmd("sudo sqlite3 -readonly 'file:/data/freenas-v1.db' .dump")
     end
     cfg.lines.reject do |line|
-      line.match(/^INSERT INTO storage_replication /) ||
+      line.match(/^INSERT INTO storage_replication /) || # ignore storage_replication because repl_status field changes on every run
         line.match(/^INSERT INTO system_alert /) || # ignore system alerts in db
-        line.match(/^INSERT INTO sqlite_sequence VALUES\('system_alert',/) # ignore system alerts in db
+        line.match(/^INSERT INTO sqlite_sequence VALUES\('system_alert',/) || # ignore system alerts in db
+        line.match(/^INSERT INTO tasks_cloudsync /) # ignore cloudsync tasks because job field changes on every run
     end.join
   end
 
+  post do
+    filter_column("storage_replication", "repl_state")
+  end
+
+  post do
+    filter_column("tasks_cloudsync", "job")
+  end
+
+  post do
+    collect_ixapps_configurations
+  end
+
+  def filter_column(table_name, column_name)
+    sqlite_cmd = "sqlite3 -readonly 'file:/data/freenas-v1.db'"
+
+    # This SQL command will create a SELECT query with all columns except the one we want to skip.
+    generate_select_cmd = "select 'select ' || group_concat(name,', ') || ' FROM #{table_name};' FROM pragma_table_info('#{table_name}') WHERE name != '#{column_name}';"
+
+    select_stmt = cmd("#{sqlite_cmd} \"#{generate_select_cmd}\"")
+    if select_stmt.include? "Error: unable to open database"
+      # retry with sudo
+      sqlite_cmd = "sudo #{sqlite_cmd}"
+      select_stmt = cmd("#{sqlite_cmd} \"#{generate_select_cmd}\"")
+    end
+
+    insert_cmds = "-header '.mode insert #{table_name}' '#{select_stmt}'"
+    cmd("#{sqlite_cmd} #{insert_cmds}") do |cfg|
+      if cfg.include? "INSERT"
+        # Don't add a COMMIT; if the query came up with no rows
+        cfg + "COMMIT;\n"
+      end
+    end
+  end
+
+  def collect_ixapps_configurations
+    config_command = <<~'CMDEND'
+      if [ -d /mnt/.ix-apps ];
+      then
+        sudo find /mnt/.ix-apps/app_configs
+        \( -name "app.yaml" -or -name "user_config.yaml" -or -name "metadata.yaml" \)
+        -printf "\n\n#######################\n# %p\n#######################\n"
+        -exec cat {} \; ;
+      else
+        echo "# No Apps configuration found in /mnt/.ix-apps";
+      fi
+    CMDEND
+    cmd(config_command.gsub("\n", ""))
+  end
+
   cfg :ssh do
     exec true # don't run shell, run each command in exec channel
   end

data/lib/oxidized/model/vyos.rb

@@ -16,6 +16,7 @@ class Vyos < Oxidized::Model
     cfg.gsub! /secret (\S+).*/, 'secret <secret removed>'
     cfg.gsub! /password (\S+).*/, 'password <secret removed>'
     cfg.gsub! /snmp community (\S+)/, 'snmp community <secret removed>'
+    cfg.gsub! /snmp trap-target ([^\s\\]*) community (\S+)/, 'snmp trap-target \1 community <secret removed>'
     cfg.gsub! /preshared-key (\S+).*/, 'preshared-key <secret removed>'
     cfg.gsub! /private key (\S+).*/, 'private key <secret removed>'
     cfg.gsub! /private-key (\S+).*/, 'private-key <secret removed>'

data/lib/oxidized/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Oxidized
-  VERSION = '0.36.0'
-  VERSION_FULL = '0.36.0'
+  VERSION = '0.37.0'
+  VERSION_FULL = '0.37.0'
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -465,6 +465,7 @@ files:
 - docs/Model-Notes/ExaLink.md
 - docs/Model-Notes/FSOS.md
 - docs/Model-Notes/Fortinet.md
+- docs/Model-Notes/GrandstreamHT8xx.md
 - docs/Model-Notes/HPEAruba.md
 - docs/Model-Notes/IOS.md
 - docs/Model-Notes/IvantiConnectSecure.md
@@ -516,6 +517,7 @@ files:
 - extra/update-ca-certificates.runit
 - lib/oxidized.rb
 - lib/oxidized/cli.rb
+- lib/oxidized/cli/support.rb
 - lib/oxidized/config.rb
 - lib/oxidized/config/vars.rb
 - lib/oxidized/core.rb
@@ -528,6 +530,8 @@ files:
 - lib/oxidized/hook/slackdiff.rb
 - lib/oxidized/hook/xmppdiff.rb
 - lib/oxidized/input/cli.rb
+- lib/oxidized/input/debugtext.rb
+- lib/oxidized/input/debugyaml.rb
 - lib/oxidized/input/exec.rb
 - lib/oxidized/input/ftp.rb
 - lib/oxidized/input/http.rb
@@ -628,6 +632,7 @@ files:
 - lib/oxidized/model/garderos.rb
 - lib/oxidized/model/gcombnps.rb
 - lib/oxidized/model/grandstream.rb
+- lib/oxidized/model/grandstreamht8xx.rb
 - lib/oxidized/model/h3c.rb
 - lib/oxidized/model/hatteras.rb
 - lib/oxidized/model/hios.rb