From d9c2fe9dc3c83e14b6bfaa533b9ced42fdfb7f8c Mon Sep 17 00:00:00 2001 From: uu59 Date: Wed, 9 Jul 2014 16:22:38 +0900 Subject: [PATCH] Add fluentd in/out setting area --- .../fluentd/settings/out_mongo/show.html.haml | 3 ++ app/views/fluentd/settings/show.html.haml | 35 +++++++++++++------ config/locales/translation_en.yml | 9 +++++ config/locales/translation_ja.yml | 9 +++++ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/app/views/fluentd/settings/out_mongo/show.html.haml b/app/views/fluentd/settings/out_mongo/show.html.haml index 38ae0d9..621ce29 100644 --- a/app/views/fluentd/settings/out_mongo/show.html.haml +++ b/app/views/fluentd/settings/out_mongo/show.html.haml @@ -1,3 +1,6 @@ - page_title t(".page_title") +.well + = raw t('fluentd.settings.out_mongo.option_guide') + = render "form" diff --git a/app/views/fluentd/settings/show.html.haml b/app/views/fluentd/settings/show.html.haml index 2f0a0ca..6b2d016 100644 --- a/app/views/fluentd/settings/show.html.haml +++ b/app/views/fluentd/settings/show.html.haml @@ -1,15 +1,30 @@ - page_title t('.page_title', label: @fluentd.label) .row - %h2 - = t(".edit_config") - = link_to icon('fa-pencil') << t(".edit"), edit_fluentd_setting_path(@fluentd) - %pre - = preserve do - = @config + .col-lg-12 + %h2 + = t(".edit_config") + = link_to icon('fa-pencil') << t(".edit"), edit_fluentd_setting_path(@fluentd) + %pre + = preserve do + = @config .row - .col-lg-4.well - = link_to(fluentd_setting_in_tail_path(@fluentd)) do - = icon('fa-file-text-o fa-lg') - = t("fluentd.common.setup_in_tail") + .col-lg-6 + .panel.panel-default + .panel-heading + %h2= t('.in') + .panel-body + %p + = link_to(fluentd_setting_in_tail_path(@fluentd)) do + = icon('fa-file-text-o fa-lg') + = t("fluentd.common.setup_in_tail") + .col-lg-6 + .panel.panel-default + .panel-heading + %h2= t('.out') + .panel-body + %p + = link_to(fluentd_setting_out_mongo_path(@fluentd)) do + = icon('fa-file-text-o fa-lg') + = t("fluentd.common.setup_out_mongo") diff --git a/config/locales/translation_en.yml b/config/locales/translation_en.yml index 1ede59c..32a0f54 100644 --- a/config/locales/translation_en.yml +++ b/config/locales/translation_en.yml @@ -93,6 +93,7 @@ en: config_file: Config file page_title: "%{label}" setup_in_tail: Setting file reading + setup_out_mongo: Setting MongoDB writing finish: Update config fluentd_info: Setting info recent_errors: "Recently %{days} days errors" @@ -121,8 +122,16 @@ en: show: <<: *fluentd_common page_title: fluentd config + in: Input source setting + out: Output source setting edit: <<: *fluentd_common + out_mongo: + option_guide: | + fluent-plugin-mongo install is required.
+ See also out_mongo plugin. + show: + page_title: Write to MongoDB setting in_tail_option_guide: | See in_tail Plugin or Fluentular for more details. diff --git a/config/locales/translation_ja.yml b/config/locales/translation_ja.yml index 10b4528..be0ecc9 100644 --- a/config/locales/translation_ja.yml +++ b/config/locales/translation_ja.yml @@ -93,6 +93,7 @@ ja: config_file: 設定ファイル page_title: "%{label}" setup_in_tail: ファイル読み込みの設定 + setup_out_mongo: MongoDBへの書き出し設定 finish: 設定する fluentd_info: 設定情報 recent_errors: "直近 %{days} 日内のエラー" @@ -122,8 +123,16 @@ ja: show: <<: *fluentd_common page_title: fluentd 設定 + in: 入力ソースの設定 + out: 出力ソースの設定 edit: <<: *fluentd_common + out_mongo: + option_guide: | + fluent-plugin-mongoプラグインのインストールが必要です。
+ out_mongoプラグインの解説もご参照ください。 + show: + page_title: MongoDB書き出し設定 in_tail_option_guide: | in_tailプラグインの解説ページFluentularもご参照ください。