facter 4.0.39 → 4.0.44

data/lib/facter/resolvers/partitions.rb

@@ -15,98 +15,122 @@ module Facter
         end
 
         def read_partitions(fact_name)
-          @fact_list[:partitions] = {}
-          return {} unless File.readable?(BLOCK_PATH)
+          return unless File.readable?(BLOCK_PATH)
 
           block_devices = Dir.entries(BLOCK_PATH).reject { |dir| dir =~ /^\.+/ }
+          @fact_list[:partitions] = {} unless block_devices.empty?
+          blkid_and_lsblk = {}
+
           block_devices.each do |block_device|
             block_path = "#{BLOCK_PATH}/#{block_device}"
             if File.directory?("#{block_path}/device")
-              extract_from_device(block_path)
+              extract_from_device(block_path, blkid_and_lsblk)
             elsif File.directory?("#{block_path}/dm")
-              extract_from_dm(block_path)
+              extract_from_dm(block_path, block_device, blkid_and_lsblk)
             elsif File.directory?("#{block_path}/loop")
-              extract_from_loop(block_path)
+              extract_from_loop(block_path, block_device, blkid_and_lsblk)
             end
           end
+
           @fact_list[fact_name]
         end
 
-        def extract_from_device(block_path)
+        def extract_from_device(block_path, blkid_and_lsblk)
           subdirs = browse_subdirectories(block_path)
           subdirs.each do |subdir|
             name = "/dev/#{subdir.split('/').last}"
-            populate_partitions(name, subdir)
+            populate_partitions(name, subdir, blkid_and_lsblk)
           end
         end
 
-        def extract_from_dm(block_path)
+        def extract_from_dm(block_path, block_device, blkid_and_lsblk)
           map_name = Util::FileHelper.safe_read("#{block_path}/dm/name").chomp
           if map_name.empty?
-            populate_partitions("/dev#{block_path}", block_path)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk)
           else
-            populate_partitions("/dev/mapper/#{map_name}", block_path)
+            populate_partitions("/dev/mapper/#{map_name}", block_path, blkid_and_lsblk)
           end
         end
 
-        def extract_from_loop(block_path)
+        def extract_from_loop(block_path, block_device, blkid_and_lsblk)
           backing_file = Util::FileHelper.safe_read("#{block_path}/loop/backing_file").chomp
           if backing_file.empty?
-            populate_partitions("/dev#{block_path}", block_path)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk)
           else
-            populate_partitions("/dev#{block_path}", block_path, backing_file)
+            populate_partitions("/dev/#{block_device}", block_path, blkid_and_lsblk, backing_file)
           end
         end
 
-        def populate_partitions(partition_name, block_path, backing_file = nil)
-          @fact_list[:partitions][partition_name] = {}
+        def populate_partitions(partition_name, block_path, blkid_and_lsblk, backing_file = nil)
           size_bytes = Util::FileHelper.safe_read("#{block_path}/size", '0')
                                        .chomp.to_i * BLOCK_SIZE
           info_hash = { size_bytes: size_bytes,
                         size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes),
                         backing_file: backing_file }
-          info_hash.merge!(populate_from_syscalls(partition_name))
+          info_hash.merge!(populate_from_syscalls(partition_name, blkid_and_lsblk))
           @fact_list[:partitions][partition_name] = info_hash.reject { |_key, value| value.nil? }
         end
 
-        def populate_from_syscalls(partition_name)
-          part_info = populate_from_blkid(partition_name)
+        def populate_from_syscalls(partition_name, blkid_and_lsblk)
+          part_info = populate_from_blkid(partition_name, blkid_and_lsblk)
 
-          return pupulate_from_lsblk(partition_name) if part_info.empty?
+          return populate_from_lsblk(partition_name, blkid_and_lsblk) if part_info.empty?
 
           part_info
         end
 
-        def populate_from_blkid(partition_name)
-          return {} unless blkid_command?
+        def browse_subdirectories(path)
+          dirs = Dir[File.join(path, '**', '*')].select { |p| File.directory? p }
+          dirs.select { |subdir| subdir.split('/').last.include?(path.split('/').last) }.reject(&:nil?)
+        end
+
+        def populate_from_blkid(partition_name, blkid_and_lsblk)
+          return {} unless available?('blkid', blkid_and_lsblk)
+
+          blkid_and_lsblk[:blkid] ||= execute_and_extract_blkid_info
 
-          @blkid_content ||= execute_and_extract_blkid_info
-          return {} unless @blkid_content[partition_name]
+          partition_data = blkid_and_lsblk[:blkid][partition_name]
+          return {} unless partition_data
+
+          filesys = partition_data['TYPE']
+          uuid = partition_data['UUID']
+          label = partition_data['LABEL']
+          part_uuid = partition_data['PARTUUID']
+          part_label = partition_data['PARTLABEL']
 
-          filesys = @blkid_content[partition_name]['TYPE']
-          uuid = @blkid_content[partition_name]['UUID']
-          label = @blkid_content[partition_name]['LABEL']
-          part_uuid = @blkid_content[partition_name]['PARTUUID']
-          part_label = @blkid_content[partition_name]['PARTLABEL']
           { filesystem: filesys, uuid: uuid, label: label, partuuid: part_uuid, partlabel: part_label }
         end
 
-        def blkid_command?
-          return @blkid_exists unless @blkid_exists.nil?
+        def available?(command, blkid_and_lsblk)
+          command_exists_key = command == 'blkid' ? :blkid_exists : :lsblk_exists
+
+          return blkid_and_lsblk[command_exists_key] unless blkid_and_lsblk[command_exists_key].nil?
 
-          output = Facter::Core::Execution.execute('which blkid', logger: log)
+          output = Facter::Core::Execution.execute("which #{command}", logger: log)
 
-          @blkid_exists = !output.empty?
+          blkid_and_lsblk[:command_exists_key] = !output.empty?
         end
 
-        def pupulate_from_lsblk(partition_name)
-          return {} unless lsblk_command?
+        def execute_and_extract_blkid_info
+          stdout = Facter::Core::Execution.execute('blkid', logger: log)
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
+          output_hash.each do |key, value|
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
+          end
+        end
 
-          @lsblk_content ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
+        def populate_from_lsblk(partition_name, blkid_and_lsblk)
+          return {} unless available?('lsblk', blkid_and_lsblk)
 
-          part_info = @lsblk_content.match(/#{partition_name}.*/).to_s.split(' ')
+          blkid_and_lsblk[:lsblk] ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
+
+          part_info = blkid_and_lsblk[:lsblk].match(/#{partition_name}.*/).to_s.split(' ')
           return {} if part_info.empty?
 
+          parse_part_info(part_info)
+        end
+
+        def parse_part_info(part_info)
           result = { filesystem: part_info[1] }
 
           if part_info.count.eql?(5)
@@ -118,27 +142,6 @@ module Facter
 
           result
         end
-
-        def lsblk_command?
-          return @lsblk_exists unless @lsblk_exists.nil?
-
-          output = Facter::Core::Execution.execute('which lsblk', logger: log)
-
-          @lsblk_exists = !output.empty?
-        end
-
-        def execute_and_extract_blkid_info
-          stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
-          output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
-          end
-        end
-
-        def browse_subdirectories(path)
-          dirs = Dir[File.join(path, '**', '*')].select { |p| File.directory? p }
-          dirs.select { |subdir| subdir.split('/').last.include?(path.split('/').last) }.reject(&:nil?)
-        end
       end
     end
   end

data/lib/facter/resolvers/processors_resolver.rb

@@ -60,7 +60,11 @@ module Facter
           def physical_devices_count
             Dir.entries('/sys/devices/system/cpu')
                .select { |dir| dir =~ /cpu[0-9]+$/ }
-               .count { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
+               .map do |dir|
+              Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+            end
+               .uniq.count
           end
 
           def build_speed(tokens)

data/lib/facter/resolvers/solaris/dmi.rb

@@ -37,6 +37,8 @@ module Facter
 
             output = exec_smbios(param[0])
             facts = param[1]
+            return unless output
+
             facts.each do |name, regx|
               @fact_list[name] = output.match(/#{regx}/)&.captures&.first
             end

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Mountpoints < BaseResolver
+        include Facter::FilesystemHelper
+        @fact_list ||= {}
+        @log = Facter::Log.new(self)
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mounts(fact_name) }
+          end
+
+          def root_device
+            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+            match = cmdline.match(/root=([^\s]+)/)
+            match&.captures&.first
+          end
+
+          def compute_device(device)
+            # If the "root" device, lookup the actual device from the kernel options
+            # This is done because not all systems symlink /dev/root
+            device = root_device if device == '/dev/root'
+            device
+          end
+
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize
+            mounts = []
+            FilesystemHelper.read_mountpoints.each do |fs|
+              device = compute_device(fs.name)
+              filesystem = fs.mount_type
+              path = fs.mount_point
+              options = fs.options.split(',').map(&:strip)
+
+              stats = FilesystemHelper.read_mountpoint_stats(path)
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
+
+              used_bytes = stats.bytes_used.abs
+              total_bytes = used_bytes + available_bytes
+              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+
+              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
+              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+
+              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+                .map { |v| binding.local_variable_get(v) })]
+            end
+            @fact_list[:mountpoints] = mounts
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/solaris/networking.rb

@@ -9,7 +9,6 @@ module Facter
       class Networking < BaseResolver
         @log = Facter::Log.new(self)
         @fact_list ||= {}
-        @interfaces = {}
 
         class << self
           private
@@ -66,7 +65,7 @@ module Facter
 
             @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
 
-            @interfaces[lifreq.name][:mtu] = lifreq[:lifr_lifru][:lifru_metric]
+            @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
 
           def load_netmask(lifreq)

data/lib/facter/resolvers/solaris/os_release.rb

@@ -5,8 +5,9 @@ module Facter
     module Solaris
       class OsRelease < BaseResolver
         @fact_list ||= {}
-        @os_version_regex_patterns = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
-                                      'Solaris (\d+)[.](\d+)', 'Solaris (\d+)']
+        OS_VERSION_REGEX_PATTERNS = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
+                                     'Solaris (\d+)[.](\d+)', 'Solaris (\d+)'].freeze
+
         class << self
           private
 
@@ -18,7 +19,7 @@ module Facter
             result = Util::FileHelper.safe_read('/etc/release', nil)
             return @fact_list[fact_name] = nil if result.nil?
 
-            @os_version_regex_patterns.each do |os_version_regex|
+            OS_VERSION_REGEX_PATTERNS.each do |os_version_regex|
               major, minor = search_for_os_version(/#{os_version_regex}/, result)
               next unless major || minor
 

data/lib/facter/resolvers/ssh_resolver.rb

@@ -5,8 +5,8 @@ module Facter
     class SshResolver < BaseResolver
       @log = Facter::Log.new(self)
       @fact_list ||= {}
-      @file_names = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub]
-      @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]
+      FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze
+      FILE_PATHS = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh].freeze
       class << self
         private
 
@@ -16,10 +16,10 @@ module Facter
 
         def retrieve_info(fact_name)
           ssh_list = []
-          @file_paths.each do |file_path|
+          FILE_PATHS.each do |file_path|
             next unless File.directory?(file_path)
 
-            @file_names.each do |file_name|
+            FILE_NAMES.each do |file_name|
               file_content = Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
               next unless file_content
 

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.39' unless defined?(VERSION)
+  VERSION = '4.0.44' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.39
+  version: 4.0.44
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,6 +180,7 @@ extra_rdoc_files: []
 files:
 - bin/facter
 - lib/facter.rb
+- lib/facter/config.rb
 - lib/facter/custom_facts/core/aggregate.rb
 - lib/facter/custom_facts/core/directed_graph.rb
 - lib/facter/custom_facts/core/execution.rb
@@ -205,7 +206,6 @@ files:
 - lib/facter/custom_facts/util/unix_root.rb
 - lib/facter/custom_facts/util/values.rb
 - lib/facter/custom_facts/util/windows_root.rb
-- lib/facter/fact_groups.conf
 - lib/facter/facts/aix/aio_agent_version.rb
 - lib/facter/facts/aix/augeas/version.rb
 - lib/facter/facts/aix/disks.rb
@@ -814,6 +814,7 @@ files:
 - lib/facter/facts_utils/facts_utils.rb
 - lib/facter/facts_utils/unit_converter.rb
 - lib/facter/facts_utils/uptime_parser.rb
+- lib/facter/facts_utils/virtual_detector.rb
 - lib/facter/facts_utils/windows_release_finder.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
@@ -853,7 +854,6 @@ files:
 - lib/facter/models/loaded_fact.rb
 - lib/facter/models/resolved_fact.rb
 - lib/facter/models/searched_fact.rb
-- lib/facter/os_hierarchy.json
 - lib/facter/patches/sysfilesystem/sys/statvfs.rb
 - lib/facter/resolvers/aio_agent_version.rb
 - lib/facter/resolvers/aix/architecture_resolver.rb
@@ -935,6 +935,7 @@ files:
 - lib/facter/resolvers/solaris/ipaddress.rb
 - lib/facter/resolvers/solaris/ldom.rb
 - lib/facter/resolvers/solaris/memory.rb
+- lib/facter/resolvers/solaris/mountpoints.rb
 - lib/facter/resolvers/solaris/networking.rb
 - lib/facter/resolvers/solaris/os_release.rb
 - lib/facter/resolvers/solaris/processors.rb

data/lib/facter/fact_groups.conf

@@ -1,308 +0,0 @@
-{
-	"EC2": [
-		"ec2_metadata",
-		"ec2_userdata"
-	],
-	"GCE": [
-		"gce"
-	],
-	"augeas": [
-		"augeas",
-		"augeasversion"
-	],
-	"desktop management interface": [
-		"dmi",
-		"bios_vendor",
-		"bios_version",
-		"bios_release_date",
-		"boardassettag",
-		"boardmanufacturer",
-		"boardproductname",
-		"boardserialnumber",
-		"chassisassettag",
-		"manufacturer",
-		"productname",
-		"serialnumber",
-		"uuid",
-		"chassistype"
-	],
-	"file system": [
-		"mountpoints",
-		"filesystems",
-		"partitions"
-	],
-	"hypervisors": [
-		"hypervisors"
-	],
-	"id": [
-		"id",
-		"gid",
-		"identity"
-	],
-	"kernel": [
-		"kernel",
-		"kernelversion",
-		"kernelrelease",
-		"kernelmajversion"
-	],
-	"load_average": [
-		"load_averages"
-	],
-	"memory": [
-		"memory",
-		"memoryfree",
-		"memoryfree_mb",
-		"memorysize",
-		"memorysize_mb",
-		"swapfree",
-		"swapfree_mb",
-		"swapsize",
-		"swapsize_mb",
-		"swapencrypted"
-	],
-	"networking": [
-		"networking",
-		"hostname",
-		"ipaddress",
-		"ipaddress6",
-		"netmask",
-		"netmask6",
-		"network",
-		"network6",
-		"macaddress",
-		"interfaces",
-		"domain",
-		"fqdn",
-		"dhcp_servers"
-	],
-	"operating system": [
-		"os",
-		"operatingsystem",
-		"osfamily",
-		"operatingsystemrelease",
-		"operatingsystemmajrelease",
-		"hardwaremodel",
-		"architecture",
-		"lsbdistid",
-		"lsbdistrelease",
-		"lsbdistcodename",
-		"lsbdistdescription",
-		"lsbmajdistrelease",
-		"lsbminordistrelease",
-		"lsbrelease",
-		"macosx_buildversion",
-		"macosx_productname",
-		"macosx_productversion",
-		"macosx_productversion_major",
-		"macosx_productversion_minor",
-		"windows_edition_id",
-		"windows_installation_type",
-		"windows_product_name",
-		"windows_release_id",
-		"system32",
-		"selinux",
-		"selinux_enforced",
-		"selinux_policyversion",
-		"selinux_current_mode",
-		"selinux_config_mode",
-		"selinux_config_policy"
-	],
-	"path": [
-		"path"
-	],
-	"processor": [
-		"processors",
-		"processorcount",
-		"physicalprocessorcount",
-		"hardwareisa"
-	],
-	"ssh": [
-		"ssh",
-		"sshdsakey",
-		"sshrsakey",
-		"sshecdsakey",
-		"sshed25519key",
-		"sshfp_dsa",
-		"sshfp_rsa",
-		"sshfp_ecdsa",
-		"sshfp_ed25519"
-	],
-	"system profiler": [
-		"system_profiler",
-		"sp_boot_mode",
-		"sp_boot_rom_version",
-		"sp_boot_volume",
-		"sp_cpu_type",
-		"sp_current_processor_speed",
-		"sp_kernel_version",
-		"sp_l2_cache_core",
-		"sp_l3_cache",
-		"sp_local_host_name",
-		"sp_machine_model",
-		"sp_machine_name",
-		"sp_number_processors",
-		"sp_os_version",
-		"sp_packages",
-		"sp_physical_memory",
-		"sp_platform_uuid",
-		"sp_secure_vm",
-		"sp_serial_number",
-		"sp_smc_version_system",
-		"sp_uptime",
-		"sp_user_name"
-	],
-	"timezone": [
-		"timezone"
-	],
-	"uptime": [
-		"system_uptime",
-		"uptime",
-		"uptime_days",
-		"uptime_hours",
-		"uptime_seconds"
-	],
-	"virtualization": [
-		"virtual",
-		"is_virtual",
-		"cloud"
-	],
-	"legacy": [
-		"architecture",
-		"augeasversion",
-		"bios_release_date",
-		"bios_vendor",
-		"bios_version",
-		"blockdevice_*_model",
-		"blockdevice_*_size",
-		"blockdevice_*_vendor",
-		"blockdevices",
-		"boardassettag",
-		"boardmanufacturer",
-		"boardproductname",
-		"boardserialnumber",
-		"chassisassettag",
-		"chassistype",
-		"dhcp_servers",
-		"domain",
-		"fqdn",
-		"gid",
-		"hardwareisa",
-		"hardwaremodel",
-		"hostname",
-		"id",
-		"interfaces",
-		"ipaddress",
-		"ipaddress_.*",
-		"ipaddress_*",
-		"ipaddress6",
-		"ipaddress6_.*",
-		"ipaddress6_*",
-		"ldom_*",
-		"lsbdistcodename",
-		"lsbdistdescription",
-		"lsbdistid",
-		"lsbdistrelease",
-		"lsbmajdistrelease",
-		"lsbminordistrelease",
-		"lsbrelease",
-		"macaddress",
-		"macaddress_.*",
-		"macaddress_*",
-		"macosx_buildversion",
-		"macosx_productname",
-		"macosx_productversion",
-		"macosx_productversion_major",
-		"macosx_productversion_minor",
-		"manufacturer",
-		"memoryfree",
-		"memoryfree_mb",
-		"memorysize",
-		"memorysize_mb",
-		"mtu_.*",
-		"mtu_*",
-		"netmask",
-		"netmask_.*",
-		"netmask_*",
-		"netmask6",
-		"netmask6_.*",
-		"netmask6_*",
-		"network",
-		"network_.*",
-		"network_*",
-		"network6",
-		"network6_.*",
-		"network6_*",
-		"operatingsystem",
-		"operatingsystemmajrelease",
-		"operatingsystemrelease",
-		"osfamily",
-		"physicalprocessorcount",
-		"processor.*",
-		"processor*",
-		"processorcount",
-		"productname",
-		"rubyplatform",
-		"rubysitedir",
-		"rubyversion",
-		"scope6",
-		"scope6_.*",
-		"selinux",
-		"selinux_config_mode",
-		"selinux_config_policy",
-		"selinux_current_mode",
-		"selinux_enforced",
-		"selinux_policyversion",
-		"serialnumber",
-		"sp_*",
-		"sp_boot_mode",
-		"sp_boot_rom_version",
-		"sp_boot_volume",
-		"sp_cpu_type",
-		"sp_current_processor_speed",
-		"sp_kernel_version",
-		"sp_l2_cache_core",
-		"sp_l3_cache",
-		"sp_local_host_name",
-		"sp_machine_model",
-		"sp_machine_name",
-		"sp_number_processors",
-		"sp_os_version",
-		"sp_packages",
-		"sp_physical_memory",
-		"sp_platform_uuid",
-		"sp_secure_vm",
-		"sp_serial_number",
-		"sp_smc_version_system",
-		"sp_uptime",
-		"sp_user_name",
-		"ssh.*key",
-		"ssh*key",
-		"sshfp_.*",
-		"sshfp_*",
-		"swapencrypted",
-		"swapfree",
-		"swapfree_mb",
-		"swapsize",
-		"swapsize_mb",
-		"system32",
-		"uptime",
-		"uptime_days",
-		"uptime_hours",
-		"uptime_seconds",
-		"uuid",
-		"windows_edition_id",
-		"windows_installation_type",
-		"windows_product_name",
-		"windows_release_id",
-		"xendomains",
-		"zone_*_brand",
-		"zone_*_id",
-		"zone_*_iptype",
-		"zone_*_name",
-		"zone_*_path",
-		"zone_*_status",
-		"zone_*_uuid",
-		"zonename",
-		"zones"
-	]
-}