fluentd-ui 0.3.8 → 0.3.9

data/app/controllers/api_controller.rb

@@ -22,8 +22,12 @@ class ApiController < ApplicationController
     preview = RegexpPreview.new(params[:file], params[:format], regexp: params[:regexp], time_format: params[:time_format])
     matches = preview.matches
     render json: {
-      regexp: preview.regexp.try(:source),
-      time_format: preview.time_format,
+      params: {
+        setting: {
+          regexp: preview.regexp.try(:source),
+          time_format: preview.time_format,
+        }
+      },
       matches: matches.compact,
     }
   end

data/app/controllers/concerns/setting_concern.rb

@@ -16,14 +16,14 @@ module SettingConcern
   def finish
     @setting = target_class.new(setting_params)
     unless @setting.valid?
-      return render "show"
+      return render "shared/settings/show"
     end
 
     @fluentd.agent.config_append @setting.to_config
     if @fluentd.agent.running?
       unless @fluentd.agent.restart
         @setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
-        return render "show"
+        return render "shared/settings/show"
       end
     end
     redirect_to daemon_setting_path(@fluentd)

data/app/controllers/fluentd/settings_controller.rb

@@ -1,18 +1,33 @@
 class Fluentd::SettingsController < ApplicationController
   before_action :login_required
   before_action :find_fluentd
+  before_action :set_config, only: [:show, :edit, :update]
 
   def show
-    @config = @fluentd.agent.config
   end
 
   def edit
-    @config = @fluentd.agent.config
   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"
+  end
+
+  def source_and_output
+    # TODO: error handling if config file has invalid syntax
+    # @config = Fluentd::Setting::Config.new(@fluentd.config_file)
+  end
+
+  private
+
+  def set_config
+    @config = @fluentd.agent.config
   end
 end

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

@@ -0,0 +1,39 @@
+require 'fluent/config'
+
+class Fluentd
+  module Setting
+    class Config
+      attr_reader :fl_config, :file
+      delegate :elements, to: :fl_config
+
+      def initialize(config_file)
+        @fl_config = Fluent::Config.parse(IO.read(config_file), config_file, nil, true)
+        @file = config_file
+      end
+
+      def empty?
+        elements.length.zero?
+      end
+
+      def sources
+        elements.find_all do |elm|
+          elm.name == "source"
+        end
+      end
+
+      def matches
+        elements.find_all do |elm|
+          elm.name == "match"
+        end
+      end
+
+      def write_to_file
+        File.open(file, "w"){|f| f.write formatted }
+      end
+
+      def formatted
+        fl_config.to_s.gsub(/<\/?ROOT>/, "").strip_heredoc.gsub(%r|^</.*?>$|, "\\0\n")
+      end
+    end
+  end
+end

data/app/views/api/settings/_element.json.jbuilder

@@ -0,0 +1,6 @@
+json.id element_id(element)
+json.name element.name
+json.type element["type"]
+json.arg element.arg
+json.settings element
+json.content element.to_s

data/app/views/api/settings/index.json.jbuilder

@@ -0,0 +1,3 @@
+json.array! @config.elements do |elm|
+  json.partial! "api/settings/element", element: elm
+end

data/app/views/api/settings/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "api/settings/element", element: @section

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

@@ -1,5 +1,8 @@
 - page_title t('.page_title', label: @fluentd.label)
 
+- if @error
+  %pre.alert.alert-danger= @error
+
 = form_tag(daemon_setting_path(@fluentd), method: :patch) do
   .form-group
     = text_area_tag "config", @config, class: "form-control", rows: 40

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

@@ -1,7 +1,5 @@
 - page_title t('.page_title')
 
-%h2
-
 .row.fluentd-setting-inout
   .col-xs-4
     .panel.panel-default
@@ -47,3 +45,22 @@
           = link_to(daemon_setting_out_forward_path(@fluentd)) do
             = icon('fa-file-text-o fa-lg')
             = t("fluentd.common.setup_out_forward")
+
+= render "shared/vue/setting"
+
+#vue-setting.current-settings
+  %h2
+    = t('.current')
+    %span{"v-on" => "click: update", "v-if" => "!loading"}= icon('fa-refresh')
+    %span{"v-if" => "loading"}= icon('fa-spin fa-refresh')
+  .row
+    .col-xs-6.input
+      %h3= t('.in')
+      %div{"v-if" => "loaded && sections.sources.length == 0"}
+        %p.empty= t('.setting_empty')
+      %div{"v-repeat" => "sections.sources", "v-component" => "section"}
+    .col-xs-6.output
+      %h3= t('.out')
+      %div{"v-if" => "loaded && sections.matches.length == 0"}
+        %p.empty= t('.setting_empty')
+      %div{"v-repeat" => "sections.matches", "v-component" => "section"}

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

@@ -29,36 +29,7 @@
         <!-- /.navbar-header -->
 
         <ul class="nav navbar-top-links navbar-right">
-          <!-- vue.js -->
-          <li class="dropdown" id="alert">
-            <a
-              class="dropdown-toggle"
-              data-toggle="dropdown" href="#"
-              >
-              <i class="fa fa-bell fa-fw"></i>
-              <span class="badge" v-if="hasAlerts">{{ alertsCount }}</span>
-              <i class="fa fa-caret-down"></i>
-            </a>
-            <ul class="nav dropdown-menu dropdown-alerts">
-              <li v-if="!hasAlerts">
-                <a>
-                  <div class="nothing text text-success">
-                    <%= icon "fa-check" %>
-                    <%= t "terms.no_alert" %>
-                  </div>
-                </a>
-              </li>
-              <li v-repeat="alerts">
-                <a>
-                  <div>
-                    <%= icon("fa-cog fa-fw fa-lg fa-spin") %>
-                    {{ text }}
-                  </div>
-                </a>
-              </li>
-            </ul>
-          </li>
-          <!-- /vue.js -->
+          <%= render partial: "shared/vue/notification" %>
 
           <li class="dropdown">
             <%= link_to(t("terms.sign_out"), sessions_path, method: :delete) %>

data/app/views/shared/vue/_in_tail_format.html.erb

@@ -1,19 +1,4 @@
-<div id="in_tail_format" class="form-group"
-  formatOptions="<%= formats.to_json %>"
-  initialSelected="<%= initialSelected %>"
-  targetFile="<%= file %>"
-  paramsJson="<%= params.to_json %>"
-  >
-  <div class="form-group">
-    <label>
-      <input type="radio" v-model="formatType" value="bundled">bundled
-    </label>
-    <label>
-      <input type="radio" v-model="formatType" value="regexp">regexp
-    </label>
-  </div>
-
-  <div v-if="formatType == 'bundled'">
+<script type="text/template" id="format-bundle">
     <div class="form-group">
       <label>format</label>
       <select name="setting[format]" v-model="format">
@@ -22,28 +7,18 @@
     </div>
     <div class="form-group" v-repeat="options">
       <label>{{ $value }} </label>
-      <input type="text" name="setting[{{ $value }}]" v-model="{{ $value }}" size="100%" />
-      <span v-if="format == 'grok' && previewProcessing"><%= icon('fa-spin fa-refresh fa-lg') %></span>
-    </div>
-    <div v-if="format == 'grok'">
-      <pre v-if="highlightedLines">{{{ highlightedLines }}}</pre>
-      <div class="well well-sm">
-        <%= raw t('fluentd.settings.grok_manual') %>
-      </div>
+      <input type="text" name="setting[{{ $value }}]" v-model="params.setting[$value]" size="100%" />
     </div>
-  </div>
+</script>
 
-  <div v-if="formatType == 'regexp'">
-    <div class="form-group">
-      <label>regexp</label>
-      <input type="hidden" name="setting[format]" value="regexp" />
-      <input type="text" name="setting[regexp]" v-model="regexp" size="100%" />
-    </div>
-    <div class="form-group">
-      <label>time_format</label>
-      <input type="text" name="setting[time_format]" v-model="time_format" size="100%" />
-    </div>
-  </div>
+<div id="in_tail_format" class="form-group"
+  formatOptionsJson="<%= formats.to_json %>"
+  initialSelected="<%= initialSelected %>"
+  targetFile="<%= file %>"
+  paramsJson="<%= params.to_json %>"
+  >
+
+  <div v-component="format-bundle" wait-for="data-loaded"></div>
 
   <pre>{{{ highlightedLines }}}</pre>
 

data/app/views/shared/vue/_notification.html.erb

@@ -0,0 +1,31 @@
+<!-- vue.js -->
+<li class="dropdown" id="vue-notification">
+  <a
+    class="dropdown-toggle"
+    data-toggle="dropdown" href="#"
+    >
+    <i class="fa fa-bell fa-fw"></i>
+    <span class="badge" v-if="hasAlerts">{{ alertsCount }}</span>
+    <i class="fa fa-caret-down"></i>
+  </a>
+  <ul class="nav dropdown-menu dropdown-alerts">
+    <li v-if="!hasAlerts">
+      <a>
+        <div class="nothing text text-success">
+          <%= icon "fa-check" %>
+          <%= t "terms.no_alert" %>
+        </div>
+      </a>
+    </li>
+    <li v-repeat="alerts">
+      <a>
+        <div>
+          <%= icon("fa-cog fa-fw fa-lg fa-spin") %>
+          {{ text }}
+        </div>
+      </a>
+    </li>
+  </ul>
+</li>
+<!-- /vue.js -->
+

data/app/views/shared/vue/_setting.html.erb

@@ -0,0 +1,23 @@
+<script type="text/template" id="vue-setting-section">
+
+<div class='panel panel-default'>
+  <div class='panel-heading' data-toggle='collapse' href='#{{ id }}' title='{{ content }}'>
+    {{ type }}
+    <span v-if="name == 'match'">({{ arg }})</span>
+    <i class="fa fa-caret-down"></i>
+  </div>
+  <div class='panel-body collapse' id='{{ id }}'>
+    <pre v-if="mode != 'edit'">{{ content }}</pre>
+    <p v-if="mode == 'edit'">
+      <textarea class="form-control" v-model="editContent" v-attr="disabled: processing"></textarea>
+    </p>
+    <p class="pull-right">
+      <button v-if="mode != 'edit'" class="btn btn-default" v-on="click: onEdit"><%= t('terms.edit') %></button>
+      <button v-if="mode != 'edit'" class="btn btn-danger" v-on="click: onDelete"><%= t('terms.destroy') %></button>
+      <button v-if="mode == 'edit'" class="btn btn-default" v-on="click: onCancel"><%= t('terms.cancel') %></button>
+      <button v-if="mode == 'edit'" class="btn btn-primary" v-on="click: onSubmit"><%= t('terms.save') %></button>
+    </p>
+  </div>
+</div>
+
+</script>

data/app/views/shared/vue/_treeview.html.erb

@@ -2,8 +2,8 @@
 <% action ||= "" %>
 <% submit_button ||= "" %>
 <%= form_tag(action, method: :post) do %>
-  <div id="treeview">
-    <input type="text" size="48" v-model="path" disabled />
+  <div id="treeview" initialPath="/var/log">
+    <pre>{{ path }}</pre>
     <input type="hidden" name="<%= name %>" v-model="path" />
     <div class="dirs">
       <span v-repeat="currentDirs">

data/bower.json

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

data/config/application.rb

@@ -19,6 +19,7 @@ require "jquery-rails"
 require "sucker_punch"
 require "settingslogic"
 require "kramdown-haml"
+require "jbuilder"
 
 module FluentdUi
   class Application < Rails::Application

data/config/locales/translation_en.yml

@@ -31,8 +31,10 @@ en:
     no_alert: Nothing
     update_password: Update Password
     detail: Detail
+    cancel: Cancel
     create: Create
     update: Update & Restart
+    save: Save
     edit: Edit
     destroy: Destroy
     new: New
@@ -125,6 +127,8 @@ en:
         page_title: Add Source and Output
         in: Source
         out: Output
+        current: Current setting
+        setting_empty: Not exists
       show:
         page_title: Config File
         in_out_head: In/Out setting
@@ -132,38 +136,38 @@ en:
         page_title: Edit Config File
       out_forward:
         option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_forward" target="_blank">Forward output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_forward" target="_blank">Forward output plugin</a> documentation page.
         secondary_note: |
           All servers are unavailable, store data as a file to specified path.
         show:
           page_title: Add Output to another Fluentd
       out_s3:
         option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_s3" target="_blank">Amazon S3 output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_s3" target="_blank">Amazon S3 output plugin</a> documentation page.
         show:
           page_title: Add Output to Amazon S3
       out_td:
         option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_td" target="_blank">Treasure Data output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_td" target="_blank">Treasure Data output plugin</a> documentation page.
         show:
           page_title: Add Output to Treasure Data
       out_elasticsearch:
         option_guide: |
-          For each config parameter, pelase refer to the <a target="_blank" href="https://github.com/uken/fluent-plugin-elasticsearch">Elasticsearch output plugin</a>  documentation page.
+          For each config parameter, please refer to the <a target="_blank" href="https://github.com/uken/fluent-plugin-elasticsearch">Elasticsearch output plugin</a>  documentation page.
         show:
           page_title: Add Output to Elasticsearch
       out_mongo:
         option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/out_mongo" target="_blank">MongoDB output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/out_mongo" target="_blank">MongoDB output plugin</a> documentation page.
         show:
           page_title: Add Output to MongoDB
       in_syslog:
         option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/in_syslog" target="_blank">MongoDB output plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/in_syslog" target="_blank">MongoDB output plugin</a> documentation page.
         show:
           page_title: Add Input from Syslog Protocol
       in_tail_option_guide: |
-          For each config parameter, pelase refer to the <a href="http://docs.fluentd.org/articles/in_tail" target="_blank">Tail iutput plugin</a> documentation page.
+          For each config parameter, please refer to the <a href="http://docs.fluentd.org/articles/in_tail" target="_blank">Tail input plugin</a> documentation page.
       in_tail:
         notice_for_permission: "Please check permission or group setting for %{user} user can read it."
         restart_from_first: Restart from first

data/config/locales/translation_ja.yml

@@ -31,8 +31,10 @@ ja:
     no_alert: 通知なし
     update_password: パスワード更新
     detail: 詳細
+    cancel: キャンセル
     create: 作成
     update: 更新
+    save: 保存
     edit: 編集
     destroy: 削除
     new: 新規作成
@@ -124,6 +126,8 @@ ja:
         page_title: ソースと出力先の追加
         in: 入力
         out: 出力
+        current: 現在の設定
+        setting_empty: 設定されていません
       show:
         page_title: 設定ファイルの編集
       edit:

data/config/routes.rb

@@ -93,5 +93,7 @@ Rails.application.routes.draw do
     get "file_preview"
     post "regexp_preview"
     post "grok_to_regexp"
+
+    resources :settings, only: [:index, :show, :update, :destroy], defaults: { format: "json" }
   end
 end