fluentd-ui 0.3.9 → 0.3.10

data/ChangeLog

@@ -1,3 +1,8 @@
+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

@@ -16,9 +16,11 @@ group :development do
 end
 
 group :test do
+  gem "rspec-its"
   gem "factory_girl_rails"
   gem "database_cleaner", "~> 1.2.0"
   gem "capybara", "~> 2.2.1"
+  gem "capybara-screenshot"
   gem "simplecov", "~> 0.7.1", require: false
   gem "webmock", "~> 1.18.0"
   gem "timecop"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.9)
+    fluentd-ui (0.3.10)
       addressable
       bundler
       draper (~> 1.3)
@@ -24,27 +24,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.7)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -59,10 +59,15 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    capybara-screenshot (1.0.3)
+      capybara (>= 1.0, < 3)
+      colored
+      launchy
     celluloid (0.15.2)
       timers (~> 1.1.0)
     cliver (0.3.2)
     coderay (1.1.0)
+    colored (1.2)
     cool.io (1.2.4)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -92,7 +97,7 @@ GEM
       yajl-ruby (~> 1.0)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
     haml-rails (0.5.3)
       actionpack (>= 4.0.1)
@@ -108,7 +113,7 @@ GEM
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.2.4)
+    jbuilder (2.2.5)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
@@ -118,6 +123,8 @@ GEM
     kramdown (1.5.0)
     kramdown-haml (0.0.3)
       haml
+    launchy (2.4.3)
+      addressable (~> 2.3)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mechanize (2.7.3)
@@ -131,14 +138,14 @@ GEM
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
     msgpack (0.5.9)
     multi_json (1.10.1)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
@@ -151,33 +158,36 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.9.2)
+    puma (2.10.2)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.1)
     request_store (1.1.0)
-    rspec-collection_matchers (1.0.0)
+    rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-its (1.0.1)
+      rspec-core (>= 2.99.0.beta1)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-mocks (2.99.2)
     rspec-rails (2.99.0)
       actionpack (>= 3.0)
@@ -191,10 +201,10 @@ GEM
     rubyzip (1.1.6)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (4.0.4)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     settingslogic (2.0.9)
     sigdump (0.2.2)
@@ -203,12 +213,12 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.6.0)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -230,7 +240,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
-    websocket-driver (0.3.5)
+    websocket-driver (0.4.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.1)
@@ -240,6 +250,7 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (~> 2.2.1)
+  capybara-screenshot
   database_cleaner (~> 1.2.0)
   factory_girl_rails
   fluentd-ui!
@@ -248,6 +259,7 @@ DEPENDENCIES
   pry
   pry-rails
   rake
+  rspec-its
   rspec-rails (~> 2.99)
   simplecov (~> 0.7.1)
   timecop

data/README.md

@@ -11,6 +11,7 @@ fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http
 * Configure fluentd settings such as config file content, pidfile path, etc
 * View fluentd log with simple error viewer
 
+
 # Getting Started
 
 ```console
@@ -21,6 +22,8 @@ $ fluentd-ui start
 Open `http://localhost:9292/` by your browser.<br />
 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)
 
 You also need to install these packages:
@@ -57,7 +60,24 @@ fluentd-ui has the same tasks of `bundle gem foobar; cd foobar; rake -T`.
 
 # Screenshots
 
-(v0.1.0)
+(v0.3.9)
+
+## Dashboard
+
+![dashboard](./docs/screenshots/dashboard.gif)
+
+## Setting
+
+![setting](./docs/screenshots/setting.gif)
+
+### in_tail setting
+
+![in_tail](./docs/screenshots/in_tail.gif)
+
+## Plugin
+
+![plugin](./docs/screenshots/plugin.gif)
+
 
 ![ss01](./docs/screenshots/01.png)
 ![ss02](./docs/screenshots/02.png)

data/app/assets/javascripts/enable_bootstrap_tooltip.js

@@ -0,0 +1,3 @@
+$(function(){
+  $('[data-toggle="tooltip"]').tooltip();
+});

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

@@ -24,7 +24,7 @@
             timer = setInterval(function(){
               self.fetchLogs();
               var $log = $(".log", self.$el);
-              $log.scrollTop($log[0].scrollHeight);
+              $log.scrollTop($log.innerHeight());
             }, 1000);
           } else {
             clearInterval(timer);

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

@@ -156,3 +156,12 @@ label {
   min-height: 12em;
   resize: both;
 }
+
+.fluentd-status {
+  .running {
+    color: #090;
+  }
+  .stopped {
+    color: #999;
+  }
+}

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

@@ -0,0 +1,9 @@
+class Fluentd::Settings::InForwardController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::InForward
+  end
+end

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

@@ -0,0 +1,9 @@
+class Fluentd::Settings::InHttpController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::InHttp
+  end
+end

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

@@ -0,0 +1,9 @@
+class Fluentd::Settings::InMonitorAgentController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::InMonitorAgent
+  end
+end

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

@@ -0,0 +1,9 @@
+class Fluentd::Settings::OutStdoutController < ApplicationController
+  include SettingConcern
+
+  private
+
+  def target_class
+    Fluentd::Setting::OutStdout
+  end
+end

data/app/controllers/fluentd/settings_controller.rb

@@ -1,3 +1,5 @@
+require "fluent/config/v1_parser"
+
 class Fluentd::SettingsController < ApplicationController
   before_action :login_required
   before_action :find_fluentd

data/app/helpers/application_helper.rb

@@ -9,6 +9,16 @@ module ApplicationHelper
     image_tag(ENV["FLUENTD_UI_LOGO"] || "/fluentd-logo-right-text.png")
   end
 
+  def fluentd_status_icon
+    return unless Fluentd.instance
+    Fluentd.instance.agent.running? ? icon('fa-circle running') : icon('fa-circle stopped')
+  end
+
+  def fluentd_status_message
+    return unless Fluentd.instance
+    Fluentd.instance.agent.running? ? I18n.t('messages.fluentd_status_running') : I18n.t('messages.fluentd_status_stopped')
+  end
+
   def language_name(locale)
     # NOTE: these are fixed terms, not i18n-ed
     {

data/app/models/fluent_gem.rb

@@ -18,7 +18,7 @@ module FluentGem
       #       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`
-        unless $?.exitstatus.zero?
+        if $? && $?.exitstatus != 0 # NOTE: $? will be nil on CircleCI, so check $? at first
           raise GemError, "failed command: `#{gem} list`"
         end
         output.lines

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

@@ -53,13 +53,14 @@ class Fluentd
         end
       end
 
-      private
-
       def pid
         return unless File.exists?(pid_file)
+        return if File.zero?(pid_file)
         File.read(pid_file).to_i rescue nil
       end
 
+      private
+
       def logged_errors(&block)
         return [] unless File.exist?(log_file)
         buf = []

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

@@ -0,0 +1,44 @@
+class Fluentd
+  module Setting
+    class InForward
+      include ActiveModel::Model
+      include Common
+
+      KEYS = [
+        :bind, :port, :linger_timeout, :chunk_size_limit, :chunk_size_warn_limit, :log_level
+      ].freeze
+
+      attr_accessor(*KEYS)
+
+      validates :bind, presence: true
+      validates :port, presence: true
+
+      def self.initial_params
+        {
+          bind: "0.0.0.0",
+          port: 24224,
+          linger_timeout: 0,
+          chunk_size_limit: nil,
+          chunk_size_warn_limit: nil,
+          log_level: "info",
+        }
+      end
+
+      def common_options
+        [
+          :bind, :port
+        ]
+      end
+
+      def advanced_options
+        [
+          :linger_timeout, :chunk_size_limit, :chunk_size_warn_limit, :log_level
+        ]
+      end
+
+      def plugin_name
+        "forward"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+class Fluentd
+  module Setting
+    class InHttp
+      include ActiveModel::Model
+      include Common
+
+      KEYS = [
+        :bind, :port, :body_size_limit, :keepalive_timeout, :add_http_headers, :format, :log_level
+      ].freeze
+
+      attr_accessor(*KEYS)
+
+      validates :bind, presence: true
+      validates :port, presence: true
+
+      def self.initial_params
+        {
+          bind: "0.0.0.0",
+          port: 8888,
+          body_size_limit: "32m",
+          keepalive_timeout: "10s",
+          add_http_headers: false,
+          format: "default",
+          log_level: "info",
+        }
+      end
+
+      def common_options
+        [
+          :bind, :port
+        ]
+      end
+
+      def advanced_options
+        [
+          :body_size_limit, :keepalive_timeout, :add_http_headers, :format, :log_level
+        ]
+      end
+
+      def plugin_name
+        "http"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+class Fluentd
+  module Setting
+    class InMonitorAgent
+      include ActiveModel::Model
+      include Common
+
+      KEYS = [
+        :bind, :port
+      ].freeze
+
+      attr_accessor(*KEYS)
+
+      validates :bind, presence: true
+      validates :port, presence: true
+
+      def self.initial_params
+        {
+          bind: "0.0.0.0",
+          port: 24220,
+        }
+      end
+
+      def common_options
+        [
+          :bind, :port
+        ]
+      end
+
+      def advanced_options
+        []
+      end
+
+      def plugin_name
+        "monitor_agent"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+class Fluentd
+  module Setting
+    class OutStdout
+      include Common
+
+      KEYS = [:match, :output_type].freeze
+
+      attr_accessor(*KEYS)
+
+      choice :output_type, %w(json hash)
+
+      validates :match, presence: true
+      validates :output_type, inclusion: { in: %w(json hash) }
+
+      def self.initial_params
+        {
+          match: "debug.**",
+          output_type: "json",
+        }
+      end
+
+      def common_options
+        [
+          :match, :output_type
+        ]
+      end
+
+      def advanced_options
+        []
+      end
+
+      def plugin_name
+        "stdout"
+      end
+    end
+  end
+end

data/app/views/fluentd/settings/source_and_output.html.haml

@@ -6,14 +6,11 @@
       .panel-heading
         %h4= t('.in')
       .panel-body
-        %p
-          = link_to(daemon_setting_in_tail_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_in_tail")
-        %p
-          = link_to(daemon_setting_in_syslog_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_in_syslog")
+        - %w|tail syslog monitor_agent http forward|.each do |type|
+          %p
+            = link_to(send("daemon_setting_in_#{type}_path", @fluentd)) do
+              = icon('fa-file-text-o fa-lg')
+              = t("fluentd.common.setup_in_#{type}")
   .col-xs-1.arrow-right
     = icon "fa-arrow-circle-right"
   .col-xs-2
@@ -25,26 +22,11 @@
       .panel-heading
         %h4= t('.out')
       .panel-body
-        %p
-          = link_to(daemon_setting_out_td_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_out_td")
-        %p
-          = link_to(daemon_setting_out_s3_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_out_s3")
-        %p
-          = link_to(daemon_setting_out_mongo_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_out_mongo")
-        %p
-          = link_to(daemon_setting_out_elasticsearch_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_out_elasticsearch")
-        %p
-          = link_to(daemon_setting_out_forward_path(@fluentd)) do
-            = icon('fa-file-text-o fa-lg')
-            = t("fluentd.common.setup_out_forward")
+        - %w|stdout td s3 mongo elasticsearch forward|.each do |type|
+          %p
+            = link_to(send("daemon_setting_out_#{type}_path", @fluentd)) do
+              = icon('fa-file-text-o fa-lg')
+              = t("fluentd.common.setup_out_#{type}")
 
 = render "shared/vue/setting"
 

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

@@ -29,6 +29,13 @@
         <!-- /.navbar-header -->
 
         <ul class="nav navbar-top-links navbar-right">
+          <% if @fluentd %>
+          <li class="fluentd-status">
+            <a href="<%= daemon_path %>" data-toggle="tooltip" data-placement="bottom" title="fluentd <%= fluentd_status_message %>">
+              <%= fluentd_status_icon %>
+            </a>
+          </li>
+          <% end %>
           <%= render partial: "shared/vue/notification" %>
 
           <li class="dropdown">

data/bower.json

@@ -2,7 +2,7 @@
   "name": "fluentd-ui",
   "dependencies": {
     "es6-promise": "~1.0.0",
-    "vue": "~0.11.1",
+    "vue": "~0.11.2",
     "lodash": "~2.4.0"
   },
   "devDependencies": {