fluent-diagtool 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f2a315c0601942f4d58cd452f14f070af79e67cbfdf3c87cdbf910678381c2
-  data.tar.gz: 960056d096bba41112ab9dc3d08a10a8af2693500d79fc8a6b4f4736ccb77d3c
+  metadata.gz: f767598bf5753ebc1ce4834843a5612d606b0d4d4ac5be26c6538d8d0f7db8fb
+  data.tar.gz: 93cef94976209e28812ab6ca5d466efcdc80c438222477e013d2bc365d8c8cae
 SHA512:
-  metadata.gz: ca7a0047228b91ae650ba9db3fb2a9e63589b45a7594a52ab62f59d02110da68b4ec94f11a9e3a6b9f507aa12dba7bf03f1366ab63b7c169805bee0f4304771d
-  data.tar.gz: a01cc78efb7e024a56619d30fdc959439cb07deccd67dd6f0faa94c026f0a054f2640c2bd796f76012ac8a0887b7ebc6c7d766c997288f3a30f78c6df4061162
+  metadata.gz: 2b45ed8576c82a0d7f772c516127ac66d03d0a2d1051cb34a663e2062c3fb2e27ad8160acba33bf9c7995485d403ae135fc496984a55b05a772d61273ce1aca0
+  data.tar.gz: 2af458d2e1202db45ebe0ddf6e6ab4e75dec2e9f53b995712ce20836a372af86588ddc5e7bb705c947a12c50673c35b8378f55ebb5c0615625c30f789112de95

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    fluent-diagtool (1.0.3)
+    fluent-diagtool (1.0.4)
       fileutils
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.5.1)
     fileutils (1.7.2)
-    json (2.6.3)
+    json (2.7.1)
     rake (12.3.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -32,9 +32,9 @@ https://docs.fluentd.org/quickstart/td-agent-v2-vs-v3-vs-v4
 When you are using td-agent, you can install Diagtool easily with "/usr/sbin/td-agent-gem" command.
 ```
 # /usr/sbin/td-agent-gem install fluent-diagtool
-Successfully installed fluent-diagtool-1.0.3
-Parsing documentation for fluent-diagtool-1.0.3
-Installing ri documentation for fluent-diagtool-1.0.3
+Successfully installed fluent-diagtool-1.0.4
+Parsing documentation for fluent-diagtool-1.0.4
+Installing ri documentation for fluent-diagtool-1.0.4
 Done installing documentation for fluent-diagtool after 0 seconds
 1 gem installed
 ```
@@ -43,9 +43,9 @@ When using /usr/sbin/td-agent-gem command, fluent-diagtool is installed under "/
 Otherwise, you can install Diagtool with common gem command. In this case, Ruby version higher than 2.3 might be required to install.
 ```
 # gem install fluent-diagtool
-Successfully installed fluent-diagtool-1.0.3
-Parsing documentation for fluent-diagtool-1.0.3
-Installing ri documentation for fluent-diagtool-1.0.3
+Successfully installed fluent-diagtool-1.0.4
+Parsing documentation for fluent-diagtool-1.0.4
+Installing ri documentation for fluent-diagtool-1.0.4
 Done installing documentation for fluent-diagtool after 0 seconds
 1 gem installed
 ```

data/lib/fluent/diagtool/collectutils.rb

@@ -157,10 +157,11 @@ module Diagtool
     
     def _find_fluentbit_info()
       ### check if the td-agent-bit is run as daemon
-      stdout, stderr, status = Open3.capture3('systemctl cat td-agent-bit')
+
+      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-bit_env.output', 'w') do |f|
+          File.open(@outdir+"/#{@service_name}_env.output", 'w') do |f|
             f.puts(stdout)
           end
         end
@@ -184,8 +185,8 @@ module Diagtool
           end
         end
       else
-        ### check if the td-agent-bit is not run as daemon or run FluentdBit with customized script 
-        stdout, stderr, status = Open3.capture3('ps aux | grep fluent-bit | grep -v ".*\(grep\|diagtool\)"')
+        ### check if the td-agent-bit is not run as daemon or run FluentdBit with customized script
+        stdout, _stderr, status = Open3.capture3('ps aux | grep fluent-bit | grep -v ".*\(grep\|diagtool\)"')
         if status.success?
           i = 0
           stdout.split().each do | line |
@@ -419,12 +420,15 @@ module Diagtool
       end
     end
 
+    def gemfile_path
+      if fluent_package?
+        "/opt/fluent/share/Gemfile"
+      else
+        "/opt/td-agent/share/Gemfile"
+      end
+    end
+
     def collect_bundled_plugins
-      gemfile_path = if fluent_package?
-                       "/opt/fluent/share/Gemfile"
-                     else
-                       "/opt/td-agent/share/Gemfile"
-                     end
       File.read(gemfile_path).lines(chomp: true).grep(/\Agem "fluent-plugin-/).collect do |line|
         gem_name = line[/\Agem "(fluent-plugin-.+?)"/, 1]
         platforms_option = line[/platforms: (\w+)/, 1]

data/lib/fluent/diagtool/diagutils.rb

@@ -49,12 +49,22 @@ module Diagtool
 	      "netstat -plan",
 	      "netstat -s",
       ]
-      if fluent_package?
-        @conf[:package_name] = "fluent-package"
-        @conf[:service_name] = "fluentd"
+      if @conf[:type] == "fluentd"
+        if fluent_package?
+          @conf[:package_name] = "fluent-package"
+          @conf[:service_name] = "fluentd"
+        else
+          @conf[:package_name] = "td-agent"
+          @conf[:service_name] = "td-agent"
+        end
       else
-        @conf[:package_name] = "td-agent"
-        @conf[:service_name] = "td-agent"
+        if fluentbit_package?
+          @conf[:package_name] = "fluent-bit"
+          @conf[:service_name] = "fluent-bit"
+        else
+          @conf[:package_name] = "td-agent-bit"
+          @conf[:service_name] = "td-agent-bit"
+        end
       end
     end
     
@@ -139,19 +149,23 @@ module Diagtool
       tdconf = c.collect_tdconf()
       diaglogger_info("[Collect] config file is stored in #{tdconf}")
 
-      diaglogger_info("[Collect] Collecting #{@conf[:package_name]} gem information...")
-      tdgem = c.collect_tdgems()
-      diaglogger_info("[Collect] #{@conf[:package_name]} gem information is stored in #{tdgem}")
-
-      gem_info = c.collect_manually_installed_gems(tdgem)
-      diaglogger_info("[Collect] #{@conf[:package_name]} gem information (bundled by default) is stored in #{gem_info[:bundled]}")
-      diaglogger_info("[Collect] #{@conf[:package_name]} manually installed gem information is stored in #{gem_info[:local]}")
-      local_gems = File.read(gem_info[:local]).lines(chomp: true)
-      unless local_gems == [""]
-        diaglogger_info("[Collect] #{@conf[:package_name]} manually installed gems:")
-        local_gems.each do |gem|
-          diaglogger_info("[Collect]   * #{gem}")
+      case @conf[:type]
+      when 'fluentd'
+        diaglogger_info("[Collect] Collecting #{@conf[:package_name]} gem information...")
+        tdgem = c.collect_tdgems()
+        diaglogger_info("[Collect] #{@conf[:package_name]} gem information is stored in #{tdgem}")
+        gem_info = c.collect_manually_installed_gems(tdgem)
+        diaglogger_info("[Collect] #{@conf[:package_name]} gem information (bundled by default) is stored in #{gem_info[:bundled]}")
+        diaglogger_info("[Collect] #{@conf[:package_name]} manually installed gem information is stored in #{gem_info[:local]}")
+        local_gems = File.read(gem_info[:local]).lines(chomp: true)
+        unless local_gems == [""]
+          diaglogger_info("[Collect] #{@conf[:package_name]} manually installed gems:")
+          local_gems.each do |gem|
+            diaglogger_info("[Collect]   * #{gem}")
+          end
         end
+      when 'fluentbit'
+        # nothing to do!
       end
 
       diaglogger_info("[Collect] Collecting config file of OS log...")
@@ -351,5 +365,9 @@ module Diagtool
     def fluent_package?
       File.exist?("/etc/fluent/fluentd.conf") || File.exist?("/opt/fluent/bin/fluentd")
     end
+
+    def fluentbit_package?
+      File.exist?("/etc/fluent-bit/fluent-bit.conf") || File.exist?("/opt/fluent-bit/bin/fluent-bit")
+    end
   end
 end

data/lib/fluent/diagtool/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Diagtool
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/lib/fluent/diagtool/windows/collectutils.rb

@@ -29,6 +29,14 @@ module Diagtool
         # Not supported yet.
         return {}
       end
+
+      def gemfile_path
+        if fluent_package?
+          File.join(ENV["FLUENT_PACKAGE_TOPDIR"], "share/Gemfile")
+        else
+          File.join(ENV["TD_AGENT_TOPDIR"], "share/Gemfile")
+        end
+      end
     end
   end
 end

data/lib/fluent/diagtool/windows/diagutils.rb

@@ -21,6 +21,10 @@ require 'fluent/diagtool/collectutils'
 module Diagtool
   module Windows
     module PlatformSpecificDiagUtils
+      def fluent_package?
+        ENV.key?("FLUENT_PACKAGE_TOPDIR")
+      end
+
       def run_precheck()
         raise "[Precheck] Precheck feature is not supported on Windows."
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-diagtool
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - kubotat
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Diagnostic Tool for Fluentd