trisulrp 2.2.8 → 3.1.1

data/lib/trisulrp/trp.proto

@@ -1,6 +1,6 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
-// (c) 2010-11, Unleash Networks (http://www.unleashnetworks.com)
+// (c) 2012-16, Unleash Networks (http://www.unleashnetworks.com)
 // $Rev: 6946 $
 
 option optimize_for = LITE_RUNTIME; 
@@ -8,6 +8,9 @@ option optimize_for = LITE_RUNTIME;
 
 package TRP;
 
+//
+// Basic structures
+//
 message Timestamp  {
   required int64            tv_sec=1;
   optional int64            tv_usec=2 [default=0];
@@ -23,6 +26,11 @@ message StatsTuple {
     required int64          val=2; 
 }
 
+message StatsArray {
+    required int64      	ts_tv_sec=1; 
+    repeated int64          values=2; 
+}
+
 message MeterValues {
     required int32          meter=1;
     repeated StatsTuple     values=2;
@@ -57,34 +65,26 @@ message MeterInfo {
 }
 
 message KeyStats {
-    optional int64          context=1[default=0];
     required string         counter_group=2;
-    required string         key=3;
+    required KeyT           key=3;
     repeated MeterValues    meters=4;
 }
 
-message KeyDetails {
-    required string         key=1;
-    optional string         label=2;
-    optional string         description=3;
-	optional int64			metric=4;
-}
 
-message SessionID {
-    required int64          slice_id=1;
-    required int64          session_id=2;
+//
+// Top level objects are named ObjT 
+//	 eg KeyT - Key Type, SessionT - Session Type etc.
+//
+message KeyT {
+    optional string         key=1;
+    optional string         readable=2;
+    optional string         label=3;
+    optional string         description=4;
+	optional int64			metric=5;
 }
 
-message AlertID {
-    required int64          slice_id=1;
-    required int64          alert_id=2;
-}
 
-message ResourceID {
-    required int64          slice_id=1;
-    required int64          resource_id=2;
-}
-message CounterGroupDetails {
+message CounterGroupT {
     required string         guid=1;
     required string         name=2;
     optional int64          bucket_size=3;
@@ -93,55 +93,90 @@ message CounterGroupDetails {
 	repeated MeterInfo		meters=6;
 }
 
-message SessionDetails  {
+message SessionT  {
 	optional string         session_key=1;
-	required SessionID      session_id=2;
+	required string         session_id=2;
 	optional string         user_label=3;
 	required TimeInterval   time_interval=4;
-	required int64          state=5;
-	required int64          az_bytes=6;
-	required int64          za_bytes=7;
-	required int64          az_packets=8;
-	required int64          za_packets=9;
-	required KeyDetails     key1A=10;
-	required KeyDetails     key2A=11;
-	required KeyDetails     key1Z=12;
-	required KeyDetails     key2Z=13;
-	required KeyDetails     protocol=14;
-	optional KeyDetails     nf_routerid=15;
-	optional KeyDetails     nf_ifindex_in=16;
-	optional KeyDetails     nf_ifindex_out=17;
+	optional int64          state=5;
+	optional int64          az_bytes=6;
+	optional int64          za_bytes=7;
+	optional int64          az_packets=8;
+	optional int64          za_packets=9;
+	required KeyT     		key1A=10;
+	required KeyT     		key2A=11;
+	required KeyT     		key1Z=12;
+	required KeyT     		key2Z=13;
+	required KeyT     		protocol=14;
+	optional KeyT     		nf_routerid=15;
+	optional KeyT     		nf_ifindex_in=16;
+	optional KeyT     		nf_ifindex_out=17;
 	optional string		    tags=18;
-	required int64          az_payload=19;
-	required int64          za_payload=20;
-	required int64          setup_rtt=21;
-	required int64          retransmissions=22;
+	optional int64          az_payload=19;
+	optional int64          za_payload=20;
+	optional int64          setup_rtt=21;
+	optional int64          retransmissions=22;
 	optional int64		    tracker_statval=23;
+	optional string			probe_id=24;
 }
 
 
-message PDPDetails  {
-	required SessionID      session_id=1;
-	required string			ipa   = 2 ; 
-	required string			msisdn   = 3 ;
-	required string			imei   = 4 ;
-	required string			imsi   = 5 ; 
-	required string 		teidc1  = 6 ; 
-	required string 		teidd1  = 7 ; 
-	required string 		teidc2  = 8 ;
-	required string 		teidd2  = 9 ;
-	required string 		apn  = 10 ; 
-	required string 		rai  = 11 ;
-	required string 		uli  = 12 ;
-	required string 		rat  = 13 ;
-	required string 		cause  = 14 ; 
-	required int64			stat0 = 15 ;
-	required int64			stat1 = 16 ; 
-	required TimeInterval   time_interval=18;
-	optional string 		mccmnc  = 19 ;
-	optional string 		trace   = 20 ;
+////////////////////////////////////
+// AlertT
+message AlertT{
+	optional int64          sensor_id=1;
+	required Timestamp      time=2;
+	required string 		alert_id=3;
+	optional KeyT     source_ip=4;
+	optional KeyT     source_port=5;
+	optional KeyT     destination_ip=6;
+	optional KeyT     destination_port=7;
+	optional KeyT     sigid=8;
+	optional KeyT     classification=9;
+	optional KeyT     priority=10;
+	optional Timestamp      dispatch_time=11;
+	optional string         aux_message1=12;
+	optional string         aux_message2=13;
+	optional int64          occurrances=14[default=1];
+	optional string         group_by_key=15;
+	optional string			probe_id=16;
 }
 
+
+////////////////////////////////////
+// ResourceT
+message ResourceT {
+	required Timestamp      time=1;
+	required string         resource_id=2;
+	optional KeyT     source_ip=3;
+	optional KeyT     source_port=4;
+	optional KeyT     destination_ip=5;
+	optional KeyT     destination_port=6;
+    optional string         uri=7;
+    optional string         userlabel=8;
+	optional string			probe_id=9;
+}
+
+////////////////////////////////////
+// DocumentT
+message DocumentT  {
+	required string         dockey=1;
+	optional string         fts_attributes=2;
+	optional string         fullcontent=3;
+
+    message Flow {
+        required Timestamp  time=1;
+        required string     key=2;
+    }
+
+    repeated Flow          flows=4;
+	optional string		   probe_id=5;
+}
+
+
+//
+// Enums
+//
 enum AuthLevel {
     ADMIN=1;
     BASIC_USER=2;
@@ -159,71 +194,98 @@ enum  PcapFormat {
     UNSNIFF=2;
 }
 
-enum PcapDisposition {
-	DOWNLOAD=1;
-	SAVE_ON_SERVER=2;
+enum DomainNodeType
+{
+	HUB=0;
+	PROBE=1;
+	CONFIG=2;
+	ROUTER=3;
+	WEB=4;
+	MONITOR=5;
 }
 
+enum DomainOperation {
+	GETNODES=1;
+	HEARTBEAT=2;
+	REGISTER=3;
+}
+
+message NameValue {
+	required string name=1;
+	optional string value=2;
+}
+
+//
+// Top level message is TRP::Message
+//  - wraps the actual request or response 
+// 
 message Message {
     enum Command {  HELLO_REQUEST=1; 
                     HELLO_RESPONSE=2;
                     OK_RESPONSE=3;
                     ERROR_RESPONSE=5;
-                    COUNTER_GROUP_REQUEST=6;
-                    COUNTER_GROUP_RESPONSE=7;
+                    COUNTER_GROUP_TOPPER_REQUEST=6;
+                    COUNTER_GROUP_TOPPER_RESPONSE=7;
                     COUNTER_ITEM_REQUEST=8;
                     COUNTER_ITEM_RESPONSE=9;
-                    RELEASE_RESOURCE_REQUEST=10;
-                    RELEASE_CONTEXT_REQUEST=11;
-                    CONTROLLED_COUNTER_GROUP_REQUEST=12;
-                    CONTROLLED_COUNTER_GROUP_RESPONSE=13;
-                    FILTERED_DATAGRAMS_REQUEST=14;
-                    FILTERED_DATAGRAMS_RESPONSE=15;
-                    CONTROLLED_CONTEXT_REQUEST=16;
-                    CONTROLLED_CONTEXT_RESPONSE=17;
+                    PCAP_REQUEST=14;
+                    PCAP_RESPONSE=15;
                     SEARCH_KEYS_REQUEST=18;                   
                     SEARCH_KEYS_RESPONSE=19;                        
                     COUNTER_GROUP_INFO_REQUEST=20;              
                     COUNTER_GROUP_INFO_RESPONSE=21;             
                     SESSION_TRACKER_REQUEST=22;                     
                     SESSION_TRACKER_RESPONSE=23;                    
-                    SESSION_ITEM_REQUEST=24;                      
-                    SESSION_ITEM_RESPONSE=25;                     
-                    BULK_COUNTER_ITEM_REQUEST=26;                     
-                    BULK_COUNTER_ITEM_RESPONSE=27;                    
-                    CGMONITOR_REQUEST=28;                             
-                    CGMONITOR_RESPONSE=29;                            
-                    TOPPER_SNAPSHOT_REQUEST=30;                       
-                    TOPPER_SNAPSHOT_RESPONSE=31;                      
                     UPDATE_KEY_REQUEST=32;                            
                     UPDATE_KEY_RESPONSE=33;                           
                     QUERY_SESSIONS_REQUEST=34;                     
                     QUERY_SESSIONS_RESPONSE=35;
-                    RING_STATS_REQUEST=36;          
-                    RING_STATS_RESPONSE=37;                     
-                    SERVER_STATS_REQUEST=38;                    
-                    SERVER_STATS_RESPONSE=39;                              
-                    SESSION_GROUP_REQUEST=40;
-                    SESSION_GROUP_RESPONSE=41;
-                    ALERT_ITEM_REQUEST=42;
-                    ALERT_ITEM_RESPONSE=43;
-                    ALERT_GROUP_REQUEST=44;
-                    ALERT_GROUP_RESPONSE=45;
-                    RESOURCE_ITEM_REQUEST=46;
-                    RESOURCE_ITEM_RESPONSE=47;
-                    RESOURCE_GROUP_REQUEST=48;
-                    RESOURCE_GROUP_RESPONSE=49;
-                    KEY_LOOKUP_REQUEST=50;
-                    KEY_LOOKUP_RESPONSE=51;
+                    PROBE_STATS_REQUEST=38;                    
+                    PROBE_STATS_RESPONSE=39;                              
+                    QUERY_ALERTS_REQUEST=44;
+                    QUERY_ALERTS_RESPONSE=45;
+                    QUERY_RESOURCES_REQUEST=48;
+                    QUERY_RESOURCES_RESPONSE=49;
 					GREP_REQUEST=60;
 					GREP_RESPONSE=61;
 					KEYSPACE_REQUEST=70;
 					KEYSPACE_RESPONSE=71;
 					TOPPER_TREND_REQUEST=72;
 					TOPPER_TREND_RESPONSE=73;
-                    QUERY_PDP_REQUEST=74;                     
-                    QUERY_PDP_RESPONSE=75;
                     STAB_PUBSUB_CTL=80;
+                    QUERY_FTS_REQUEST=90;
+                    QUERY_FTS_RESPONSE=91;
+                    TIMESLICES_REQUEST=92;
+                    TIMESLICES_RESPONSE=93;
+                    DELETE_ALERTS_REQUEST=94;
+                    METRICS_SUMMARY_REQUEST=95;
+                    METRICS_SUMMARY_RESPONSE=96;
+                    PCAP_SLICES_REQUEST=97;
+                    SERVICE_REQUEST=101;
+                    SERVICE_RESPONSE=102;
+                    CONFIG_REQUEST=103;
+                    CONFIG_RESPONSE=104;
+                    LOG_REQUEST=105;
+                    LOG_RESPONSE=106;
+					CONTEXT_CREATE_REQUEST=108;
+					CONTEXT_DELETE_REQUEST=109;
+					CONTEXT_START_REQUEST=110;
+					CONTEXT_STOP_REQUEST=111;
+					CONTEXT_INFO_REQUEST=112;
+					CONTEXT_INFO_RESPONSE=113;
+					CONTEXT_CONFIG_REQUEST=114;
+					CONTEXT_CONFIG_RESPONSE=115;
+					DOMAIN_REQUEST=116;
+					DOMAIN_RESPONSE=117;
+					NODE_CONFIG_REQUEST=118;
+					NODE_CONFIG_RESPONSE=119;
+					ASYNC_REQUEST=120;
+					ASYNC_RESPONSE=121;
+					FILE_REQUEST=122;
+					FILE_RESPONSE=123;
+					SUBSYSTEM_INIT=124;			// init msg  used to prepare services 
+					SUBSYSTEM_EXIT=125;
+
     }
 
     required Command    trp_command=1;
@@ -231,69 +293,86 @@ message Message {
     optional HelloResponse hello_response=3;
     optional OKResponse ok_response=4;
     optional ErrorResponse error_response=5;
-    optional CounterGroupRequest counter_group_request=6;
-    optional CounterGroupResponse counter_group_response=7;
+    optional CounterGroupTopperRequest counter_group_topper_request=6;
+    optional CounterGroupTopperResponse counter_group_topper_response=7;
     optional CounterItemRequest counter_item_request=8;
     optional CounterItemResponse counter_item_response=9;
-    optional ReleaseContextRequest release_context_request=11; 
-    optional FilteredDatagramRequest filtered_datagram_request=14;
-    optional FilteredDatagramResponse filtered_datagram_response=15;
-    optional ControlledContextRequest controlled_context_request=16;
-    optional ControlledContextResponse controlled_context_response=17;
+    optional PcapRequest pcap_request=14;
+    optional PcapResponse pcap_response=15;
     optional SearchKeysRequest search_keys_request=18;
     optional SearchKeysResponse search_keys_response=19;
     optional CounterGroupInfoRequest counter_group_info_request=20;
     optional CounterGroupInfoResponse counter_group_info_response=21;
-    optional SessionItemRequest session_item_request=22;
-    optional SessionItemResponse session_item_response=23;
-    optional BulkCounterItemRequest bulk_counter_item_request=24;
-    optional BulkCounterItemResponse bulk_counter_item_response=25;
-    // optional TopperSnapshotRequest topper_snapshot_request=28; 
-    // optional TopperSnapshotResponse topper_snapshot_response=29;
     optional UpdateKeyRequest update_key_request=30;
     optional QuerySessionsRequest query_sessions_request=31;
     optional QuerySessionsResponse  query_sessions_response=32;
     optional SessionTrackerRequest session_tracker_request=33;
     optional SessionTrackerResponse session_tracker_response=34;
-    optional ServerStatsRequest server_stats_request=37;
-    optional ServerStatsResponse server_stats_response=38;
-    optional SessionGroupRequest session_group_request=39;
-    optional SessionGroupResponse session_group_response=40;
-    optional AlertItemRequest alert_item_request=41;
-    optional AlertItemResponse alert_item_response=42;
-    optional AlertGroupRequest alert_group_request=43;
-    optional AlertGroupResponse alert_group_response=44;
-    optional ResourceItemRequest resource_item_request=45;
-    optional ResourceItemResponse resource_item_response=46;
-    optional ResourceGroupRequest resource_group_request=47;
-    optional ResourceGroupResponse resource_group_response=48;
-    optional KeyLookupRequest key_lookup_request=49;
-    optional KeyLookupResponse key_lookup_response=50;
+    optional ProbeStatsRequest probe_stats_request=37;
+    optional ProbeStatsResponse probe_stats_response=38;
+    optional QueryAlertsRequest query_alerts_request=43;
+    optional QueryAlertsResponse  query_alerts_response=44;
+    optional QueryResourcesRequest query_resources_request=47;
+    optional QueryResourcesResponse  query_resources_response=48;
     optional GrepRequest  grep_request=51;
     optional GrepResponse  grep_response=52;
-    optional KeySpaceRequest  keyspace_request=53;
-    optional KeySpaceResponse  keyspace_response=54;
     optional TopperTrendRequest  topper_trend_request=55;
     optional TopperTrendResponse  topper_trend_response=56;
-    optional QueryPDPRequest query_pdp_request=57;
-    optional QueryPDPResponse  query_pdp_response=58;
     optional SubscribeCtl  subscribe_ctl=59;
+    optional QueryFTSRequest  query_fts_request=60;
+    optional QueryFTSResponse  query_fts_response=61;
+    optional TimeSlicesRequest  time_slices_request=62;
+    optional TimeSlicesResponse  time_slices_response=63;
+    optional DeleteAlertsRequest delete_alerts_request=64;
+	optional MetricsSummaryRequest metrics_summary_request=65;
+	optional MetricsSummaryResponse metrics_summary_response=66;
+	optional KeySpaceRequest key_space_request=67;
+	optional KeySpaceResponse  key_space_response=68;
+	optional PcapSlicesRequest  pcap_slices_request=69;
+	optional LogRequest  log_request=105;
+	optional LogResponse  log_response=106;
+	optional ContextCreateRequest  context_create_request=108;
+	optional ContextDeleteRequest  context_delete_request=109;
+	optional ContextStartRequest  context_start_request=110;
+	optional ContextStopRequest  context_stop_request=111;
+	optional ContextConfigRequest  context_config_request=112;
+	optional ContextConfigResponse  context_config_response=113;
+	optional ContextInfoRequest   context_info_request=114;
+	optional ContextInfoResponse   context_info_response=115;
+	optional DomainRequest   domain_request=116;
+	optional DomainResponse   domain_response=117;
+	optional NodeConfigRequest   node_config_request=118;
+	optional NodeConfigResponse   node_config_response=119;
+	optional AsyncRequest   async_request=120;
+	optional AsyncResponse   async_response=121;
+	optional FileRequest   file_request=122;
+	optional FileResponse    file_response=123;
+    optional string     destination_node=200; 	// todo move 2nd
+    optional string     probe_id=201;			// todo move 3rd 
+    optional bool       run_async=202;			// todo move 3rd 
+
 }
 
+
+//////////////////////////////////////////////////////////////
+// --------------- Messages Section -------------------------//
+// TRP is a synchronous request response protocol            //
+// Send a xyz_Request() and wait for xyz_Response            //
+// All requests necessarily get a response                   //
+// --------------- Messages Section -------------------------//
+//////////////////////////////////////////////////////////////
+
 ///////////////////////////////
 // Hello 
 message HelloRequest{
   required string   station_id=1;
+  optional string	message=2;
 }       
 
 message HelloResponse{
-  required string       trisul_id=1;
-  required string       trisul_description=2;
-  required string       connection_id=3;
-  required string       version_string=4;
-  required Timestamp    connection_start_time=5;
-  required Timestamp    connection_up_time=6;
-  required AuthLevel    current_auth_level=7;   
+  required string       station_id=1;
+  optional string       station_id_request=2;
+  optional string       message=3;
 }
 
 ///////////////////////////////
@@ -311,17 +390,13 @@ message OKResponse{
    optional string      message=2;
 }
 
-message ReleaseContextRequest{
-  optional int64        context=1;
-}
 
 ///////////////////////////////
 // CounterItemRequest 
 message CounterItemRequest{
-    optional int64          context=1 [default=0];
     required string         counter_group=2;
     optional int64          meter=3;
-    required string         key=4;
+    required KeyT     key=4;
     required TimeInterval   time_interval=5;
 	optional int64			volumes_only=6 [default=0];
 }
@@ -329,140 +404,59 @@ message CounterItemRequest{
 ///////////////////////////////
 // CounterItemResponse  
 message CounterItemResponse{
-    required KeyStats       stats=1;
+	required string			counter_group=1;
+	required KeyT			key=2;
+    optional StatsArray     totals=3;
+    repeated StatsArray     stats=4;
 }
 
 
-//////////////////////////////////////////
-// BulkCounterItemRequest
-message BulkCounterItemRequest{
-    optional int64          context=1[default=0];
-    required string         counter_group=2;
-    required int64          meter=3;
-    required TimeInterval   time_interval=4;
-    repeated string         keys=5;
-}
-
-//////////////////////////////////////////
-// BulkCounterItemResponse
-message BulkCounterItemResponse{
-    repeated KeyStats       stats=1;
-}
-
 ///////////////////////////////
-// CounterGroupRequest 
-message CounterGroupRequest{
-    optional int64          context=1 [default=0];
+// CounterGroupTopperRequest 
+message CounterGroupTopperRequest{
     required string         counter_group=2;
     optional int64          meter=3 [default=0];
-    optional int64          maxitems=4 [default=10];
+    optional int64          maxitems=4 [default=100];
     optional TimeInterval   time_interval=5;
     optional Timestamp      time_instant=6;
     optional int64          flags=7;
-    optional bool           resolve_keys=8;
+    optional bool           resolve_keys=8 [default=true];
 }
 
 ///////////////////////////////
-// CounterGroupResponse  
-message  CounterGroupResponse{
-    required int64          context=1;
+// CounterGroupTopperResponse  
+message  CounterGroupTopperResponse{
     required string         counter_group=2;
     required int64          meter=3;
 	optional int64			sysgrouptotal=4;
-    repeated KeyDetails     keys=6;
-}
-
-
-///////////////////////////////
-// FilteredDatagramRequest
-message FilteredDatagramRequest{
-    optional int64          max_packets=1[default=0];                
-    optional int64          max_bytes=2[default=0];                   
-    optional CompressionType compress_type=3[default=UNCOMPRESSED];              
-
-	// by trisul filter format expr
-	message ByFilterExpr {
-		required TimeInterval   time_interval=1;                   
-		required string         filter_expression=2;
-	}
-	optional ByFilterExpr 		filter_expression=4;
-
-	// by session
-	message BySession   {
-    	optional string         session_group=1[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-		repeated SessionID		session_ids=2;
-	}
-	optional BySession			session=5;
-
-
-	// by alert
-	message ByAlert     {
-		optional string			alert_group=1[default="{9AFD8C08-07EB-47E0-BF05-28B4A7AE8DC9}"];
-		repeated AlertID		alert_ids=2;
-	}
-	optional ByAlert			alert=6;
-
-	// by resource
-	message ByResource  {
-		required string			resource_group=1;
-		repeated ResourceID		resource_ids=2;
-	}
-	optional ByResource			resource=7;
-
-    optional PcapDisposition    disposition=8[default=DOWNLOAD];              
-
+    repeated KeyT     keys=6;
 }
 
-/////////////////////////////////////
-// FileredDatagaramResponse
-message FilteredDatagramResponse{
-    required PcapFormat     format=1;                                 
-    required CompressionType compress_type=2;                   
-    required TimeInterval   time_interval=3;                
-    required int64          num_datagrams=4;               
-    required int64          num_bytes=5;      
-    required string         sha1=6;
-    required bytes          contents=7;
-	required PcapDisposition disposition=8;
-	optional string			path=9;
-}
-
-//////////////////////////////////////////
-// ControlledContextRequest
-message ControlledContextRequest{
-    required TimeInterval       time_interval=1;          
-    required string             filter_expression=2;       
-} 
-
-//////////////////////////////////////////
-//// ControlledContextResponse
-message ControlledContextResponse{
-    required int64              context=1;
-    optional string             context_db=2;
-    required TimeInterval       time_interval =3;          
-} 
 
 ///////////////////////////////////////
 // SearchkeysRequest
 message SearchKeysRequest{
-    optional int64          context=1[default=0];                    
     required string         counter_group=2;        
-    required string         pattern=3;        
-    required int64          maxitems=4;
+    optional int64          maxitems=3[default=100];
+    optional string         pattern=4;        
+    optional string         label=5;
+    repeated string         keys=6;
+    optional int64          offset=7[default=0];
+    optional bool           get_totals=8[default=false];
 } 
 
 //////////////////////////////////////
 // SearchKeysResponse
 message SearchKeysResponse{
-    optional int64          context=1;                    
     required string         counter_group=2;        
-    repeated KeyDetails     found_keys=3;
+    repeated KeyT     keys=3;
+    optional int64          total_count=4;
+
 } 
 
 /////////////////////////////////////
 /// CounterGroupInfoRequest
 message CounterGroupInfoRequest{
-    optional int64         context=1[default=0];
     optional string        counter_group=2;
 	optional bool		   get_meter_info=3[default=false];
 }
@@ -470,62 +464,42 @@ message CounterGroupInfoRequest{
 ///////////////////////////////////
 /// CounterGroupInfoResponse
 message CounterGroupInfoResponse{
-    optional int64                  context=1;
-    repeated CounterGroupDetails    group_details=2;
-}
-
-/////////////////////////////////////
-// SessionItemRequest
-message SessionItemRequest{
-    optional int64          context=1[default=0];            
-    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    repeated string         session_keys=3;
-    repeated SessionID      session_ids=4;
-	optional bool			resolve_keys=5[default=true];
+    repeated CounterGroupT    group_details=2;
 }
 
-////////////////////////////////////
-// SessionItemResponse
-message SessionItemResponse{
-    optional int64          	context=1[default=0];            
-    required string         	session_group=2;
-    repeated SessionDetails     sessions=3;
-}
 ///////////////////////////////////
 // QuerySessions - any of the fields can be filled
 // 				   all the fields filled are treated as AND criteria 
 message QuerySessionsRequest {
-    optional int64          context=1[default=0];
     optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    required TimeInterval   time_interval=3;
+    optional TimeInterval   time_interval=3;
     optional string         key=4;
-	optional string			source_ip=5;
-	optional string			source_port=6;
-	optional string			dest_ip=7;
-	optional string			dest_port=8;
-	optional string			any_ip=9;
-	optional string			any_port=10;
-	optional string			ip_pair=11;
-	optional string			protocol=12;
+	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;
+	optional KeyT			any_port=10;
+	repeated KeyT           ip_pair=11;			// array of 2 ips 
+	optional KeyT			protocol=12;
 	optional string			flowtag=13;
-	optional string			nf_routerid=14;
-	optional string			nf_ifindex_in=15;
-	optional string			nf_ifindex_out=16;
+	optional KeyT			nf_routerid=14;
+	optional KeyT			nf_ifindex_in=15;
+	optional KeyT			nf_ifindex_out=16;
 	optional string			subnet_24=17;
 	optional string			subnet_16=18;
-
     optional int64          maxitems=19[default=100];
     optional int64          volume_filter=20[default=0];
 	optional bool			resolve_keys=21[default=true];
 	optional string			outputpath=22;
+	repeated string			idlist=23;
 }
 
 /////////////////////////////////////
 // QuerySessionsResponse 
 message QuerySessionsResponse {
-    optional int64          	context=1;
     required string         	session_group=2;
-    repeated SessionDetails     sessions=3;
+    repeated SessionT     		sessions=3;
     optional string         	outputpath=4;
 }
 
@@ -533,295 +507,127 @@ message QuerySessionsResponse {
 /// UpdatekeysRequest
 /// Response = OKResponse or ErrorResponse
 message UpdateKeyRequest{
-    optional int64          context=1[default=0];
     required string         counter_group=2;
-    required string         key=4;
-    required string         label=5;
-    optional string         description=6;
+    repeated KeyT     keys=4;
 }
 
 /////////////////////////////////////
 // SessionTrackerRequest
 message SessionTrackerRequest {
-    optional int64          context=1[default=0];
     optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
     required int64          tracker_id=3 [default=1];
     optional int64          maxitems=4 [default=100];
     required TimeInterval   time_interval=5;
+    optional bool           resolve_keys=6 [default=true];
 }
 
 ///////////////////////////////////
 // SessionTrackerResponse 
 message SessionTrackerResponse{
-    optional int64          context=1;
     required string         session_group=2;
-    repeated SessionDetails sessions=3;
+    repeated SessionT       sessions=3;
     optional int64          tracker_id=4;
 }
 
-///////////////////////////////////
-// SessionGroupRequest
-message SessionGroupRequest {
-    optional int64          context=1[default=0];
-    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    optional int64          tracker_id=3;
-    optional string         key_filter=4;
-    optional int64          maxitems=5 [default=100];
-}
-
-//////////////////////////////////
-// SessionGroupResponse
-message SessionGroupResponse {
-    optional int64          context=1;
-    required string         session_group=2;
-    repeated string         session_keys=3;
-}
-
-
-//////////////////////////////////
-// ServerStatsRequest
-message ServerStatsRequest{
-     required int64         param=1;
-}
-
-//////////////////////////////////
-// ServerStatsResponse
-message ServerStatsResponse{
-    required string         instance_name=1;
-    required int64          connections=2;
-    required int64          uptime_seconds=3;
-    required double         cpu_usage_percent_trisul=4;
-    required double         cpu_usage_percent_total=5;
-    required double         mem_usage_trisul=6;
-    required double         mem_usage_total=7;
-    required double         mem_total=8;
-    required int64          size_total=9;
-    required double         drop_percent_cap=11;
-    required double         drop_percent_trisul=12;
-    required TimeInterval   time_interval=13;
-}
-
-/////////////////////////////////////
-// AlertItemRequest
-message AlertItemRequest{
-    optional int64          context=1[default=0];            
-    required string         alert_group=2;
-    repeated AlertID        alert_ids=3;
-}
 ////////////////////////////////////
-// AlertItemResponse
-message AlertItemResponse{
-    optional int64          context=1;            
+// QueryAlertsRequest 
+message QueryAlertsRequest  {
     required string         alert_group=2;
-    message Item {
-        optional int64          sensor_id=1;
-        required Timestamp      time=2;
-		required AlertID		alert_id=3;
-        optional string         source_ip=4;
-        optional string         source_port=5;
-        optional string         destination_ip=6;
-        optional string         destination_port=7;
-        required string         sigid=8;
-        required string         classification=9;
-        required string         priority=10;
-        required Timestamp      dispatch_time=11;
-        required string         aux_message1=12;
-        required string         aux_message2=13;
-    }
-    repeated Item           items=3;
-}
-
-////////////////////////////////////
-// AlertGroupQueryRequest
-message AlertGroupRequest {
-    optional int64          context=1[default=0];            
-    required string         alert_group=2;
-    required TimeInterval   time_interval=3;
-    optional int64          maxitems=5 [default=10];
-    optional string         source_ip=6;
-    optional string         source_port=7;
-    optional string         destination_ip=8;
-    optional string         destination_port=9;
-    optional string         sigid=10;
-    optional string         classification=11;
-    optional string         priority=12;
+    optional TimeInterval   time_interval=3;
+    optional int64          maxitems=5 [default=100];
+    optional KeyT      		source_ip=6;
+    optional KeyT     		source_port=7;
+    optional KeyT     		destination_ip=8;
+    optional KeyT     		destination_port=9;
+    optional KeyT     		sigid=10;
+    optional KeyT     		classification=11;
+    optional KeyT     		priority=12;
     optional string         aux_message1=13;
     optional string         aux_message2=14;
+    optional string         group_by_fieldname=15;
+	repeated string 		idlist=16;
+	optional bool			resolve_keys=17[default=true];
+    optional KeyT           any_ip=18;
+    optional KeyT           any_port=19;
+	repeated KeyT           ip_pair=20;			     // array of 2 ips 
+	optional string			message_regex=21;		// searech via regex 
 }
 
 /////////////////////////////////////
-// AlertGroupResponse 
-message AlertGroupResponse {
-    optional int64          context=1;
+// QueryAlertsResponse 
+message QueryAlertsResponse {
     required string         alert_group=2;
-    repeated AlertID        alerts=3;
-}
-
-/////////////////////////////////////
-// ResourceRequest - mutliple 
-message ResourceItemRequest{
-    optional int64          context=1[default=0];            
-    required string         resource_group=2;
-    repeated ResourceID     resource_ids=3;
+    repeated AlertT   		alerts=3;
 }
 ////////////////////////////////////
-// ResourceItemResponse
-message ResourceItemResponse{
-    optional int64          context=1;            
+//  QueryResourcesRequest
+message QueryResourcesRequest {
     required string         resource_group=2;
-    message Item {
-        required Timestamp      time=1;
-        required ResourceID     resource_id=2;
-        optional string         source_ip=3;
-        optional string         source_port=4;
-        optional string         destination_ip=5;
-        optional string         destination_port=6;
-        optional string         uri=7;
-        optional string         userlabel=8;
-    }
-    repeated Item           items=3;
-}
-
-////////////////////////////////////
-// ResourceGroupRequest
-message ResourceGroupRequest {
-    optional int64          context=1[default=0];            
-    required string         resource_group=2;
-    required TimeInterval   time_interval=3;
-    optional int64          maxitems=4 [default=10];
-    optional string         source_ip=5;
-    optional string         source_port=6;
-    optional string         destination_ip=7;
-    optional string         destination_port=8;
+    optional TimeInterval   time_interval=3;
+    optional int64          maxitems=4 [default=100];
+    optional KeyT     		source_ip=5;
+    optional KeyT     		source_port=6;
+    optional KeyT     		destination_ip=7; 
+    optional KeyT     		destination_port=8;
     optional string         uri_pattern=9;
     optional string         userlabel_pattern=10;
-    repeated string         uri_list=11;
+    repeated string         regex_uri=12;            // cant be combined with others 
+	repeated string    		idlist=13;				 // resource ID list 
+	optional bool			resolve_keys=14 [default=true];
+    optional KeyT     		any_port=15;
+    optional KeyT     		any_ip=16;
+	repeated KeyT           ip_pair=17;			     // array of 2 ips 
 }
 
 /////////////////////////////////////
-// ResourceGroupResponse  
-message ResourceGroupResponse {
-    optional int64          context=1;
-    required string         resource_group=2;
-    repeated ResourceID     resources=3;
+// QueryResourceResponse  
+message QueryResourcesResponse {
+    required string        	resource_group=2;
+    repeated ResourceT     	resources=3;
 }
 
 
 
-/////////////////////////////////////////////
-// KeyLookup - mutliple keys from a single CG
-message KeyLookupRequest {
-    optional int64          context=1[default=0];            
-    required string         counter_group=2;
-    repeated string         keys=3;
-}
-
-
-/////////////////////////////////////////////
-// KeyLookup 
-message KeyLookupResponse {
-    optional int64          context=1;            
-    required string         counter_group=2;
-    repeated KeyDetails     key_details=3;
-}
-
-////////////////////////////////////
-// GrepRequest
-message GrepRequest {
-    optional int64          context=1[default=0];            
-    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    required TimeInterval   time_interval=3;
-    optional int64          maxitems=4 [default=50];
-    optional string         pattern=5;
-	repeated string         md5list=6;
-}
-
-/////////////////////////////////////
-// GrepResponse  
-message GrepResponse  {
-    optional int64          context=1;
-    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    repeated SessionDetails sessions=3;
-    repeated string         hints=4;
-}
-
-
 ////////////////////////////////////
 // KeySpaceRequest
 message KeySpaceRequest {
-    optional int64          context=1[default=0];            
     required string         counter_group=2;
     required TimeInterval   time_interval=3;
     optional int64          maxitems=4 [default=100];
 
 	message KeySpace {
-		required string 	from=1;
-		required string 	to=2;
+		required KeyT 	from_key=1;
+		required KeyT 	to_key=2;
 	}
 
 	repeated KeySpace       spaces=5;
+    optional bool           resolve_keys=6[default=true];
 }
 
 /////////////////////////////////////
 // KeySpaceResponse  
 message KeySpaceResponse  {
-    optional int64          context=1;
     optional string         counter_group=2;
-    repeated string         hits=3;
+    repeated KeyT         hits=3;
 }
 
 ///////////////////////////////
 // TopperTrendRequest 
 message TopperTrendRequest {
-    optional int64          context=1 [default=0];
     required string         counter_group=2;
     optional int64          meter=3 [default=0];
-    optional int64          maxitems=4 [default=10];
+    optional int64          maxitems=4 [default=100];
     optional TimeInterval   time_interval=5;
 }
 
 ///////////////////////////////
 // TopperTrendResponse   
 message  TopperTrendResponse {
-    required int64          context=1;
     required string         counter_group=2;
     required int64          meter=3;
     repeated KeyStats       keytrends=4;
 }
 
-///////////////////////////////////
-// QueryPDP - any of the fields can be filled
-// 				   all the fields filled are treated as AND criteria 
-// {3fcbae7f-bbec-47ca-bae0-b48d5f96fd6b}
-// define_guid(<<name>>, 
-// 0x3fcbae7f, 0xbbec, 0x47ca, 0xba, 0xe0, 0xb4, 0x8d, 0x5f, 0x96, 0xfd, 0x6b);
-
-message QueryPDPRequest {
-    optional int64          context=1[default=0];
-    optional string         session_group=2[default="{3FCBAE7F-BBEC-47CA-BAE0-B48D5F96FD6B}"];
-    required TimeInterval   time_interval=3;
-	optional string			ipa=4;
-	optional string			msisdn=5;
-	optional string			imei=6;
-	optional string			imsi=7;
-	optional string			apn=8;
-	optional string			rai=9;
-	optional string			uli=10;
-	optional string			rat=11;
-	optional string			cause=12;
-	optional string			mccmnc=13;
-    optional int64          maxitems=14[default=100];
-	optional string			teid=15;
-}
-
-/////////////////////////////////////
-// QueryPDPResponse 
-message QueryPDPResponse {
-    optional int64          	context=1;
-    repeated PDPDetails         sessions=3;
-}
-
-
 
 
 ///////////////////////////////////
@@ -843,7 +649,7 @@ message SubscribeCtl  {
 		CT_UNSUBSCRIBE=1;
 	}
 
-    optional int64          context=1[default=0];
+	required string			context_name=1;
 	required CtlType		ctl=2;
 	required StabberType	type=3;
 	optional string			guid=4;
@@ -852,3 +658,391 @@ message SubscribeCtl  {
 }
 
 
+
+// FTS
+//  query to return docs, docids, and flows based on keyword search
+//
+
+message QueryFTSRequest  {
+
+    required TimeInterval       time_interval=2;
+	required string			    fts_group=3;
+    required string             keywords=4;
+    optional int64              maxitems=5[default=100];
+}
+
+
+message QueryFTSResponse {
+
+	required string			    fts_group=2;
+    repeated DocumentT    		documents=3;   
+
+}
+
+
+// Timeslices
+//
+// 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];
+}
+
+// .. response = TimeSlicesResponse
+// get the PCAP METASLICE based info 
+message PcapSlicesRequest {
+	required string context_name=1;
+	optional bool	get_total_window=2[default=false];
+}
+
+message TimeSlicesResponse  {
+	message SliceT
+	{
+		required TimeInterval   time_interval=1;
+		optional string 		name=2;
+		optional string 		status=3;
+		optional int64          disk_size=4;
+		optional string         path=5;
+		optional bool			available=6;
+	};
+
+	repeated SliceT		    slices=1;
+    optional TimeInterval   total_window=2;
+	optional string			context_name=3;
+}
+
+
+// DeleteAlerts
+//  - very limited exception to Trisul rule of not having delete options 
+message DeleteAlertsRequest  {
+    required string         alert_group=2;
+    required TimeInterval   time_interval=3;
+    optional KeyT     		source_ip=6;
+    optional KeyT     		source_port=7;
+    optional KeyT     		destination_ip=8;
+    optional KeyT     		destination_port=9;
+    optional KeyT     		sigid=10;
+    optional KeyT     		classification=11;
+    optional KeyT     		priority=12;
+    optional KeyT     		any_ip=18;
+    optional KeyT     		any_port=19;
+	optional string			message_regex=21;		// delete using regex 
+} 
+
+//////////////////////////////////
+// MetricsSummaryRequest
+message MetricsSummaryRequest{
+     optional  TimeInterval   time_interval=1;
+     required  string         metric_name=2;
+	 optional  bool			  totals_only=3[default=true];
+}
+
+//////////////////////////////////
+// MetricsSummaryResponse
+message MetricsSummaryResponse {
+    required  string         metric_name=2;
+    repeated  StatsTuple     vals=3;
+}
+
+
+
+//////////////////////////////////
+// LogRequest  - want log file 
+message LogRequest  {
+
+     required  string         context_name=1;
+     required  string         log_type=2;
+     optional  string         regex_filter=4;
+     optional  int64          maxlines=5[default=1000];
+	 optional  string		  continue_logfilename=6;
+	 optional  int64		  continue_seekpos=7;
+	 optional  bool			  latest_run_only=8[default=false];
+}
+
+
+message LogResponse  {
+
+     required  string         context_name=1;
+	 optional  string		  logfilename=6;
+	 optional  int64		  seekpos=7;
+     repeated  string         log_lines=8; // compressed gz 
+}
+
+
+// messages to routerX backend 
+message DomainRequest {
+	required 	DomainOperation cmd=1;
+	optional	string	station_id=2;
+	optional	string	params=3;
+	optional 	DomainNodeType nodetype=4;
+}
+
+message DomainResponse {
+
+
+	message Node {
+
+		required string	id=1;
+		required DomainNodeType  nodetype=2;
+		optional string station_id=3; 
+		optional string extra_info=4;
+		optional Timestamp register_time=5; 
+		optional Timestamp heartbeat_time=6; 
+
+	}
+
+	required DomainOperation	cmd=1;
+	repeated Node nodes=2;
+	optional string req_params=3;
+	optional string params=4;
+	optional bool need_reconnect=5[default=false];
+}
+
+
+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 
+	}
+
+	optional IntelFeed add_feed=2;
+	optional IntelFeed process_new_feed=3;
+}
+
+message NodeConfigResponse {
+
+	message Node {
+		required string	id=1;
+		required DomainNodeType  nodetype=2;
+		required string	description=3;
+		required string	public_key=4;
+	}
+
+	repeated Node		domains=1;
+	repeated Node		hubs=2;
+	repeated Node		probes=3;
+	repeated string		feeds=4;
+}
+
+
+//////////////////////////////////
+// ContextRequest  - Context methods 
+// 	response Ok or Error, follow up with ContextInfo to print details 
+// 
+message ContextCreateRequest  {
+     required  string         context_name=1;
+     optional  string         clone_from=2;
+}
+
+//////////////////////////////////
+// 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 
+}
+
+message ContextInfoResponse {
+
+
+	message Item
+	{
+		required string 		context_name=1;
+		required bool			is_initialized=2;
+		required bool   		is_running=3;
+		optional int64			size_on_disk=4;
+		optional TimeInterval	time_interval=5;
+		optional bool   		is_clean=6;
+		optional string			extrainfo=7;
+		repeated TimeInterval   run_history=8;
+		optional string			profile=9;
+		optional string			runmode=10;
+	}
+
+	repeated  Item 	items=1;
+}
+
+//////////////////////////////////
+// ContextDelete  : initialize 
+//		reset data only .. 
+message ContextDeleteRequest   {
+     required   string         context_name=1; 		// if not  set all context get in 
+	 optional   bool		   reset_data=2;	// reset data dont delete everything
+}
+
+// ContextStart  : run 
+//		run data only .. 
+message ContextStartRequest   {
+     required   string         context_name=1; 		// if not  set all context get in 
+	 optional   string		   mode=2;
+	 optional   bool           background=3;
+	 optional   string		   pcap_path=4;
+	 optional   string		   run_tool=5;			// snort, suricata supported..
+	 optional   string		   tool_ids_config=6;
+	 optional   string		   tool_av_config=7;
+
+}
+
+// ContextSttop  : kill 
+message ContextStopRequest   {
+     required   string         context_name=1; 		// if not  set all context get in 
+	 optional   string		   run_tool=5;			// snort, suricata , trp, flushd supported..
+}
+
+
+//////////////////////////////////
+// ContextConfigRequest - start stop status 
+// 	OK or ERROR response 
+//  Status = OK if running with PID etc in message text 
+message ContextConfigRequest {
+     required  string         context_name=1;
+     optional  string         profile=2;
+     optional  string         params=3;
+	 optional  bytes		  push_config_blob=4;     // push this .. 
+	 optional  string		  query_config=5;  		  // push this .. 
+
+	 repeated  NameValue	  set_config_values=6;    // push this ..  (name=value;name=value ..)
+}
+
+
+message ContextConfigResponse {
+
+	message Layer
+	{
+		required int64	layer=1;
+		required string probe_id=2;
+		optional string probe_description=3;
+	}
+
+	required  string         	context_name=1;
+	optional  string         	profile=2;
+	optional  string		  	params=3;	   				// what kind of config you want 
+	optional  bytes		  		pull_config_blob=4;	// config 
+	optional  bytes          	config_blob=5; 			// compress tar.gz ..
+	repeated  string		  	endpoints_flush=6;
+	repeated  string		  	endpoints_query=7;
+	repeated  string		  	endpoints_pub=8;
+	optional  string		  	config_value=10;  // response to query config .. 
+	repeated  Layer 		  	layers=11;
+
+}
+
+///////////////////////////////
+// PcapReqiest
+//  NOTE - only one of the various filters are supported
+//  sending > 1 will result in error 
+// 
+message PcapRequest {
+	required string				context_name=1;
+    optional int64              max_bytes=2[default=100000000]; // 100MB , can increase to 0.75 Filesystem freespace
+    optional CompressionType    compress_type=3[default=UNCOMPRESSED];              
+    optional string             save_file=4;
+	required TimeInterval       time_interval=5;                   
+	required string             filter_expression=6;
+}
+
+/////////////////////////////////////
+// FileredDatagaramResponse
+message PcapResponse  {
+	required string			context_name=1;
+    optional PcapFormat     format=2[default=LIBPCAP];                                 
+    optional CompressionType compress_type=3[default=UNCOMPRESSED];                   
+    optional TimeInterval   time_interval=4;                
+    optional int64          num_bytes=5;      
+    optional string         sha1=6;
+    optional bytes          contents=7;
+	optional string			save_file=8;
+}
+
+////////////////////////////////////
+// GrepRequest
+message GrepRequest {
+	required string			context_name=1;
+    required TimeInterval   time_interval=2;
+    optional int64          maxitems=3 [default=100];
+    optional int64          flowcutoff_bytes=4;
+    optional string         pattern_hex=5;
+    optional string         pattern_text=6;
+    optional string         pattern_file=7;
+	repeated string         md5list=8;
+    optional bool           resolve_keys=9 [default=true];
+}
+
+/////////////////////////////////////
+// GrepResponse  
+message GrepResponse  {
+	required string			context_name=1;
+    repeated SessionT       sessions=2;
+    repeated string         hints=3;
+}
+
+//////////////////////////////////
+// ProbeStatsRequest
+message ProbeStatsRequest{
+	 required  string		context_name=1;
+     optional  string       param=2;
+}
+
+//////////////////////////////////
+// ProbeStatsResponse
+message ProbeStatsResponse {
+	required string			context_name=1;
+    required string         instance_name=2;
+    required int64          connections=3;
+    required int64          uptime_seconds=4;
+    required double         cpu_usage_percent_trisul=5;
+    required double         cpu_usage_percent_total=6;
+    required double         mem_usage_trisul=7;
+    required double         mem_usage_total=8;
+    required double         mem_total=9;
+    required double         drop_percent_cap=10;
+    required double         drop_percent_trisul=11;
+	optional int64			proc_bytes=12;
+	optional int64			proc_packets=13;
+	optional string			offline_pcap_file=14;
+	optional bool			is_running=15;
+}
+
+/////////////////////////////////////
+// AsyncResponse  
+message AsyncResponse  {
+    required int64          token=1;
+	optional string 		response_message=3;
+	optional Message		response=4;
+}
+
+//////////////////////////////////
+// AsyncRequest
+//		response taken from original (if ready) or not_ready flag set 	
+message AsyncRequest {
+	 required  int64		token=1;
+     optional  string       request_message =2; // basically extra text for logging 
+}
+
+/////////////////////////////////////
+// FileRequest  
+message FileRequest  {
+	required string 		uri=1;
+    required int64          position=2;
+	optional string			params=3;	// local meaning sentback n response
+}
+
+//////////////////////////////////
+// FileResponse
+//		one chunk at at time, Trisul has slightly inefficient File Transfer
+// 		for very large files, since most files are data feeds  < 100MB fine for now
+message FileResponse  {
+	 required  string 		uri=1;
+	 required  bool		    eof=2;
+     optional  int64        position=3;
+     optional  bytes        content=4;
+     optional  string       request_params =5; 
+}
+
+