diff --git a/Dockerfile b/Dockerfile index 13acced00..51a42eae9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,8 @@ RUN go build -ldflags="-s -w \ -X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent . # Download Basenine executable, verify the sha1sum and move it to a directory in $PATH -ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64 ./basenine_linux_amd64 -ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256 +ADD https://github.com/up9inc/basenine/releases/download/v0.2.19/basenine_linux_amd64 ./basenine_linux_amd64 +ADD https://github.com/up9inc/basenine/releases/download/v0.2.19/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256 RUN shasum -a 256 -c basenine_linux_amd64.sha256 RUN chmod +x ./basenine_linux_amd64 diff --git a/agent/go.mod b/agent/go.mod index 822531ba8..c2c3ba36e 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -16,7 +16,7 @@ require ( github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/up9inc/basenine/client/go v0.0.0-20211207165834-2ced7577f9e6 + github.com/up9inc/basenine/client/go v0.0.0-20211215185650-10083bb9a1b3 github.com/up9inc/mizu/shared v0.0.0 github.com/up9inc/mizu/tap v0.0.0 github.com/up9inc/mizu/tap/api v0.0.0 diff --git a/agent/go.sum b/agent/go.sum index 9627935ed..2c113c74a 100644 --- a/agent/go.sum +++ b/agent/go.sum @@ -450,8 +450,8 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/up9inc/basenine/client/go v0.0.0-20211207165834-2ced7577f9e6 h1:8JOkoaZHhUPi4r7vSL/xo83foSz8BHPSabTDpxmtHFU= -github.com/up9inc/basenine/client/go v0.0.0-20211207165834-2ced7577f9e6/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI= +github.com/up9inc/basenine/client/go v0.0.0-20211215185650-10083bb9a1b3 h1:FeDCVOBFVpZA5/O5hfPdGTn0rdR2jTEYo3iB2htELI4= +github.com/up9inc/basenine/client/go v0.0.0-20211215185650-10083bb9a1b3/go.mod h1:SvJGPoa/6erhUQV7kvHBwM/0x5LyO6XaG2lUaCaKiUI= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= diff --git a/debug.Dockerfile b/debug.Dockerfile index 858b6ae31..e063e887f 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -37,8 +37,8 @@ COPY agent . RUN go build -gcflags="all=-N -l" -o mizuagent . # Download Basenine executable, verify the sha1sum and move it to a directory in $PATH -ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64 ./basenine_linux_amd64 -ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256 +ADD https://github.com/up9inc/basenine/releases/download/v0.2.19/basenine_linux_amd64 ./basenine_linux_amd64 +ADD https://github.com/up9inc/basenine/releases/download/v0.2.19/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256 RUN shasum -a 256 -c basenine_linux_amd64.sha256 RUN chmod +x ./basenine_linux_amd64 diff --git a/ui/src/components/EntriesList.tsx b/ui/src/components/EntriesList.tsx index b5da7736e..14e78bec2 100644 --- a/ui/src/components/EntriesList.tsx +++ b/ui/src/components/EntriesList.tsx @@ -18,6 +18,7 @@ interface EntriesListProps { queriedCurrent: number; setQueriedCurrent: any; queriedTotal: number; + setQueriedTotal: any; startTime: number; noMoreDataTop: boolean; setNoMoreDataTop: (flag: boolean) => void; @@ -30,11 +31,13 @@ interface EntriesListProps { ws: any; openWebSocket: (query: string, resetEntries: boolean) => void; leftOffBottom: number; + truncatedTimestamp: number; + setTruncatedTimestamp: any; } const api = new Api(); -export const EntriesList: React.FC = ({entries, setEntries, query, listEntryREF, onSnapBrokenEvent, isSnappedToBottom, setIsSnappedToBottom, queriedCurrent, setQueriedCurrent, queriedTotal, startTime, noMoreDataTop, setNoMoreDataTop, focusedEntryId, setFocusedEntryId, updateQuery, leftOffTop, setLeftOffTop, isWebSocketConnectionClosed, ws, openWebSocket, leftOffBottom}) => { +export const EntriesList: React.FC = ({entries, setEntries, query, listEntryREF, onSnapBrokenEvent, isSnappedToBottom, setIsSnappedToBottom, queriedCurrent, setQueriedCurrent, queriedTotal, setQueriedTotal, startTime, noMoreDataTop, setNoMoreDataTop, focusedEntryId, setFocusedEntryId, updateQuery, leftOffTop, setLeftOffTop, isWebSocketConnectionClosed, ws, openWebSocket, leftOffBottom, truncatedTimestamp, setTruncatedTimestamp}) => { const [loadMoreTop, setLoadMoreTop] = useState(false); const [isLoadingTop, setIsLoadingTop] = useState(false); const scrollableRef = useRef(null); @@ -83,11 +86,13 @@ export const EntriesList: React.FC = ({entries, setEntries, qu setEntries(newEntries); setQueriedCurrent(queriedCurrent + data.meta.current); + setQueriedTotal(data.meta.total); + setTruncatedTimestamp(data.meta.truncatedTimestamp); if (scrollTo) { scrollableRef.current.scrollToIndex(data.data.length - 1); } - },[setLoadMoreTop, setIsLoadingTop, entries, setEntries, query, setNoMoreDataTop, leftOffTop, setLeftOffTop, queriedCurrent, setQueriedCurrent]); + },[setLoadMoreTop, setIsLoadingTop, entries, setEntries, query, setNoMoreDataTop, leftOffTop, setLeftOffTop, queriedCurrent, setQueriedCurrent, setQueriedTotal, setTruncatedTimestamp]); useEffect(() => { if(!isWebSocketConnectionClosed || !loadMoreTop || noMoreDataTop) return; @@ -144,7 +149,7 @@ export const EntriesList: React.FC = ({entries, setEntries, qu
Displaying {entries?.length} results out of {queriedTotal} total
- {startTime !== 0 &&
Started listening at {Moment(startTime).utc().format('MM/DD/YYYY, h:mm:ss.SSS A')}
} + {startTime !== 0 &&
Started listening at {Moment(truncatedTimestamp ? truncatedTimestamp : startTime).utc().format('MM/DD/YYYY, h:mm:ss.SSS A')}
}
; diff --git a/ui/src/components/TrafficPage.tsx b/ui/src/components/TrafficPage.tsx index 7d4075e01..d79356293 100644 --- a/ui/src/components/TrafficPage.tsx +++ b/ui/src/components/TrafficPage.tsx @@ -68,6 +68,7 @@ export const TrafficPage: React.FC = ({setAnalyzeStatus, onTLS const [queriedTotal, setQueriedTotal] = useState(0); const [leftOffBottom, setLeftOffBottom] = useState(0); const [leftOffTop, setLeftOffTop] = useState(null); + const [truncatedTimestamp, setTruncatedTimestamp] = useState(0); const [startTime, setStartTime] = useState(0); @@ -169,6 +170,7 @@ export const TrafficPage: React.FC = ({setAnalyzeStatus, onTLS setQueriedCurrent(queriedCurrent + message.data.current); setQueriedTotal(message.data.total); setLeftOffBottom(message.data.leftOff); + setTruncatedTimestamp(message.data.truncatedTimestamp); if (leftOffTop === null) { setLeftOffTop(message.data.leftOff - 1); } @@ -296,6 +298,7 @@ export const TrafficPage: React.FC = ({setAnalyzeStatus, onTLS queriedCurrent={queriedCurrent} setQueriedCurrent={setQueriedCurrent} queriedTotal={queriedTotal} + setQueriedTotal={setQueriedTotal} startTime={startTime} noMoreDataTop={noMoreDataTop} setNoMoreDataTop={setNoMoreDataTop} @@ -308,6 +311,8 @@ export const TrafficPage: React.FC = ({setAnalyzeStatus, onTLS ws={ws.current} openWebSocket={openWebSocket} leftOffBottom={leftOffBottom} + truncatedTimestamp={truncatedTimestamp} + setTruncatedTimestamp={setTruncatedTimestamp} />