trisulrp 3.2.9 → 3.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c5a4e8a02d0cd3e01efc327bf0cea7f3e5709f7
-  data.tar.gz: 5968b88379c4cf79bc11278560751c43987285a8
+SHA256:
+  metadata.gz: 1eb9ef98c73c9736310f21bd9cdb84c4f6f2409dc4f1c0915aaf86f4d5522dba
+  data.tar.gz: e53eccfad2338f817067c392338d501bebd9c66e319e32fb189965f72f5d042b
 SHA512:
-  metadata.gz: fd0cd44e3a28314555f1e64a3c48a0635cafae12826fb4b6cfe8c3f4bfb3787455d216b054bfd8960037db77607c6bc25da86522efc3c57c082260cce06cda7c
-  data.tar.gz: 100144bf495624fa1dd3bd424c02e4382ab664d2fd9afc82833cd57a766f705cb90fd10182c74a78365cfb469b839b3cb55625883a7af8c645185f7a65a885c6
+  metadata.gz: 7a31a36b630e1e1f7a957fed3d3d4f480900f4cdfed69869bbeee628aa9a303c31b3f4f6a1e2740bd0297b6537896a38501a1b9d3a8395e279846f13a9490a51
+  data.tar.gz: 9080652d629291fb28f4b313c3f0c6769f1bc0117ca6d0295037e16b992d6bdecc435cd9a95c033b7458d61d8471310da781f33c4f2f79e6891e558916a95037

data/README.rdoc

@@ -16,7 +16,7 @@ Key Features :
 
 * TRP Documentation and Tutorials  http://trisul.org/docs/trp/index.html
 * Getting started tutorial http://trisul.org/docs/trp/trpgemsteps.html
-* Github repo of sample scripts  https://github.com/vivekrajan/trisul-scripts
+* Github repo of sample scripts  https://github.com/trisulnsm/trisul-scripts/trp
 
 
 == Contributing to trisulrp

data/Rakefile

@@ -1,3 +1,4 @@
+$SAFE=0
 require 'rubygems'
 require 'bundler'
 begin

data/VERSION

@@ -1 +1 @@
-3.2.9
+3.2.26

data/lib/trisulrp/protocol.rb

@@ -335,6 +335,32 @@ module TrisulRP::Protocol
     return  tint
   end
 
+
+  # Helper iterate through each time interval in reverse order 
+  #
+  # [endpoint]  - the ZMQ endpoint
+  #
+  # ==== Returns
+  # ==== Yields
+  # [time_interval,  id, total_intervals] A TRP::TimeInterval object which can be attached to any :time_interval field of a TRP request
+  #
+  #
+  def each_time_interval(zmq_endpt)
+
+    req=mk_request(TRP::Message::Command::TIMESLICES_REQUEST )
+    get_response_zmq(zmq_endpt,req) do |resp|
+
+     slice_id = 0
+     total_slices = resp.slices.size 
+
+     resp.slices.reverse_each do | slc |
+        yield slc.time_interval, slice_id, total_slices
+        slice_id=slice_id+1 
+      end 
+    end
+  end
+
+
   # Helper to allow assinging string to KeyT field
   #
   # instead of  
@@ -460,6 +486,9 @@ module TrisulRP::Protocol
     when TRP::Message::Command::QUERY_SESSIONS_REQUEST 
 	  fix_TRP_Fields( TRP::QuerySessionsRequest, params)
       req.query_sessions_request = TRP::QuerySessionsRequest.new(params)
+    when TRP::Message::Command::AGGREGATE_SESSIONS_REQUEST 
+	  fix_TRP_Fields( TRP::AggregateSessionsRequest, params)
+      req.aggregate_sessions_request = TRP::AggregateSessionsRequest.new(params)
     when TRP::Message::Command::GREP_REQUEST
 	  fix_TRP_Fields( TRP::GrepRequest, params)
       req.grep_request  = TRP::GrepRequest.new(params)
@@ -517,6 +546,12 @@ module TrisulRP::Protocol
     when TRP::Message::Command::GRAPH_REQUEST
 	  fix_TRP_Fields( TRP::GraphRequest, params)
       req.graph_request = TRP::GraphRequest.new(params)
+    when TRP::Message::Command::RUNTOOL_REQUEST
+	  fix_TRP_Fields( TRP::RunToolRequest, params)
+      req.run_tool_request = TRP::RunToolRequest.new(params)
+    when TRP::Message::Command::TOOL_INFO_REQUEST
+	  fix_TRP_Fields( TRP::ToolInfoRequest, params)
+      req.tool_info_request = TRP::ToolInfoRequest.new(params)
     else
       raise "Unknown TRP command ID"
     end
@@ -586,6 +621,8 @@ module TrisulRP::Protocol
         resp.session_tracker_response 
     when TRP::Message::Command::QUERY_SESSIONS_RESPONSE
         resp.query_sessions_response 
+    when TRP::Message::Command::AGGREGATE_SESSIONS_RESPONSE
+        resp.aggregate_sessions_response 
     when TRP::Message::Command::GREP_RESPONSE
         resp.grep_response  
     when TRP::Message::Command::KEYSPACE_RESPONSE
@@ -614,6 +651,10 @@ module TrisulRP::Protocol
         resp.file_response
     when TRP::Message::Command::GRAPH_RESPONSE
         resp.graph_response
+    when TRP::Message::Command::RUNTOOL_RESPONSE
+        resp.run_tool_response
+    when TRP::Message::Command::TOOL_INFO_RESPONSE
+        resp.tool_info_response
     else
       raise "#{resp.trp_command.to_i} Unknown TRP command ID"
     end

data/lib/trisulrp/trp.pb.rb

@@ -78,7 +78,11 @@ module TRP
 
   end
 
-  class CounterGroupT < ::Protobuf::Message; end
+  class CounterGroupT < ::Protobuf::Message
+    class Crosskey < ::Protobuf::Message; end
+
+  end
+
   class SessionT < ::Protobuf::Message; end
   class AlertT < ::Protobuf::Message; end
   class ResourceT < ::Protobuf::Message; end
@@ -159,6 +163,15 @@ module TRP
       define :SUBSYSTEM_EXIT, 125
       define :GRAPH_REQUEST, 130
       define :GRAPH_RESPONSE, 131
+      define :AGGREGATE_SESSIONS_REQUEST, 132
+      define :AGGREGATE_SESSIONS_RESPONSE, 133
+      define :RUNTOOL_REQUEST, 134
+      define :RUNTOOL_RESPONSE, 135
+      define :HA_CONTROL_REQUEST, 140
+      define :HA_CONTROL_RESPONSE, 141
+      define :DOMAIN_PING, 142
+      define :TOOL_INFO_REQUEST, 143
+      define :TOOL_INFO_RESPONSE, 144
     end
 
   end
@@ -177,6 +190,13 @@ module TRP
   class CounterGroupInfoResponse < ::Protobuf::Message; end
   class QuerySessionsRequest < ::Protobuf::Message; end
   class QuerySessionsResponse < ::Protobuf::Message; end
+  class AggregateSessionsRequest < ::Protobuf::Message; end
+  class AggregateSessionsResponse < ::Protobuf::Message
+    class KeyTCount < ::Protobuf::Message; end
+    class TagGroup < ::Protobuf::Message; end
+
+  end
+
   class UpdateKeyRequest < ::Protobuf::Message; end
   class SessionTrackerRequest < ::Protobuf::Message; end
   class SessionTrackerResponse < ::Protobuf::Message; end
@@ -184,6 +204,12 @@ module TRP
   class QueryAlertsResponse < ::Protobuf::Message; end
   class QueryResourcesRequest < ::Protobuf::Message; end
   class QueryResourcesResponse < ::Protobuf::Message; end
+  class AggregateResourcesRequest < ::Protobuf::Message; end
+  class AggregateResourcesResponse < ::Protobuf::Message
+    class KeyTCount < ::Protobuf::Message; end
+
+  end
+
   class KeySpaceRequest < ::Protobuf::Message
     class KeySpace < ::Protobuf::Message; end
 
@@ -227,6 +253,18 @@ module TRP
 
   end
 
+  class HAControlRequest < ::Protobuf::Message
+    class HAOperation < ::Protobuf::Enum
+      define :HA_TEST_REACHABILITY, 0
+      define :HA_SWITCH_BACKUP, 1
+      define :HA_SWITCH_PRIMARY, 2
+    end
+
+  end
+
+  class HAControlResponse < ::Protobuf::Message; end
+  class ToolInfoRequest < ::Protobuf::Message; end
+  class ToolInfoResponse < ::Protobuf::Message; end
   class NodeConfigRequest < ::Protobuf::Message
     class IntelFeed < ::Protobuf::Message; end
 
@@ -265,6 +303,18 @@ module TRP
   class FileResponse < ::Protobuf::Message; end
   class GraphRequest < ::Protobuf::Message; end
   class GraphResponse < ::Protobuf::Message; end
+  class RunToolRequest < ::Protobuf::Message
+    class NodeTool < ::Protobuf::Enum
+      define :PING, 1
+      define :DF, 2
+      define :GEOQUERY, 3
+      define :TOP, 4
+      define :BGPQUERY, 5
+    end
+
+  end
+
+  class RunToolResponse < ::Protobuf::Message; end
 
 
   ##
@@ -330,15 +380,25 @@ module TRP
     optional :string, :description, 4
     optional :int64, :metric, 5
     repeated ::TRP::KeyT::NameValueT, :attributes, 6
+    optional :int64, :metric_max, 7
+    optional :int64, :metric_min, 8
+    optional :int64, :metric_avg, 9
   end
 
   class CounterGroupT
+    class Crosskey
+      required :string, :parentguid, 1
+      required :string, :crosskeyguid_1, 2
+      optional :string, :crosskeyguid_2, 3
+    end
+
     required :string, :guid, 1
     required :string, :name, 2
     optional :int64, :bucket_size, 3
     optional ::TRP::TimeInterval, :time_interval, 4
     optional :int64, :topper_bucket_size, 5
     repeated ::TRP::MeterInfo, :meters, 6
+    optional ::TRP::CounterGroupT::Crosskey, :crosskey, 7
   end
 
   class SessionT
@@ -491,6 +551,16 @@ module TRP
     optional ::TRP::FileResponse, :file_response, 123
     optional ::TRP::GraphRequest, :graph_request, 130
     optional ::TRP::GraphResponse, :graph_response, 131
+    optional ::TRP::AggregateSessionsRequest, :aggregate_sessions_request, 140
+    optional ::TRP::AggregateSessionsResponse, :aggregate_sessions_response, 141
+    optional ::TRP::AggregateResourcesRequest, :aggregate_resources_request, 142
+    optional ::TRP::AggregateResourcesResponse, :aggregate_resources_response, 143
+    optional ::TRP::RunToolRequest, :run_tool_request, 144
+    optional ::TRP::RunToolResponse, :run_tool_response, 145
+    optional ::TRP::HAControlRequest, :ha_control_request, 150
+    optional ::TRP::HAControlResponse, :ha_control_response, 151
+    optional ::TRP::ToolInfoRequest, :tool_info_request, 152
+    optional ::TRP::ToolInfoResponse, :tool_info_response, 153
     optional :string, :destination_node, 200
     optional :string, :probe_id, 201
     optional :bool, :run_async, 202
@@ -506,6 +576,8 @@ module TRP
     optional :string, :station_id_request, 2
     optional :string, :message, 3
     optional :int64, :local_timestamp, 4
+    optional :string, :local_timestamp_string, 5
+    optional :bool, :is_primary, 6
   end
 
   class ErrorResponse
@@ -532,6 +604,9 @@ module TRP
     required ::TRP::KeyT, :key, 2
     optional ::TRP::StatsArray, :totals, 3
     repeated ::TRP::StatsArray, :stats, 4
+    optional ::TRP::StatsArray, :maximums, 5
+    optional ::TRP::StatsArray, :minimums, 6
+    optional ::TRP::StatsArray, :samples, 8
   end
 
   class CounterGroupTopperRequest
@@ -542,6 +617,8 @@ module TRP
     optional ::TRP::Timestamp, :time_instant, 6
     optional :int64, :flags, 7
     optional :bool, :resolve_keys, 8, :default => true
+    optional :string, :key_filter, 9
+    optional :string, :inverse_key_filter, 10
   end
 
   class CounterGroupTopperResponse
@@ -600,6 +677,7 @@ module TRP
     optional :bool, :resolve_keys, 21, :default => true
     optional :string, :outputpath, 22
     repeated :string, :idlist, 23
+    optional ::TRP::KeyT, :any_nf_ifindex, 24
   end
 
   class QuerySessionsResponse
@@ -608,9 +686,66 @@ module TRP
     optional :string, :outputpath, 4
   end
 
+  class AggregateSessionsRequest
+    optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
+    optional ::TRP::TimeInterval, :time_interval, 3
+    optional ::TRP::KeyT, :source_ip, 5
+    optional ::TRP::KeyT, :source_port, 6
+    optional ::TRP::KeyT, :dest_ip, 7
+    optional ::TRP::KeyT, :dest_port, 8
+    optional ::TRP::KeyT, :any_ip, 9
+    optional ::TRP::KeyT, :any_port, 10
+    repeated ::TRP::KeyT, :ip_pair, 11
+    optional ::TRP::KeyT, :protocol, 12
+    optional :string, :flowtag, 13
+    optional ::TRP::KeyT, :nf_routerid, 14
+    optional ::TRP::KeyT, :nf_ifindex_in, 15
+    optional ::TRP::KeyT, :nf_ifindex_out, 16
+    optional :string, :subnet_24, 17
+    optional :string, :subnet_16, 18
+    optional :int64, :aggregate_topcount, 19, :default => 100
+    repeated :string, :group_by_fields, 20
+    optional ::TRP::KeyT, :any_nf_ifindex, 21
+  end
+
+  class AggregateSessionsResponse
+    class KeyTCount
+      required ::TRP::KeyT, :key, 1
+      required :int64, :count, 2
+      required :int64, :metric, 3
+    end
+
+    class TagGroup
+      required :string, :group_name, 1
+      repeated ::TRP::AggregateSessionsResponse::KeyTCount, :tag_metrics, 2
+    end
+
+    required :string, :session_group, 2
+    optional ::TRP::TimeInterval, :time_interval, 3
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :source_ip, 5
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :source_port, 6
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :dest_ip, 7
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :dest_port, 8
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :any_ip, 9
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :any_port, 10
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :ip_pair, 11
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :protocol, 12
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :flowtag, 13
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :nf_routerid, 14
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :nf_ifindex_in, 15
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :nf_ifindex_out, 16
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :subnet_24, 17
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :internal_port, 18
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :internal_ip, 19
+    repeated ::TRP::AggregateSessionsResponse::KeyTCount, :external_ip, 20
+    repeated ::TRP::AggregateSessionsResponse::TagGroup, :tag_group, 21
+  end
+
   class UpdateKeyRequest
     required :string, :counter_group, 2
     repeated ::TRP::KeyT, :keys, 4
+    optional :bool, :remove_all_attributes, 5
+    repeated :string, :remove_attributes, 6
   end
 
   class SessionTrackerRequest
@@ -684,6 +819,25 @@ module TRP
     optional :int64, :approx_count, 4
   end
 
+  class AggregateResourcesRequest
+    required ::TRP::QueryResourcesRequest, :query, 1
+    optional :int64, :aggregate_topcount, 2, :default => 100
+  end
+
+  class AggregateResourcesResponse
+    class KeyTCount
+      required ::TRP::KeyT, :key, 1
+      required :int64, :count, 2
+    end
+
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :source_ip, 5
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :source_port, 6
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :destination_ip, 7
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :destination_port, 8
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :uri, 9
+    repeated ::TRP::AggregateResourcesResponse::KeyTCount, :userlabel, 10
+  end
+
   class KeySpaceRequest
     class KeySpace
       required ::TRP::KeyT, :from_key, 1
@@ -709,6 +863,8 @@ module TRP
     optional :int64, :meter, 3, :default => 0
     optional :int64, :maxitems, 4, :default => 100
     optional ::TRP::TimeInterval, :time_interval, 5
+    optional :string, :key_filter, 6
+    optional :string, :inverse_key_filter, 7
   end
 
   class TopperTrendResponse
@@ -824,6 +980,7 @@ module TRP
       optional :string, :extra_info, 4
       optional ::TRP::Timestamp, :register_time, 5
       optional ::TRP::Timestamp, :heartbeat_time, 6
+      optional :bool, :is_primary, 7, :default => true
     end
 
     required ::TRP::DomainOperation, :cmd, 1
@@ -833,12 +990,39 @@ module TRP
     optional :bool, :need_reconnect, 5, :default => false
   end
 
+  class HAControlRequest
+    required ::TRP::HAControlRequest::HAOperation, :cmd, 1
+    optional :string, :station_id, 2
+    optional :string, :params, 3
+  end
+
+  class HAControlResponse
+    optional :bool, :control_success, 1
+    optional :string, :station_id, 2
+    optional :string, :status_message, 3
+    optional :bool, :primary_reachable, 4
+    optional :bool, :backup_reachable, 5
+  end
+
+  class ToolInfoRequest
+    optional :string, :context_name, 1
+    optional :string, :tool_name, 2
+    repeated :string, :tool_info_requested, 3
+  end
+
+  class ToolInfoResponse
+    repeated ::TRP::NameValue, :tool_info, 1
+  end
+
   class NodeConfigRequest
     class IntelFeed
       required :string, :guid, 1
       optional :string, :name, 2
       optional :string, :download_rules, 3
       repeated :string, :uri, 4
+      repeated :string, :usernodes, 5
+      optional :int64, :sub_feed_id, 6, :default => -1
+      optional :bool, :restore_mode, 7, :default => false
     end
 
     optional :string, :message, 1
@@ -846,6 +1030,7 @@ module TRP
     optional ::TRP::NodeConfigRequest::IntelFeed, :process_new_feed, 3
     optional :bool, :get_all_nodes, 4, :default => true
     repeated ::TRP::NameValue, :query_config, 5
+    optional ::TRP::NodeConfigRequest::IntelFeed, :remove_feed, 6
   end
 
   class NodeConfigResponse
@@ -871,6 +1056,7 @@ module TRP
   class ContextInfoRequest
     optional :string, :context_name, 1
     optional :bool, :get_size_on_disk, 2, :default => false
+    optional :string, :tool_name, 3
   end
 
   class ContextInfoResponse
@@ -1048,5 +1234,17 @@ module TRP
     repeated ::TRP::EdgeGraphT, :graphs, 3
   end
 
+  class RunToolRequest
+    required :string, :context_name, 1
+    required ::TRP::RunToolRequest::NodeTool, :tool, 2
+    optional :string, :tool_input, 3
+    optional :string, :tool_input_file_data, 4
+  end
+
+  class RunToolResponse
+    required :string, :context_name, 1
+    optional :string, :tool_output, 2
+  end
+
 end
 

data/lib/trisulrp/trp.proto

@@ -107,6 +107,9 @@ message KeyT {
 		required string		attr_value=2;
 	}
 	repeated NameValueT		attributes=6;			/// New: Attributes are NVP for keys 
+    optional int64          metric_max=7;           /// optional : max observed value for metric  in context
+    optional int64          metric_min=8;           /// optional : max observed value for metric 
+    optional int64          metric_avg=9;           /// optional : max observed value for metric 
 }
 
 
@@ -119,6 +122,14 @@ message CounterGroupT {
     optional TimeInterval   time_interval=4;        /// total time interval available in DB 
     optional int64          topper_bucket_size=5;   /// topper bucketsize (streaming analytics window)
     repeated MeterInfo      meters=6;               /// array of meter information (m0, m1, .. mn) 
+
+	message Crosskey {
+		required string		parentguid=1;			/// parent GUID of ckey counter group
+		required string		crosskeyguid_1=2;		/// crosskey 1 guid - required 
+		optional string		crosskeyguid_2=3;		/// crosskey 2 guid - optional 
+	}
+	optional Crosskey		crosskey=7;				/// for cross key counter group
+
 }
 
 /// SessionT : an IP flow 
@@ -340,6 +351,16 @@ message Message {
                     SUBSYSTEM_EXIT=125;
                     GRAPH_REQUEST=130;
                     GRAPH_RESPONSE=131;
+                    AGGREGATE_SESSIONS_REQUEST=132;                     
+                    AGGREGATE_SESSIONS_RESPONSE=133;
+                    RUNTOOL_REQUEST=134;
+                    RUNTOOL_RESPONSE=135;
+                    HA_CONTROL_REQUEST=140;
+                    HA_CONTROL_RESPONSE=141;
+					DOMAIN_PING=142;
+					TOOL_INFO_REQUEST=143;
+					TOOL_INFO_RESPONSE=144;
+
     }
 
     required Command    trp_command=1;
@@ -403,6 +424,16 @@ message Message {
     optional FileResponse    file_response=123;
     optional GraphRequest   graph_request=130;
     optional GraphResponse    graph_response=131;
+    optional AggregateSessionsRequest  aggregate_sessions_request=140;
+    optional AggregateSessionsResponse  aggregate_sessions_response=141;
+    optional AggregateResourcesRequest  aggregate_resources_request=142;
+    optional AggregateResourcesResponse  aggregate_resources_response=143;
+    optional RunToolRequest  run_tool_request=144;
+    optional RunToolResponse  run_tool_response=145;
+    optional HAControlRequest  ha_control_request=150;
+    optional HAControlResponse  ha_control_response=151;
+    optional ToolInfoRequest  tool_info_request=152;
+    optional ToolInfoResponse  tool_info_response=153;
     optional string     destination_node=200;   // todo move 2nd
     optional string     probe_id=201;           // todo move 3rd 
     optional bool       run_async=202;          /// if run_async = true, then you will immediately get a AsynResponse with a token you can poll 
@@ -429,6 +460,8 @@ message HelloResponse{
   optional string       station_id_request=2;   /// station id found in the request 
   optional string       message=3;              /// message found in the request 
   optional int64        local_timestamp=4;      /// local timestamp at server, used to detect drifts 
+  optional string       local_timestamp_string=5; /// on server with time zone, use this 
+  optional bool         is_primary=6;              /// is this a primary or HA node 
 }
 
 /// ErrorResponse
@@ -463,6 +496,9 @@ message CounterItemResponse{
     required KeyT           key=2;                          /// key : filled up with readable,label automatically 
     optional StatsArray     totals=3;                       /// if volumes_only = 1 in request, this contains totals for each metric 
     repeated StatsArray     stats=4;                        /// time series stats - can use to draw charts etc 
+    optional StatsArray     maximums=5;                     /// if volumes_only = 1  this contains MAX(..) 
+    optional StatsArray     minimums=6;                     /// if volumes_only = 1  this contains MIN(..)
+    optional StatsArray     samples=8;                 		/// if volumes_only = 1  this contains SAMPLES(..) 
 }
 
 
@@ -475,6 +511,8 @@ message CounterGroupTopperRequest{
     optional Timestamp      time_instant=6;                 /// 
     optional int64          flags=7;                        
     optional bool           resolve_keys=8 [default=true];  /// retrieve labels as set in the response for each key 
+	optional string			key_filter=9;					/// only get keys with this pattern and SYS:GROUP
+	optional string			inverse_key_filter=10;			/// only get keys without this pattern  NOT
 }
 
 /// CounterGroupTopperResponse  
@@ -529,7 +567,7 @@ message QuerySessionsRequest {
     optional KeyT           dest_ip=7;
     optional KeyT           dest_port=8;
     optional KeyT           any_ip=9;           /// source or dest match
-    optional KeyT           any_port=10;            /// source or dest match
+    optional KeyT           any_port=10;        /// source or dest match
     repeated KeyT           ip_pair=11;         /// array of 2 ips 
     optional KeyT           protocol=12;
     optional string         flowtag=13;         /// string flow tagger text 
@@ -543,6 +581,7 @@ message QuerySessionsRequest {
     optional bool           resolve_keys=21[default=true];  
     optional string         outputpath=22;      /// write results to a file (CSV) on trisul-hub (for very large dumps) 
     repeated string         idlist=23;          /// array of flow ids , usually from SessionTracker response 
+    optional KeyT           any_nf_ifindex=24;  /// composite query for both ifindex 
 }
 
 
@@ -554,11 +593,76 @@ message QuerySessionsResponse {
     optional string             outputpath=4;       /// if 'outputpath' set in request, the sessions are here (in CSV format)
 }
 
+
+/// AggregateSessions - count star 
+///   query flow and then count the numbers 
+///   by default aggregate on ALL fields
+message AggregateSessionsRequest {
+    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
+    optional TimeInterval   time_interval=3;
+    optional KeyT           source_ip=5;
+    optional KeyT           source_port=6;
+    optional KeyT           dest_ip=7;
+    optional KeyT           dest_port=8;
+    optional KeyT           any_ip=9;           /// source or dest match
+    optional KeyT           any_port=10;            /// source or dest match
+    repeated KeyT           ip_pair=11;         /// array of 2 ips 
+    optional KeyT           protocol=12;
+    optional string         flowtag=13;         /// string flow tagger text 
+    optional KeyT           nf_routerid=14;
+    optional KeyT           nf_ifindex_in=15;
+    optional KeyT           nf_ifindex_out=16;
+    optional string         subnet_24=17;       /// ip /24 subnet  matching 
+    optional string         subnet_16=18;       /// ip /16 subnet 
+    optional int64          aggregate_topcount=19[default=100];   	/// number of count-star per field 
+	repeated string         group_by_fields=20; /// list of field names 
+    optional KeyT           any_nf_ifindex=21;  /// matches either gen2 or gen3 
+}
+
+/// AggregateSessionsResponse 
+///   contains counts  of each key 
+message AggregateSessionsResponse {
+
+	message KeyTCount {
+		required KeyT	key=1;                  ///  aggregate key 
+		required int64  count=2;                ///  number of matching flows
+		required int64  metric=3;               ///  aggregated metrics, eg total bytes 
+	}
+
+	message TagGroup {
+		required string 	group_name=1;
+		repeated KeyTCount	tag_metrics=2;
+	}
+
+    required string         session_group=2;
+    optional TimeInterval   time_interval=3;
+    repeated KeyTCount      source_ip=5;        /// top IPs 
+    repeated KeyTCount      source_port=6;      /// top ports 
+    repeated KeyTCount      dest_ip=7;	        /// dest IPs
+    repeated KeyTCount      dest_port=8;	    /// dest ports 
+    repeated KeyTCount      any_ip=9;           /// source or dest match
+    repeated KeyTCount      any_port=10;        /// source or dest match
+    repeated KeyTCount      ip_pair=11;         /// array of 2 ips 
+    repeated KeyTCount      protocol=12;        /// protocols 
+    repeated KeyTCount      flowtag=13;         /// string flow tagger text 
+    repeated KeyTCount      nf_routerid=14;
+    repeated KeyTCount      nf_ifindex_in=15;
+    repeated KeyTCount      nf_ifindex_out=16;
+    repeated KeyTCount      subnet_24=17;       /// ip /24 subnet  matching 
+    repeated KeyTCount      internal_port=18;   /// internal IP ports
+    repeated KeyTCount      internal_ip=19;     /// internal IPs 
+    repeated KeyTCount      external_ip=20;     /// external IPs
+	repeated TagGroup		tag_group=21;		/// tag groups 
+}
+
+
 /// UpdatekeysRequest
 /// Response = OKResponse or ErrorResponse
 message UpdateKeyRequest{
     required string         counter_group=2;
-    repeated KeyT           keys=4;  		/// key  : if you set both key and label, the DB label will be updated 
+    repeated KeyT           keys=4;  		         /// key  : if you set both key and label, the DB label will be updated 
+	optional bool           remove_all_attributes=5; /// remove all key attributes from keys 
+	repeated string         remove_attributes=6;     /// remove these attributes only from keys 
 }
 
 /// SessionTrackerRequest  - query session trackers 
@@ -619,6 +723,7 @@ message QueryAlertsResponse {
 
 
 ///  QueryResourcesRequest - resource queries 
+///     DNS, HTTP, 
 message QueryResourcesRequest {
     required string         resource_group=2;
     optional TimeInterval   time_interval=3;
@@ -648,6 +753,30 @@ message QueryResourcesResponse {
 }
 
 
+///  AggregatedResourceRequest - resource queries 
+///     DNS, HTTP, 
+message AggregateResourcesRequest  {
+	required QueryResourcesRequest	query=1;
+    optional int64                  aggregate_topcount=2[default=100];   	/// number of count-star per field 
+}
+
+/// AggregateResourcesResponse  
+///     various counters 
+message AggregateResourcesResponse {
+
+	message KeyTCount {
+		required KeyT	key=1;
+		required int64  count=2;
+	}
+
+    repeated KeyTCount           source_ip=5;
+    repeated KeyTCount           source_port=6;
+    repeated KeyTCount           destination_ip=7; 
+    repeated KeyTCount           destination_port=8;
+    repeated KeyTCount           uri=9;			 ///  group by URI 
+    repeated KeyTCount           userlabel=10;	 ///  group by Pattern
+}
+
 
 /// KeySpaceRequest - search hits in Key Space 
 /// for example you can search the key space 10.0.0.0 to 11.0.0.0 to get all IP 
@@ -681,6 +810,8 @@ message TopperTrendRequest {
     optional int64          meter=3 [default=0];
     optional int64          maxitems=4 [default=100];
     optional TimeInterval   time_interval=5;
+	optional string			key_filter=6;					/// only get keys with this pattern and SYS:GROUP
+	optional string			inverse_key_filter=7;			/// only get keys without this pattern  NOT
 }
 
 /// TopperTrendResponse   
@@ -747,9 +878,16 @@ message QueryFTSResponse {
 /// get the METERS METASLICE info 
 /// .. response = TimeSlicesResponse
 message TimeSlicesRequest  {
-    optional bool   get_disk_usage=1[default=false];
-    optional bool   get_all_engines=2[default=false];
-    optional bool   get_total_window=3[default=false];
+    optional bool   get_disk_usage=1[default=false];     /// get disk usage per SLICE 
+
+    optional bool   get_all_engines=2[default=false];    /// by default (set to false) we only get instance-0 
+	                                                     /// because are interested in iterating over 
+														 /// the time interval rather then each slice
+														 /// inside the time interval. set this to true
+														 /// if you want each slice to be reported 
+
+    optional bool   get_total_window=3[default=false];   /// just get the total time window in the 
+	                                                     /// trisul database 
 }
 
 /// .. response = TimeSlicesResponse
@@ -849,6 +987,7 @@ message DomainResponse {
         optional string             extra_info=4;
         optional Timestamp          register_time=5; 
         optional Timestamp          heartbeat_time=6; 
+		optional bool               is_primary=7[default=true]; /// primary or backup HA mode 
 
     }
 
@@ -859,22 +998,62 @@ message DomainResponse {
     optional bool                   need_reconnect=5[default=false];
 }
 
+/// messages to HAControl
+message HAControlRequest {
+    enum HAOperation
+    {
+        HA_TEST_REACHABILITY=0;		///  test if primary or backup is reachable (test the other side)
+        HA_SWITCH_BACKUP=1;			///  switch all nodes to backup HA 
+        HA_SWITCH_PRIMARY=2;        ///  switch to primary HA 
+    }
+
+
+    required    HAOperation         cmd=1;
+    optional    string              station_id=2;
+    optional    string              params=3;
+}
+
+message HAControlResponse {
+    optional    bool                control_success=1;
+    optional    string              station_id=2;
+    optional    string              status_message=3;
+	optional    bool                primary_reachable=4;
+	optional    bool                backup_reachable=5;
+}
+
+/// tool info 
+/// general purpose probe information gathering tool 
+/// use cases :   get BGP route receiver peer status 
+message ToolInfoRequest {
+    optional    string              context_name=1;
+    optional    string              tool_name=2;
+    repeated    string              tool_info_requested=3; ///  array of information elements requested 
+}
+
+message ToolInfoResponse  {
+    repeated    NameValue           tool_info=1;	/// info elements Name=Value 
+}
+
 
 message NodeConfigRequest {
     optional string message=1;
 
     message IntelFeed {
-        required string     guid=1;             /// identifying feed group (eg Geo, Badfellas)
-        optional string     name=2;             /// name
-        optional string     download_rules=3;   /// xml file with feed update instructions
-        repeated string     uri=4;              /// individual files in config//.. for FileRequest download 
+        required string     guid=1;                   /// identifying feed group (eg Geo, Badfellas)
+        optional string     name=2;                   /// feed name (eg badfellas) 
+        optional string     download_rules=3;         /// xml file with feed update instructions
+        repeated string     uri=4;                    /// individual files in config//.. for FileRequest download 
+		repeated string     usernodes=5;              /// user requesting the feed, the probe0, probe1, etc 
+		optional int64		sub_feed_id=6[default=-1];/// sub feed ID, when a feed consists of several sub-feeds 
+		optional bool       restore_mode=7[default=false]; /// restore mode will backup and restore, used with add,remove
+
     }
 
     optional IntelFeed      add_feed=2;
     optional IntelFeed      process_new_feed=3;
     optional bool           get_all_nodes=4[default=true];
     repeated NameValue      query_config=5;
-
+    optional IntelFeed      remove_feed=6;            
 }
 
 message NodeConfigResponse {
@@ -905,8 +1084,9 @@ message ContextCreateRequest  {
 /// ContextInfo : one or all contexts
 ///  use is_init to prime with config 
 message ContextInfoRequest {
-     optional   string         context_name=1;     /// if not  set all context get in 
+     optional   string         context_name=1;      /// if not  set all context get in 
      optional   bool           get_size_on_disk=2[default=false]; ///  get size on disk (expensive) 
+	 optional   string         tool_name=3;         /// get status of this tool, freeform bgp, suricata, snort, udpsink etc..
 }
 
 message ContextInfoResponse {
@@ -916,11 +1096,11 @@ message ContextInfoResponse {
     {
         required string         context_name=1;
         required bool           is_initialized=2;
-        required bool           is_running=3;
+        required bool           is_running=3;       /// trisul processes runs 
         optional int64          size_on_disk=4;
         optional TimeInterval   time_interval=5;
         optional bool           is_clean=6;
-        optional string         extrainfo=7;
+        optional string         extrainfo=7;        /// freeform text output when tool is specified , can be long string 
         repeated TimeInterval   run_history=8;
         optional string         profile=9;
         optional string         runmode=10;
@@ -1137,3 +1317,24 @@ message GraphResponse {
 											  /// repeated because returned in time chunks 
 }
 
+/// RunToolRequest  : run  set of named tools 
+message RunToolRequest   {
+     required   string         context_name=1;      /// if not  set all context get in 
+	 enum NodeTool {
+	 	PING=1;
+		DF=2;
+		GEOQUERY=3;
+		TOP=4;
+		BGPQUERY=5;
+	 }
+	 required  NodeTool 		tool=2;				/// which of these tools you want to run on node
+	 optional  string           tool_input=3;		/// input 
+	 optional  string           tool_input_file_data=4;/// data that goes into a tool input file 
+}
+
+/// RunToolResponse  : ouput 
+message RunToolResponse   {
+     required   string         context_name=1;      /// if not  set all context get in 
+     optional   string         tool_output=2;       /// cmd lines 
+}
+

data/trisulrp.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: trisulrp 3.2.9 ruby lib
+# stub: trisulrp 3.2.26 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "trisulrp"
-  s.version = "3.2.9"
+  s.name = "trisulrp".freeze
+  s.version = "3.2.26"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["vivek"]
-  s.date = "2018-10-05"
-  s.description = "This gem deals about the trisul remote protocol"
-  s.email = "vivek_rajagopal@yahoo.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["vivek".freeze]
+  s.date = "2021-04-07"
+  s.description = "This gem deals about the trisul remote protocol".freeze
+  s.email = "vivek_rajagopal@yahoo.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -47,33 +47,33 @@ Gem::Specification.new do |s|
     "test/test_trisulrp.rb",
     "trisulrp.gemspec"
   ]
-  s.homepage = "http://github.com/vivekrajan/trisulrp"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "trisul trp"
+  s.homepage = "http://github.com/vivekrajan/trisulrp".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.3".freeze
+  s.summary = "trisul trp".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<protobuf>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<juwelier>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<protobuf>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<protobuf>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<juwelier>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<protobuf>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<protobuf>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<juwelier>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<protobuf>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trisulrp
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.26
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
@@ -134,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: trisul trp