Add offset to api-logs; remove relevant_id

api_logs/api-logs.go

@@ -147,7 +147,6 @@ type ApiLog struct {
 	Username            string         `json:"username,omitempty"`
 	SourceIP            string         `json:"source_ip,omitempty"`  //only logged for incoming API
 	UserAgent           string         `json:"user_agent,omitempty"` //only for incoming, indicate type of browser when UI
-	RelevantID          string         `json:"relevant_id,omitempty"`
 	Request             ApiLogRequest  `json:"request"`
 	Response            ApiLogResponse `json:"response"`
 }

search/opensearch_types.go

@@ -37,6 +37,7 @@ type SearchRequestBody struct {
 	Size  int64               `json:"size,omitempty"`
 	Query Query               `json:"query"`
 	Sort  []map[string]string `json:"sort,omitempty"`
+	From  int64               `json:"from,omitempty"`
 }
 
 type Query struct {

search/time_series.go

@@ -40,7 +40,7 @@ type TimeSeries interface {
 	//				...
 	//			}
 	//		}
-	Search(query Query, searchQuery []map[string]string, limit int64) (docs map[string]interface{}, totalCount int, err error)
+	Search(query Query, searchQuery []map[string]string, limit int64, offset int64) (docs map[string]interface{}, totalCount int, err error)
 
 	// Get takes the id returned in Search()
 	// The id is uuid assigned by OpenSearch when documents are added with Write().
@@ -398,7 +398,7 @@ type IndexSettings struct {
 //Search
 //Return:
 //	docs will be a slice of the TimeSeries data type
-func (ts *timeSeries) Search(query Query, sortQuery []map[string]string, limit int64) (docs map[string]interface{}, totalCount int, err error) {
+func (ts *timeSeries) Search(query Query, sortQuery []map[string]string, limit int64, offset int64) (docs map[string]interface{}, totalCount int, err error) {
 	if ts == nil {
 		return nil, 0, errors.Errorf("time series == nil")
 	}
@@ -421,6 +421,7 @@ func (ts *timeSeries) Search(query Query, sortQuery []map[string]string, limit i
 		Size:  limit,
 		Query: query,
 		Sort:  sortQuery,
+		From:  offset,
 	}
 
 	jsonBody, _ := json.Marshal(body)