142 Commits

Author SHA1 Message Date
Kyuden
8b07f217ff Display success message when password updated successfully 2014-10-03 12:41:51 +09:00
uu59
7a0c8de799 Merge pull request #85 from hassaku/show_processing_status
Show processing status of plugin install
2014-10-01 16:19:55 +09:00
hassaku
4e959c1fd2 Refactor logic in view using decorator. 2014-09-30 22:07:52 +09:00
Kouhei Sutou
f5c0aaf8f2 Converge codes for user name restriction
The current implementation accepts only "admin" user. Codes for the
restriction exist in several files.

This change converges codes for the restriction to
app/models/user.rb. This change will be helpful when we support more
user names.
2014-09-25 15:55:19 +09:00
Kouhei Sutou
ab903716bc Try to fix wrong try usage
`Object#try` checks "whether receiver is nil or not". It doesn't rescue
any exceptions raised in method call.

    > User.new(name: "admin", password_digest: "invalid-hash").authenticate("X")
    BCrypt::Errors::InvalidHash: invalid hash
            from /var/lib/gems/2.1.0/gems/bcrypt-3.1.7/lib/bcrypt/password.rb:60:in `initialize'
            ...
2014-08-19 21:21:35 +09:00
uu59
5e704969d2 tag_key is not config param 2014-08-13 18:20:24 +09:00
uu59
242e23732c Add out_elasticsearch setting 2014-08-13 18:12:28 +09:00
uu59
6551280ba0 Refactoring for commonly setting controllers to be concern 2014-08-13 17:40:24 +09:00
uu59
b2a6f0e9dc Remove duplicated validation (same code in the model). thanks @kou! 2014-08-12 22:25:48 +09:00
uu59
176cc4b1ef Fix can't login if password changed 2014-08-07 18:22:51 +09:00
Kouhei Sutou
8e8c95fce3 in_tail: Fix error on setting page for binary file
How to reproduce:

  * Create a binary file by the following command:

        "ruby -e 'puts "\u3042"' > /tmp/xxx"

  * Open /daemon/setting/in_tail
  * Select "/tmp/xxx"
  * Error page is rendered
  * log/production.log says:

        ActionView::Template::Error (undefined method `join' for nil:NilClass):
            12:     = f.text_field :path, class: "form-control", disabled: true
            13:   = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.format || @setting.guess_format }
            14:
            15:   %pre= file_tail(@setting.path).join("\n")
            16:
            17:   %p
            18:     = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right"
          app/views/fluentd/settings/in_tail/after_file_choose.html.haml:15:in `block in _app_views_fluentd_settings_in_tail_after_file_choose_html_haml___1713159989942914940_40548520'
2014-08-06 17:34:23 +09:00
uu59
cf51f165cd setting_params should be normally 2014-07-31 18:30:46 +09:00
uu59
982b5b3d4e Only store password if default password is used 2014-07-31 18:30:46 +09:00
uu59
fd2ceda5a4 Display success flash should be succeed only 2014-07-31 17:25:31 +09:00
uu59
6374bd86ca Remove unnecessary return 2014-07-31 17:17:14 +09:00
uu59
1d5ad1f31e Add comment why using try method 2014-07-31 17:17:14 +09:00
uu59
93e1998016 Controller methods to be private 2014-07-31 17:17:14 +09:00
uu59
3d750a0c7a Display a message for the daemon start/stop/restart could take a long time 2014-07-31 11:42:17 +09:00
uu59
260a12e375 Add notation for permission on in_tail setting page 2014-07-30 16:02:56 +09:00
uu59
412022cfa8 Add uname -a to system_info.zip. Fix #66 2014-07-30 11:11:05 +09:00
uu59
df1773c26f Remove dead code 2014-07-29 14:11:05 +09:00
uu59
a6d11053d4 Fix to zip fluentd-ui log when FLUENTD_UI_PATH given 2014-07-29 10:52:40 +09:00
uu59
6a19537a3f error -> messages 2014-07-28 16:58:05 +09:00
uu59
f40200741f Clean up out_td params 2014-07-28 16:15:59 +09:00
uu59
a9ab6c1270 Fix plugins handling 2014-07-28 15:28:59 +09:00
uu59
3ada1f874c Switching brand name with ENV 2014-07-24 16:03:45 +09:00
uu59
23a30452e4 Fix route name fluentd -> daemon by sed
$ git grep --name-only -E "[a-z0-9A-Z_]*fluentd_[a-zA-Z0-9_]*path" app/  | xargs gsed -i -E 's#([a-z0-9A-Z_]*)fluentd([a-zA-Z0-9_]*path)#\1daemon\2#g'
2014-07-24 15:28:04 +09:00
uu59
720e1ae3a1 Separate fluentd log and error log page 2014-07-24 13:52:07 +09:00
uu59
5403234974 Merge remote-tracking branch 'origin/master' into add_output_settings
* origin/master:
  Auto reload fluentd log by default
  Fix if fluentd is not installed
  Replace title with ENV
  Strict detetction fluent-gem command with setup fluentd/td-agent specific
  clickable whole heading element same as fluentd setting page
  Fix fluentd version (not bundle-installed fluentd version)
  Hide plugin pages until fluentd setup finished

Conflicts:
	app/views/shared/_global_nav.html.erb
2014-07-22 14:09:06 +09:00
uu59
da9111a72a Merge pull request #54 from treasure-data/fix_gem_handling
Fix gem handling
2014-07-22 11:09:37 +09:00
uu59
b36b3eb483 Add <secondary> for out_forward 2014-07-17 16:33:54 +09:00
uu59
55ebbe6b80 Refactoring: to_conf -> to_config 2014-07-17 14:09:10 +09:00
uu59
b2594218b0 Simplified out_s3 setting 2014-07-17 14:03:32 +09:00
uu59
4fac24a9bf Fix fluentd version (not bundle-installed fluentd version) 2014-07-17 13:42:36 +09:00
uu59
3ddb412846 Add out_forward setting basis (wip) 2014-07-16 13:33:50 +09:00
uu59
d47b60a953 Add out_s3 setting basis 2014-07-14 15:09:22 +09:00
uu59
744c6a18ea Add in_syslog setting basis 2014-07-11 12:54:36 +09:00
uu59
ee8e3e5407 Add out_td setting basis 2014-07-11 11:06:23 +09:00
uu59
c833682cc8 Add basis out_mongo setting 2014-07-11 11:06:23 +09:00
uu59
e60ac201a5 Add download system information button 2014-07-10 16:24:41 +09:00
uu59
a923ade63e Auto fill-in time_format after selected format 2014-07-09 14:01:27 +09:00
uu59
2aa6b05f4b Some controller methods to lib/ 2014-07-08 13:26:51 +09:00
uu59
b10171b89a Refactor updating fluentd-ui 2014-07-07 10:55:36 +09:00
uu59
babb3df89c Remove debug code 2014-07-04 18:28:19 +09:00
uu59
82a5cce4bd Add failed route to waiting update page 2014-07-04 17:32:45 +09:00
uu59
e530c1604b Add fluentd-ui updating wait page 2014-07-04 15:39:11 +09:00
uu59
25dda76174 Restart fluentd-ui process with fluentd-ui 2014-07-04 12:51:14 +09:00
uu59
35346045a9 Can delete fluentd setting 2014-07-02 13:04:18 +09:00
uu59
568c7620b6 Fix to hide some sidebnav links if fluentd not registered yet 2014-07-02 11:06:18 +09:00
uu59
a3d61c3cc8 Resolve some TODOs 2014-07-01 11:19:15 +09:00