mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-09-03 11:35:12 +00:00
Include milliseconds information into the timestamps in the UI (#524)
* Include milliseconds information into the timestamps in the UI * Upgrade Basenine version from `0.2.16` to `0.2.17` * Increase the `width` of timestamp
This commit is contained in:
@@ -42,8 +42,8 @@ RUN go build -ldflags="-s -w \
|
|||||||
-X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent .
|
-X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent .
|
||||||
|
|
||||||
# Download Basenine executable, verify the sha1sum and move it to a directory in $PATH
|
# Download Basenine executable, verify the sha1sum and move it to a directory in $PATH
|
||||||
ADD https://github.com/up9inc/basenine/releases/download/v0.2.16/basenine_linux_amd64 ./basenine_linux_amd64
|
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.16/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256
|
ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256
|
||||||
RUN shasum -a 256 -c basenine_linux_amd64.sha256
|
RUN shasum -a 256 -c basenine_linux_amd64.sha256
|
||||||
RUN chmod +x ./basenine_linux_amd64
|
RUN chmod +x ./basenine_linux_amd64
|
||||||
|
|
||||||
|
@@ -37,8 +37,8 @@ COPY agent .
|
|||||||
RUN go build -gcflags="all=-N -l" -o mizuagent .
|
RUN go build -gcflags="all=-N -l" -o mizuagent .
|
||||||
|
|
||||||
# Download Basenine executable, verify the sha1sum and move it to a directory in $PATH
|
# Download Basenine executable, verify the sha1sum and move it to a directory in $PATH
|
||||||
ADD https://github.com/up9inc/basenine/releases/download/v0.2.16/basenine_linux_amd64 ./basenine_linux_amd64
|
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.16/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256
|
ADD https://github.com/up9inc/basenine/releases/download/v0.2.17/basenine_linux_amd64.sha256 ./basenine_linux_amd64.sha256
|
||||||
RUN shasum -a 256 -c basenine_linux_amd64.sha256
|
RUN shasum -a 256 -c basenine_linux_amd64.sha256
|
||||||
RUN chmod +x ./basenine_linux_amd64
|
RUN chmod +x ./basenine_linux_amd64
|
||||||
|
|
||||||
|
5
ui/package-lock.json
generated
5
ui/package-lock.json
generated
@@ -11080,6 +11080,11 @@
|
|||||||
"minimist": "^1.2.5"
|
"minimist": "^1.2.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"moment": {
|
||||||
|
"version": "2.29.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
|
||||||
|
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
|
||||||
|
},
|
||||||
"move-concurrently": {
|
"move-concurrently": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
||||||
|
@@ -16,6 +16,7 @@
|
|||||||
"@uiw/react-textarea-code-editor": "^1.4.12",
|
"@uiw/react-textarea-code-editor": "^1.4.12",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"jsonpath": "^1.1.1",
|
"jsonpath": "^1.1.1",
|
||||||
|
"moment": "^2.29.1",
|
||||||
"node-sass": "^5.0.0",
|
"node-sass": "^5.0.0",
|
||||||
"numeral": "^2.0.6",
|
"numeral": "^2.0.6",
|
||||||
"protobuf-decoder": "^0.1.0",
|
"protobuf-decoder": "^0.1.0",
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
|
import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
|
||||||
import styles from './style/EntriesList.module.sass';
|
import styles from './style/EntriesList.module.sass';
|
||||||
import ScrollableFeedVirtualized from "react-scrollable-feed-virtualized";
|
import ScrollableFeedVirtualized from "react-scrollable-feed-virtualized";
|
||||||
|
import Moment from 'moment';
|
||||||
import {EntryItem} from "./EntryListItem/EntryListItem";
|
import {EntryItem} from "./EntryListItem/EntryListItem";
|
||||||
import down from "./assets/downImg.svg";
|
import down from "./assets/downImg.svg";
|
||||||
import spinner from './assets/spinner.svg';
|
import spinner from './assets/spinner.svg';
|
||||||
@@ -136,7 +137,7 @@ export const EntriesList: React.FC<EntriesListProps> = ({entries, setEntries, qu
|
|||||||
|
|
||||||
<div className={styles.footer}>
|
<div className={styles.footer}>
|
||||||
<div>Displaying <b>{entries?.length}</b> results out of <b>{queriedTotal}</b> total</div>
|
<div>Displaying <b>{entries?.length}</b> results out of <b>{queriedTotal}</b> total</div>
|
||||||
{startTime !== 0 && <div>Started listening at <span style={{marginRight: 5, fontWeight: 600, fontSize: 13}}>{new Date(startTime).toLocaleString()}</span></div>}
|
{startTime !== 0 && <div>Started listening at <span style={{marginRight: 5, fontWeight: 600, fontSize: 13}}>{Moment(startTime).utc().format('MM/DD/YYYY, h:mm:ss.SSS A')}</span></div>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>;
|
</>;
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
color: $secondary-font-color
|
color: $secondary-font-color
|
||||||
padding-left: 12px
|
padding-left: 12px
|
||||||
flex-shrink: 0
|
flex-shrink: 0
|
||||||
width: 145px
|
width: 185px
|
||||||
text-align: left
|
text-align: left
|
||||||
|
|
||||||
.endpointServiceContainer
|
.endpointServiceContainer
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
|
import Moment from 'moment';
|
||||||
import styles from './EntryListItem.module.sass';
|
import styles from './EntryListItem.module.sass';
|
||||||
import StatusCode, {getClassification, StatusCodeClassification} from "../UI/StatusCode";
|
import StatusCode, {getClassification, StatusCodeClassification} from "../UI/StatusCode";
|
||||||
import Protocol, {ProtocolInterface} from "../UI/Protocol"
|
import Protocol, {ProtocolInterface} from "../UI/Protocol"
|
||||||
@@ -268,7 +269,7 @@ export const EntryItem: React.FC<EntryProps> = ({entry, focusedEntryId, setFocus
|
|||||||
</div>
|
</div>
|
||||||
<div className={styles.timestamp}>
|
<div className={styles.timestamp}>
|
||||||
<Queryable
|
<Queryable
|
||||||
query={`timestamp >= datetime("${new Date(+entry.timestamp)?.toLocaleString("en-US", {timeZone: 'UTC' })}")`}
|
query={`timestamp >= datetime("${Moment(+entry.timestamp)?.utc().format('MM/DD/YYYY, h:mm:ss.SSS A')}")`}
|
||||||
updateQuery={updateQuery}
|
updateQuery={updateQuery}
|
||||||
displayIconOnMouseOver={true}
|
displayIconOnMouseOver={true}
|
||||||
flipped={false}
|
flipped={false}
|
||||||
@@ -276,7 +277,7 @@ export const EntryItem: React.FC<EntryProps> = ({entry, focusedEntryId, setFocus
|
|||||||
<span
|
<span
|
||||||
title="Timestamp"
|
title="Timestamp"
|
||||||
>
|
>
|
||||||
{new Date(+entry.timestamp)?.toLocaleString("en-US")}
|
{Moment(+entry.timestamp)?.utc().format('MM/DD/YYYY, h:mm:ss.SSS A')}
|
||||||
</span>
|
</span>
|
||||||
</Queryable>
|
</Queryable>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -214,7 +214,7 @@ export const QueryForm: React.FC<QueryFormProps> = ({query, setQuery, background
|
|||||||
<SyntaxHighlighter
|
<SyntaxHighlighter
|
||||||
isWrapped={false}
|
isWrapped={false}
|
||||||
showLineNumbers={false}
|
showLineNumbers={false}
|
||||||
code={`timestamp < datetime("10/28/2021, 9:13:02 PM")`}
|
code={`timestamp < datetime("10/28/2021, 9:13:02.905 PM")`}
|
||||||
language="python"
|
language="python"
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -305,7 +305,7 @@ export const QueryForm: React.FC<QueryFormProps> = ({query, setQuery, background
|
|||||||
<SyntaxHighlighter
|
<SyntaxHighlighter
|
||||||
isWrapped={false}
|
isWrapped={false}
|
||||||
showLineNumbers={false}
|
showLineNumbers={false}
|
||||||
code={`timestamp >= datetime("10/19/2021, 6:29:02 PM")`}
|
code={`timestamp >= datetime("10/19/2021, 6:29:02.593 PM")`}
|
||||||
language="python"
|
language="python"
|
||||||
/>
|
/>
|
||||||
<Typography id="modal-modal-description">
|
<Typography id="modal-modal-description">
|
||||||
|
Reference in New Issue
Block a user