fluentd-ui 0.3.13 → 0.3.14

data/ChangeLog

@@ -1,3 +1,12 @@
+Release 0.3.14 - 2015/02/04
+* [maintenance] #150, #151 minor fix in README.md.
+* [maintenance] #149 Make circle-ci result stable.
+* [maintenance] #147 Update gems.
+* [maintenance] #144 Ignore useless bower files
+* [fixed] #146 Fix to enable to too fast input in regex text box (#145 issue).
+* [improve] #152 Add dry-run to config edit.
+* [improve] #153 Show diff between current config and backup files.
+
 Release 0.3.13 - 2015/01/28
 * [improve] #143 Use CodeMirror for setting edit
 

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.13)
+    fluentd-ui (0.3.14)
       addressable
       bundler
+      diff-lcs
       draper (~> 1.3)
       fluentd (~> 0.10.56)
       font-awesome-rails
@@ -24,27 +25,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
+    actionpack (4.1.9)
+      actionview (= 4.1.9)
+      activesupport (= 4.1.9)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+    actionview (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+    activemodel (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
+    activerecord (4.1.9)
+      activemodel (= 4.1.9)
+      activesupport (= 4.1.9)
       arel (~> 5.0.0)
-    activesupport (4.1.8)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -59,7 +60,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.3)
+    capybara-screenshot (1.0.4)
       capybara (>= 1.0, < 3)
       colored
       launchy
@@ -68,12 +69,12 @@ GEM
     cliver (0.3.2)
     coderay (1.1.0)
     colored (1.2)
-    cool.io (1.2.4)
+    cool.io (1.3.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.2.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.22)
+    domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
     draper (1.4.0)
       actionpack (>= 3.0)
@@ -86,7 +87,7 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    fluentd (0.10.57)
+    fluentd (0.10.59)
       cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -95,7 +96,7 @@ GEM
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     haml (4.0.6)
       tilt
@@ -109,17 +110,17 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     httpclient (2.4.0)
-    i18n (0.6.11)
+    i18n (0.7.0)
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.2.5)
+    jbuilder (2.2.6)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     kramdown (1.5.0)
     kramdown-haml (0.0.3)
       haml
@@ -138,13 +139,13 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    msgpack (0.5.9)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    msgpack (0.5.10)
     multi_json (1.10.1)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
     poltergeist (1.5.1)
@@ -158,27 +159,27 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.10.2)
+    puma (2.11.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.1.9)
+      actionmailer (= 4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      activemodel (= 4.1.9)
+      activerecord (= 4.1.9)
+      activesupport (= 4.1.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
+      railties (= 4.1.9)
       sprockets-rails (~> 2.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+    railties (4.1.9)
+      actionpack (= 4.1.9)
+      activesupport (= 4.1.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.1)
+    rake (10.4.2)
     request_store (1.1.0)
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
@@ -188,7 +189,7 @@ GEM
     rspec-its (1.0.1)
       rspec-core (>= 2.99.0.beta1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (2.99.2)
+    rspec-mocks (2.99.3)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
@@ -218,7 +219,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -240,7 +241,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.1)

data/README.md

@@ -6,10 +6,10 @@
 
 fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
 
-* Install, uninstall, and upgrade fluentd plugins
+* Install, uninstall, and upgrade Fluentd plugins
 * start/stop/restart fluentd process
-* Configure fluentd settings such as config file content, pidfile path, etc
-* View fluentd log with simple error viewer
+* Configure Fluentd settings such as config file content, pid file path, etc
+* View Fluentd log with simple error viewer
 
 
 # Getting Started
@@ -24,7 +24,7 @@ The default account is username="admin" and password="changeme"
 
 ![fluentd-ui](./docs/screenshots/fluentd-ui.gif)
 
-## TO Ubuntu 14.04 user (installed ruby by apt-get)
+## To Ubuntu 14.04 user (installed ruby by apt-get)
 
 You also need to install these packages:
 

data/app/assets/javascripts/vue/in_tail_format.js

@@ -120,9 +120,12 @@
         },
 
         preview: function(){
+          if(this.previewAjax) {
+            this.previewAjax.abort();
+          }
           var self = this;
           new Promise(function(resolve, reject) {
-            $.ajax({
+            self.previewAjax = $.ajax({
               method: "POST",
               url: "/api/regexp_preview",
               data: {
@@ -137,7 +140,9 @@
             self.regexpMatches = result.matches;
             self.updateHighlightedLines();
           })["catch"](function(error){
-            console.error(error.stack);
+            if(error.stack) {
+              console.error(error.stack);
+            }
           });
         },
       }

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

@@ -169,3 +169,19 @@ label {
 .datetime {
   white-space: nowrap;
 }
+.diff {
+  .deleted {
+    background-color: #fdd;
+  }
+  .added {
+    background-color: #dfd;
+  }
+}
+
+.frame-corner-radius {
+  border: 1px solid #ddd;
+  padding:10px 10px;
+  border-radius: 3px;
+  margin: 10px 0px;
+}
+

data/app/controllers/concerns/setting_history_concern.rb

@@ -8,6 +8,12 @@ module SettingHistoryConcern
   end
 
   def show
+    current = @fluentd.agent.config
+    target = @backup_file.content
+    if target
+      @sdiff = Diff::LCS.sdiff(current.split("\n").map(&:rstrip), target.split("\n").map(&:rstrip))
+      @changed = @sdiff.any? { |context_change| context_change.changed? }
+    end
   end
 
   def reuse

data/app/controllers/fluentd/settings_controller.rb

@@ -17,14 +17,11 @@ class Fluentd::SettingsController < ApplicationController
   end
 
   def  update
-    Fluent::Config::V1Parser.parse(params[:config], @fluentd.config_file)
-    @fluentd.agent.config_write params[:config]
-    @fluentd.agent.restart if @fluentd.agent.running?
-    redirect_to daemon_setting_path(@fluentd)
-  rescue Fluent::ConfigParseError => e
-    @config = params[:config]
-    @error = e.message
-    render "edit"
+    if params[:dryrun]
+      handle_dryrun
+    else
+      handle_update
+    end
   end
 
   def source_and_output
@@ -37,4 +34,36 @@ class Fluentd::SettingsController < ApplicationController
   def set_config
     @config = @fluentd.agent.config
   end
+
+  def handle_dryrun
+    if dryrun(params[:config])
+      flash.now[:success] = I18n.t('messages.dryrun_is_passed')
+    else
+      flash.now[:danger] = @fluentd.agent.last_error_message
+    end
+    @config = params[:config]
+    render "edit"
+  end
+
+  def handle_update
+    update_config(params[:config])
+    redirect_to daemon_setting_path(@fluentd)
+  rescue Fluent::ConfigParseError => e
+    @config = params[:config]
+    flash.now[:danger] = e.message
+    render "edit"
+  end
+
+  def dryrun(conf)
+    tmpfile = Tempfile.open("fluentd-test-config")
+    tmpfile.write params[:config]
+    tmpfile.close
+    @fluentd.agent.dryrun(tmpfile.path)
+  end
+
+  def update_config(conf)
+    Fluent::Config::V1Parser.parse(conf, @fluentd.config_file)
+    @fluentd.agent.config_write conf
+    @fluentd.agent.restart if @fluentd.agent.running?
+  end
 end

data/app/models/fluent_gem.rb

@@ -17,9 +17,12 @@ module FluentGem
       #       but long living caching causes mismatch with actual status e.g. user install plugin from console (without fluentd-ui)
       #       So our decision is that cache `gem list` in 3 seconds
       Rails.cache.fetch(LIST_CACHE_KEY, expires_in: 3.seconds) do
-        output = `#{gem} list`
-        if $? && $?.exitstatus != 0 # NOTE: $? will be nil on CircleCI, so check $? at first
-          raise GemError, "failed command: `#{gem} list`"
+        last_status = $?
+        output = `#{gem} list 2>&1`
+        # https://github.com/fluent/fluentd-ui/pull/149#issuecomment-71954588
+        # Sometimes, $? wouldn't override with `#{gem} list` but I don't know why..
+        if $? && last_status != $? && $?.exitstatus != 0 # NOTE: $? will be nil on CircleCI, so check $? at first
+          raise GemError, "failed command: `#{gem} list` output: #{output}"
         end
         output.lines.to_a
       end

data/app/models/fluentd/agent.rb

@@ -23,5 +23,6 @@ class Fluentd
     #   td-agent: /etc/td-agent/td-agent.conf
     #   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.postinst#L69
     #   fluentd: /etc/fluent/fluent.conf (by fluentd -s)
+    class ConfigError < StandardError; end
   end
 end

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

@@ -45,6 +45,10 @@ class Fluentd
         errors
       end
 
+      def last_error_message
+        recent_errors(1).first.try(:[], :subject) || ""
+      end
+
       def pid_file
         extra_options[:pid_file] || self.class.default_options[:pid_file]
       end

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

@@ -42,10 +42,15 @@ class Fluentd
         actual_reload
       end
 
-      def dryrun
-        Bundler.with_clean_env do
-          system("fluentd -q --dry-run #{options_to_argv}")
-        end
+      def dryrun!(file_path = nil)
+        exec_dryrun("fluentd", file_path)
+      end
+
+      def config_syntax_check
+        Fluent::Config::V1Parser.parse(params[:config], config_file)
+        true
+      rescue Fluent::ConfigParseError
+        false
       end
 
       def version
@@ -56,15 +61,6 @@ class Fluentd
 
       private
 
-      def options_to_argv
-        argv = ""
-        argv << " --use-v1-config"
-        argv << " -c #{config_file}"
-        argv << " -d #{pid_file}"
-        argv << " -o #{log_file}"
-        argv
-      end
-
       def validate_fluentd_options
         dryrun
       end

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

@@ -73,8 +73,22 @@ class Fluentd
         backup_files_in_old_order.reverse
       end
 
+      def dryrun(file_path = nil)
+        dryrun!(file_path)
+        true
+      rescue ::Fluentd::Agent::ConfigError
+        false
+      end
+
       private
 
+      def exec_dryrun(command, file_path = nil)
+        Bundler.with_clean_env do
+          system("#{command} -q --dry-run #{options_to_argv(config_file: file_path)}", out: File::NULL, err: File::NULL)
+          raise ::Fluentd::Agent::ConfigError, last_error_message unless $?.exitstatus.zero?
+        end
+      end
+
       def backup_config
         return unless File.exists? config_file
 
@@ -173,6 +187,15 @@ class Fluentd
         thread.join
         thread.value.exitstatus.zero?
       end
+
+      def options_to_argv(opts = {})
+        argv = ""
+        argv << " --use-v1-config"
+        argv << " -c #{opts[:config_file] || config_file}"
+        argv << " -d #{opts[:pid_file] || pid_file}"
+        argv << " -o #{opts[:log_file] || log_file}"
+        argv
+      end
     end
   end
 end