fluentd-ui 0.3.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of fluentd-ui might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/ChangeLog +6 -0
- data/Gemfile.lock +66 -67
- data/app/controllers/concerns/setting_concern.rb +15 -0
- data/app/controllers/fluentd/settings/in_syslog_controller.rb +0 -7
- data/app/controllers/fluentd/settings/out_elasticsearch_controller.rb +0 -12
- data/app/controllers/fluentd/settings/out_forward_controller.rb +0 -10
- data/app/controllers/fluentd/settings/out_mongo_controller.rb +0 -9
- data/app/controllers/fluentd/settings/out_s3_controller.rb +4 -26
- data/app/models/fluentd/setting/in_syslog.rb +17 -0
- data/app/models/fluentd/setting/out_elasticsearch.rb +26 -0
- data/app/models/fluentd/setting/out_forward.rb +23 -0
- data/app/models/fluentd/setting/out_mongo.rb +23 -0
- data/app/models/fluentd/setting/out_s3.rb +25 -0
- data/app/models/fluentd/setting/out_td.rb +21 -0
- data/app/views/shared/settings/_form.html.haml +17 -0
- data/app/views/shared/settings/show.html.haml +6 -0
- data/fluentd-ui.gemspec +2 -2
- data/lib/fluentd-ui/version.rb +1 -1
- data/lib/tasks/dep.rake +59 -0
- data/vendor/assets/javascripts/bower/vue/.bower.json +4 -4
- data/vendor/assets/javascripts/bower/vue/dist/vue.js +102 -43
- data/vendor/assets/javascripts/bower/vue/dist/vue.min.js +3 -3
- data/vendor/assets/javascripts/bower/vue/src/directives/on.js +3 -1
- data/vendor/assets/javascripts/bower/vue/src/directives/style.js +12 -6
- data/vendor/assets/javascripts/bower/vue/src/filters.js +1 -0
- data/vendor/assets/javascripts/bower/vue/src/fragment.js +4 -21
- data/vendor/assets/javascripts/bower/vue/src/main.js +11 -9
- data/vendor/assets/javascripts/bower/vue/src/template-parser.js +46 -0
- data/vendor/assets/javascripts/bower/vue/src/utils.js +7 -2
- data/vendor/assets/javascripts/bower/vue/src/viewmodel.js +14 -4
- metadata +12 -21
- data/app/views/fluentd/settings/in_syslog/_form.html.haml +0 -9
- data/app/views/fluentd/settings/in_syslog/show.html.haml +0 -6
- data/app/views/fluentd/settings/out_elasticsearch/_form.html.haml +0 -23
- data/app/views/fluentd/settings/out_elasticsearch/show.html.haml +0 -6
- data/app/views/fluentd/settings/out_forward/_form.html.haml +0 -22
- data/app/views/fluentd/settings/out_forward/show.html.haml +0 -6
- data/app/views/fluentd/settings/out_mongo/_form.html.haml +0 -30
- data/app/views/fluentd/settings/out_mongo/finish.html.haml +0 -4
- data/app/views/fluentd/settings/out_mongo/show.html.haml +0 -6
- data/app/views/fluentd/settings/out_s3/_form.html.haml +0 -39
- data/app/views/fluentd/settings/out_s3/show.html.haml +0 -6
- data/app/views/fluentd/settings/out_td/_form.html.haml +0 -18
- data/app/views/fluentd/settings/out_td/show.html.haml +0 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cd82626dac8fa5a41f6a2f86269c6a312da42528
|
4
|
+
data.tar.gz: 111ca2fe63f517dff32c5d3102ae51dc325b29ad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a24ea27306a2f29f56d11915cfe75d34645aba7ecf3fdc4fdb6babc5170781a7e0c234a475b375a334d285bd67c6103165e43220ef2780835953c46e10fb38f3
|
7
|
+
data.tar.gz: d91e0b3c499494c524c58bd92d056ee7841a9b70d20c278bedaf83329974e4a71a2f05d191c0c93fc8fc719caffbe51f8c1c263958767e100fb1230286f55b45
|
data/ChangeLog
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fluentd-ui (0.3.
|
4
|
+
fluentd-ui (0.3.1)
|
5
5
|
addressable
|
6
6
|
bundler
|
7
7
|
draper (~> 1.3)
|
8
|
-
fluentd (~> 0.10.
|
8
|
+
fluentd (~> 0.10.56)
|
9
9
|
font-awesome-rails
|
10
10
|
haml-rails (~> 0.5.3)
|
11
11
|
httpclient
|
@@ -14,7 +14,7 @@ PATH
|
|
14
14
|
kramdown (> 1.0.0)
|
15
15
|
kramdown-haml
|
16
16
|
puma
|
17
|
-
rails (
|
17
|
+
rails (~> 4.1.7)
|
18
18
|
rubyzip (~> 1.1)
|
19
19
|
sass-rails (~> 4.0.3)
|
20
20
|
settingslogic
|
@@ -24,27 +24,27 @@ PATH
|
|
24
24
|
GEM
|
25
25
|
remote: https://rubygems.org/
|
26
26
|
specs:
|
27
|
-
actionmailer (4.1.
|
28
|
-
actionpack (= 4.1.
|
29
|
-
actionview (= 4.1.
|
30
|
-
mail (~> 2.5.4)
|
31
|
-
actionpack (4.1.
|
32
|
-
actionview (= 4.1.
|
33
|
-
activesupport (= 4.1.
|
27
|
+
actionmailer (4.1.7)
|
28
|
+
actionpack (= 4.1.7)
|
29
|
+
actionview (= 4.1.7)
|
30
|
+
mail (~> 2.5, >= 2.5.4)
|
31
|
+
actionpack (4.1.7)
|
32
|
+
actionview (= 4.1.7)
|
33
|
+
activesupport (= 4.1.7)
|
34
34
|
rack (~> 1.5.2)
|
35
35
|
rack-test (~> 0.6.2)
|
36
|
-
actionview (4.1.
|
37
|
-
activesupport (= 4.1.
|
36
|
+
actionview (4.1.7)
|
37
|
+
activesupport (= 4.1.7)
|
38
38
|
builder (~> 3.1)
|
39
39
|
erubis (~> 2.7.0)
|
40
|
-
activemodel (4.1.
|
41
|
-
activesupport (= 4.1.
|
40
|
+
activemodel (4.1.7)
|
41
|
+
activesupport (= 4.1.7)
|
42
42
|
builder (~> 3.1)
|
43
|
-
activerecord (4.1.
|
44
|
-
activemodel (= 4.1.
|
45
|
-
activesupport (= 4.1.
|
43
|
+
activerecord (4.1.7)
|
44
|
+
activemodel (= 4.1.7)
|
45
|
+
activesupport (= 4.1.7)
|
46
46
|
arel (~> 5.0.0)
|
47
|
-
activesupport (4.1.
|
47
|
+
activesupport (4.1.7)
|
48
48
|
i18n (~> 0.6, >= 0.6.9)
|
49
49
|
json (~> 1.7, >= 1.7.7)
|
50
50
|
minitest (~> 5.1)
|
@@ -68,7 +68,7 @@ GEM
|
|
68
68
|
safe_yaml (~> 1.0.0)
|
69
69
|
database_cleaner (1.2.0)
|
70
70
|
diff-lcs (1.2.5)
|
71
|
-
domain_name (0.5.
|
71
|
+
domain_name (0.5.22)
|
72
72
|
unf (>= 0.0.5, < 1.0.0)
|
73
73
|
draper (1.4.0)
|
74
74
|
actionpack (>= 3.0)
|
@@ -76,17 +76,19 @@ GEM
|
|
76
76
|
activesupport (>= 3.0)
|
77
77
|
request_store (~> 1.0)
|
78
78
|
erubis (2.7.0)
|
79
|
-
factory_girl (4.
|
79
|
+
factory_girl (4.5.0)
|
80
80
|
activesupport (>= 3.0.0)
|
81
|
-
factory_girl_rails (4.
|
82
|
-
factory_girl (~> 4.
|
81
|
+
factory_girl_rails (4.5.0)
|
82
|
+
factory_girl (~> 4.5.0)
|
83
83
|
railties (>= 3.0.0)
|
84
|
-
fluentd (0.10.
|
84
|
+
fluentd (0.10.56)
|
85
85
|
cool.io (>= 1.1.1, < 2.0.0, != 1.2.0)
|
86
86
|
http_parser.rb (>= 0.5.1, < 0.7.0)
|
87
87
|
json (>= 1.4.3)
|
88
88
|
msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
|
89
89
|
sigdump (~> 0.2.2)
|
90
|
+
tzinfo (>= 1.0.0)
|
91
|
+
tzinfo-data (>= 1.0.0)
|
90
92
|
yajl-ruby (~> 1.0)
|
91
93
|
font-awesome-rails (4.2.0.0)
|
92
94
|
railties (>= 3.2, < 5.0)
|
@@ -101,42 +103,41 @@ GEM
|
|
101
103
|
http-cookie (1.0.2)
|
102
104
|
domain_name (~> 0.5)
|
103
105
|
http_parser.rb (0.6.0)
|
104
|
-
httpclient (2.5.1)
|
105
|
-
i18n (0.6.
|
106
|
+
httpclient (2.5.3.1)
|
107
|
+
i18n (0.6.11)
|
106
108
|
i18n_generators (1.2.1)
|
107
109
|
mechanize
|
108
110
|
rails (>= 3.0.0)
|
109
|
-
jbuilder (2.
|
111
|
+
jbuilder (2.2.4)
|
110
112
|
activesupport (>= 3.0.0, < 5)
|
111
113
|
multi_json (~> 1.2)
|
112
114
|
jquery-rails (3.1.2)
|
113
115
|
railties (>= 3.0, < 5.0)
|
114
116
|
thor (>= 0.14, < 2.0)
|
115
117
|
json (1.8.1)
|
116
|
-
kramdown (1.
|
118
|
+
kramdown (1.5.0)
|
117
119
|
kramdown-haml (0.0.3)
|
118
120
|
haml
|
119
|
-
mail (2.
|
120
|
-
mime-types (
|
121
|
-
|
122
|
-
mechanize (2.7.2)
|
121
|
+
mail (2.6.3)
|
122
|
+
mime-types (>= 1.16, < 3)
|
123
|
+
mechanize (2.7.3)
|
123
124
|
domain_name (~> 0.5, >= 0.5.1)
|
124
|
-
http-cookie (~> 1.0
|
125
|
-
mime-types (~>
|
125
|
+
http-cookie (~> 1.0)
|
126
|
+
mime-types (~> 2.0)
|
126
127
|
net-http-digest_auth (~> 1.1, >= 1.1.1)
|
127
128
|
net-http-persistent (~> 2.5, >= 2.5.2)
|
128
129
|
nokogiri (~> 1.4)
|
129
130
|
ntlm-http (~> 0.1, >= 0.1.1)
|
130
131
|
webrobots (>= 0.0.9, < 0.2)
|
131
132
|
method_source (0.8.2)
|
132
|
-
mime-types (
|
133
|
+
mime-types (2.4.3)
|
133
134
|
mini_portile (0.6.0)
|
134
|
-
minitest (5.4.
|
135
|
-
msgpack (0.5.
|
135
|
+
minitest (5.4.2)
|
136
|
+
msgpack (0.5.9)
|
136
137
|
multi_json (1.10.1)
|
137
138
|
net-http-digest_auth (1.4)
|
138
139
|
net-http-persistent (2.9.4)
|
139
|
-
nokogiri (1.6.
|
140
|
+
nokogiri (1.6.3.1)
|
140
141
|
mini_portile (= 0.6.0)
|
141
142
|
ntlm-http (0.1.1)
|
142
143
|
poltergeist (1.5.1)
|
@@ -144,39 +145,38 @@ GEM
|
|
144
145
|
cliver (~> 0.3.1)
|
145
146
|
multi_json (~> 1.0)
|
146
147
|
websocket-driver (>= 0.2.0)
|
147
|
-
|
148
|
-
pry (0.10.0)
|
148
|
+
pry (0.10.1)
|
149
149
|
coderay (~> 1.1.0)
|
150
150
|
method_source (~> 0.8.1)
|
151
151
|
slop (~> 3.4)
|
152
|
-
puma (2.9.
|
152
|
+
puma (2.9.2)
|
153
153
|
rack (>= 1.1, < 2.0)
|
154
154
|
rack (1.5.2)
|
155
155
|
rack-test (0.6.2)
|
156
156
|
rack (>= 1.0)
|
157
|
-
rails (4.1.
|
158
|
-
actionmailer (= 4.1.
|
159
|
-
actionpack (= 4.1.
|
160
|
-
actionview (= 4.1.
|
161
|
-
activemodel (= 4.1.
|
162
|
-
activerecord (= 4.1.
|
163
|
-
activesupport (= 4.1.
|
157
|
+
rails (4.1.7)
|
158
|
+
actionmailer (= 4.1.7)
|
159
|
+
actionpack (= 4.1.7)
|
160
|
+
actionview (= 4.1.7)
|
161
|
+
activemodel (= 4.1.7)
|
162
|
+
activerecord (= 4.1.7)
|
163
|
+
activesupport (= 4.1.7)
|
164
164
|
bundler (>= 1.3.0, < 2.0)
|
165
|
-
railties (= 4.1.
|
165
|
+
railties (= 4.1.7)
|
166
166
|
sprockets-rails (~> 2.0)
|
167
|
-
railties (4.1.
|
168
|
-
actionpack (= 4.1.
|
169
|
-
activesupport (= 4.1.
|
167
|
+
railties (4.1.7)
|
168
|
+
actionpack (= 4.1.7)
|
169
|
+
activesupport (= 4.1.7)
|
170
170
|
rake (>= 0.8.7)
|
171
171
|
thor (>= 0.18.1, < 2.0)
|
172
172
|
rake (10.3.2)
|
173
173
|
request_store (1.1.0)
|
174
174
|
rspec-collection_matchers (1.0.0)
|
175
175
|
rspec-expectations (>= 2.99.0.beta1)
|
176
|
-
rspec-core (2.99.
|
177
|
-
rspec-expectations (2.99.
|
176
|
+
rspec-core (2.99.2)
|
177
|
+
rspec-expectations (2.99.2)
|
178
178
|
diff-lcs (>= 1.1.3, < 2.0)
|
179
|
-
rspec-mocks (2.99.
|
179
|
+
rspec-mocks (2.99.2)
|
180
180
|
rspec-rails (2.99.0)
|
181
181
|
actionpack (>= 3.0)
|
182
182
|
activemodel (>= 3.0)
|
@@ -187,12 +187,12 @@ GEM
|
|
187
187
|
rspec-expectations (~> 2.99.0)
|
188
188
|
rspec-mocks (~> 2.99.0)
|
189
189
|
rubyzip (1.1.6)
|
190
|
-
safe_yaml (1.0.
|
190
|
+
safe_yaml (1.0.4)
|
191
191
|
sass (3.2.19)
|
192
|
-
sass-rails (4.0.
|
192
|
+
sass-rails (4.0.4)
|
193
193
|
railties (>= 4.0.0, < 5.0)
|
194
|
-
sass (~> 3.2.
|
195
|
-
sprockets (~> 2.8,
|
194
|
+
sass (~> 3.2.2)
|
195
|
+
sprockets (~> 2.8, < 2.12)
|
196
196
|
sprockets-rails (~> 2.0)
|
197
197
|
settingslogic (2.0.9)
|
198
198
|
sigdump (0.2.2)
|
@@ -200,16 +200,16 @@ GEM
|
|
200
200
|
multi_json (~> 1.0)
|
201
201
|
simplecov-html (~> 0.7.1)
|
202
202
|
simplecov-html (0.7.1)
|
203
|
-
slop (3.
|
204
|
-
sprockets (2.11.
|
203
|
+
slop (3.6.0)
|
204
|
+
sprockets (2.11.3)
|
205
205
|
hike (~> 1.2)
|
206
206
|
multi_json (~> 1.0)
|
207
207
|
rack (~> 1.0)
|
208
208
|
tilt (~> 1.1, != 1.3.0)
|
209
|
-
sprockets-rails (2.
|
209
|
+
sprockets-rails (2.2.0)
|
210
210
|
actionpack (>= 3.0)
|
211
211
|
activesupport (>= 3.0)
|
212
|
-
sprockets (
|
212
|
+
sprockets (>= 2.8, < 4.0)
|
213
213
|
sucker_punch (1.0.5)
|
214
214
|
celluloid (~> 0.15.2)
|
215
215
|
thor (0.19.1)
|
@@ -217,11 +217,10 @@ GEM
|
|
217
217
|
tilt (1.4.1)
|
218
218
|
timecop (0.7.1)
|
219
219
|
timers (1.1.0)
|
220
|
-
|
221
|
-
polyglot
|
222
|
-
polyglot (>= 0.3.1)
|
223
|
-
tzinfo (1.2.1)
|
220
|
+
tzinfo (1.2.2)
|
224
221
|
thread_safe (~> 0.1)
|
222
|
+
tzinfo-data (1.2014.9)
|
223
|
+
tzinfo (>= 1.0.0)
|
225
224
|
unf (0.1.4)
|
226
225
|
unf_ext
|
227
226
|
unf_ext (0.0.6)
|
@@ -229,7 +228,7 @@ GEM
|
|
229
228
|
addressable (>= 2.3.6)
|
230
229
|
crack (>= 0.3.2)
|
231
230
|
webrobots (0.1.1)
|
232
|
-
websocket-driver (0.3.
|
231
|
+
websocket-driver (0.3.5)
|
233
232
|
xpath (2.0.0)
|
234
233
|
nokogiri (~> 1.3)
|
235
234
|
yajl-ruby (1.2.1)
|
@@ -4,10 +4,13 @@ module SettingConcern
|
|
4
4
|
included do
|
5
5
|
before_action :login_required
|
6
6
|
before_action :find_fluentd
|
7
|
+
helper_method :target_plugin_name, :plugin_setting_form_action_url
|
7
8
|
end
|
8
9
|
|
10
|
+
|
9
11
|
def show
|
10
12
|
@setting = target_class.new(initial_params)
|
13
|
+
render "shared/settings/show"
|
11
14
|
end
|
12
15
|
|
13
16
|
def finish
|
@@ -31,4 +34,16 @@ module SettingConcern
|
|
31
34
|
def setting_params
|
32
35
|
params.require(target_class.to_s.underscore.gsub("/", "_")).permit(*target_class.const_get(:KEYS))
|
33
36
|
end
|
37
|
+
|
38
|
+
def initial_params
|
39
|
+
target_class.initial_params
|
40
|
+
end
|
41
|
+
|
42
|
+
def target_plugin_name
|
43
|
+
target_class.to_s.split("::").last.underscore
|
44
|
+
end
|
45
|
+
|
46
|
+
def plugin_setting_form_action_url(*args)
|
47
|
+
send("finish_daemon_setting_#{target_plugin_name}_path", *args)
|
48
|
+
end
|
34
49
|
end
|
@@ -6,16 +6,4 @@ class Fluentd::Settings::OutElasticsearchController < ApplicationController
|
|
6
6
|
def target_class
|
7
7
|
Fluentd::Setting::OutElasticsearch
|
8
8
|
end
|
9
|
-
|
10
|
-
def initial_params
|
11
|
-
{
|
12
|
-
host: "127.0.0.1",
|
13
|
-
port: 9200,
|
14
|
-
index_name: "via_fluentd",
|
15
|
-
type_name: "via_fluentd",
|
16
|
-
logstash_format: true,
|
17
|
-
include_tag_key: false,
|
18
|
-
utc_index: true,
|
19
|
-
}
|
20
|
-
end
|
21
9
|
end
|
@@ -1,34 +1,12 @@
|
|
1
1
|
class Fluentd::Settings::OutS3Controller < ApplicationController
|
2
|
-
|
3
|
-
before_action :find_fluentd
|
2
|
+
include SettingConcern
|
4
3
|
|
5
|
-
|
6
|
-
@setting = Fluentd::Setting::OutS3.new({
|
7
|
-
s3_endpoint: "s3-us-west-1.amazonaws.com",
|
8
|
-
output_tag: true,
|
9
|
-
output_time: true,
|
10
|
-
use_ssl: true,
|
11
|
-
})
|
12
|
-
end
|
13
|
-
|
14
|
-
def finish
|
15
|
-
@setting = Fluentd::Setting::OutS3.new(setting_params)
|
16
|
-
unless @setting.valid?
|
17
|
-
return render "show"
|
18
|
-
end
|
4
|
+
private
|
19
5
|
|
20
|
-
|
21
|
-
|
22
|
-
unless @fluentd.agent.restart
|
23
|
-
@setting.errors.add(:base, @fluentd.agent.log_tail(1).first)
|
24
|
-
return render "show"
|
25
|
-
end
|
26
|
-
end
|
27
|
-
redirect_to daemon_setting_path(@fluentd)
|
6
|
+
def target_class
|
7
|
+
Fluentd::Setting::OutS3
|
28
8
|
end
|
29
9
|
|
30
|
-
private
|
31
|
-
|
32
10
|
def setting_params
|
33
11
|
params.require(:fluentd_setting_out_s3).permit(*Fluentd::Setting::OutS3::KEYS)
|
34
12
|
end
|
@@ -11,6 +11,23 @@ class Fluentd
|
|
11
11
|
attr_accessor(*KEYS)
|
12
12
|
|
13
13
|
validates :tag, presence: true
|
14
|
+
|
15
|
+
def self.initial_params
|
16
|
+
{
|
17
|
+
bind: "0.0.0.0",
|
18
|
+
port: 5140,
|
19
|
+
}
|
20
|
+
end
|
21
|
+
|
22
|
+
def common_options
|
23
|
+
[
|
24
|
+
:tag, :bind, :port, :types,
|
25
|
+
]
|
26
|
+
end
|
27
|
+
|
28
|
+
def advanced_options
|
29
|
+
[]
|
30
|
+
end
|
14
31
|
end
|
15
32
|
end
|
16
33
|
end
|
@@ -19,6 +19,32 @@ class Fluentd
|
|
19
19
|
validates :port, presence: true
|
20
20
|
validates :index_name, presence: true
|
21
21
|
validates :type_name, presence: true
|
22
|
+
|
23
|
+
def self.initial_params
|
24
|
+
{
|
25
|
+
host: "127.0.0.1",
|
26
|
+
port: 9200,
|
27
|
+
index_name: "via_fluentd",
|
28
|
+
type_name: "via_fluentd",
|
29
|
+
logstash_format: true,
|
30
|
+
include_tag_key: false,
|
31
|
+
utc_index: true,
|
32
|
+
}
|
33
|
+
end
|
34
|
+
|
35
|
+
def common_options
|
36
|
+
[
|
37
|
+
:match, :host, :port, :logstash_format,
|
38
|
+
:index_name, :type_name,
|
39
|
+
]
|
40
|
+
end
|
41
|
+
|
42
|
+
def advanced_options
|
43
|
+
[
|
44
|
+
:hosts, :logstash_prefix, :logstash_dateformat,
|
45
|
+
:utc_index, :request_timeout, :include_tag_key,
|
46
|
+
]
|
47
|
+
end
|
22
48
|
end
|
23
49
|
end
|
24
50
|
end
|