apisonator 3.3.1.1 → 3.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +23 -0
- data/Gemfile.base +2 -2
- data/Gemfile.lock +12 -12
- data/Gemfile.on_prem.lock +12 -12
- data/lib/3scale/backend/configuration.rb +0 -1
- data/lib/3scale/backend/rack.rb +4 -1
- data/lib/3scale/backend/stats/aggregator.rb +4 -0
- data/lib/3scale/backend/version.rb +1 -1
- data/lib/3scale/prometheus_server.rb +1 -1
- data/licenses.xml +6 -6
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 881dcbb24dbe3757ed8d786f49cdf6aab9dce3bb060f26387f142b4e825e06a1
|
4
|
+
data.tar.gz: e25f370546c286d5400fdbf19331ef554f34ce47c91df522007039c1fbf322e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 618be1a317cee54f1892357f7a64739b79eb0e203e15ae03a367176642e4d526c72d283a59438640e1e6503fd5e72a85be230deab76e6ac13c2305e8080aacd5
|
7
|
+
data.tar.gz: e7150ec528c2dc2b2b0f53a69fa50b2f5b7af52f736ca0a74196a38ae6be1b8a6913fd81fc609f00e18278c2fab571a7a926f647635b9b264b7abd7099673584
|
data/CHANGELOG.md
CHANGED
@@ -2,6 +2,29 @@
|
|
2
2
|
|
3
3
|
Notable changes to Apisonator will be tracked in this document.
|
4
4
|
|
5
|
+
## 3.3.2 - 2021-02-23
|
6
|
+
|
7
|
+
### Fixed
|
8
|
+
|
9
|
+
- Fixed nil exception in `Aggregator.process`
|
10
|
+
([#269](https://github.com/3scale/apisonator/pull/269)).
|
11
|
+
|
12
|
+
### Changed
|
13
|
+
|
14
|
+
- Updated to Ruby 2.7 in Docker images
|
15
|
+
([#265](https://github.com/3scale/apisonator/pull/265)) and
|
16
|
+
([#266](https://github.com/3scale/apisonator/pull/266)).
|
17
|
+
- Updated pry to 0.14.0 and pry-doc to 1.1.0
|
18
|
+
([#267](https://github.com/3scale/apisonator/pull/267)).
|
19
|
+
- Updated Docker image to be based on RHEL UBI 8
|
20
|
+
([#268](https://github.com/3scale/apisonator/pull/268)).
|
21
|
+
|
22
|
+
### Removed
|
23
|
+
|
24
|
+
- Removed redundant prometheus config params
|
25
|
+
(`listener_prometheus_metrics.enabled` and `listener_prometheus_metrics.port`)
|
26
|
+
([#270](https://github.com/3scale/apisonator/pull/270)).
|
27
|
+
|
5
28
|
## 3.3.1.1 - 2021-02-12
|
6
29
|
|
7
30
|
### Changed
|
data/Gemfile.base
CHANGED
@@ -36,8 +36,8 @@ end
|
|
36
36
|
group :development do
|
37
37
|
gem 'sshkit'
|
38
38
|
gem 'source2swagger', git: 'https://github.com/3scale/source2swagger', branch: 'backend'
|
39
|
-
gem 'pry', '~> 0.
|
40
|
-
gem 'pry-doc', '~>
|
39
|
+
gem 'pry', '~> 0.14'
|
40
|
+
gem 'pry-doc', '~> 1.1'
|
41
41
|
gem 'license_finder', '~> 5'
|
42
42
|
end
|
43
43
|
|
data/Gemfile.lock
CHANGED
@@ -36,7 +36,7 @@ GIT
|
|
36
36
|
PATH
|
37
37
|
remote: .
|
38
38
|
specs:
|
39
|
-
apisonator (3.3.
|
39
|
+
apisonator (3.3.2)
|
40
40
|
|
41
41
|
GEM
|
42
42
|
remote: https://rubygems.org/
|
@@ -96,7 +96,7 @@ GEM
|
|
96
96
|
chronic (0.10.2)
|
97
97
|
codeclimate-test-reporter (0.6.0)
|
98
98
|
simplecov (>= 0.7.1, < 1.0.0)
|
99
|
-
coderay (1.1.
|
99
|
+
coderay (1.1.3)
|
100
100
|
concurrent-ruby (1.1.6)
|
101
101
|
console (1.8.2)
|
102
102
|
daemons (1.2.4)
|
@@ -131,7 +131,7 @@ GEM
|
|
131
131
|
localhost (1.1.6)
|
132
132
|
mapping (1.1.1)
|
133
133
|
metaclass (0.0.4)
|
134
|
-
method_source (0.
|
134
|
+
method_source (1.0.0)
|
135
135
|
mini_portile2 (2.4.0)
|
136
136
|
minitest (5.14.1)
|
137
137
|
mocha (1.3.0)
|
@@ -164,15 +164,15 @@ GEM
|
|
164
164
|
protocol-hpack (~> 1.4)
|
165
165
|
protocol-http (~> 0.15)
|
166
166
|
protocol-redis (0.5.0)
|
167
|
-
pry (0.
|
168
|
-
coderay (~> 1.1
|
169
|
-
method_source (~>
|
167
|
+
pry (0.14.0)
|
168
|
+
coderay (~> 1.1)
|
169
|
+
method_source (~> 1.0)
|
170
170
|
pry-byebug (3.5.1)
|
171
171
|
byebug (~> 9.1)
|
172
172
|
pry (~> 0.10)
|
173
|
-
pry-doc (
|
174
|
-
pry (~> 0.
|
175
|
-
yard (~> 0.9)
|
173
|
+
pry-doc (1.1.0)
|
174
|
+
pry (~> 0.11)
|
175
|
+
yard (~> 0.9.11)
|
176
176
|
rack (2.1.4)
|
177
177
|
rack-protection (2.0.3)
|
178
178
|
rack
|
@@ -260,7 +260,7 @@ GEM
|
|
260
260
|
prometheus-client (~> 1.0)
|
261
261
|
yabeda (~> 0.5)
|
262
262
|
yajl-ruby (1.3.1)
|
263
|
-
yard (0.9.
|
263
|
+
yard (0.9.26)
|
264
264
|
|
265
265
|
PLATFORMS
|
266
266
|
ruby
|
@@ -284,9 +284,9 @@ DEPENDENCIES
|
|
284
284
|
nokogiri (~> 1.10.8)
|
285
285
|
pg (= 0.20.0)
|
286
286
|
pkg-config (~> 1.1.7)
|
287
|
-
pry (~> 0.
|
287
|
+
pry (~> 0.14)
|
288
288
|
pry-byebug (~> 3.5.1)
|
289
|
-
pry-doc (~>
|
289
|
+
pry-doc (~> 1.1)
|
290
290
|
puma!
|
291
291
|
rack (~> 2.1.4)
|
292
292
|
rack-test (= 0.8.2)
|
data/Gemfile.on_prem.lock
CHANGED
@@ -36,7 +36,7 @@ GIT
|
|
36
36
|
PATH
|
37
37
|
remote: .
|
38
38
|
specs:
|
39
|
-
apisonator (3.3.
|
39
|
+
apisonator (3.3.2)
|
40
40
|
|
41
41
|
GEM
|
42
42
|
remote: https://rubygems.org/
|
@@ -86,7 +86,7 @@ GEM
|
|
86
86
|
byebug (9.1.0)
|
87
87
|
codeclimate-test-reporter (0.6.0)
|
88
88
|
simplecov (>= 0.7.1, < 1.0.0)
|
89
|
-
coderay (1.1.
|
89
|
+
coderay (1.1.3)
|
90
90
|
concurrent-ruby (1.1.6)
|
91
91
|
console (1.8.2)
|
92
92
|
daemons (1.2.4)
|
@@ -120,7 +120,7 @@ GEM
|
|
120
120
|
localhost (1.1.6)
|
121
121
|
mapping (1.1.1)
|
122
122
|
metaclass (0.0.4)
|
123
|
-
method_source (0.
|
123
|
+
method_source (1.0.0)
|
124
124
|
mini_portile2 (2.4.0)
|
125
125
|
minitest (5.14.1)
|
126
126
|
mocha (1.3.0)
|
@@ -152,15 +152,15 @@ GEM
|
|
152
152
|
protocol-hpack (~> 1.4)
|
153
153
|
protocol-http (~> 0.15)
|
154
154
|
protocol-redis (0.5.0)
|
155
|
-
pry (0.
|
156
|
-
coderay (~> 1.1
|
157
|
-
method_source (~>
|
155
|
+
pry (0.14.0)
|
156
|
+
coderay (~> 1.1)
|
157
|
+
method_source (~> 1.0)
|
158
158
|
pry-byebug (3.5.1)
|
159
159
|
byebug (~> 9.1)
|
160
160
|
pry (~> 0.10)
|
161
|
-
pry-doc (
|
162
|
-
pry (~> 0.
|
163
|
-
yard (~> 0.9)
|
161
|
+
pry-doc (1.1.0)
|
162
|
+
pry (~> 0.11)
|
163
|
+
yard (~> 0.9.11)
|
164
164
|
rack (2.1.4)
|
165
165
|
rack-protection (2.0.3)
|
166
166
|
rack
|
@@ -244,7 +244,7 @@ GEM
|
|
244
244
|
prometheus-client (~> 1.0)
|
245
245
|
yabeda (~> 0.5)
|
246
246
|
yajl-ruby (1.3.1)
|
247
|
-
yard (0.9.
|
247
|
+
yard (0.9.26)
|
248
248
|
|
249
249
|
PLATFORMS
|
250
250
|
ruby
|
@@ -265,9 +265,9 @@ DEPENDENCIES
|
|
265
265
|
mocha (~> 1.3)
|
266
266
|
nokogiri (~> 1.10.8)
|
267
267
|
pkg-config (~> 1.1.7)
|
268
|
-
pry (~> 0.
|
268
|
+
pry (~> 0.14)
|
269
269
|
pry-byebug (~> 3.5.1)
|
270
|
-
pry-doc (~>
|
270
|
+
pry-doc (~> 1.1)
|
271
271
|
puma!
|
272
272
|
rack (~> 2.1.4)
|
273
273
|
rack-test (= 0.8.2)
|
@@ -58,7 +58,6 @@ module ThreeScale
|
|
58
58
|
config.add_section(:internal_api, :user, :password)
|
59
59
|
config.add_section(:master, :metrics)
|
60
60
|
config.add_section(:worker_prometheus_metrics, :enabled, :port)
|
61
|
-
config.add_section(:listener_prometheus_metrics, :enabled, :port)
|
62
61
|
|
63
62
|
config.add_section(
|
64
63
|
:async_worker,
|
data/lib/3scale/backend/rack.rb
CHANGED
@@ -17,7 +17,10 @@ module ThreeScale
|
|
17
17
|
|
18
18
|
Backend::Logging::External.setup_rack self
|
19
19
|
|
20
|
-
|
20
|
+
# Notice that this cannot be specified via config, it needs to be an
|
21
|
+
# ENV because the metric server is started in Puma/Falcon
|
22
|
+
# "before_fork" and the configuration is not loaded at that point.
|
23
|
+
if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s.downcase.freeze == 'true'.freeze
|
21
24
|
use Rack::Prometheus
|
22
25
|
end
|
23
26
|
|
@@ -145,6 +145,10 @@ module ThreeScale
|
|
145
145
|
application = Backend::Application.load(service_id,
|
146
146
|
values[:application_id])
|
147
147
|
|
148
|
+
# The app could have been deleted at some point since the job was
|
149
|
+
# enqueued. No need to update alerts in that case.
|
150
|
+
next unless application
|
151
|
+
|
148
152
|
application.load_metric_names
|
149
153
|
usage = Usage.application_usage(application, current_timestamp)
|
150
154
|
status = Transactor::Status.new(service_id: service_id,
|
@@ -4,7 +4,7 @@
|
|
4
4
|
require_relative '../3scale/backend/listener_metrics'
|
5
5
|
|
6
6
|
# Config is not loaded at this point, so read ENV instead.
|
7
|
-
if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s == 'true'
|
7
|
+
if ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_ENABLED'].to_s.downcase.freeze == 'true'.freeze
|
8
8
|
prometheus_port = ENV['CONFIG_LISTENER_PROMETHEUS_METRICS_PORT']
|
9
9
|
ThreeScale::Backend::ListenerMetrics.start_metrics_server(prometheus_port)
|
10
10
|
end
|
data/licenses.xml
CHANGED
@@ -23,7 +23,7 @@
|
|
23
23
|
</dependency>
|
24
24
|
<dependency>
|
25
25
|
<packageName>apisonator</packageName>
|
26
|
-
<version>3.3.
|
26
|
+
<version>3.3.2</version>
|
27
27
|
<licenses>
|
28
28
|
<license>
|
29
29
|
<name>Apache 2.0</name>
|
@@ -233,7 +233,7 @@
|
|
233
233
|
</dependency>
|
234
234
|
<dependency>
|
235
235
|
<packageName>coderay</packageName>
|
236
|
-
<version>1.1.
|
236
|
+
<version>1.1.3</version>
|
237
237
|
<licenses>
|
238
238
|
<license>
|
239
239
|
<name>MIT</name>
|
@@ -421,7 +421,7 @@
|
|
421
421
|
</dependency>
|
422
422
|
<dependency>
|
423
423
|
<packageName>method_source</packageName>
|
424
|
-
<version>0.
|
424
|
+
<version>1.0.0</version>
|
425
425
|
<licenses>
|
426
426
|
<license>
|
427
427
|
<name>MIT</name>
|
@@ -679,7 +679,7 @@
|
|
679
679
|
</dependency>
|
680
680
|
<dependency>
|
681
681
|
<packageName>pry</packageName>
|
682
|
-
<version>0.
|
682
|
+
<version>0.14.0</version>
|
683
683
|
<licenses>
|
684
684
|
<license>
|
685
685
|
<name>MIT</name>
|
@@ -699,7 +699,7 @@
|
|
699
699
|
</dependency>
|
700
700
|
<dependency>
|
701
701
|
<packageName>pry-doc</packageName>
|
702
|
-
<version>
|
702
|
+
<version>1.1.0</version>
|
703
703
|
<licenses>
|
704
704
|
<license>
|
705
705
|
<name>MIT</name>
|
@@ -1143,7 +1143,7 @@
|
|
1143
1143
|
</dependency>
|
1144
1144
|
<dependency>
|
1145
1145
|
<packageName>yard</packageName>
|
1146
|
-
<version>0.9.
|
1146
|
+
<version>0.9.26</version>
|
1147
1147
|
<licenses>
|
1148
1148
|
<license>
|
1149
1149
|
<name>MIT</name>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apisonator
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.
|
4
|
+
version: 3.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Ciganek
|
@@ -16,7 +16,7 @@ authors:
|
|
16
16
|
autorequire:
|
17
17
|
bindir: bin
|
18
18
|
cert_chain: []
|
19
|
-
date: 2021-02-
|
19
|
+
date: 2021-02-23 00:00:00.000000000 Z
|
20
20
|
dependencies: []
|
21
21
|
description: This gem provides a daemon that handles authorization and reporting of
|
22
22
|
web services managed by 3scale.
|
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: 1.3.7
|
209
209
|
requirements: []
|
210
|
-
|
211
|
-
rubygems_version: 2.7.8
|
210
|
+
rubygems_version: 3.2.10
|
212
211
|
signing_key:
|
213
212
|
specification_version: 4
|
214
213
|
summary: 3scale web service management system backend
|