fluentd-ui 0.3.11 → 0.3.12

data/app/models/{fluentd/setting/backup_file.rb → concerns/fluentd/setting_archive/archivable.rb}

@@ -1,21 +1,21 @@
 class Fluentd
-  module Setting
-    class BackupFile
+  module SettingArchive
+    module Archivable
+      extend ActiveSupport::Concern
       attr_accessor :file_path
 
-      def self.find_by_file_id(backup_dir, file_id)
-        file_path = Pathname.new(backup_dir).join("#{file_id}.conf")
-        raise "No such a file #{file_path}" unless File.exist?(file_path)
+      module ClassMethods
+        private
 
-        new(file_path)
-      end
-
-      def initialize(file_path)
-        @file_path = file_path
+        def file_path_of(dir, id)
+          file_path = Pathname.new(dir).join("#{id}#{self::FILE_EXTENSION}")
+          raise "No such a file #{file_path}" unless File.exist?(file_path)
+          file_path
+        end
       end
 
       def file_id
-        @file_id ||= with_file { name.gsub(/.conf\Z/,'') }
+        @file_id ||= with_file { name.gsub(/#{Regexp.escape(self.class::FILE_EXTENSION)}\Z/,'') }
       end
 
       def name

data/app/models/fluent_gem.rb

@@ -21,7 +21,7 @@ module FluentGem
         if $? && $?.exitstatus != 0 # NOTE: $? will be nil on CircleCI, so check $? at first
           raise GemError, "failed command: `#{gem} list`"
         end
-        output.lines
+        output.lines.to_a
       end
     end
 

data/app/models/fluentd/agent/fluentd_gem.rb

@@ -42,6 +42,12 @@ class Fluentd
         actual_reload
       end
 
+      def dryrun
+        Bundler.with_clean_env do
+          system("fluentd -q --dry-run #{options_to_argv}")
+        end
+      end
+
       def version
         Bundler.with_clean_env do
           `fluentd --version`.strip
@@ -60,9 +66,7 @@ class Fluentd
       end
 
       def validate_fluentd_options
-        Bundler.with_clean_env do
-          system("fluentd --dry-run #{options_to_argv}")
-        end
+        dryrun
       end
 
       def actual_start

data/app/models/fluentd/agent/local_common.rb

@@ -89,8 +89,9 @@ class Fluentd
         return if over_file_count <= 0
 
         backup_files_in_old_order.first(over_file_count).each do |file|
-          next unless File.exist? file
-          FileUtils.rm(file)
+          note_file_attached_backup = file.sub(/#{Regexp.escape(File.extname(file))}\z/, ::Fluentd::SettingArchive::Note::FILE_EXTENSION)
+          FileUtils.rm(note_file_attached_backup) if File.exist? note_file_attached_backup
+          FileUtils.rm(file) if File.exist? file
         end
       end
 
@@ -116,12 +117,14 @@ class Fluentd
               #           2014-06-30 11:24:08 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.2/lib/ruby/2.1.0/socket.rb:461:in `block in tcp_server_sockets'
               #         ]
               #       }
-              subject, *notes = *buf.reverse
-              block.call({
-                subject: subject,
-                notes: notes,
-              })
+              split_error_lines_to_error_units(buf.reverse).each do |error_unit|
+                block.call({
+                  subject: error_unit[:subject],
+                  notes: error_unit[:notes],
+                })
+              end
             end
+
             buf = []
             next
           end
@@ -131,12 +134,44 @@ class Fluentd
         io && io.close
       end
 
+      def split_error_lines_to_error_units(buf)
+        # NOTE: if a following log is given
+        #
+        #2014-05-27 10:54:37 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::#EADDRINUSE: Address already in use - bind(2) for "0.0.0.0" port 24224>
+        #2014-05-27 10:55:40 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::#EADDRINUSE: Address already in use - bind(2) for "0.0.0.0" port 24224>
+        #  2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `initialize'
+        #  2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `new'
+        #
+        #the first line and second line must be each "error_unit". and after third lines lines are "notes" of second error unit of .
+        # [
+        #   { subject: "2014-05-27 10:54:37 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::#EADDRINUSE: Address already in use - bind(2) for "0.0.0.0" port 24224>          ",
+        #     notes: [] },
+        #   { subject: "2014-05-27 10:55:40 +0900 [error]: unexpected error error_class=Errno::EADDRINUSE error=#<Errno::#EADDRINUSE: Address already in use - bind(2) for "0.0.0.0" port 24224>          ",
+        #     notes: [
+        #       "2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `initialize'",
+        #       "2014-05-27 10:55:40 +0900 [error]: /Users/uu59/.rbenv/versions/2.1.0/lib/ruby/gems/2.1.0/gems/cool.io-1.2.4/lib/cool.io/server.rb:57:in `new'"
+        #     ]
+        #   },
+        # ]
+        #
+        return_array = []
+        buf.each_with_index do |b, i|
+          if b.match(/\A /)
+            return_array[-1][:notes] << b
+          else
+            return_array << { subject: b, notes: [] }
+          end
+        end
+        return return_array.reverse
+      end
+
       def detached_command(cmd)
-        Bundler.with_clean_env do
+        thread = Bundler.with_clean_env do
           pid = spawn(cmd)
           Process.detach(pid)
         end
-        sleep 1 # NOTE/FIXME: too early return will be caused incorrect status report, "sleep 1" is a adhoc hack
+        thread.join
+        thread.value.exitstatus.zero?
       end
     end
   end

data/app/models/fluentd/agent/td_agent/macosx.rb

@@ -2,7 +2,6 @@ class Fluentd
   class Agent
     class TdAgent
       module Macosx
-
         def start
           backup_running_config do
             detached_command("launchctl load #{plist}") && pid_from_launchctl
@@ -14,7 +13,11 @@ class Fluentd
         end
 
         def restart
-          stop && start
+          dryrun && stop && start
+        end
+
+        def dryrun
+          detached_command("/usr/sbin/td-agent --dry-run -q --use-v1-config -c #{config_file}")
         end
 
         private

data/app/models/fluentd/agent/td_agent/unix.rb

@@ -17,6 +17,10 @@ class Fluentd
           # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
           detached_command('/etc/init.d/td-agent restart')
         end
+
+        def dryrun
+          detached_command('/etc/init.d/td-agent configtest')
+        end
       end
     end
   end

data/app/models/fluentd/setting/out_s3.rb

@@ -6,7 +6,7 @@ class Fluentd
 
       KEYS = [
         :match,
-        :aws_key_id, :aws_sec_key, :s3_bucket, :s3_endpoint, :path,
+        :aws_key_id, :aws_sec_key, :s3_bucket, :s3_region, :path,
         # :reduced_redundancy, :check_apikey_on_start, :command_parameter, # not configurable?
         :format, :include_time_key, :time_key, :delimiter, :label_delimiter, :add_newline, :output_tag, :output_time,
         :time_slice_format, :time_slice_wait, :time_format, :utc, :store_as, :proxy_uri, :use_ssl,
@@ -27,7 +27,7 @@ class Fluentd
 
       def self.initial_params
         {
-          s3_endpoint: "s3-us-west-1.amazonaws.com",
+          s3_region: "us-west-1",
           output_tag: true,
           output_time: true,
           use_ssl: true,
@@ -37,7 +37,7 @@ class Fluentd
       def common_options
         [
           :match, :aws_key_id, :aws_sec_key,
-          :s3_endpoint, :s3_bucket, :use_ssl, :path,
+          :s3_region, :s3_bucket, :use_ssl, :path,
         ]
       end
 

data/app/models/fluentd/setting_archive/backup_file.rb

@@ -0,0 +1,20 @@
+class Fluentd
+  module SettingArchive
+    class BackupFile
+      include Archivable
+      attr_reader :note
+
+      FILE_EXTENSION = ".conf".freeze
+
+      def self.find_by_file_id(backup_dir, file_id)
+        note = Note.find_by_file_id(backup_dir, file_id) rescue nil
+        new(file_path_of(backup_dir, file_id), note)
+      end
+
+      def initialize(file_path, note = nil)
+        @file_path = file_path
+        @note = note || Note.create(file_path.sub(/#{Regexp.escape(FILE_EXTENSION)}\z/, Note::FILE_EXTENSION))
+      end
+    end
+  end
+end

data/app/models/fluentd/setting_archive/note.rb

@@ -0,0 +1,28 @@
+class Fluentd
+  module SettingArchive
+    class Note
+      include Archivable
+
+      FILE_EXTENSION = ".note".freeze
+
+      def self.find_by_file_id(backup_dir, file_id)
+        new(file_path_of(backup_dir, file_id))
+      end
+
+      def self.create(file_path)
+        FileUtils.touch(file_path)
+        new(file_path)
+      end
+
+      def initialize(file_path)
+        @file_path = file_path
+      end
+
+      def update!(content)
+        File.open(@file_path, "w") do |f|
+          f.write content
+        end
+      end
+    end
+  end
+end

data/app/models/plugin.rb

@@ -68,13 +68,11 @@ class Plugin
   end
 
   def summary
-    target_version = self.version || latest_version
-    JSON.parse(gem_versions).find {|ver| ver["number"] == target_version }.try(:[], "summary")
+    property("summary")
   end
 
   def authors
-    target_version = self.version || latest_version
-    JSON.parse(gem_versions).find {|ver| ver["number"] == target_version }.try(:[], "authors")
+    property("authors")
   end
 
   def inspect
@@ -110,11 +108,11 @@ class Plugin
   end
 
   def self.installing
-    processing.find_all{|data| data[:type] == :install }.map{|data| data[:plugin] }
+    processing_state(:install)
   end
 
   def self.uninstalling
-    processing.find_all{|data| data[:type] == :uninstall }.map{|data| data[:plugin] }
+    processing_state(:uninstall)
   end
 
   def gem_versions
@@ -137,6 +135,14 @@ class Plugin
   end
 
   private
+  def self.processing_state(state)
+    processing.find_all{|data| data[:type] == state }.map{ |data| data[:plugin] }
+  end
+
+  def property(prop)
+    target_version = self.version || latest_version
+    JSON.parse(gem_versions).find {|ver| ver["number"] == target_version }.try(:[], prop)
+  end
 
   def gem_install
     data = { plugin: self, state: :running, type: :install }

data/app/views/fluentd/settings/histories/_list.html.haml

@@ -1,6 +1,17 @@
-%ul
-  - @backup_files.each do |file|
-    %li
-      = link_to(file.name, daemon_setting_history_path(id: file.file_id))
-      %label= t('terms.backup_time')
-      = file.ctime.strftime(I18n.t 'time.formats.default')
+%table.table.table-hover.table-bordered
+  %thead
+    %tr
+      %th= t('terms.backup_file')
+      %th= t('terms.backup_time')
+      %th= t('terms.note')
+  %tbody
+    - @backup_files.each do |file|
+      %tr
+        %td= link_to(file.name, daemon_setting_history_path(id: file.file_id))
+        %td.datetime= file.ctime.strftime t('time.formats.default')
+        %td
+          = form_for :note, url: daemon_setting_note_path(id: file.note.file_id), method: :patch do |f|
+            .form-group.input-group
+              = f.text_field :content, value: file.note.content, class: "note-content form-control", id: nil
+              %span.input-group-btn
+                = submit_tag t('terms.save'), class: 'btn btn-default'

data/app/views/fluentd/settings/histories/show.html.haml

@@ -1,8 +1,18 @@
-- page_title t('.page_title', label: @fluentd.label) do
-  - link_to reuse_daemon_setting_history_path(id: @backup_file.file_id), method: 'post', class: "btn btn-primary pull-right" do
+- page_title t('.page_title', label: @fluentd.label)
+
+%p.pull-right
+  = link_to configtest_daemon_setting_history_path(id: @backup_file.file_id), method: "post", class: "btn btn-default" do
+    = icon('fa-legal')
+    = t("terms.configtest")
+  = link_to reuse_daemon_setting_history_path(id: @backup_file.file_id), method: 'post', class: "btn btn-primary" do
     = icon('fa-pencil')
     = t("terms.reuse")
 
+- if @backup_file.note.content.present?
+  .row
+    .col-xs-12
+      %p= @backup_file.note.content
+
 .row
   .col-xs-12
     %pre

data/app/views/fluentd/settings/running_backup/show.html.haml

@@ -1,6 +1,11 @@
-- page_title t('.page_title', label: @fluentd.label) do
-  - if @backup_file.content
-    - link_to reuse_daemon_setting_running_backup_path, method: 'post', class: "btn btn-primary pull-right" do
+- page_title t('.page_title', label: @fluentd.label)
+
+- if @backup_file.content
+  %p.pull-right
+    = link_to configtest_daemon_setting_running_backup_path, method: 'post', class: "btn btn-default" do
+      = icon('fa-legal')
+      = t("terms.configtest")
+    = link_to reuse_daemon_setting_running_backup_path, method: 'post', class: "btn btn-primary" do
       = icon('fa-pencil')
       = t("terms.reuse")
 

data/app/views/layouts/application.html.erb

@@ -46,7 +46,7 @@
 
         <div class="navbar-default navbar-static-side" role="navigation">
           <div class="sidebar-collapse">
-            <%= render partial: "shared/global_nav" %> 
+            <%= render partial: "shared/global_nav" %>
             <!-- /#side-menu -->
           </div>
           <!-- /.sidebar-collapse -->

data/app/views/plugins/updated.html.haml

@@ -5,25 +5,27 @@
 - else
   = form_tag(bulk_upgrade_plugins_path, method: :patch) do
     %table{class: "table table-striped table-hover"}
-      %tr
-        %th.col-xs-2= t('plugins.common.name')
-        %th.col-xs-2= t('plugins.common.authors')
-        %th.col-xs-6= t('plugins.common.summary')
-        %th.col-xs-1= t('plugins.common.installed_version')
-        %th.col-xs-1= t('plugins.common.latest_version')
-      - @plugins.each do |plugin|
+      %thead
         %tr
-          %td
-            = check_box_tag("plugins[]", plugin.gem_name, false, id: "plugin_#{plugin.gem_name}")
-            %label{for: "plugin_#{plugin.gem_name}"}
-              = plugin.gem_name
-          %td
-            = plugin.authors
-          %td
-            = plugin.summary
-          %td
-            = plugin.installed_version
-          %td
-            = plugin.latest_version
+          %th.col-xs-2= t('plugins.common.name')
+          %th.col-xs-2= t('plugins.common.authors')
+          %th.col-xs-6= t('plugins.common.summary')
+          %th.col-xs-1= t('plugins.common.installed_version')
+          %th.col-xs-1= t('plugins.common.latest_version')
+      %tbody
+        - @plugins.each do |plugin|
+          %tr
+            %td
+              = check_box_tag("plugins[]", plugin.gem_name, false, id: "plugin_#{plugin.gem_name}")
+              %label{for: "plugin_#{plugin.gem_name}"}
+                = plugin.gem_name
+            %td
+              = plugin.authors
+            %td
+              = plugin.summary
+            %td
+              = plugin.installed_version
+            %td
+              = plugin.latest_version
     = submit_tag t("terms.install_latest"), class: "btn btn-primary"
 

data/app/views/shared/_flash.html.haml

@@ -8,3 +8,6 @@
   - if flash[:info]
     %p.alert.alert-info
       =raw flash[:info]
+  - if flash[:danger]
+    %p.alert.alert-danger
+      =raw flash[:danger]

data/config/locales/translation_en.yml

@@ -12,6 +12,8 @@ en:
     fluentd_status_running: Running
     fluentd_status_stopped: Stopped
     config_successfully_copied: "Config has been copied successfully. Please restart %{brand} to use the new config"
+    note_updating_success: "Note successfully updated."
+    dryrun_is_passed: config test passed
 
   terms: &terms
     name: Name
@@ -59,8 +61,11 @@ en:
     notice_restart_for_config_edit: "NOTICE: running %{brand} will restart after update config"
     lines: Lines
     languages: Language
+    backup_file: Backup File
     backup_time: Backed up at
+    note: Note
     reuse: reuse
+    configtest: config test
 
   plugins:
     view_on_rubygems_org: View on rubygems.org