ruby-grafana-reporter 0.4.2 → 0.4.3
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.
- checksums.yaml +4 -4
- data/lib/VERSION.rb +2 -2
- data/lib/grafana/influxdb_datasource.rb +1 -1
- data/lib/grafana_reporter/abstract_query.rb +3 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 24eeae0371069c8375a2d1eaa9533630f57d63939ba8426041b8c6ccc3a3ddd9
|
4
|
+
data.tar.gz: 0deba99c14aead036fe70fc0bd07a4cac5332f436282e5fffdaba5884c3a5c47
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1bfd492430be9661470ab7ee9ceb25bdbfb91e845adbdd8d493c3fd121a4e09c68b52c2bb74793422ab4940507cd27fb8542e4a1aa6dde8da9ce6ceb2339a751
|
7
|
+
data.tar.gz: fe2aced545c186bb803dfdbfe0988d4af135e39d45c6243cbf69c6e4012e96c15be1d4fdd5c76004593b4b4b4ed849240471304b9147c46ea42c415ef7ac47e1
|
data/lib/VERSION.rb
CHANGED
@@ -15,7 +15,7 @@ module Grafana
|
|
15
15
|
def request(query_description)
|
16
16
|
raise MissingSqlQueryError if query_description[:raw_query].nil?
|
17
17
|
|
18
|
-
url = "/api/datasources/proxy/#{id}/query?db=#{@model['database']}&q=#{
|
18
|
+
url = "/api/datasources/proxy/#{id}/query?db=#{@model['database']}&q=#{ERB::Util.url_encode(query_description[:raw_query])}&epoch=ms"
|
19
19
|
|
20
20
|
webrequest = query_description[:prepared_request]
|
21
21
|
webrequest.relative_url = url
|
@@ -327,7 +327,7 @@ module GrafanaReporter
|
|
327
327
|
# check if a relative date is mentioned
|
328
328
|
date_spec = orig_date.clone
|
329
329
|
|
330
|
-
date_spec.
|
330
|
+
date_spec = date_spec.gsub(/^now/, '')
|
331
331
|
raise TimeRangeUnknownError, orig_date unless date_spec
|
332
332
|
|
333
333
|
date = DateTime.parse(report_time.raw_value)
|
@@ -338,13 +338,13 @@ module GrafanaReporter
|
|
338
338
|
fit_match = date_spec.match(%r{^/(?<fit>[smhdwMy])})
|
339
339
|
if fit_match
|
340
340
|
date = fit_date(date, fit_match[:fit], is_to_time)
|
341
|
-
date_spec.
|
341
|
+
date_spec = date_spec.gsub(%r{^/#{fit_match[:fit]}}, '')
|
342
342
|
end
|
343
343
|
|
344
344
|
delta_match = date_spec.match(/^(?<op>(?:-|\+))(?<count>\d+)?(?<unit>[smhdwMy])/)
|
345
345
|
if delta_match
|
346
346
|
date = delta_date(date, "#{delta_match[:op]}#{delta_match[:count] || 1}".to_i, delta_match[:unit])
|
347
|
-
date_spec.
|
347
|
+
date_spec = date_spec.gsub(/^#{delta_match[:op]}#{delta_match[:count]}#{delta_match[:unit]}/, '')
|
348
348
|
end
|
349
349
|
|
350
350
|
raise TimeRangeUnknownError, orig_date unless fit_match || delta_match
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ruby-grafana-reporter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Christian Kohlmeyer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-06-
|
11
|
+
date: 2021-06-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: asciidoctor
|