fluentd-ui 0.4.5 → 1.0.0.alpha.1

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

@@ -1,18 +1,22 @@
 # pidfile
 #   td-agent: /var/run/td-agent/td-agent.pid
-#   - https://github.com/treasure-data/td-agent/blob/master/td-agent.logrotate#L10
-#   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L25
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/systemd/td-agent.service.erb#L18
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/init.d/deb/td-agent#L24
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/init.d/rpm/td-agent#L24
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/td-agent/logrotate.d/td-agent.logrotate#L10
 #   fluentd:  nothing (or --daemon PIDFILE)
 #
 # logfile
 #   td-agent: /var/log/td-agent/td-agent.log
-#   - https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L28
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/systemd/td-agent.service.erb#L21
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/init.d/deb/td-agent#L23
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/init.d/rpm/td-agent#L23
 #   fluentd: stdout (or --log LOGFILE)
 #
 # config file
 #   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)
+#   - https://github.com/treasure-data/omnibus-td-agent/blob/master/templates/etc/systemd/td-agent.service.erb#L14
+#   fluentd: /etc/fluent/fluent.conf (created by fluentd -s)
 
 class Fluentd
   class Agent
@@ -20,7 +24,7 @@ class Fluentd
       attr_reader :extra_options
 
       def self.included(base)
-        base.send(:include, Fluentd::Agent::ProcessOperation)
+        base.include(Fluentd::Agent::ProcessOperation)
       end
 
       # define these methods on each Agent class

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

@@ -36,7 +36,7 @@ class Fluentd
         end
       end
 
-      def reload # NOTE: does not used currently, and td-agent has no reload command
+      def reload
         return false unless running?
         actual_reload
       end
@@ -96,8 +96,7 @@ class Fluentd
           true
         rescue Errno::ESRCH
           # successful to create pidfile, but process not exists.
-          # any error occured at booting process that after create pidfile. such as readling config, loading plugins, etc
-          # https://github.com/fluent/fluentd/blob/master/lib/fluent/supervisor.rb#L106
+          # any error occured at booting process that after create pidfile. such as reading config, loading plugins, etc
           false
         rescue TimeoutError
           false

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

@@ -4,18 +4,20 @@ class Fluentd
       module Unix
         def start
           backup_running_config do
-            detached_command('/etc/init.d/td-agent start')
+            detached_command("systemctl start td-agent.service")
           end
         end
 
         def stop
-          detached_command('/etc/init.d/td-agent stop')
+          detached_command("systemctl stop td-agent.service")
         end
 
         def restart
-          # NOTE: td-agent has no reload command
-          # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
-          detached_command('/etc/init.d/td-agent restart')
+          detached_command("systemctl restart td-agent.service")
+        end
+
+        def reload
+          detached_command("systemctl reload td-agent.service")
         end
       end
     end

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

@@ -101,7 +101,7 @@ class Fluentd
 
       def to_conf
         # NOTE: Using strip_heredoc makes more complex for format_specific_conf indent
-        <<-XML.gsub(/^[ ]*\n/m, "")
+        <<-CONFIG.gsub(/^[ ]*\n/m, "")
 <source>
   type tail
   path #{path}
@@ -114,7 +114,7 @@ class Fluentd
   #{rotate_wait.present? ? "rotate_wait #{rotate_wait}" : ""}
   #{refresh_interval.present? ? "refresh_interval #{refresh_interval}" : ""}
 </source>
-        XML
+        CONFIG
       end
     end
   end

data/app/views/fluentd/_form.html.haml

@@ -1,4 +1,4 @@
-.col-xs-6
+.col-xl-6
   - @fluentd.errors.full_messages.each do |e|
     .alert.alert-danger= e
 

data/app/views/fluentd/errors.html.haml

@@ -1,19 +1,18 @@
 - page_title t('fluentd.common.recent_errors', days: @error_duration_days) do
-  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary pull-right" do
+  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary float-right mt-3" do
     = icon('fa-download')
     = t('fluentd.common.raw_log_link')
 
 .row
-  .col-xs-12
+  .col-xl-12.col-sm-12
     - @errors.each do |error|
-      .panel.panel-default
-        .panel-heading
+      .card.card-primary
+        .card-heading
           %h4= error[:subject]
         - if error[:notes].present?
-          .panel-body
+          .card-body
             %ul
               - error[:notes].each do |stack|
                 %li= stack
     - if @errors.empty?
       %p= t('.error_is_empty')
-

data/app/views/fluentd/log.html.haml

@@ -1,9 +1,8 @@
 - page_title t('.page_title', label: @fluentd.label) do
-  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary pull-right" do
+  - link_to raw_log_daemon_path(@fluentd), class: "btn btn-primary float-right mt-3" do
     = icon('fa-download')
     = t('fluentd.common.raw_log_link')
 
-.row
-  .col-xs-12
-    = preserve do # partial containing <pre>, so shouldn't break indent
-      = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }
+.row.ml-3
+  = preserve do # partial containing <pre>, so shouldn't break indent
+    = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }

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

@@ -1,8 +1,9 @@
 - page_title t('.page_title', label: @fluentd.label)
+- add_javascript_pack_tag("codemirror")
 
 = form_tag(daemon_setting_path(@fluentd), method: :patch) do
   .form-group
     = text_area_tag "config", @config, class: "form-control js-fluentd-config-editor", rows: 40
   %p.text.text-danger= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)
   = submit_tag t("terms.update"), class: "btn btn-primary"
-  = submit_tag t("terms.configtest"), class: "btn btn-default", name: "dryrun"
+  = submit_tag t("terms.configtest"), class: "btn btn-secondary", name: "dryrun"

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

@@ -14,4 +14,4 @@
             .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'
+                = submit_tag t('terms.save'), class: 'btn btn-info'

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

@@ -1,7 +1,7 @@
 - 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
+%p.float-right
+  = link_to configtest_daemon_setting_history_path(id: @backup_file.file_id), method: "post", class: "btn btn-secondary" 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
@@ -10,22 +10,22 @@
 
 - if @backup_file.note.content.present?
   .row
-    .col-xs-12
+    .col-xl-12
       %p= @backup_file.note.content
 
 .row
-  .col-xs-12
+  .col-xl-12
     %h2
       ="#{t('.target_config')}(#{params[:id]})"
     %pre
       = preserve do
         = @backup_file.content
 
-  .col-xs-12.diff
+  .col-xl-12.diff
     %h2
       Diff:
     %div
       = t(".diff_description", file_name: params[:id] )
-      .pull-right
+      .float-right
         = link_to t(".show_current"), daemon_setting_path(@fluentd)
     = preserve render "/shared/settings/diff"

data/app/views/fluentd/settings/in_tail/after_file_choose.html.haml

@@ -12,8 +12,9 @@
     = f.text_field :path, class: "form-control", disabled: true
   = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.format || @setting.guess_format }
 
-  %pre= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n")
+  .card
+    %pre.card-body= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n")
 
   %p
-    = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right"
-    = link_to t('terms.prev'), daemon_setting_in_tail_path(@fluentd), class: "btn btn-lg btn-default"
+    = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right"
+    = link_to t('terms.prev'), daemon_setting_in_tail_path(@fluentd), class: "btn btn-lg btn-secondary"

data/app/views/fluentd/settings/in_tail/after_format.html.haml

@@ -6,5 +6,5 @@
   = render partial: "form", locals: { f: f }
 
   %p
-    = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right"
-    = f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back"
+    = f.submit t('terms.next'), class: "btn btn-lg btn-primary float-right"
+    = f.submit t('terms.prev'), class: "btn btn-lg btn-secondary", name: "back"

data/app/views/fluentd/settings/in_tail/confirm.html.haml

@@ -8,6 +8,6 @@
   %pre= @setting.to_conf
 
   %p
-    = f.submit t('fluentd.common.finish')   , class: "btn btn-lg btn-primary pull-right"
-    = f.submit t('terms.prev'),   class: "btn btn-lg btn-default", name: "back"
-    .clearfix.pull-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)
+    = f.submit t('fluentd.common.finish')   , class: "btn btn-lg btn-primary float-right"
+    = f.submit t('terms.prev'),   class: "btn btn-lg btn-secondary", name: "back"
+    .clearfix.float-right= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)

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

@@ -1,8 +1,8 @@
 - 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
+  %p.float-right
+    = link_to configtest_daemon_setting_running_backup_path, method: 'post', class: "btn btn-secondary" do
       = icon('fa-legal')
       = t("terms.configtest")
     = link_to reuse_daemon_setting_running_backup_path, method: 'post', class: "btn btn-primary" do
@@ -10,7 +10,7 @@
       = t("terms.reuse")
 
 .row
-  .col-xs-12
+  .col-xl-12
     - if @backup_file.content
       %h2
         = t('.page_title')
@@ -21,11 +21,11 @@
       %p
         =t('fluentd.common.never_started_yet', brand: fluentd_ui_brand)
   - if @backup_file.content
-    .col-xs-12.diff
+    .col-xl-12.diff
       %h2
         Diff:
       %div
         = t(".diff_description")
-        .pull-right
+        .float-right
           = link_to t(".show_current"), daemon_setting_path(@fluentd)
       = preserve render "/shared/settings/diff"

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

@@ -1,23 +1,23 @@
 - page_title t('.page_title') do
-  - link_to edit_daemon_setting_path(@fluentd), class: "btn btn-primary pull-right" do
+  - link_to edit_daemon_setting_path(@fluentd), class: "btn btn-primary float-right mt-3" do
     = icon('fa-pencil')
     = t("terms.edit")
 
-.row
-  .col-xs-12
-    %pre
+.row.mb-3
+  .card.col-xl-12.bg-light.ml-3
+    %pre.card-body
       = preserve do
         = @config
 
-.row
-  .col-xs-12
+.row.mb-3
+  .col-xl-12
     %h3= link_to(t('fluentd.settings.running_backup.title'), daemon_setting_running_backup_path)
     %p
       %label= t('terms.backup_time')
       = @running_backedup_file.ctime.try(:strftime, I18n.t('time.formats.default')) || t('fluentd.common.never_started_yet', brand: fluentd_ui_brand)
 
 .row
-  .col-xs-12
+  .col-xl-12
     %h3= t('fluentd.settings.history')
     = render '/fluentd/settings/histories/list'
     .link= link_to t('.link_to_histories'), daemon_setting_histories_path

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

@@ -1,27 +1,28 @@
+- add_javascript_pack_tag("settings")
 - page_title t('.page_title')
 
 .row.fluentd-setting-inout
-  .col-xs-4
-    .panel.panel-default
-      .panel-heading
+  .col-xl-4
+    .card.card-primary
+      .card-header
         %h4= t('.in')
-      .panel-body
+      .card-body
         - %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
+  .col-xl-1.arrow-right
     = icon "fa-arrow-circle-right"
-  .col-xs-2
+  .col-xl-2
     = image_tag "/fluentd-logo.png", style: "max-width: 100%"
-  .col-xs-1.arrow-right
+  .col-xl-1.arrow-right
     = icon "fa-arrow-circle-right"
-  .col-xs-4
-    .panel.panel-default
-      .panel-heading
+  .col-xl-4
+    .card.card-primary
+      .card-header
         %h4= t('.out')
-      .panel-body
+      .card-body
         - %w|stdout td s3 mongo elasticsearch forward|.each do |type|
           %p
             = link_to(send("daemon_setting_out_#{type}_path", @fluentd)) do
@@ -33,17 +34,29 @@
 #vue-setting.current-settings
   %h2
     = t('.current')
-    .pull-right
-      %button.btn.btn-default.btn-sm{"v-on" => "click: update", "v-if" => "!loading"}= icon('fa-refresh')
-      %button.btn.btn-default.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh')
+    .float-right
+      %button.btn.btn-outline-dark.btn-sm{"v-on:click" => "update", "v-if" => "!loading"}= icon('fa-refresh')
+      %button.btn.btn-outline-dark.btn-sm{"v-if" => "loading"}= icon('fa-spin fa-refresh')
   .row
-    .col-xs-6.input
+    .col-xl-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
+      %setting-section{"v-if" => "loaded && sections.sources.length > 0",
+                       "v-for" => "source in sections.sources",
+                       "v-bind:id" => "source.id",
+                       "v-bind:content" => "source.content",
+                       "v-bind:type" => "source.type",
+                       "v-bind:name" => "source.name",
+                       "v-bind:arg" => "source.arg"}
+    .col-xl-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"}
+      %setting-section{"v-if" => "loaded && sections.matches.length > 0",
+                       "v-for" => "match in sections.matches",
+                       "v-bind:id" => "match.id",
+                       "v-bind:content" => "match.content",
+                       "v-bind:type" => "match.type",
+                       "v-bind:name" => "match.name",
+                       "v-bind:arg" => "match.arg"}

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

@@ -1,9 +1,9 @@
 - if @fluentd.present?
   - page_title t('.page_title')
   .row
-    .col-xs-6
-      %div{class: "panel panel-#{@fluentd.agent.running? ? "success":"default"}"}
-        .panel-heading
+    .col-xl-6.col-sm-6
+      %div{class: "card card-#{@fluentd.agent.running? ? "primary":"secondary"}"}
+        .card-header
           %h4
             - if @fluentd.agent.running?
               = icon("fa-play")
@@ -11,17 +11,18 @@
             - else
               = icon("fa-pause")
               = t("fluentd.common.stopped")
-        .panel-body
+        .card-body
           - if flash[:error]
             .alert.alert-danger= flash[:error]
-          = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd),     method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-default" : "btn-primary"}"
-          = link_to icon("fa-pause") << t("fluentd.common.stop"), stop_daemon_agent_path(@fluentd),       method: :put, class: "btn #{@fluentd.agent.running? ? "btn-danger" : "disabled btn-default"}"
-          = link_to icon("fa-refresh") << t("fluentd.common.restart"), restart_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-warning" : "disabled btn-default"}"
-    .col-xs-6
-      .panel.panel-default
-        .panel-heading
-          .pull-right
-            = link_to t('terms.edit'), edit_daemon_path, class: "btn btn-default"
+          = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd),     method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-outline-dark" : "btn-primary"}"
+          = link_to icon("fa-pause") << t("fluentd.common.stop"), stop_daemon_agent_path(@fluentd),       method: :put, class: "btn #{@fluentd.agent.running? ? "btn-danger" : "disabled btn-outline-dark"}"
+          = link_to icon("fa-refresh") << t("fluentd.common.restart"), restart_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-warning" : "disabled btn-outline-dark"}"
+          = link_to icon("fa-refresh") << t("fluentd.common.reload"), reload_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-info" : "disabled btn-default"}"
+    .col-xl-6.col-sm-6
+      .card.card-default
+        .card-header
+          .float-right
+            = link_to t('terms.edit'), edit_daemon_path, class: "btn btn-info"
             = link_to t('terms.destroy'), "#", class: "btn btn-danger", data: { toggle: "modal", target: "#setting-destroy-modal" }
           %h4= t('fluentd.common.fluentd_info')
           .modal.fade{id: "setting-destroy-modal"}
@@ -36,11 +37,11 @@
                   = raw t('fluentd.common.destroy_fluentd_setting_warning', brand: fluentd_ui_brand)
                 .modal-footer
                   = form_tag(daemon_path(@fluentd), method: :delete) do
-                    %button.btn.btn-default{"data-dismiss" => "modal"}
+                    %button.btn.btn-secondary{"data-dismiss" => "modal"}
                       Close
                     = submit_tag t('terms.destroy'), class: "btn btn-danger"
 
-        %table.table.table-hover
+        %table.table.table-hover.mb-0
           %tbody
             %tr
               %th= @fluentd.class.human_attribute_name(:pid_file)
@@ -52,7 +53,7 @@
               %th= @fluentd.class.human_attribute_name(:config_file)
               %td= @fluentd.agent.config_file
   .row
-    .col-xs-12
+    .col-xl-12
       = preserve do # partial containing <pre>, so shouldn't break indent
         = render partial: "shared/vue/fluent_log", locals: { fluentd: @fluentd }