NETOBSERV-292 End time for time range is now inclusive (#162)

* NETOBSERV-292 End time for time range is now inclusive

* Fix tests

Author: jotak

pkg/handler/flows.go

@@ -64,10 +64,29 @@ func getStartTime(params url.Values) (string, error) {
 			}
 			start = strconv.FormatInt(time.Now().Unix()-r, 10)
 		}
+	} else {
+		// Make sure it is a valid int
+		_, err := strconv.ParseInt(start, 10, 64)
+		if err != nil {
+			return "", errors.New("Could not parse start time: " + err.Error())
+		}
 	}
 	return start, nil
 }
 
+// getEndTime will parse end time and ceil it to the next second
+func getEndTime(params url.Values) (string, error) {
+	end := params.Get(endTimeKey)
+	if len(end) > 0 {
+		r, err := strconv.ParseInt(end, 10, 64)
+		if err != nil {
+			return "", errors.New("Could not parse end time: " + err.Error())
+		}
+		end = strconv.Itoa(int(r) + 1)
+	}
+	return end, nil
+}
+
 // getLimit returns limit as string (used for logQL) and as int (used to check if reached)
 func getLimit(params url.Values) (string, int, error) {
 	limit := params.Get(limitKey)
@@ -111,7 +130,10 @@ func getFlows(cfg loki.Config, client httpclient.Caller, params url.Values) (*mo
 	if err != nil {
 		return nil, http.StatusBadRequest, err
 	}
-	end := params.Get(endTimeKey)
+	end, err := getEndTime(params)
+	if err != nil {
+		return nil, http.StatusBadRequest, err
+	}
 	limit, reqLimit, err := getLimit(params)
 	if err != nil {
 		return nil, http.StatusBadRequest, err

pkg/handler/topology.go

@@ -47,7 +47,10 @@ func getTopologyFlows(cfg loki.Config, client httpclient.Caller, params url.Valu
 	if err != nil {
 		return nil, http.StatusBadRequest, err
 	}
-	end := params.Get(endTimeKey)
+	end, err := getEndTime(params)
+	if err != nil {
+		return nil, http.StatusBadRequest, err
+	}
 	limit, reqLimit, err := getLimit(params)
 	if err != nil {
 		return nil, http.StatusBadRequest, err

pkg/server/server_flows_test.go

@@ -104,10 +104,10 @@ func TestLokiFiltering(t *testing.T) {
 		outputQueries: []string{`?query={app="netobserv-flowcollector"}&start=1640991600`},
 	}, {
 		inputPath:     "?endTime=1641160800",
-		outputQueries: []string{`?query={app="netobserv-flowcollector"}&end=1641160800`},
+		outputQueries: []string{`?query={app="netobserv-flowcollector"}&end=1641160801`},
 	}, {
 		inputPath:     "?startTime=1640991600&endTime=1641160800",
-		outputQueries: []string{`?query={app="netobserv-flowcollector"}&start=1640991600&end=1641160800`},
+		outputQueries: []string{`?query={app="netobserv-flowcollector"}&start=1640991600&end=1641160801`},
 	}, {
 		inputPath:     "?timeRange=300000",
 		outputQueries: []string{`?query={app="netobserv-flowcollector"}&start=${timeNow-300000}`},

web/locales/en/plugin__network-observability-plugin.json

@@ -50,6 +50,8 @@
   "Namespace": "Namespace",
   "Owner": "Owner",
   "Resource": "Resource",
+  "From": "From",
+  "To": "To",
   "XL": "XL",
   "L": "L",
   "M": "M",
@@ -69,8 +71,6 @@
   "Cancel": "Cancel",
   "At least one column must be selected": "At least one column must be selected",
   "Save": "Save",
-  "From": "From",
-  "To": "To",
   "Export": "Export",
   "Following query will be exported as CSV format:": "Following query will be exported as CSV format:",
   "Time Range": "Time Range",

web/src/components/modals/time-range-modal.tsx

@@ -31,7 +31,7 @@ let displayedFromTime: string | undefined;
 let displayedToTime: string | undefined;
 
 export const TimeRangeModal: React.FC<TimeRangeModalProps> = ({ id, isModalOpen, setModalOpen, range, setRange }) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('plugin__network-observability-plugin');
   const [error, setError] = React.useState<string | undefined>();
   const [fromDate, setFromDate] = React.useState<string | undefined>();
   const [fromTime, setFromTime] = React.useState<string | undefined>();

web/src/components/netflow-record/record-panel.tsx

@@ -76,7 +76,8 @@ export const RecordPanel: React.FC<RecordDrawerProps> = ({
           } else {
             //Filter at exact same date
             const dateSeconds = Math.floor(Number(value) / 1000);
-            setRange({ from: dateSeconds, to: dateSeconds + 1 });
+            // Note: "to" field will be rounded up to the next second from the backend
+            setRange({ from: dateSeconds, to: dateSeconds });
           }
         },
         isDelete: isDelete