fluentd-ui 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ed10127f4321d0c21f6c39e75b49957ac513a7
-  data.tar.gz: e78e3fd0a95570ff29e04ec013648ed4d13e1b78
+  metadata.gz: df5582c25976be8c9a4ef35ed3a285b1dcc6cd71
+  data.tar.gz: 82aa759ea3e96c6211b38f0e5626e8da10923570
 SHA512:
-  metadata.gz: 12b2478c0bb2f7da835daae83286cfcd5ff92b831067406921dca558bf9b0f6cd3dc5870c2c17ef41b06d66034aeecd5ee02cee7adac32394972c9b80860047b
-  data.tar.gz: ceca6e06deeb788d55c0c7fbd583dd7218d685e50a8d9389315dcf77a26adb951cb2268f229ea09249c9ec1a0d3cbd71861f8d8c0ddb591eccf35ced92b34f5c
+  metadata.gz: 3059252decb9f859e20da7e44348ac0c50c4d807d32cfbf569bac92d910f132e153062842bdcfd010bc8e057a2664824d8b0e6d3cc6763b23e1370603ab890b0
+  data.tar.gz: 4aac3e74fefb4d13b0134ec6bff092722616fd80c01b9df7d5c5b431e8d9925465618374edc8a8d73a9590f4a17e1658aed09c638102d49e9f620a9759916376

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## Release 0.4.5 - 2018/04/20
+
+* [maintenance] Use twilio instead of boundio [#212](https://github.com/fluent/fluentd-ui/pull/212)
+* [maintenance] Use terminal_notifier instead of Growl [#213](https://github.com/fluent/fluentd-ui/pull/213)
+* [maintenance] Use Rails 4.2.10 [#222](https://github.com/fluent/fluentd-ui/pull/222)
+
 ## Release 0.4.4 - 2017/04/25
 
 * [fixed] Fix multiline parser preview bug [#209](https://github.com/fluent/fluentd-ui/pull/209)

data/Gemfile

@@ -21,7 +21,7 @@ group :test do
   gem "factory_girl_rails"
   gem "capybara", "~> 2.4.0"
   gem "capybara-screenshot"
-  gem "simplecov", "~> 0.7.1", require: false
+  gem "simplecov", "~> 0.16.1", require: false
   gem "webmock", "~> 1.18.0"
   gem "timecop"
   gem "poltergeist"

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.4.4)
+    fluentd-ui (0.4.5)
       addressable
       bundler
       diff-lcs
-      draper (~> 1.3)
-      fluentd (>= 0.10.56, < 2)
+      draper (~> 2.1)
+      fluentd (>= 0.10.56, < 0.14)
       font-awesome-rails
-      haml-rails (~> 0.5.3)
+      haml-rails (~> 1.0)
       httpclient (~> 2.5)
       jbuilder (~> 2.0)
-      jquery-rails (~> 3.1.0)
+      jquery-rails (~> 4.3.1)
       kramdown (> 1.0.0)
       kramdown-haml
       puma
@@ -19,42 +19,42 @@ PATH
       rubyzip (~> 1.1)
       sass-rails (~> 4.0.3)
       settingslogic
-      sucker_punch (~> 1.0.5)
+      sucker_punch (~> 1.6.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -78,18 +78,36 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.17.3)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.6)
+      timers (>= 4.1.1)
     cliver (0.3.2)
     coderay (1.1.1)
-    cool.io (1.5.0)
+    concurrent-ruby (1.0.5)
+    cool.io (1.5.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.4)
     debug_inspector (0.0.2)
     diff-lcs (1.3)
+    docile (1.3.0)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    draper (1.4.0)
+    draper (2.1.0)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
@@ -100,7 +118,7 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    fluentd (0.12.35)
+    fluentd (0.12.43)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -110,42 +128,53 @@ GEM
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
-    font-awesome-rails (4.7.0.1)
-      railties (>= 3.2, < 5.1)
-    globalid (0.4.0)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    haml (4.0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (1.0.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 6.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hike (1.2.3)
+    hitimes (1.2.6)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (0.8.1)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.6.3)
-      activesupport (>= 3.0.0, < 5.2)
-      multi_json (~> 1.2)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
-    kramdown (1.13.2)
+    kramdown (1.16.2)
     kramdown-haml (0.0.3)
       haml
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     mechanize (2.7.5)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -159,14 +188,15 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    msgpack (1.1.0)
-    multi_json (1.12.1)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     ntlm-http (0.1.1)
     poltergeist (1.14.0)
       capybara (~> 2.1)
@@ -179,36 +209,37 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (2.0.5)
-    puma (3.8.2)
-    rack (1.6.5)
+    puma (3.11.4)
+    rack (1.6.9)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    request_store (1.3.2)
+    rake (12.3.1)
+    request_store (1.4.1)
+      rack (>= 1.4)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -226,6 +257,8 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sass (3.2.19)
@@ -235,11 +268,13 @@ GEM
       sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     settingslogic (2.0.9)
+    sexp_processor (4.11.0)
     sigdump (0.2.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -251,16 +286,18 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     string-scrub (0.0.5)
-    sucker_punch (1.0.5)
-      celluloid (~> 0.15.2)
-    thor (0.19.4)
+    sucker_punch (1.6.0)
+      celluloid (~> 0.17.2)
+    temple (0.8.0)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.8.1)
-    timers (1.1.0)
-    tzinfo (1.2.3)
+    timers (4.1.2)
+      hitimes
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2017.2)
+    tzinfo-data (1.2018.4)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -279,7 +316,7 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
@@ -296,10 +333,10 @@ DEPENDENCIES
   pry-rails
   rake
   rspec-rails (~> 3.0)
-  simplecov (~> 0.7.1)
+  simplecov (~> 0.16.1)
   timecop
   web-console (~> 2.0)
   webmock (~> 1.18.0)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/README.md

@@ -17,7 +17,9 @@ fluentd-ui is a browser-based [fluentd](http://www.fluentd.org) and [td-agent](h
 ## Requirements
 
 - ruby 2.1.3 or later (since v0.4.0)
+- fluentd v0.12
 
+Currently, fluentd-ui doesn't support fleuntd v1 and td-agent 3.
 And some additional packages (Debian / Ubuntu)
 
 - build-essential

data/app/views/fluentd/settings/edit.html.haml

@@ -2,7 +2,7 @@
 
 = form_tag(daemon_setting_path(@fluentd), method: :patch) do
   .form-group
-    = text_area_tag "config", @config, class: "form-control", rows: 40, class: "js-fluentd-config-editor"
+    = text_area_tag "config", @config, class: "form-control js-fluentd-config-editor", rows: 40
   %p.text.text-danger= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)
   = submit_tag t("terms.update"), class: "btn btn-primary"
   = submit_tag t("terms.configtest"), class: "btn btn-default", name: "dryrun"

data/config/application.yml

@@ -180,9 +180,9 @@ defaults: &defaults
     - category: search
       name: "splunkapi"
     - category: notification
-      name: "boundio"
+      name: "twilio"
     - category: notification
-      name: "growl"
+      name: "terminal_notifier"
 
 development:
   <<: *defaults

data/fluentd-ui.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Web UI for Fluentd}
   spec.description   = %q{Web UI for Fluentd}
   spec.homepage      = "https://github.com/fluent/fluentd-ui"
-  spec.license       = "Apache"
+  spec.license       = "Apache-2.0"
 
   unless (ARGV & %w(rake build)).length.zero?
     # NOTE: `fluentd-ui start` will run `bundle exec ...`. so this gemspec file evaluated by bundler then exec `git ls-files`
@@ -24,16 +24,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", [">= 0.10.56", "< 2"]
+  spec.add_dependency "fluentd", [">= 0.10.56", "< 0.14"]
   spec.add_dependency 'rails', '~> 4.2.0'
-  spec.add_dependency 'sucker_punch', "~> 1.0.5"
+  spec.add_dependency 'sucker_punch', "~> 1.6.0"
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"
   spec.add_dependency 'sass-rails', '~> 4.0.3'
-  spec.add_dependency "haml-rails", "~> 0.5.3"
-  spec.add_dependency 'jquery-rails', "~> 3.1.0"
+  spec.add_dependency "haml-rails", "~> 1.0"
+  spec.add_dependency 'jquery-rails', "~> 4.3.1"
   spec.add_dependency 'jbuilder', '~> 2.0'
-  spec.add_dependency "draper", '~> 1.3'
+  spec.add_dependency "draper", '~> 2.1'
   spec.add_dependency "bundler"
   spec.add_dependency "httpclient", "~> 2.5" # same as td-agent
   spec.add_dependency "settingslogic"

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/lib/regexp_preview/single_line_spec.rb

@@ -66,7 +66,7 @@ describe RegexpPreview::SingleLine do
 
         include_examples "should set regexp and time_format from selected format" do
           let(:regexp) do
-            /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
+            /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\[]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
           end
           let(:time_format) { "%b %d %H:%M:%S" }
         end
@@ -156,7 +156,7 @@ describe RegexpPreview::SingleLine do
 
         it 'should set regexp and time_format from syslog format' do
           setting_json = {
-            regexp: "^(?<time>[^ ]*\\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_/\\.\\-]*)(?:\\[(?<pid>[0-9]+)\\])?(?:[^\\:]*\\:)? *(?<message>.*)$",
+            regexp: "^(?<time>[^ ]*\\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\\[]*)(?:\\[(?<pid>[0-9]+)\\])?(?:[^\\:]*\\:)? *(?<message>.*)$",
             time_format: "%b %d %H:%M:%S",
           }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -20,7 +20,7 @@ dependencies:
         version: 0.10.56
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 0.10.56
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -107,28 +107,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -691,7 +691,7 @@ files:
 - vendor/patterns/ruby
 homepage: https://github.com/fluent/fluentd-ui
 licenses:
-- Apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -709,7 +709,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Web UI for Fluentd