fluentd-ui 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1ab2d5ce725a63c27f10c40a0327cc35f7b430
-  data.tar.gz: 5b61d101c19bec0e603c0497debbb5e89fb012a0
+  metadata.gz: d1234cfcd1d5b0b9b3516e222f0636a525c6bbc7
+  data.tar.gz: 1cda1dadc1c7ccaf68ad646a218e41179ab8f6d7
 SHA512:
-  metadata.gz: 048827d25bbb3e971bdc13dfda18165718ab6babda3da181fc16ad76fb9ce6f0067a87a1bbf6b4fa2219511e2923cd5621b2bf0f08f7a10a0effe6194a20c666
-  data.tar.gz: d24f8c0065fd5ecd5d62a23dffff0dbeece212bcc0effd442b1f2ca545d54176a6eb7ff7594bb3914d2a039a74244dac817a1942244533cea028b35152ec3263
+  metadata.gz: 8c9556dca73540fad194055497813912481af121c40303a15c378ca02cb5c88e6f05d92780cfe801870ff67a517d0e3897f5f86cc16d3a11043fb332d1bc6d65
+  data.tar.gz: 9b92d7c3774bab9acf5f73b86f04aa39122c0112ff322af3c2ab4ba28482a711d27c61fb1d2c348c8c1523029623ab3de67e38e5b9eecc40e9530f51e8418409

data/ChangeLog

@@ -1,11 +1,22 @@
+Release 0.3.12 - 2015/01/16
+* [maintenance] #126-#131, #135, #138,#139 #CodeClimate score is now 4.0! special thanks to @rthbound for many pull-requests.
+* [fixed] #133 Incompatible config generated on out_s3 version 0.5.x or newer.
+* [fixed] #140 Fluentd::Agent#logged_errors methods returned wrong errors.
+* [fixed] #136 Caused error on gem list fetching on some environments.
+* [improve] #124 Enable to note config history.
+* [improve] #137 Add "config test" button to config histories. You can check config before reuse that.
+
+
 Release 0.3.11 - 2014/12/19
 * [improve] Save config history. Now any saved config files can be restored to the current.
 
+
 Release 0.3.10 - 2014/12/17
 * [maintenance] Update components.
 * [improve] Add fluentd default plugin settings.
 * [fixed] Fix #121. Change to allow utf-8 string instead of ascii.
 
+
 Release 0.3.9 - 2014/12/01
 
 * [improve] Display current setting for each section.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.11)
+    fluentd-ui (0.3.12)
       addressable
       bundler
       draper (~> 1.3)

data/app/assets/stylesheets/common.css.scss

@@ -165,3 +165,7 @@ label {
     color: #999;
   }
 }
+
+.datetime {
+  white-space: nowrap;
+}

data/app/controllers/application_controller.rb

@@ -75,28 +75,38 @@ class ApplicationController < ActionController::Base
   end
 
   def set_locale
-    available = I18n.available_locales.map(&:to_s)
-    if params[:lang] && available.include?(params[:lang])
+    I18n.locale = locale_from_params || locale_from_session || locale_from_http_accept_lang || I18n.default_locale
+  end
+
+  def locale_from_params
+    if params[:lang] && available_locales.include?(params[:lang])
       session[:prefer_lang] = params[:lang]
-      I18n.locale = params[:lang]
-      return
-    end
-    if session[:prefer_lang]
-      I18n.locale = session[:prefer_lang]
-      return
+      params[:lang]
+    else
+      nil
     end
+  end
+
+  def locale_from_session
+    session[:prefer_lang]
+  end
 
+  def locale_from_http_accept_lang
     # NOTE: ignoring q=xxx in request header for now
-    return if request.env["HTTP_ACCEPT_LANGUAGE"].blank?
+    return nil if request.env["HTTP_ACCEPT_LANGUAGE"].blank?
+
     langs = request.env["HTTP_ACCEPT_LANGUAGE"].gsub(/q=[0-9.]+/, "").gsub(";","").split(",")
-    prefer = langs.find {|lang| available.include?(lang) }
+    prefer = langs.find { |lang| available_locales.include?(lang) }
+
     unless prefer
-      if langs.find{|lang| lang.match(/^en/)}
-        I18n.locale = :en
-        return
-      end
+      prefer = :en if langs.find{ |lang| lang.match(/^en/) }
     end
-    I18n.locale = prefer
+
+    prefer
+  end
+
+  def available_locales
+    @available_locales ||= I18n.available_locales.map(&:to_s)
   end
 
   def file_tail(path, limit = 10)

data/app/controllers/concerns/setting_history_concern.rb

@@ -0,0 +1,28 @@
+module SettingHistoryConcern
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :login_required
+    before_action :find_fluentd
+    before_action :find_backup_file, only: [:show, :reuse, :configtest]
+  end
+
+  def show
+  end
+
+  def reuse
+    @fluentd.agent.config_write @backup_file.content
+    redirect_to daemon_setting_path, flash: { success: t('messages.config_successfully_copied',  brand: fluentd_ui_brand) }
+  end
+
+  def configtest
+    @fluentd.config_file = @backup_file.file_path
+    if @fluentd.agent.dryrun
+      flash = { success: t('messages.dryrun_is_passed') }
+    else
+      flash = { danger: @fluentd.agent.log_tail(1).first }
+    end
+    redirect_to :back, flash: flash
+  end
+
+end

data/app/controllers/fluentd/agents_controller.rb

@@ -2,29 +2,17 @@ class Fluentd::AgentsController < ApplicationController
   before_action :find_fluentd
 
   def start
-    if @fluentd.agent.start
-      flash[:success] = t("messages.fluentd_start_stop_delay_notice", action: t('fluentd.common.start'))
-    else
-      flash[:error] = t("messages.fluentd_start_failed", brand: fluentd_ui_title) + @fluentd.agent.log_tail(1).first
-    end
+    run_action(__method__) { @fluentd.agent.log_tail(1).first }
     redirect_to daemon_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def stop
-    if @fluentd.agent.stop
-      flash[:success] = t("messages.fluentd_start_stop_delay_notice", action: t('fluentd.common.stop'))
-    else
-      flash[:error] = t("messages.fluentd_stop_failed", brand: fluentd_ui_title)
-    end
+    run_action(__method__)
     redirect_to daemon_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
   def restart
-    if @fluentd.agent.restart
-      flash[:success] = t("messages.fluentd_start_stop_delay_notice", action: t('fluentd.common.restart'))
-    else
-      flash[:error] = t("messages.fluentd_restart_failed", brand: fluentd_ui_title) + @fluentd.agent.log_tail(1).first
-    end
+    run_action(__method__) { @fluentd.agent.log_tail(1).first }
     redirect_to daemon_path(@fluentd), status: 303 # 303 is change HTTP Verb GET
   end
 
@@ -32,4 +20,14 @@ class Fluentd::AgentsController < ApplicationController
     @logs = @fluentd.agent.log_tail(params[:limit]).reverse if @fluentd
     render json: @logs
   end
+
+  private
+  def run_action(action)
+    if @fluentd.agent.public_send(action)
+      flash[:success] = t("messages.fluentd_start_stop_delay_notice", action: t("fluentd.common.#{action}"))
+    else
+      flash[:error] = t("messages.fluentd_#{action}_failed", brand: fluentd_ui_title)
+      flash[:error] += yield if block_given?
+    end
+  end
 end

data/app/controllers/fluentd/settings/histories_controller.rb

@@ -1,26 +1,16 @@
 class Fluentd::Settings::HistoriesController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
-  before_action :find_backup_file, only: [:show, :reuse]
+  include SettingHistoryConcern
 
   def index
     @backup_files = @fluentd.agent.backup_files_in_new_order.map do |file_path|
-      Fluentd::Setting::BackupFile.new(file_path)
+      Fluentd::SettingArchive::BackupFile.new(file_path)
     end
   end
 
-  def show
-  end
-
-  def reuse
-    @fluentd.agent.config_write @backup_file.content
-    redirect_to daemon_setting_path, flash: { success: t('messages.config_successfully_copied',  brand: fluentd_ui_brand) }
-  end
-
   private
 
   def find_backup_file
     #Do not use BackupFile.new(params[:id]) because params[:id] can be any path.
-    @backup_file = Fluentd::Setting::BackupFile.find_by_file_id(@fluentd.agent.config_backup_dir, params[:id])
+    @backup_file = Fluentd::SettingArchive::BackupFile.find_by_file_id(@fluentd.agent.config_backup_dir, params[:id])
   end
 end

data/app/controllers/fluentd/settings/notes_controller.rb

@@ -0,0 +1,16 @@
+class Fluentd::Settings::NotesController < ApplicationController
+  before_action :login_required
+  before_action :find_fluentd
+  before_action :find_note, only: [:update]
+
+  def update
+    @note.update!(params[:note][:content])
+    redirect_to daemon_setting_path, flash: { success: t('messages.note_updating_success') }
+  end
+
+  private
+
+  def find_note
+    @note = Fluentd::SettingArchive::Note.find_by_file_id(@fluentd.agent.config_backup_dir, params[:id])
+  end
+end

data/app/controllers/fluentd/settings/running_backup_controller.rb

@@ -1,19 +1,9 @@
 class Fluentd::Settings::RunningBackupController < ApplicationController
-  before_action :login_required
-  before_action :find_fluentd
-  before_action :find_backup_file, only: [:show, :reuse]
-
-  def show
-  end
-
-  def reuse
-    @fluentd.agent.config_write @backup_file.content
-    redirect_to daemon_setting_path, flash: { success: t('messages.config_successfully_copied',  brand: fluentd_ui_brand) }
-  end
+  include SettingHistoryConcern
 
   private
 
   def find_backup_file
-    @backup_file = Fluentd::Setting::BackupFile.new(@fluentd.agent.running_config_backup_file)
+    @backup_file = Fluentd::SettingArchive::BackupFile.new(@fluentd.agent.running_config_backup_file)
   end
 end

data/app/controllers/fluentd/settings_controller.rb

@@ -7,10 +7,10 @@ class Fluentd::SettingsController < ApplicationController
 
   def show
     @backup_files = @fluentd.agent.backup_files_in_new_order.first(Settings.histories_count_in_preview).map do |file_path|
-      Fluentd::Setting::BackupFile.new(file_path)
+      Fluentd::SettingArchive::BackupFile.new(file_path)
     end
 
-    @running_backedup_file = Fluentd::Setting::BackupFile.new(@fluentd.agent.running_config_backup_file)
+    @running_backedup_file = Fluentd::SettingArchive::BackupFile.new(@fluentd.agent.running_config_backup_file)
   end
 
   def edit

data/app/controllers/misc_controller.rb

@@ -39,30 +39,39 @@ class MiscController < ApplicationController
 
     Zip::File.open(path, Zip::File::CREATE) do |zip|
       zip.get_output_stream('fluentd.log') {|f| f.puts fluentd.agent.log }
-      if ENV["FLUENTD_UI_LOG_PATH"].present?
-        zip.add("fluentd-ui.log", ENV["FLUENTD_UI_LOG_PATH"])
-      else
-        zip.add("fluentd-ui.log", Rails.root.join("log/#{Rails.env}.log"))
-      end
-      zip.get_output_stream('env.txt') do |f|
-        ENV.to_a.each do |(key, value)|
-          f.puts "#{key}=#{value}"
-        end
-      end
-      zip.get_output_stream('versions.txt') do |f|
-        f.puts "ruby: #{RUBY_DESCRIPTION}"
-        f.puts "fluentd: #{FluentdUI.fluentd_version}"
-        f.puts "fluentd-ui: #{FluentdUI::VERSION}"
-        f.puts
-        f.puts "# OS Information"
-        f.puts "uname -a: #{`uname -a`.strip}"
-      end
+      zip.add("fluentd-ui.log", log_path)
+
+      add_env_file_to(zip)
+      add_version_file_to(zip)
     end
     send_file path
   end
 
   private
 
+  def log_path
+    ENV["FLUENTD_UI_LOG_PATH"] || Rails.root.join("log/#{Rails.env}.log")
+  end
+
+  def add_env_file_to(zip)
+    zip.get_output_stream('env.txt') do |f|
+      ENV.to_a.each do |(key, value)|
+        f.puts "#{key}=#{value}"
+      end
+    end
+  end
+
+  def add_version_file_to(zip)
+    zip.get_output_stream('versions.txt') do |f|
+      f.puts "ruby: #{RUBY_DESCRIPTION}"
+      f.puts "fluentd: #{FluentdUI.fluentd_version}"
+      f.puts "fluentd-ui: #{FluentdUI::VERSION}"
+      f.puts
+      f.puts "# OS Information"
+      f.puts "uname -a: #{`uname -a`.strip}"
+    end
+  end
+
   def update!
     FluentdUiRestart.new.async.perform
   end

data/app/controllers/polling_controller.rb

@@ -1,20 +1,17 @@
 class PollingController < ApplicationController
   def alerts
     alerts = []
-    installing_gems.each do |plugin|
-      target = plugin.gem_name.dup
-      target << "(#{plugin.version})" if plugin.version
-      alerts << {
-        text: I18n.t('terms.installing', target: target)
-      }
-    end
-    uninstalling_gems.each do |plugin|
-      target = plugin.gem_name.dup
-      target << "(#{plugin.version})" if plugin.version
-      alerts << {
-        text: I18n.t('terms.uninstalling', target: target)
-      }
+
+    %w{ installing uninstalling }.each do |action|
+      send("#{action}_gems").each do |plugin|
+        target = plugin.gem_name.dup
+        target << "(#{plugin.version})" if plugin.version
+        alerts << {
+          text: I18n.t("terms.#{action}", target: target)
+        }
+      end
     end
+
     render json: alerts
   end
 end

data/app/helpers/settings_helper.rb

@@ -2,42 +2,80 @@ module SettingsHelper
   def field(form, key, opts = {})
     html = '<div class="form-group">'
 
-    case form.object.column_type(key)
+    field_resolver(form.object.column_type(key), html, form, key, opts)
+
+    html << "</div>"
+    html.html_safe
+  end
+
+  private
+  def field_resolver(type, html, form, key, opts)
+    case type
     when :hidden
-      return form.hidden_field(key)
+      html << form.hidden_field(key)
     when :boolean, :flag
-      html << form.check_box(key, {}, "true", "false")
-      html << " " # NOTE: Adding space for padding
-      html << h(form.label(key))
+      boolean_field(html, form, key, opts)
     when :choice
-      html << h(form.label(key))
-      html << " " # NOTE: Adding space for padding
-      html << form.select(key, form.object.values_of(key), opts)
+      choice_field(html, form, key, opts)
     when :nested
-      child_data = form.object.class.children[key]
-      klass = child_data[:class]
-      options = child_data[:options]
-      children = form.object.send(key) || {"0" => {}}
-      children.each_pair do |index, child|
-        html << %Q!<div class="js-nested-column #{options[:multiple] ? "js-multiple" : ""} well well-sm">!
-        if options[:multiple]
-          html << %Q!<a class="btn btn-xs btn-default js-append">#{icon('fa-plus')}</a> !
-          html << %Q!<a class="btn btn-xs btn-default js-remove" style="display:none">#{icon('fa-minus')}</a> !
-        end
-        html << h(form.label(key))
-        form.fields_for("#{key}[#{index}]", klass.new(child)) do |ff|
-          klass::KEYS.each do |k|
-            html << field(ff, k)
-          end
-        end
-        html << "</div>"
-      end
+      nested_field(html, form, key, opts)
     else
+      other_field(html, form, key, opts)
+    end
+  end
+
+  def nested_field(html, form, key, opts = {})
+    klass    = child_data(form, key)[:class]
+    options  = child_data(form, key)[:options]
+    children = form.object.send(key) || {"0" => {}}
+
+    children.each_pair do |index, child|
+      html << open_nested_div(options[:multiple])
+      html << append_and_remove_links if options[:multiple]
       html << h(form.label(key))
-      html << form.text_field(key, class: "form-control")
+      html << nested_fields(form, key, index, klass, child)
+      html << "</div>"
     end
+  end
 
-    html << "</div>"
-    html.html_safe
+  def open_nested_div(multiple)
+    %Q!<div class="js-nested-column #{ multiple ? "js-multiple" : "" } well well-sm">!
+  end
+
+  def nested_fields(form, key, index, klass, child)
+    nested_html = ""
+    form.fields_for("#{key}[#{index}]", klass.new(child)) do |ff|
+      klass::KEYS.each do |k|
+        nested_html << field(ff, k)
+      end
+    end
+
+    nested_html
+  end
+
+  def append_and_remove_links
+    %Q!<a class="btn btn-xs btn-default js-append">icon('fa-plus')}</a> ! +
+    %Q!<a class="btn btn-xs btn-default js-remove" style="display:none">icon('fa-minus')}</a> !
+  end
+
+  def child_data(form, key)
+    form.object.class.children[key]
+  end
+
+  def choice_field(html, form, key, opts = {})
+    html << h(form.label(key))
+    html << " " # NOTE: Adding space for padding
+    html << form.select(key, form.object.values_of(key), opts)
+  end
+
+  def boolean_field(html, form, key, opts = {})
+    html << form.check_box(key, {}, "true", "false")
+    html << " " # NOTE: Adding space for padding
+    html << h(form.label(key))
+  end
+
+  def other_field(html, form, key, opts = {})
+    html << h(form.label(key))
+    html << form.text_field(key, class: "form-control")
   end
 end