Fix fluentd version (not bundle-installed fluentd version)

app/controllers/misc_controller.rb

@@ -47,7 +47,7 @@ class MiscController < ApplicationController
       end
       zip.get_output_stream('versions.txt') do |f|
         f.puts "ruby: #{RUBY_DESCRIPTION}"
-        f.puts "fluentd: #{Fluent::VERSION}"
+        f.puts "fluentd: #{FluentdUI.fluentd_version}"
         f.puts "fluentd-ui: #{FluentdUI::VERSION}"
       end
     end

app/models/fluentd/agent/common.rb

@@ -66,7 +66,7 @@ class Fluentd
         end
       end
 
-      %w(running? log config config_write config_append log_tail configuration).each do |method|
+      %w(running? version log config config_write config_append log_tail configuration).each do |method|
         define_method(method) do
           raise NotImplementedError, "'#{method}' method is required to be defined"
         end

app/models/fluentd/agent/fluentd_gem.rb

@@ -41,6 +41,12 @@ class Fluentd
         actual_reload
       end
 
+      def version
+        Bundler.with_clean_env do
+          `fluentd --version`.strip
+        end
+      end
+
       private
 
       def options_to_argv

app/models/fluentd/agent/td_agent.rb

@@ -25,6 +25,10 @@ class Fluentd
         # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
         system('/etc/init.d/td-agent restart')
       end
+
+      def version
+        `td-agent --version`.strip
+      end
     end
   end
 end

app/views/misc/information.html.haml

@@ -24,7 +24,7 @@
           %dt ruby
           %dd= RUBY_DESCRIPTION
           %dt fluentd
-          %dd= Fluent::VERSION
+          %dd= FluentdUI.fluentd_version
           %dt fluentd-ui
           %dd= FluentdUI::VERSION
 

lib/fluentd-ui.rb

@@ -13,4 +13,10 @@ module FluentdUI
     current = Gem::Version.new(::FluentdUI::VERSION)
     latest > current
   end
+
+  def self.fluentd_version
+    setup_fluentd = Fluentd.instance
+    return nil unless setup_fluentd
+    setup_fluentd.agent.version
+  end
 end