fluent-diagtool 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180c7e58ee03d59778640b05042fca84197936b7bdd2b2fff236ef86f0639ef4
-  data.tar.gz: b1ffccfb3a92af08dfa17fe4796e7a229a25d0abe1bf0f1362ac4618bf5c99f0
+  metadata.gz: e5be26bf333469e8c3c4eed5be22a33d05f8a37306d5e93067c10134a9415cb3
+  data.tar.gz: 128d6aa7ff697b5fcae2669a8e14dffb96f52ab360d4585313942343432a89b8
 SHA512:
-  metadata.gz: b482bfc75cda3285976980d2f8a04abfe848dd9bb6ff4992c0760f871f237811fbae361dfb15075482a781ec284974d7471937423e3400f0b576bc3dff03ccf0
-  data.tar.gz: 5810ec1b6f37b5ccf49f53bd8271beb885dde8c7b9e8be33aed38b5d137e8952085aaddbb8b7717e58535bd36decd19e1babde94a2ba78d07ba41d1ffd0cf9c5
+  metadata.gz: 4165a154d754ac8d7d338bd4adaa681059579c6f7c7410badefdb34d9ab260211e5807a54dcd602bb3f765a8265aa40a2ff8b95d5ecb82c5ccb8931be198c6a3
+  data.tar.gz: c0f8916a1399438aa50a15deb90f59321e5e02fc5902c04d04ed1ac98701f8f1bc109de5fa79ff9167169a9e848310f7988a6a521af95bb74dade68ddbdbc4e0

data/README.md

@@ -17,8 +17,7 @@ The scope of data collection:
   - snapshot of current process(ps)
   - network conectivity status/stats(netstat -plan/netstat -s)
   - memory information(/proc/meminfo)
-<br>  
-(*) The diagtool automatically gather the path of td-agent configuration files and log files from td-agent daemon and use them during data collection. 
+<br>   
 
 ## Prerequisite
 The diagtool provides support for td-agent based installation running on Linux OS. The td-agent is a stable distribution package of Fluentd.  
@@ -43,13 +42,54 @@ Successfully installed fluent-diagtool-0.1.2
 ```
 # diagtool --help
 Usage: /usr/local/bin/diagtool -o OUTPUT_DIR -m {yes | no} -w {word1,[word2...]} -f {listfile} -s {hash seed}
+        --precheck                   Run Precheck (Optional)
     -o, --output DIR                 Output directory (Mandatory)
     -m, --mask yes|no                Enable mask function (Optional : Default=no)
     -w, --word-list word1,word2      Provide a list of user-defined words which will to be masked (Optional : Default=None)
-    -f, --word-file listfile         provide a file which describes a List of user-defined words (Optional : Default=None)
+    -f, --word-file list_file        provide a file which describes a List of user-defined words (Optional : Default=None)
     -s, --hash-seed seed             provide a word which will be used when generate the mask (Optional : Default=None)
+    -c, --conf config_file           provide a full path of td-agent configuration file (Optional : Default=None)
+    -l, --log log_file               provide a full path of td-agent log file (Optional : Default=None)
 ```
-The list of user-defined words can be specified both -e option and -f option.
+### Pre-check
+The diagtool automatically extract the path of td-agent configuration and log files from td-agent daemon and use them during data collection if the td-agent is managed as daemon. The precheck options provides the function to confirm if the diagtool could gather the td-agent information as expected. 
+The following command output shows the case when the diagtool successfully gather information from daemon.
+```
+# diagtool --precheck
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck] Check OS parameters...
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    operating system = CentOS Linux 8 (Core)
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    kernel version = Linux 4.18.0-147.el8.x86_64
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck] Check td-agent parameters...
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    td-agent conf path = /etc/td-agent/
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    td-agent conf file = td-agent.conf
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    td-agent log path = /var/log/td-agent/
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck]    td-agent log = td-agent.log
+2020-05-28 00:39:02 -0400: [Diagtool] [INFO] [Precheck] Precheck completed. You can run diagtool command without -c and -l options
+```
+In some cases, users do not manage td-agent as daemon but use own script to run td-agent with command line options. In that cases, users need to speccify the path of td-agent configuration and log files with -c and -l options respectively.  
+The following example shows the precheck results when the diagtool is not able to extract the path of td-agent configuration and log files.
+```
+# diagtool --precheck
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck] Check OS parameters...
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    operating system = CentOS Linux 8 (Core)
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    kernel version = Linux 4.18.0-147.5.1.el8_1.x86_64
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck] Check td-agent parameters...
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    td-agent conf path =
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    td-agent conf file =
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    td-agent log path =
+2020-05-28 05:45:14 +0000: [Diagtool] [INFO] [Precheck]    td-agent log =
+2020-05-28 05:45:14 +0000: [Diagtool] [WARN] [Precheck]    can not find td-agent conf path: please run diagtool command with -c /path/to/<td-agent conf file>
+2020-05-28 05:45:14 +0000: [Diagtool] [WARN] [Precheck]    can not find td-agent log path: please run diagtool command with -l /path/to/<td-agent log file>
+```
+
+### Run diagtool
+
+#### The "@include" directive in td-agent configuration file
+The "@include" directive is a function to reuse configuration defined in another configuration files. The diagtool read the td-agent configuration and collect the files described in "@include" directive as well. The details of "@include" directive are described in followed url:  
+https://docs.fluentd.org/configuration/config-file#6-re-use-your-config-the-include-directive
+
+#### User defined words to be masked 
+The user-defined words can be specified both -e option and -f option and the words are merged when both options are selected.
 The format of user-defined words list file specified in -f option should be followed format.
 ```
 # cat word_list_sample
@@ -116,7 +156,7 @@ NOTE: When user specified the keywork, only the exact match words will be masked
 2020-05-12 18:21:22 -0400: [Diagtool] [INFO] [Mask] Export mask log file : ./mask_20200512182119.json
 2020-05-12 18:21:22 -0400: [Diagtool] [INFO] [Collect] Generate tar file /tmp/work1/diagout-20200512182119.tar.gz
 ```
-## Mask Function
+#### Mask Function
 When run diagtool with mask option, the log of mask is also created in 'mask_{timestamp}.json' file. Users are able to confirm how the mask was generated on each files.  
 The diagtool provides hash-seed option with '-s'. When hash-seed is specified, the mask will be generated with original word and hash-seed so that users could use unique mask value.
 #### Mask sample - IP address: IPv4_{md5hash}

data/bin/diagtool.rb

@@ -0,0 +1,87 @@
+require 'optparse'
+require 'logger'
+require '../lib/diagutils'
+include Diagtool
+
+logger = Logger.new(STDOUT, formatter: proc {|severity, datetime, progname, msg|
+  "#{datetime}: [Diagtool] [#{severity}] #{msg}\n"
+})
+
+output_dir = '../output'
+mask = 'yes'
+exlist= Array.new
+
+opt = OptionParser.new
+opt.banner = "Usage: #{$0} -o OUTPUT_DIR -m {yes | no} -e {word1,[word2...]} -f {listfile}"
+opt.on('-o','--output DIR', String, 'Output directory (Default=./output)') { |o|
+	output_dir = o 
+}
+opt.on('-m','--mask YES|NO', String, 'Enable mask function (Default=True)') { |m| 
+	if m == 'yes' || m == 'no'
+		mask = m
+	else
+		logger.error("Invalid value '#{m}' : -m | --mask should be yes or no")
+		exit!
+	end
+}
+opt.on('-e','--exclude-list LIST', Array, 'Provide a list of exclude words which will to be masked (Default=None)') { |e| exlist += e } 
+opt.on('-f','--exclude-file FILE', String, 'provide a file which describes a List of exclude words (Default=None)') { |f|
+	if File.exist?(f)
+		File.readlines(f).each do  |l|
+			exlist.append(l.gsub(/\n/,''))
+		end
+	else
+		logger.error("No such file or directory")
+		exit!
+	end
+}
+opt.parse(ARGV)
+exlist = exlist.uniq
+
+logger.info("Parsing command options...")
+logger.info("   Option : Output directory = #{output_dir}")
+logger.info("   Option : Mask = #{mask}")
+logger.info("   Option : Exclude list = #{exlist}")
+
+logger.info("Initializing parameters...")
+node1 = Diagutils.new(output_dir,exlist, 'INFO')
+
+logger.info("Collecting log files of td-agent...")
+tdlog = node1.collect_tdlog()
+logger.info("log files of td-agent are stored in #{tdlog}")
+
+logger.info("Collecting config file of td-agent...")
+tdconf = node1.collect_tdconf()
+logger.info("config file is stored in #{tdconf}")
+
+logger.info("Collecting systctl information...")
+sysctl = node1.collect_sysctl()
+logger.info("sysctl information is stored in #{sysctl}")
+
+logger.info("Collecting date/time information...")
+ntp = node1.collect_ntp()
+logger.info("date/time information is stored in #{ntp}")
+
+logger.info("Collecting ulimit information...")
+ulimit = node1.collect_ulimit()
+logger.info("ulimit information is stored in #{ulimit}")
+
+if mask == 'yes'
+	logger.info("Masking td-agent config file : #{tdconf}...")
+	node1.mask_tdconf(tdconf)
+	tdlog.each do | file |
+		logger.info("Masking td-agent log file : #{file}...")
+      		filename = file.split("/")[-1]
+		if filename.include?(".gz")
+               		node1.mask_tdlog_gz(file)
+       		elsif
+               		node1.mask_tdlog(file)
+       		end
+	end
+end
+
+tar_file = node1.compress_output()
+logger.info("Generate tar file #{tar_file}")
+
+
+

data/exclude_list01

@@ -0,0 +1,2 @@
+centos8101
+centos8102

data/fluent-diagtool.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("fileutils", ["~> 1.0"])
-  spec.add_runtime_dependency("json", ["~> 2.1"])
+  spec.add_runtime_dependency("fileutils")
+  spec.add_runtime_dependency("json")
 end

data/lib/fluent/diagtool/collectutils.rb

@@ -22,7 +22,7 @@ module Diagtool
   class CollectUtils
     def initialize(conf, log_level)
       @logger = Logger.new(STDOUT, level: log_level, formatter: proc {|severity, datetime, progname, msg|
-        "#{datetime}: [Diagutils] [#{severity}] #{msg}\n"
+        "#{datetime}: [Collectutils] [#{severity}] #{msg}\n"
       })
       @precheck = conf[:precheck]
       @time_format = conf[:time]
@@ -30,7 +30,7 @@ module Diagtool
       @workdir = conf[:workdir]
       @outdir = conf[:outdir]			
        
-      @tdenv = get_tdenv()
+      @tdenv = gen_tdenv()
       if not conf[:tdconf].empty?
 	@tdconf = conf[:tdconf].split('/')[-1]
         @tdconf_path = conf[:tdconf].gsub(@tdconf,'')
@@ -53,9 +53,10 @@ module Diagtool
           raise "The path of td-agent log file need to be specified." if conf[:precheck] == false
 	end
       end 
-      @osenv = get_osenv()
+      @osenv = gen_osenv()
       @oslog_path = '/var/log/'
       @oslog = 'messages'
+      @syslog = 'syslog'
       @sysctl_path = '/etc/'
       @sysctl = 'sysctl.conf'        
 
@@ -68,7 +69,7 @@ module Diagtool
       @logger.info("    td-agent log = #{@tdlog}")
     end
     
-    def get_osenv()
+    def gen_osenv()
       stdout, stderr, status = Open3.capture3('hostnamectl')
       os_dict = {}
       stdout.each_line { |l|
@@ -83,7 +84,7 @@ module Diagtool
       return os_dict
     end
     
-    def get_tdenv()
+    def gen_tdenv()
       stdout, stderr, status = Open3.capture3('systemctl cat td-agent')
       env_dict = {}
       if status.success?
@@ -143,12 +144,45 @@ module Diagtool
       target_dir = @workdir+@tdconf_path
       FileUtils.mkdir_p(target_dir)
       FileUtils.cp(@tdconf_path+@tdconf, target_dir)
-      return target_dir+@tdconf
+      conf = @workdir+@tdconf_path+@tdconf
+      conf_list = []
+      conf_list.push target_dir + @tdconf
+      File.readlines(conf).each { |line|
+      if line.include? '@include'
+        f = line.split()[1]
+        if f.start_with?(/\//)  # /tmp/work1/b.conf
+          if f.include?('*')
+            Dir.glob(f).each { |ff|
+              conf_inc = target_dir + ff.gsub(/\//,'__')
+              FileUtils.cp(ff, conf_inc)
+              conf_list.push conf_inc
+             }
+	  else 
+	    conf_inc = target_dir+f.gsub(/\//,'__')
+            FileUtils.cp(f, conf_inc)
+            conf_list.push  conf_inc
+	  end
+        else
+	  f = f.gsub('./','') if f.include?('./')
+          if f.include?('*')
+            Dir.glob(@tdconf_path+f).each{ |ff|
+              conf_inc = target_dir + ff.gsub(@tdconf_path,'').gsub(/\//,'__')
+              FileUtils.cp(ff, conf_inc)
+              conf_list.push conf_inc
+            }
+	  else
+            conf_inc = target_dir+f.gsub(/\//,'__')
+            FileUtils.cp(@tdconf_path+f, conf_inc)
+            conf_list.push  conf_inc
+	  end
+        end
+      end
+     }
+     return conf_list
     end
-    
+
     def collect_tdlog()
       target_dir = @workdir+@tdlog_path
-      p target_dir
       FileUtils.mkdir_p(target_dir)
       Dir.glob(@tdlog_path+@tdlog+'*').each{ |f| 
         FileUtils.cp(f, target_dir)
@@ -156,77 +190,34 @@ module Diagtool
       return Dir.glob(target_dir+@tdlog+'*')
     end
     
-    def collect_sysctl()
-      target_dir = @workdir+@sysctl_path
-      FileUtils.mkdir_p(target_dir)
-      FileUtils.cp(@sysctl_path+@sysctl, target_dir)
-      return target_dir+@sysctl
-    end
-    
     def collect_oslog()
       target_dir = @workdir+@oslog_path
       FileUtils.mkdir_p(target_dir)
-      FileUtils.cp(@oslog_path+@oslog, target_dir)
-      return target_dir+@oslog
-    end
-    
-    def collect_ulimit()
-      output = @outdir+'/ulimit_n.output'
-      stdout, stderr, status = Open3.capture3("ulimit -n")
-      File.open(output, 'w') do |f|
-        f.puts(stdout)
-      end
-      return output
-    end
-   
-    def collect_ps_eo()
-      output = @outdir+'/ps_eo.output'
-      stdout, stderr, status = Open3.capture3("ps -eo pid,ppid,stime,time,%mem,%cpu,cmd")
-      File.open(output, 'w') do |f|
-        f.puts(stdout)
+      if File.exist? @oslog_path+@oslog
+      	FileUtils.cp(@oslog_path+@oslog, target_dir)
+      	return target_dir+@oslog
+      elsif File.exist? @oslog_path+@syslog
+        FileUtils.cp(@oslog_path+@syslog, target_dir)
+        return target_dir+@syslog
+      else
+	@logger.warn("Can not find OS log file in #{oslog} or #{syslog}")
       end
-      return output
     end
 
-    def collect_meminfo()
-      output = @outdir+'/meminfo.output'
-      stdout, stderr, status = Open3.capture3("cat /proc/meminfo")
-      File.open(output, 'w') do |f|
-        f.puts(stdout)
-      end
-      return output
-    end
-    
-    def collect_netstat_plan()
-      output = @outdir+'/netstat_plan.output'
-      stdout, stderr, status = Open3.capture3("netstat -plan")
-      File.open(output, 'w') do |f|
-        f.puts(stdout)
-      end
-      return output
-    end
-    
-    def collect_netstat_s()
-      output = @outdir+'/netstat_s.output'
-      stdout, stderr, status = Open3.capture3("netstat -s")
-      File.open(output, 'w') do |f|
-        f.puts(stdout)
-      end
-      return output
-    end
-    
-    def collect_ntp(command)
-      output = @outdir+'/ntp_info.output'
-      stdout_date, stderr_date, status_date = Open3.capture3("date")
-      stdout_ntp, stderr_ntp, status_ntp = Open3.capture3("chronyc sources") if command == "chrony"
-      stdout_ntp, stderr_ntp, status_ntp = Open3.capture3("ntpq -p") if command == "ntp"
-      File.open(output, 'w') do |f|
-        f.puts(stdout_date)
-        f.puts(stdout_ntp)
+    def collect_cmd_output(cmd)
+      cmd_name = cmd.gsub(/\s/,'_').gsub(/\//,'-').gsub(',','_')
+      output = @outdir+'/'+cmd_name+'.txt'
+      stdout, stderr, status = Open3.capture3(cmd)
+      if status.success?
+	File.open(output, 'w') do |f|
+          f.puts(stdout)
+        end
+      else
+        @logger.warn("Command #{cmd} failed due to the following message -  #{stderr.chomp}")
       end
       return output
     end
-    
+
     def collect_tdgems()
       output = @outdir+'/tdgem_list.output'
       stdout, stderr, status = Open3.capture3("td-agent-gem list | grep fluent")

data/lib/fluent/diagtool/diagutils.rb

@@ -27,26 +27,12 @@ module Diagtool
       time = Time.new
       @time_format = time.strftime("%Y%m%d%0k%M%0S")
       @conf = parse_diagconf(params)
-      #@conf[:time] = @time_format
-      #@conf[:workdir] = @conf[:basedir] + '/' + @time_format
-      #@conf[:outdir] = @conf[:workdir] + '/output'
-
-      #FileUtils.mkdir_p(@conf[:workdir])
-      #FileUtils.mkdir_p(@conf[:outdir])
-      
-      #diaglog = @conf[:workdir] + '/diagtool.output'
-      #@masklog = './mask_' + @time_format + '.json'
-      #@logger = Logger.new(STDOUT, formatter: proc {|severity, datetime, progname, msg|
-      #  "#{datetime}: [Diagtool] [#{severity}] #{msg}\n"
-      #})
-      #@logger_file = Logger.new(diaglog, formatter: proc {|severity, datetime, progname, msg|
-      #  "#{datetime}: [Diagtool] [#{severity}] #{msg}\n"
-      #})
-      #diaglogger_info("Parsing command options...")
-      #diaglogger_info("   Option : Output directory = #{@conf[:basedir]}")
-      #diaglogger_info("   Option : Mask = #{@conf[:mask]}")
-      #diaglogger_info("   Option : Word list = #{@conf[:words]}")
-      #diaglogger_info("   Option : Hash Seed = #{@conf[:seed]}")
+      @cmd_list = [
+      	"ps -eo pid,ppid,stime,time,%mem,%cpu,cmd",
+	"cat /proc/meminfo",
+	"netstat -plan",
+	"netstat -s",
+      ]
     end
     
     def run_precheck()
@@ -130,39 +116,35 @@ module Diagtool
       end
       diaglogger_info("[Collect] config file is stored in #{oslog}")
 
-      diaglogger_info("[Collect] Collecting process information...")
-      meminfo = c.collect_ps_eo()
-      diaglogger_info("[Collect] process informationis stored in #{meminfo}")
-
-      diaglogger_info("[Collect] Collecting OS memory information...")
-      meminfo = c.collect_meminfo()
-      diaglogger_info("[Collect] OS memory information is stored in #{meminfo}")
-
       diaglogger_info("[Collect] Collecting date/time information...")
       if system('which chronyc > /dev/null 2>&1')
-        ntp = c.collect_ntp(command="chrony")
+        ntp = c.collect_cmd_output(command="chronyc sources")
+	diaglogger_info("[Collect] date/time information is stored in #{ntp}")
       elsif system('which ntpq > /dev/null 2>&1')
-        ntp = c.collect_ntp(command="ntp")
+        ntp = c.collect_ntp(command="ntpq -p")
+	diaglogger_info("[Collect] date/time information is stored in #{ntp}")
       else
         diaglogger_warn("[Collect] chrony/ntp does not exist. skip collectig date/time information")
       end
-      diaglogger_info("[Collect] date/time information is stored in #{ntp}")
-			
-      diaglogger_info("[Collect] Collecting netstat information...")
-      if system('which netstat > /dev/null 2>&1')
-        netstat_n = c.collect_netstat_plan()
-        netstat_s = c.collect_netstat_s()
-        if @conf[:mask] == 'yes'
-          diaglogger_info("[Mask] Masking netstat file : #{netstat_n}...")
-          netstat_n = m.mask_tdlog(netstat_n, clean = true)
-        end
-        diaglogger_info("[Collect] netstat information is stored in #{netstat_n} and #{netstat_s}")		
-      else
-        diaglogger_warn("[Collect] netstat does not exist. skip collectig netstat")
-      end
       
+      ###
+      #  Correct OS information
+      ###
+      @cmd_list.each { |cmd|
+	diaglogger_info("[Collect] Collecting command output : command = #{cmd}")
+	out = c.collect_cmd_output(cmd)
+	if @conf[:mask] == 'yes'
+          diaglogger_info("[Mask] Masking netstat file : #{out}...")
+          out = m.mask_tdlog(out, clean = true)
+        end
+	diaglogger_info("[Collect] Collecting command output #{cmd.split[0]} stored in #{out}")
+      }
+			
+      ###
+      #  Correct information to be validated
+      ###
       diaglogger_info("[Collect] Collecting systctl information...")
-      sysctl = c.collect_sysctl()
+      sysctl = c.collect_cmd_output("sysctl -a")
       diaglogger_info("[Collect] sysctl information is stored in #{sysctl}")
 			
       diaglogger_info("[Valid] Validating systctl information...")
@@ -177,7 +159,7 @@ module Diagtool
       end
 
       diaglogger_info("[Collect] Collecting ulimit information...")
-      ulimit = c.collect_ulimit()
+      ulimit = c.collect_cmd_output(cmd="sh -c 'ulimit -n'")
       diaglogger_info("[Collect] ulimit information is stored in #{ulimit}")
 
       diaglogger_info("[Valid] Validating ulimit information...")
@@ -189,9 +171,11 @@ module Diagtool
       end
 
       if @conf[:mask] == 'yes'
-        diaglogger_info("[Mask] Masking td-agent config file : #{tdconf}...")
-        m.mask_tdlog(tdconf, clean = true)
-        tdlog.each do | file |
+	tdconf.each { | file |
+	  diaglogger_info("[Mask] Masking td-agent config file : #{file}...")
+	  m.mask_tdlog(file, clean = true)
+	}
+        tdlog.each { | file |
           diaglogger_info("[Mask] Masking td-agent log file : #{file}...")
           filename = file.split("/")[-1]
           if filename.include?(".gz")
@@ -199,14 +183,14 @@ module Diagtool
           elsif
             m.mask_tdlog(file, clean = true)
           end
-        end
+	}
       end
       
       if @conf[:mask] == 'yes'
         diaglogger_info("[Mask] Export mask log file : #{@masklog}")
         m.export_masklog(@masklog)
       end
-      
+
       tar_file = c.compress_output()
       diaglogger_info("[Collect] Generate tar file #{tar_file}")
     end

data/lib/fluent/diagtool/validutils.rb

@@ -33,7 +33,8 @@ module Diagtool
         :net_ipv4_tcp_max_syn_backlog => "8096",
         :net_ipv4_tcp_slow_start_after_idle => "0",
         :net_ipv4_tcp_tw_reuse => "1",
-        :net_ipv4_ip_local_port_range => ["10240", "65535"]}
+        :net_ipv4_ip_local_port_range => ["10240", "65535"]
+      }
       @logger.debug("Initialize Validation Utils:")
       @logger.debug("    Default ulimit: #{@def_ulimit}")
       @logger.debug("    Default sysctl: #{@def_sysctl}")
@@ -57,7 +58,7 @@ module Diagtool
       v = Hash.new { |i,j| i[j] = Hash.new(&h.default_proc) }
       @logger.info("Loading sysctl file: #{sysctl_file}")
       File.readlines(sysctl_file).each{ |line|
-        if line.include?("net")
+        if line.include? "net"
           line_net = line.chomp.gsub(".","_").split("=")
           key = line_net[0].strip.to_sym
           if line_net[1].strip! =~ /\s/
@@ -66,17 +67,19 @@ module Diagtool
             value= line_net[1]
           end
           h[key] = value
-          if @def_sysctl[key] == value
-            @logger.info("#{key} => #{value} is correct")
-            v[key]['value'] = value
-            v[key]['recommend'] = @def_sysctl[key]	
-            v[key]['result'] = "correct"
-          else
-            @logger.warn("#{key} => #{value} is incorrect, should be #{@def_sysctl[key]}")
-            v[key]['value'] = value
-            v[key]['recommend'] = @def_sysctl[key]
-            v[key]['result'] = "incorrect"
-          end
+	  if @def_sysctl.key? key
+            if @def_sysctl[key] == value
+              @logger.info("#{key} => #{value} is correct")
+              v[key]['value'] = value
+              v[key]['recommend'] = @def_sysctl[key]	
+              v[key]['result'] = "correct"
+            else
+              @logger.warn("#{key} => #{value} is incorrect, should be #{@def_sysctl[key]}")
+              v[key]['value'] = value
+              v[key]['recommend'] = @def_sysctl[key]
+              v[key]['result'] = "incorrect"
+            end
+	  end
         end
       }
       if h == @sysctl

data/lib/fluent/diagtool/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Diagtool
-    VERSION = "0.1.4"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fluent-diagtool
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - kubotat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 description: Bringing productivity of trouble shooting to the next level  by automating
   collection of Fluentd configurations, settings and OS parameters as well as masking
   sensitive information in logs and configurations.
@@ -56,8 +56,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/diagtool.rb
 - bin/setup
 - bin/word_list_sample
+- exclude_list01
 - exe/diagtool
 - fluent-diagtool.gemspec
 - lib/fluent/diagtool/collectutils.rb