plunk 0.2.7 → 0.2.8
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/Gemfile.lock +1 -1
- data/lib/plunk/result_set.rb +1 -1
- data/plunk.gemspec +1 -1
- data/spec/chained_search_spec.rb +14 -19
- data/spec/last_spec.rb +13 -13
- data/spec/nested_search_spec.rb +1 -1
- data/spec/shared/plunk_stubs.rb +1 -1
- data/spec/shared/time_stubs.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d1df030ee7ffb629c5a935786caa66cf0ccec422
|
4
|
+
data.tar.gz: 0569af2f42d44ae588f16fb757a779b403221c66
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 966f3eda9a63ac9bfb2ce2f86ac5b3cbd8d2ab6881d27a8633995f0d4dfb00b7d2e70abbeab19ba7c9458c4c736c482aab594e8d9ffa884dccea4d09949571ca
|
7
|
+
data.tar.gz: c68a239707d1222dc8e05dbcd9437e769f0f7be44bc078c5e08fb9d4124a5b05a5208d4fece4e8067d22f9514ba49c5f75c8864e75ea900df354f478218dce6d
|
data/Gemfile.lock
CHANGED
data/lib/plunk/result_set.rb
CHANGED
@@ -47,7 +47,7 @@ module Plunk
|
|
47
47
|
|
48
48
|
result_sets.each do |result_set|
|
49
49
|
first.query[:query][:filtered][:filter][:and] <<
|
50
|
-
result_set.query[:query][:filtered]
|
50
|
+
result_set.query[:query][:filtered]
|
51
51
|
|
52
52
|
if result_set.query[:query][:filtered][:filter]
|
53
53
|
first.query[:query][:filtered][:filter][:and] +=
|
data/plunk.gemspec
CHANGED
data/spec/chained_search_spec.rb
CHANGED
@@ -6,11 +6,6 @@ describe 'chained searches' do
|
|
6
6
|
include_context "time stubs"
|
7
7
|
include_context "plunk stubs"
|
8
8
|
|
9
|
-
before :each do
|
10
|
-
@time = Time.parse("01/01/2010 10:00")
|
11
|
-
Time.any_instance.stub(:now).and_return(@time)
|
12
|
-
end
|
13
|
-
|
14
9
|
it 'should parse last 24h foo_type=bar baz="fez" host=27.224.123.110' do
|
15
10
|
parsed = @parser.parse 'last 24h foo_type=bar baz="fez" host=27.224.123.110'
|
16
11
|
result = @transformer.apply parsed
|
@@ -21,17 +16,17 @@ describe 'chained searches' do
|
|
21
16
|
filter: {
|
22
17
|
and: [{
|
23
18
|
range: {
|
24
|
-
|
25
|
-
gte: @time - 24.hours,
|
26
|
-
lte: @time
|
19
|
+
:@timestamp => {
|
20
|
+
gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
|
21
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
27
22
|
}
|
28
23
|
}},
|
29
|
-
{query_string: {
|
30
|
-
query: 'baz:fez'
|
31
|
-
}},
|
32
|
-
{query_string: {
|
24
|
+
{query:{query_string: {
|
25
|
+
query: 'baz:"fez"'
|
26
|
+
}}},
|
27
|
+
{query:{query_string: {
|
33
28
|
query: 'host:27.224.123.110'
|
34
|
-
}}
|
29
|
+
}}}
|
35
30
|
]}}}})
|
36
31
|
end
|
37
32
|
|
@@ -46,16 +41,16 @@ describe 'chained searches' do
|
|
46
41
|
and: [{
|
47
42
|
range: {
|
48
43
|
:timestamp => {
|
49
|
-
gte: 1.day.
|
50
|
-
lte: @time
|
44
|
+
gte: (@time - 1.day).utc.to_datetime.iso8601(3),
|
45
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
51
46
|
}
|
52
47
|
}},
|
53
|
-
{query_string: {
|
48
|
+
{query:{query_string: {
|
54
49
|
query: 'baz:fez'
|
55
|
-
}},
|
56
|
-
{query_string: {
|
50
|
+
}}},
|
51
|
+
{query:{query_string: {
|
57
52
|
query: 'host:27.224.123.110'
|
58
|
-
}}
|
53
|
+
}}}
|
59
54
|
]}}}})
|
60
55
|
end
|
61
56
|
end
|
data/spec/last_spec.rb
CHANGED
@@ -11,8 +11,8 @@ describe 'the last command' do
|
|
11
11
|
expect(result.query.to_s).to eq({query:{filtered:{query:{
|
12
12
|
range: {
|
13
13
|
Plunk.timestamp_field => {
|
14
|
-
gte: @time - 24.hours,
|
15
|
-
lte: @time
|
14
|
+
gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
|
15
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
16
16
|
}}}}}}.to_s)
|
17
17
|
end
|
18
18
|
|
@@ -21,8 +21,8 @@ describe 'the last command' do
|
|
21
21
|
expect(result.query.to_s).to eq({query:{filtered:{query:{
|
22
22
|
range: {
|
23
23
|
Plunk.timestamp_field => {
|
24
|
-
gte: @time - 24.days,
|
25
|
-
lte: @time
|
24
|
+
gte: (@time - 24.days).utc.to_datetime.iso8601(3),
|
25
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
26
26
|
}}}}}}.to_s)
|
27
27
|
end
|
28
28
|
|
@@ -31,8 +31,8 @@ describe 'the last command' do
|
|
31
31
|
expect(result.query.to_s).to eq({query:{filtered:{query:{
|
32
32
|
range: {
|
33
33
|
Plunk.timestamp_field => {
|
34
|
-
gte: @time - 24.weeks,
|
35
|
-
lte: @time
|
34
|
+
gte: (@time - 24.weeks).utc.to_datetime.iso8601(3),
|
35
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
36
36
|
}}}}}}.to_s)
|
37
37
|
end
|
38
38
|
|
@@ -41,8 +41,8 @@ describe 'the last command' do
|
|
41
41
|
expect(result.query.to_s).to eq({query:{filtered:{query:{
|
42
42
|
range: {
|
43
43
|
Plunk.timestamp_field => {
|
44
|
-
gte: @time - 24.seconds,
|
45
|
-
lte: @time
|
44
|
+
gte: (@time - 24.seconds).utc.to_datetime.iso8601(3),
|
45
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
46
46
|
}}}}}}.to_s)
|
47
47
|
end
|
48
48
|
|
@@ -51,8 +51,8 @@ describe 'the last command' do
|
|
51
51
|
expect(result.query.to_s).to eq({query:{filtered:{query:{
|
52
52
|
range: {
|
53
53
|
Plunk.timestamp_field => {
|
54
|
-
gte: @time - 24.minutes,
|
55
|
-
lte: @time
|
54
|
+
gte: (@time - 24.minutes).utc.to_datetime.iso8601(3),
|
55
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
56
56
|
}}}}}}.to_s)
|
57
57
|
end
|
58
58
|
|
@@ -61,14 +61,14 @@ describe 'the last command' do
|
|
61
61
|
expect(result.query.to_s).to eq({query:{filtered:{
|
62
62
|
query:{
|
63
63
|
query_string: {
|
64
|
-
query: '@fields.foo
|
64
|
+
query: '@fields.foo.@field:bar'
|
65
65
|
}},
|
66
66
|
filter: {
|
67
67
|
and: [
|
68
68
|
range: {
|
69
69
|
Plunk.timestamp_field => {
|
70
|
-
gte: @time - 1.hour,
|
71
|
-
lte: @time
|
70
|
+
gte: (@time - 1.hour).utc.to_datetime.iso8601(3),
|
71
|
+
lte: @time.utc.to_datetime.iso8601(3)
|
72
72
|
}}]}}}}.to_s)
|
73
73
|
end
|
74
74
|
end
|
data/spec/nested_search_spec.rb
CHANGED
data/spec/shared/plunk_stubs.rb
CHANGED
data/spec/shared/time_stubs.rb
CHANGED