fluent-diagtool 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb1e90d1be9a7723371f6ea3cf72ea4eec822d732e2d940e54871cf20ce02d0
-  data.tar.gz: bbc10274d97eef4e0c79b5da843947389607519dd8f34e66ebc775ecf7171736
+  metadata.gz: 44527fe77df5bcf3b4888b5a697f796460a69e3873561c88b278e318f5c83cd8
+  data.tar.gz: 6052777c8a6930f4dde4bc1fa40bd3a62eba4541253488d419f21f02ab11568a
 SHA512:
-  metadata.gz: 1917964e68291c9a4cef64fca18139a1235f3a8bacc6eac8071881e4303cf4b18a0217fd0a8085641e4881a4847542b53b4b2390af8a50298f72259f3d6cba9b
-  data.tar.gz: d8c90fa8083e37510c55e1ad3059767585bc0b9c9adff3709e58d0e4225329c4ef4b5e5509a1323ab7af4e48101bf06384db82c56ad1dce99cbef6e512218a08
+  metadata.gz: 1d03c3277e64b402db14aaa6f530c02ceb640ff57b53e170fc2633e63d23a53b4b8f604a292b4a958e74035ccb6dac4f02b782ee58e1ea579e916cf3ba050012
+  data.tar.gz: b2d8da326cab4181b391758e9e7fa7cfb8682580726b0921afcc08a6fc8788db818bd325c8a24dcc8ee83975d69d058f306bc8d852b8417a2a4d9f3341e38fd0

data/lib/fluent/diagtool/collectutils.rb

@@ -36,7 +36,9 @@ module Diagtool
         'FLUENT_CONF' => '',
         'TD_AGENT_LOG_FILE' => ''
       }			
-      
+      @package_name = conf[:package_name]
+      @service_name = conf[:service_name]
+
       case @type
       when 'fluentd'
         _find_fluentd_info()
@@ -52,7 +54,7 @@ module Diagtool
           @tdconf = @tdenv['FLUENT_CONF'].split('/')[-1]
       	  @tdconf_path = @tdenv['FLUENT_CONF'].gsub(@tdconf,'')
 	else
-	  raise "The path of td-agent configuration file need to be specified."  if conf[:precheck] == false
+	  raise "The path of #{@package_name} configuration file need to be specified."  if conf[:precheck] == false
 	end
       end
       if not conf[:tdlog].empty?
@@ -62,10 +64,13 @@ module Diagtool
         if not @tdenv['TD_AGENT_LOG_FILE'].empty?
           @tdlog =  @tdenv['TD_AGENT_LOG_FILE'].split('/')[-1]
           @tdlog_path = @tdenv['TD_AGENT_LOG_FILE'].gsub(@tdlog,'')
+        elsif not @tdenv['FLUENT_PACKAGE_LOG_FILE'].empty?
+          @tdlog =  @tdenv['FLUENT_PACKAGE_LOG_FILE'].split('/')[-1]
+          @tdlog_path = @tdenv['FLUENT_PACKAGE_LOG_FILE'].gsub(@tdlog,'')
         else
           case @type
           when 'fluentd'
-            raise "The path of td-agent log file need to be specified." if conf[:precheck] == false
+            raise "The path of #{@package_name} log file need to be specified." if conf[:precheck] == false
           when 'fluentbit'
             @logger.warn("FluentBit logs are redirected to the standard output interface ")
           end
@@ -81,10 +86,10 @@ module Diagtool
       @logger.info("Loading the environment parameters...")
       @logger.info("    operating system = #{@osenv['Operating System']}")
       @logger.info("    kernel version = #{@osenv['Kernel']}")
-      @logger.info("    td-agent conf path = #{@tdconf_path}")
-      @logger.info("    td-agent conf file = #{@tdconf}")
-      @logger.info("    td-agent log path = #{@tdlog_path}")
-      @logger.info("    td-agent log = #{@tdlog}")
+      @logger.info("    #{@package_name} conf path = #{@tdconf_path}")
+      @logger.info("    #{@package_name} conf file = #{@tdconf}")
+      @logger.info("    #{@package_name} log path = #{@tdlog_path}")
+      @logger.info("    #{@package_name} log = #{@tdlog}")
     end
     
     def _find_os_info()
@@ -104,7 +109,7 @@ module Diagtool
     
     def _find_fluentd_info()
       ### check if the td-agent is run as daemon
-      stdout, stderr, status = Open3.capture3('systemctl cat td-agent')
+      stdout, stderr, status = Open3.capture3("systemctl cat #{@service_name}")
       if status.success?
         if @precheck == false  # SKip if precheck is true
           File.open(@outdir+'/td-agent_env.output', 'w') do |f|
@@ -365,7 +370,7 @@ module Diagtool
         FileUtils.cp(@oslog_path+@syslog, target_dir)
         return target_dir+@syslog
       else
-        @logger.warn("Can not find OS log file in #{oslog} or #{syslog}")
+        @logger.warn("Can not find OS log file in #{@oslog} or #{@syslog}")
       end
     end
 
@@ -400,7 +405,12 @@ module Diagtool
 
     def collect_tdgems()
       output = @outdir+'/tdgem_list.output'
-      stdout, stderr, status = Open3.capture3("td-agent-gem list | grep fluent")
+      command = if @package_name == "fluent-package"
+                  "fluent-gem"
+                else
+                  "td-agent-gem"
+                end
+      stdout, stderr, status = Open3.capture3("#{command} list | grep fluent")
       File.open(output, 'w') do |f|
         f.puts(stdout)
       end

data/lib/fluent/diagtool/diagutils.rb

@@ -33,6 +33,13 @@ module Diagtool
 	      "netstat -plan",
 	      "netstat -s",
       ]
+      if fluent_package?
+        @conf[:package_name] = "fluent-package"
+        @conf[:service_name] = "fluentd"
+      else
+        @conf[:package_name] = "td-agent"
+        @conf[:service_name] = "td-agent"
+      end
     end
     
     def run_precheck()
@@ -46,16 +53,16 @@ module Diagtool
       prechecklog.info("[Precheck] Check OS parameters...")
       prechecklog.info("[Precheck]    operating system = #{c_env[:os]}")
       prechecklog.info("[Precheck]    kernel version = #{c_env[:kernel]}")
-      prechecklog.info("[Precheck] Check td-agent parameters...")
-      prechecklog.info("[Precheck]    td-agent conf path = #{c_env[:tdconf_path]}")
-      prechecklog.info("[Precheck]    td-agent conf file = #{c_env[:tdconf]}")
-      prechecklog.info("[Precheck]    td-agent log path = #{c_env[:tdlog_path]}")
-      prechecklog.info("[Precheck]    td-agent log = #{c_env[:tdlog]}")
+      prechecklog.info("[Precheck] Check #{@conf[:package_name]} parameters...")
+      prechecklog.info("[Precheck]    #{@conf[:package_name]} conf path = #{c_env[:tdconf_path]}")
+      prechecklog.info("[Precheck]    #{@conf[:package_name]} conf file = #{c_env[:tdconf]}")
+      prechecklog.info("[Precheck]    #{@conf[:package_name]} log path = #{c_env[:tdlog_path]}")
+      prechecklog.info("[Precheck]    #{@conf[:package_name]} log = #{c_env[:tdlog]}")
       if c_env[:tdconf_path] == nil || c_env[:tdconf] == nil
-        prechecklog.warn("[Precheck]    can not find td-agent conf path: please run diagtool command with -c /path/to/<td-agent conf file>")
+        prechecklog.warn("[Precheck]    can not find #{@conf[:package_name]} conf path: please run diagtool command with -c /path/to/<#{@conf[:package_name]} conf file>")
       end
       if c_env[:tdlog_path] == nil || c_env[:tdlog] == nil
-        prechecklog.warn("[Precheck]    can not find td-agent log path: please run diagtool command with -l /path/to/<td-agent log file>")
+        prechecklog.warn("[Precheck]    can not find #{@conf[:package_name]} log path: please run diagtool command with -l /path/to/<#{@conf[:package_name]} log file>")
       end
       if c_env[:tdconf_path] != nil && c_env[:tdconf] != nil && c_env[:tdlog_path] != nil && c_env[:tdlog] != nil
         prechecklog.info("[Precheck] Precheck completed. You can run diagtool command without -c and -l options")
@@ -90,35 +97,35 @@ module Diagtool
       diaglogger_info("[Collect] Loading the environment parameters...")
       diaglogger_info("[Collect]    operating system = #{c_env[:os]}")
       diaglogger_info("[Collect]    kernel version = #{c_env[:kernel]}")
-      diaglogger_info("[Collect]    td-agent conf path = #{c_env[:tdconf_path]}")
-      diaglogger_info("[Collect]    td-agent conf file = #{c_env[:tdconf]}")
-      diaglogger_info("[Collect]    td-agent log path = #{c_env[:tdlog_path]}")
-      diaglogger_info("[Collect]    td-agent log = #{c_env[:tdlog]}")
+      diaglogger_info("[Collect]    #{@conf[:package_name]} conf path = #{c_env[:tdconf_path]}")
+      diaglogger_info("[Collect]    #{@conf[:package_name]} conf file = #{c_env[:tdconf]}")
+      diaglogger_info("[Collect]    #{@conf[:package_name]} log path = #{c_env[:tdlog_path]}")
+      diaglogger_info("[Collect]    #{@conf[:package_name]} log = #{c_env[:tdlog]}")
       m = MaskUtils.new(@conf, loglevel)
       v = ValidUtils.new(loglevel)
 							
-      diaglogger_info("[Collect] Collecting log files of td-agent...")
+      diaglogger_info("[Collect] Collecting log files of #{@conf[:package_name]}...")
       case @type
       when 'fluentd'
         tdlog = c.collect_tdlog()
-        diaglogger_info("[Collect] log files of td-agent are stored in #{tdlog}")
+        diaglogger_info("[Collect] log files of #{@conf[:package_name]} are stored in #{tdlog}")
       when 'fleuntbit'
         if tdlog.empty?
           diaglogger_info("FluentBit logs are redirected to the standard output interface ")
           tdlog = ''
         else
           tdlog = c.collect_tdlog()
-          diaglogger_info("[Collect] log files of td-agent are stored in #{tdlog}")
+          diaglogger_info("[Collect] log files of #{@conf[:package_name]} are stored in #{tdlog}")
         end
       end
 
-      diaglogger_info("[Collect] Collecting config file of td-agent...")
+      diaglogger_info("[Collect] Collecting config file of #{@conf[:package_name]}...")
       tdconf = c.collect_tdconf()
       diaglogger_info("[Collect] config file is stored in #{tdconf}")
 
-      diaglogger_info("[Collect] Collecting td-agent gem information...")
+      diaglogger_info("[Collect] Collecting #{@conf[:package_name]} gem information...")
       tdgem = c.collect_tdgems()
-      diaglogger_info("[Collect] td-agent gem information is stored in #{tdgem}")
+      diaglogger_info("[Collect] #{@conf[:package_name]} gem information is stored in #{tdgem}")
 
       diaglogger_info("[Collect] Collecting config file of OS log...")
       oslog = c.collect_oslog()
@@ -157,11 +164,11 @@ module Diagtool
       ###
       #  Correct information to be validated
       ###
-      diaglogger_info("[Collect] Collecting systctl information...")
+      diaglogger_info("[Collect] Collecting sysctl information...")
       sysctl = c.collect_cmd_output("sysctl -a")
       diaglogger_info("[Collect] sysctl information is stored in #{sysctl}")
 			
-      diaglogger_info("[Valid] Validating systctl information...")
+      diaglogger_info("[Valid] Validating sysctl information...")
       ret, sysctl = v.valid_sysctl(sysctl)
       list =  sysctl.keys
       list.each do |k|
@@ -186,7 +193,7 @@ module Diagtool
 
       if @conf[:mask] == 'yes'
         tdconf.each { | file |
-          diaglogger_info("[Mask] Masking td-agent config file : #{file}...")
+          diaglogger_info("[Mask] Masking #{@conf[:package_name]} config file : #{file}...")
           m.mask_tdlog(file, clean = true)
         }
       end
@@ -194,7 +201,7 @@ module Diagtool
       if @conf[:mask] == 'yes'
         if tdlog != nil
           tdlog.each { | file |
-            diaglogger_info("[Mask] Masking td-agent log file : #{file}...")
+            diaglogger_info("[Mask] Masking #{@conf[:package_name]} log file : #{file}...")
             filename = file.split("/")[-1]
             if filename.include?(".gz")
               m.mask_tdlog_gz(file, clean = true)
@@ -229,7 +236,7 @@ module Diagtool
           if Dir.exist?(params[:output])
             options[:basedir] = params[:output]
           else
-            raise "output directory '#{basedir}' does not exist"
+            raise "output directory '#{params[:output]}' does not exist"
           end
         else
           raise "output directory '-o' must be specified"
@@ -313,5 +320,9 @@ module Diagtool
       @logger.error(str)
       @logger_file.error(str)
     end
+
+    def fluent_package?
+      File.exist?("/etc/fluent/fluentd.conf") || File.exist?("/opt/fluent/bin/fluentd")
+    end
   end
 end

data/lib/fluent/diagtool/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Diagtool
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-diagtool
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - kubotat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
@@ -85,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Diagnostic Tool for Fluentd