trisulrp 3.2.9 → 3.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5a4e8a02d0cd3e01efc327bf0cea7f3e5709f7
-  data.tar.gz: 5968b88379c4cf79bc11278560751c43987285a8
+  metadata.gz: d418f25fea2c8eaed993c659026c8e8217095bbb
+  data.tar.gz: 00601201b5c7878cf9fb719891ed71327100b797
 SHA512:
-  metadata.gz: fd0cd44e3a28314555f1e64a3c48a0635cafae12826fb4b6cfe8c3f4bfb3787455d216b054bfd8960037db77607c6bc25da86522efc3c57c082260cce06cda7c
-  data.tar.gz: 100144bf495624fa1dd3bd424c02e4382ab664d2fd9afc82833cd57a766f705cb90fd10182c74a78365cfb469b839b3cb55625883a7af8c645185f7a65a885c6
+  metadata.gz: 6604ebee90f6e960e9609e228f93abbabe94922aae71bf84782346f8c4c84e9c32c17a18f30952fb46ca167282684d30d6b957894b75decbaf7aa35a309c64ac
+  data.tar.gz: 3d9404aab2c1f12462c48bde1714022724ea62f4c225fe5a7106f11e92194827caf8a9b0aa1d60d9dd2b350253df6fea072a1ad5d7e4b24c70eeef476e69698b

data/VERSION

@@ -1 +1 @@
-3.2.9
+3.2.13

data/lib/trisulrp/protocol.rb

@@ -460,6 +460,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)
@@ -586,6 +589,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

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,8 @@ module TRP
       define :SUBSYSTEM_EXIT, 125
       define :GRAPH_REQUEST, 130
       define :GRAPH_RESPONSE, 131
+      define :AGGREGATE_SESSIONS_REQUEST, 132
+      define :AGGREGATE_SESSIONS_RESPONSE, 133
     end
 
   end
@@ -177,6 +183,12 @@ 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
+
+  end
+
   class UpdateKeyRequest < ::Protobuf::Message; end
   class SessionTrackerRequest < ::Protobuf::Message; end
   class SessionTrackerResponse < ::Protobuf::Message; end
@@ -184,6 +196,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
 
@@ -333,12 +351,19 @@ module TRP
   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 +516,10 @@ 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 :string, :destination_node, 200
     optional :string, :probe_id, 201
     optional :bool, :run_async, 202
@@ -608,6 +637,54 @@ 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
+    optional :string, :group_by_fields, 20
+  end
+
+  class AggregateSessionsResponse
+    class KeyTCount
+      required ::TRP::KeyT, :key, 1
+      required :int64, :count, 2
+      required :int64, :metric, 3
+    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
+  end
+
   class UpdateKeyRequest
     required :string, :counter_group, 2
     repeated ::TRP::KeyT, :keys, 4
@@ -684,6 +761,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

data/lib/trisulrp/trp.proto

@@ -119,6 +119,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 +348,8 @@ message Message {
                     SUBSYSTEM_EXIT=125;
                     GRAPH_REQUEST=130;
                     GRAPH_RESPONSE=131;
+                    AGGREGATE_SESSIONS_REQUEST=132;                     
+                    AGGREGATE_SESSIONS_RESPONSE=133;
     }
 
     required Command    trp_command=1;
@@ -403,6 +413,10 @@ 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 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 
@@ -554,6 +568,61 @@ 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 
+	optional string         group_by_fields=20; /// list of field names 
+}
+
+/// 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 
+	}
+
+    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
+}
+
 /// UpdatekeysRequest
 /// Response = OKResponse or ErrorResponse
 message UpdateKeyRequest{
@@ -619,6 +688,7 @@ message QueryAlertsResponse {
 
 
 ///  QueryResourcesRequest - resource queries 
+///     DNS, HTTP, 
 message QueryResourcesRequest {
     required string         resource_group=2;
     optional TimeInterval   time_interval=3;
@@ -648,6 +718,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 

data/trisulrp.gemspec

@@ -2,16 +2,16 @@
 # 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.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "3.2.9"
+  s.version = "3.2.13"
 
   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.date = "2019-01-18"
   s.description = "This gem deals about the trisul remote protocol"
   s.email = "vivek_rajagopal@yahoo.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trisulrp
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.13
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf