norikra-client 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/norikra/client/cli.rb +12 -6
- data/lib/norikra/client/version.rb +1 -1
- data/lib/norikra/client.rb +4 -4
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 977d1aa48be9fffbe3e15345ada507f13f015025
|
4
|
+
data.tar.gz: be8ae108a34d29bae3b9e41492bda892e343ab83
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f8736c37f9ab56a2cfa7107c6f988900f97553bf6a9fcf1b93526e975ce9f85318bd4d39b3879515d5254b96c3dbcadfc9cd5c1e4c2e054ec423fa0c8d7f300c
|
7
|
+
data.tar.gz: bf112510340cafe31499916244eddfe08a748e7f6539f2d34812c9405e1756bd062b752f9b7b6bda99046111194028a1baf4fee23664d04795550c2f3cc770fc
|
data/lib/norikra/client/cli.rb
CHANGED
@@ -67,19 +67,25 @@ class Norikra::Client
|
|
67
67
|
option :simple, :type => :boolean, :default => false, :desc => "suppress header/footer", :aliases => "-s"
|
68
68
|
def list
|
69
69
|
wrap do
|
70
|
-
puts "QUERY_NAME\
|
70
|
+
puts ["QUERY_NAME", "GROUP", "TARGETS", "QUERY"].join("\t") unless options[:simple]
|
71
71
|
queries = client(parent_options).queries
|
72
72
|
queries.sort{|a,b| (a['targets'].first <=> b['targets'].first).nonzero? || a['name'] <=> b['name']}.each do |q|
|
73
|
-
puts
|
73
|
+
puts [
|
74
|
+
q['name'],
|
75
|
+
(q['group'] || 'default'),
|
76
|
+
q['targets'].join(','),
|
77
|
+
q['expression']
|
78
|
+
].join("\t")
|
74
79
|
end
|
75
80
|
puts "#{queries.size} queries found." unless options[:simple]
|
76
81
|
end
|
77
82
|
end
|
78
83
|
|
79
84
|
desc "add QUERY_NAME QUERY_EXPRESSION", "register a query"
|
85
|
+
option :group, :type => :string, :default => nil, :desc => "query group for sweep/listen (default: null)", :aliases => "-g"
|
80
86
|
def add(query_name, expression)
|
81
87
|
wrap do
|
82
|
-
client(parent_options).register(query_name, expression)
|
88
|
+
client(parent_options).register(query_name, options[:group], expression)
|
83
89
|
end
|
84
90
|
end
|
85
91
|
|
@@ -153,17 +159,17 @@ class Norikra::Client
|
|
153
159
|
end
|
154
160
|
end
|
155
161
|
|
156
|
-
desc "sweep", "fetch all output events of all queries"
|
162
|
+
desc "sweep [query_group_name]", "fetch all output events of all queries of default (or specified) query group"
|
157
163
|
option :format, :type => :string, :default => 'json', :desc => "format of output data per line of stdout [json(default), ltsv]"
|
158
164
|
option :query_name_key, :type => :string, :default => 'query', :desc => "output key name for query name (default: query)"
|
159
165
|
option :time_key, :type => :string, :default => 'time', :desc => "output key name for event time (default: time)"
|
160
166
|
option :time_format, :type => :string, :default => '%Y/%m/%d %H:%M:%S', :desc => "output time format (default: '2013/05/14 17:57:59')"
|
161
|
-
def sweep
|
167
|
+
def sweep(query_group=nil)
|
162
168
|
wrap do
|
163
169
|
formatter = formatter(options[:format])
|
164
170
|
time_formatter = lambda{|t| Time.at(t).strftime(options[:time_format])}
|
165
171
|
|
166
|
-
data = client(parent_options).sweep
|
172
|
+
data = client(parent_options).sweep(query_group)
|
167
173
|
|
168
174
|
data.keys.sort.each do |queryname|
|
169
175
|
events = data[queryname]
|
data/lib/norikra/client.rb
CHANGED
@@ -36,8 +36,8 @@ module Norikra
|
|
36
36
|
@client.call(:queries)
|
37
37
|
end
|
38
38
|
|
39
|
-
def register(query_name, query_expression)
|
40
|
-
@client.call(:register, query_name, query_expression)
|
39
|
+
def register(query_name, query_group, query_expression)
|
40
|
+
@client.call(:register, query_name, query_group, query_expression)
|
41
41
|
end
|
42
42
|
|
43
43
|
def deregister(query_name)
|
@@ -62,8 +62,8 @@ module Norikra
|
|
62
62
|
end
|
63
63
|
|
64
64
|
# {'query_name' => [ [time, event], ... ]}
|
65
|
-
def sweep
|
66
|
-
@client.call(:sweep)
|
65
|
+
def sweep(query_group=nil)
|
66
|
+
@client.call(:sweep, query_group)
|
67
67
|
end
|
68
68
|
end
|
69
69
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: norikra-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- TAGOMORI Satoshi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-
|
11
|
+
date: 2013-09-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: msgpack-rpc-over-http
|
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
121
121
|
version: '0'
|
122
122
|
requirements: []
|
123
123
|
rubyforge_project:
|
124
|
-
rubygems_version: 2.0.
|
124
|
+
rubygems_version: 2.0.3
|
125
125
|
signing_key:
|
126
126
|
specification_version: 4
|
127
127
|
summary: Client commands and libraries for Norikra
|