diff --git a/app/models/fluentd/setting/filter_grep.rb b/app/models/fluentd/setting/filter_grep.rb index 7dccedd..4d5dcce 100644 --- a/app/models/fluentd/setting/filter_grep.rb +++ b/app/models/fluentd/setting/filter_grep.rb @@ -12,6 +12,7 @@ class Fluentd def self.permit_params [ + :label, :pattern, :log_level, :@log_level, { and: {regexp: [:key, :pattern], exclude: [:key, :pattern]} }, { or: {regexp: [:key, :pattern], exclude: [:key, :pattern]} } @@ -20,7 +21,8 @@ class Fluentd def common_options [ - :pattern + :label, + :pattern, ] end diff --git a/app/models/fluentd/setting/filter_parser.rb b/app/models/fluentd/setting/filter_parser.rb index b5d313c..2defa2c 100644 --- a/app/models/fluentd/setting/filter_parser.rb +++ b/app/models/fluentd/setting/filter_parser.rb @@ -18,6 +18,7 @@ class Fluentd def common_options [ + :label, :pattern, :key_name, ] diff --git a/app/models/fluentd/setting/filter_record_transformer.rb b/app/models/fluentd/setting/filter_record_transformer.rb index df29d65..e03a0ea 100644 --- a/app/models/fluentd/setting/filter_record_transformer.rb +++ b/app/models/fluentd/setting/filter_record_transformer.rb @@ -14,6 +14,7 @@ class Fluentd def common_options [ + :label, :pattern, ] end diff --git a/app/models/fluentd/setting/filter_stdout.rb b/app/models/fluentd/setting/filter_stdout.rb index 7be6e1d..51633f9 100644 --- a/app/models/fluentd/setting/filter_stdout.rb +++ b/app/models/fluentd/setting/filter_stdout.rb @@ -19,6 +19,7 @@ class Fluentd def common_options [ + :label, :pattern, ] end diff --git a/app/models/fluentd/setting/in_forward.rb b/app/models/fluentd/setting/in_forward.rb index 7f1f496..3b4567b 100644 --- a/app/models/fluentd/setting/in_forward.rb +++ b/app/models/fluentd/setting/in_forward.rb @@ -7,6 +7,7 @@ class Fluentd def common_options [ + :label, :bind, :port ] end diff --git a/app/models/fluentd/setting/in_http.rb b/app/models/fluentd/setting/in_http.rb index be30528..3440f47 100644 --- a/app/models/fluentd/setting/in_http.rb +++ b/app/models/fluentd/setting/in_http.rb @@ -23,7 +23,7 @@ class Fluentd def common_options [ - :bind, :port, :add_http_headers, :add_remote_addr + :label, :bind, :port, :add_http_headers, :add_remote_addr ] end diff --git a/app/models/fluentd/setting/in_monitor_agent.rb b/app/models/fluentd/setting/in_monitor_agent.rb index 6e6167c..c716f49 100644 --- a/app/models/fluentd/setting/in_monitor_agent.rb +++ b/app/models/fluentd/setting/in_monitor_agent.rb @@ -17,7 +17,7 @@ class Fluentd def common_options [ - :bind, :port, :tag + :label, :bind, :port, :tag ] end end diff --git a/app/models/fluentd/setting/in_syslog.rb b/app/models/fluentd/setting/in_syslog.rb index bacc574..9b5d2e8 100644 --- a/app/models/fluentd/setting/in_syslog.rb +++ b/app/models/fluentd/setting/in_syslog.rb @@ -19,7 +19,7 @@ class Fluentd def common_options [ - :tag, :bind, :port + :label, :tag, :bind, :port ] end diff --git a/app/models/fluentd/setting/out_elasticsearch.rb b/app/models/fluentd/setting/out_elasticsearch.rb index b1566f3..a807f59 100644 --- a/app/models/fluentd/setting/out_elasticsearch.rb +++ b/app/models/fluentd/setting/out_elasticsearch.rb @@ -26,6 +26,7 @@ class Fluentd def common_options [ + :label, :pattern, :host, :port, :logstash_format, :index_name, :type_name, ] diff --git a/app/models/fluentd/setting/out_forward.rb b/app/models/fluentd/setting/out_forward.rb index 16b54ea..ddf6583 100644 --- a/app/models/fluentd/setting/out_forward.rb +++ b/app/models/fluentd/setting/out_forward.rb @@ -33,7 +33,7 @@ class Fluentd def common_options [ - :pattern, :server, :secondary, + :label, :pattern, :server, :secondary, ] end diff --git a/app/models/fluentd/setting/out_mongo.rb b/app/models/fluentd/setting/out_mongo.rb index 668c0b8..b7d7f63 100644 --- a/app/models/fluentd/setting/out_mongo.rb +++ b/app/models/fluentd/setting/out_mongo.rb @@ -25,6 +25,7 @@ class Fluentd def common_options [ + :label, :pattern, :host, :port, :database, :collection, :tag_mapped, :user, :password, ] diff --git a/app/models/fluentd/setting/out_s3.rb b/app/models/fluentd/setting/out_s3.rb index 057f701..dc86838 100644 --- a/app/models/fluentd/setting/out_s3.rb +++ b/app/models/fluentd/setting/out_s3.rb @@ -26,6 +26,7 @@ class Fluentd def common_options [ + :label, :pattern, :s3_region, :s3_bucket, :use_ssl, :path, ] diff --git a/app/models/fluentd/setting/out_stdout.rb b/app/models/fluentd/setting/out_stdout.rb index 0337b97..f4b7416 100644 --- a/app/models/fluentd/setting/out_stdout.rb +++ b/app/models/fluentd/setting/out_stdout.rb @@ -26,7 +26,7 @@ class Fluentd def common_options [ - :pattern, :output_type + :label, :pattern, :output_type ] end diff --git a/app/models/fluentd/setting/out_tdlog.rb b/app/models/fluentd/setting/out_tdlog.rb index c09287c..374fcd1 100644 --- a/app/models/fluentd/setting/out_tdlog.rb +++ b/app/models/fluentd/setting/out_tdlog.rb @@ -22,7 +22,7 @@ class Fluentd def common_options [ - :pattern, :apikey, :auto_create_table, :database, :table, + :label, :pattern, :apikey, :auto_create_table, :database, :table, ] end diff --git a/app/views/fluentd/settings/in_tail/_form.html.haml b/app/views/fluentd/settings/in_tail/_form.html.haml index cd789ee..73567f3 100644 --- a/app/views/fluentd/settings/in_tail/_form.html.haml +++ b/app/views/fluentd/settings/in_tail/_form.html.haml @@ -19,6 +19,7 @@ = f.hidden_field(key) = f.field(key, disabled: true) += form.field(:label) = form.field(:tag) = form.field(:pos_file)