fluentd-ui 0.4.2 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of fluentd-ui might be problematic. Click here for more details.

Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.rspec +1 -0
  3. data/.travis.yml +9 -0
  4. data/ChangeLog.md +6 -1
  5. data/Gemfile.lock +2 -2
  6. data/README.md +10 -50
  7. data/app/models/fluentd/agent/process_operation.rb +0 -1
  8. data/lib/fluentd-ui/version.rb +1 -1
  9. data/lib/regexp_preview/single_line.rb +1 -1
  10. data/spec/models/fluentd/agent_spec.rb +0 -1
  11. data/spec/models/fluentd_spec.rb +0 -2
  12. data/spec/spec_helper.rb +0 -5
  13. metadata +4 -4
  14. data/circle.yml +0 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cd1e3276ee063e5e564972bb94cc281052ec8e7d
4
- data.tar.gz: 744d53df9f936b2f86c645ec38710ecee0fb084e
3
+ metadata.gz: 20261f9c2c86bdd51ac0e63e061685b2bfba1e24
4
+ data.tar.gz: a6fc1338a79f7fe027ba0741578f8c02ea831c96
5
5
  SHA512:
6
- metadata.gz: fd9566d4e6ea184e1e6f70ea9c04658ab90f55b0c97963441e96d723df573ccabc8c7126c87ddb1a570148cade474c9bc3344b496401f034af68511939f2cfaf
7
- data.tar.gz: 8e553642229c938b460ab8d28f44e65bc8501da501859df62dd8bc7f1eccc64f058551f8222e1e76523620f52532ee190ec6fad18e8b9136a69318a3d6189a12
6
+ metadata.gz: f83c80f732eed9ab0d4200dda63735047f76b0c35a7a6bea6e7dfa635496ec655b27157193850dfbef47c9b7c5a4cc6f2713efdf8eb806a0acb4064f4de812bc
7
+ data.tar.gz: 5dc23b0d64c8c057490bb631f7df8e5ce2c77ff35b3fa9f30f0c7d624548ee24d7f043a5b687ce9f0fff4531fb8d0f37ecb78e67de2f990a6f5c538455aca95b
data/.rspec CHANGED
@@ -1 +1,2 @@
1
1
  --color
2
+ -f d
data/.travis.yml ADDED
@@ -0,0 +1,9 @@
1
+ rvm: 2.1.3
2
+
3
+ sudo: required
4
+
5
+ install:
6
+ - bundle -v
7
+ - gem i bundler
8
+ - sudo sh -c 'curl -L https://toolbelt.treasuredata.com/sh/install-ubuntu-precise-td-agent2.sh | sh'
9
+ - bundle install --jobs=4 --retry=4
data/ChangeLog.md CHANGED
@@ -1,7 +1,12 @@
1
+ ## Release 0.4.3 - 2016/03/09
2
+
3
+ * [fixed] Fix for latest fluentd [#200](https://github.com/fluent/fluentd-ui/pull/200)
4
+ * [fixed] Fix some documentation [#195](https://github.com/fluent/fluentd-ui/pull/195)
5
+
1
6
  ## Release 0.4.2 - 2015/05/28
2
7
 
3
8
  * [maintenance] Update httpclient as 2.5.x [#193](https://github.com/fluent/fluentd-ui/pull/193)
4
- * [fixex] Fix confused license [#192](https://github.com/fluent/fluentd-ui/pull/192)
9
+ * [fixed] Fix confused license [#192](https://github.com/fluent/fluentd-ui/pull/192)
5
10
 
6
11
  ## Release 0.4.1 - 2015/04/24
7
12
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fluentd-ui (0.4.2)
4
+ fluentd-ui (0.4.3)
5
5
  addressable
6
6
  bundler
7
7
  diff-lcs
@@ -82,7 +82,7 @@ GEM
82
82
  timers (~> 1.1.0)
83
83
  cliver (0.3.2)
84
84
  coderay (1.1.0)
85
- cool.io (1.3.0)
85
+ cool.io (1.4.3)
86
86
  crack (0.4.2)
87
87
  safe_yaml (~> 1.0.0)
88
88
  debug_inspector (0.0.2)
data/README.md CHANGED
@@ -1,44 +1,34 @@
1
1
  # fluentd-ui
2
2
 
3
- [![build status](https://circleci.com/gh/fluent/fluentd-ui.png?style=shield&circle-token=a739a52ae9ae6774ab2192d4236a5f93ac29e11e)](https://circleci.com/gh/fluent/fluentd-ui)
3
+ [![Build Status](https://travis-ci.org/fluent/fluentd-ui.svg?branch=master)](https://travis-ci.org/fluent/fluentd-ui)
4
4
  [![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui)
5
5
  [![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui)
6
6
 
7
- fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
7
+ fluentd-ui is a browser-based [fluentd](http://www.fluentd.org) and [td-agent](https://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
8
8
 
9
9
  * Install, uninstall, and upgrade Fluentd plugins
10
10
  * start/stop/restart fluentd process
11
11
  * Configure Fluentd settings such as config file content, pid file path, etc
12
12
  * View Fluentd log with simple error viewer
13
13
 
14
+ [Official documentation](http://docs.fluentd.org/articles/fluentd-ui) \| [Changelog](./ChangeLog.md)
14
15
 
15
- # Getting Started
16
16
 
17
- ```console
18
- $ gem install -V fluentd-ui
19
- $ fluentd-ui start
20
- ```
21
-
22
- Open `http://localhost:9292/` by your browser.<br />
23
- The default account is username="admin" and password="changeme"
24
-
25
- ![fluentd-ui](./docs/screenshots/fluentd-ui.gif)
26
-
27
- ## Dependency
17
+ ## Requirements
28
18
 
29
19
  - ruby 2.1.3 or later (since v0.4.0)
30
20
 
31
- ## To Ubuntu 14.04 user (installed ruby by apt-get)
32
-
33
- You also need to install these packages:
21
+ And some additional packages (Debian / Ubuntu)
34
22
 
35
23
  - build-essential
36
24
  - libssl-dev
25
+ - libxml2-dev
26
+ - libxslt1-dev
37
27
  - ruby-dev
38
28
 
39
- ## To the developer
29
+ ## Development
40
30
 
41
- $ git clone https://github.com/treasure-data/fluentd-ui
31
+ $ git clone https://github.com/fluent/fluentd-ui
42
32
  $ cd fluentd-ui
43
33
  $ bundle install
44
34
  $ bundle exec rails s
@@ -51,40 +41,10 @@ Also you need a phantomjs for test.
51
41
 
52
42
  NOTE: `phantomjs` executable binary should be located under your `$PATH`.
53
43
 
54
- # Building fluentd-ui.gem
55
-
56
- fluentd-ui has the same tasks of `bundle gem foobar; cd foobar; rake -T`.
44
+ ## Building fluentd-ui.gem
57
45
 
58
46
  $ bundle exec rake build
59
47
  fluentd-ui X.X.X built to pkg/fluentd-ui-X.X.X.gem.
60
48
 
61
49
  $ bundle exec rake release
62
50
  # Push to rubygems.org
63
-
64
-
65
- # Screenshots
66
-
67
- (v0.3.9)
68
-
69
- ## Dashboard
70
-
71
- ![dashboard](./docs/screenshots/dashboard.gif)
72
-
73
- ## Setting
74
-
75
- ![setting](./docs/screenshots/setting.gif)
76
-
77
- ### in_tail setting
78
-
79
- ![in_tail](./docs/screenshots/in_tail.gif)
80
-
81
- ## Plugin
82
-
83
- ![plugin](./docs/screenshots/plugin.gif)
84
-
85
-
86
- ![ss01](./docs/screenshots/01.png)
87
- ![ss02](./docs/screenshots/02.png)
88
- ![ss03](./docs/screenshots/03.png)
89
- ![ss04](./docs/screenshots/04.png)
90
- ![ss05](./docs/screenshots/05.png)
data/app/models/fluentd/agent/process_operation.rb CHANGED
@@ -50,7 +50,6 @@ class Fluentd
50
50
 
51
51
  def options_to_argv(opts = {})
52
52
  argv = ""
53
- argv << " --use-v1-config"
54
53
  argv << " -c #{opts[:config_file] || config_file}"
55
54
  argv << " -d #{opts[:pid_file] || pid_file}"
56
55
  argv << " -o #{opts[:log_file] || log_file}"
data/lib/fluentd-ui/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FluentdUI
2
- VERSION = "0.4.2"
2
+ VERSION = "0.4.3"
3
3
  end
data/lib/regexp_preview/single_line.rb CHANGED
@@ -18,7 +18,7 @@ module RegexpPreview
18
18
  else # apache, nginx, etc
19
19
  definition = Fluent::TextParser::TEMPLATE_REGISTRY.lookup(format).call
20
20
  raise "Unknown format '#{format}'" unless definition
21
- definition.configure({}) # NOTE: SyslogParser define @regexp in configure method so call it to grab Regexp object
21
+ definition.configure(Fluent::Config::Element.new('ROOT', '', {}, [])) # NOTE: SyslogParser define @regexp in configure method so call it to grab Regexp object
22
22
  @regexp = definition.patterns["format"]
23
23
  @time_format = definition.patterns["time_format"]
24
24
  end
data/spec/models/fluentd/agent_spec.rb CHANGED
@@ -18,7 +18,6 @@ describe Fluentd::Agent do
18
18
  it { should include("-c #{instance.config_file}") }
19
19
  it { should include("-d #{instance.pid_file}") }
20
20
  it { should include("-o #{instance.log_file}") }
21
- it { should include("--use-v1-config") }
22
21
  end
23
22
 
24
23
  describe "#start" do
data/spec/models/fluentd_spec.rb CHANGED
@@ -144,8 +144,6 @@ describe Fluentd do
144
144
 
145
145
  describe "#ensure_default_config_file" do
146
146
  subject do
147
- skip "Circle CI file operations are unstable :(" if ENV["CIRCLECI"]
148
-
149
147
  fluentd.config_file = config_file
150
148
  fluentd.save
151
149
  fluentd.config_file
data/spec/spec_helper.rb CHANGED
@@ -1,11 +1,6 @@
1
1
  if ENV['RAILS_ENV'] == 'test'
2
2
  require 'simplecov'
3
3
  SimpleCov.start 'rails'
4
-
5
- if ENV['CIRCLE_ARTIFACTS'] # https://circleci.com/docs/code-coverage
6
- dir = File.join("..", "..", "..", ENV['CIRCLE_ARTIFACTS'], "coverage")
7
- SimpleCov.coverage_dir(dir)
8
- end
9
4
  end
10
5
 
11
6
  # This file is copied to spec/ when you run 'rails generate rspec:install'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluentd-ui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-05-28 00:00:00.000000000 Z
12
+ date: 2016-03-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd
@@ -295,6 +295,7 @@ files:
295
295
  - ".bowerrc"
296
296
  - ".gitignore"
297
297
  - ".rspec"
298
+ - ".travis.yml"
298
299
  - ChangeLog
299
300
  - ChangeLog.md
300
301
  - Gemfile
@@ -452,7 +453,6 @@ files:
452
453
  - bin/setup
453
454
  - bin/spring
454
455
  - bower.json
455
- - circle.yml
456
456
  - config.ru
457
457
  - config/application.rb
458
458
  - config/application.yml
@@ -708,7 +708,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
708
708
  version: '0'
709
709
  requirements: []
710
710
  rubyforge_project:
711
- rubygems_version: 2.4.6
711
+ rubygems_version: 2.2.2
712
712
  signing_key:
713
713
  specification_version: 4
714
714
  summary: Web UI for Fluentd
data/circle.yml DELETED
@@ -1,15 +0,0 @@
1
- machine:
2
- environment:
3
- SPEC_OPTS: "-f d --color"
4
- ruby:
5
- version: 2.1.3
6
-
7
- checkout:
8
- post:
9
- - mkdir -p tmp
10
- - sync
11
-
12
- dependencies:
13
- pre:
14
- - wget http://packages.treasuredata.com.s3.amazonaws.com/2/ubuntu/precise/pool/contrib/t/td-agent/td-agent_2.2.0-0_amd64.deb
15
- - sudo dpkg -i td-agent_2.2.0-0_amd64.deb