Merge pull request #259 from fluent/customize-header

Add note to Fluentd model
fluent · Aug 17, 2018 · ff7bff0 · ff7bff0
2 parents 2423f65 + c7182e0
commit ff7bff0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 4 deletions.
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
@@ -161,6 +161,16 @@ label {
   resize: both;
 }
 
+.fluentd-note {
+  display: block;
+  padding: 0.5em 1rem;
+  color: #999;
+}
+
+.fluentd-note:hover {
+  color: #495057;
+}
+
 .fluentd-status {
   .running {
     color: #090;
@@ -188,4 +198,3 @@ label {
   border-radius: 3px;
   margin: 10px 0px;
 }
-
diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb
@@ -29,7 +29,7 @@ def update
     end
     redirect_to daemon_path
   end
-  
+
   def destroy
     @fluentd.agent.stop if @fluentd.agent.running?
     @fluentd.destroy
@@ -51,7 +51,7 @@ def raw_log
   private
 
   def fluentd_params
-    params.require(:fluentd).permit(:log_file, :pid_file, :config_file, :variant, :api_endpoint)
+    params.require(:fluentd).permit(:log_file, :pid_file, :config_file, :note, :variant, :api_endpoint)
   end
 
   def check_fluentd_exists

diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb
@@ -10,7 +10,7 @@ class Fluentd
 
   before_validation :expand_paths
 
-  COLUMNS = [:id, :variant, :log_file, :pid_file, :config_file]
+  COLUMNS = [:id, :variant, :log_file, :pid_file, :config_file, :note]
   DEFAULT_CONF = <<-CONF.strip_heredoc
     <source>
       # http://docs.fluentd.org/articles/in_forward

diff --git a/app/views/fluentd/_form.html.haml b/app/views/fluentd/_form.html.haml
@@ -28,4 +28,7 @@
         = f.hidden_field :config_file
       - else
         = f.text_field :config_file, class: "form-control"
+    .form-group
+      = f.label :note
+      = f.text_field :note, class: "form-control"
     = f.submit btn, class: "btn btn-primary"
diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml
@@ -52,6 +52,9 @@
             %tr
               %th= @fluentd.class.human_attribute_name(:config_file)
               %td= @fluentd.agent.config_file
+            %tr
+              %th= @fluentd.class.human_attribute_name(:note)
+              %td= @fluentd.note
   .row
     .col-xl-12
       = preserve do # partial containing <pre>, so shouldn't break indent

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -30,6 +30,9 @@
         <%= render partial: "shared/global_nav" %>
         <ul class="navbar-nav ml-auto">
           <%- if @fluentd %>
+            <li class="nav-item fluentd-note">
+              <%= @fluentd.note %>
+            </li>
             <li class="nav-item fluentd-status">
               <a class="nav-link" href="<%= daemon_path %>" data-toggle="tooltip" data-placement="bottom" title="fluentd <%= fluentd_status_message %>">
                 <%= fluentd_status_icon %>

diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml
@@ -284,6 +284,7 @@ en:
         log_file: Log file
         pid_file: PID file
         config_file: Config file
+        note: Note
         variant: type
         api_endpoint: API Endpoint
 

diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml
@@ -290,6 +290,7 @@ ja:
         log_file: ログファイル
         pid_file: PIDファイル
         config_file: 設定ファイル
+        note: ノート
         variant: タイプ
         api_endpoint: APIエンドポイント