Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(General): 🐞 Associate proxy host to the connector #447

Merged
merged 1 commit into from
Sep 10, 2024
Merged

fix(General): 🐞 Associate proxy host to the connector #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/core/components/SkFlowPairsTable/FlowPair.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const ConnectionDetail: FC<DescriptionProps<TcpBiflow>> = function ({ title, flo
const processId = isCounterflow ? flow.sourceProcessId : flow.destProcessId;
const processName = isCounterflow ? flow.sourceProcessName : flow.destProcessName;
const host = isCounterflow ? `${flow.destHost} : ${flow.destPort}` : `${flow.sourceHost} : ${flow.sourcePort}`;
const proxyHost = isCounterflow ? '-' : `${flow.proxyHost} : ${flow.proxyPort}`;
const proxyHost = isCounterflow ? `${flow.proxyHost} : ${flow.proxyPort}` : undefined;
const octets = isCounterflow ? flow.octets : flow.octetsReverse;
const latency = isCounterflow ? flow.latency : flow.latencyReverse;

Expand All @@ -152,14 +152,14 @@ const ConnectionDetail: FC<DescriptionProps<TcpBiflow>> = function ({ title, flo
<Link to={`${ProcessesRoutesPaths.Processes}/${processName}@${processId}`}>{processName}</Link>
</>
</DescriptionListDescription>
<DescriptionListTerm>{FlowPairLabels.Host}</DescriptionListTerm>
<DescriptionListDescription>{host}</DescriptionListDescription>
<DescriptionListTerm>{FlowPairLabels.ProxyHost}</DescriptionListTerm>
<DescriptionListDescription>{proxyHost}</DescriptionListDescription>
<DescriptionListTerm>{FlowPairLabels.BytesTransferred}</DescriptionListTerm>
<DescriptionListDescription>{octets} </DescriptionListDescription>
<DescriptionListTerm>{FlowPairLabels.Latency}</DescriptionListTerm>
<DescriptionListDescription>{formatLatency(latency)}</DescriptionListDescription>
<DescriptionListTerm>{FlowPairLabels.Host}</DescriptionListTerm>
<DescriptionListDescription>{host}</DescriptionListDescription>
{proxyHost && <DescriptionListTerm>{FlowPairLabels.ProxyHost}</DescriptionListTerm>}
{proxyHost && <DescriptionListDescription>{proxyHost}</DescriptionListDescription>}
</DescriptionListGroup>
</DescriptionList>
</CardBody>
Expand Down
53 changes: 27 additions & 26 deletions src/pages/shared/Metrics/components/Traffic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const Traffic: FC<TrafficProps> = function ({
const dataSeverAvailable =
!!data?.trafficServer.txTimeSerie?.data.length && !!data?.trafficServer.rxTimeSerie?.data.length;

const isClientAndServer = dataSeverAvailable && dataClientAvailable;
const isOnlyClientOrServer = dataSeverAvailable && dataClientAvailable;

return (
<Card isExpanded={isExpanded}>
Expand All @@ -75,36 +75,37 @@ const Traffic: FC<TrafficProps> = function ({
<CardBody style={{ minHeight: minChartHeight }}>
{isLoading && <SkIsLoading />}

{isClientAndServer &&
(!!data?.traffic.txTimeSerie?.data.length || !!data?.traffic.rxTimeSerie?.data.length) && (
<>
{!isLoading && isRefetching && <SkIsLoading />}
<Title headingLevel="h4">{`${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts byteRateData={data.traffic} />
</>
)}

{(!!data?.trafficClient.txTimeSerie?.data.length || !!data?.trafficClient.rxTimeSerie?.data.length) && (
{(!!data?.traffic.txTimeSerie?.data.length || !!data?.traffic.rxTimeSerie?.data.length) && (
<>
{!isLoading && isRefetching && <SkIsLoading />}
<Title headingLevel="h4">{`Client ${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts
byteRateData={data.trafficClient}
colorScale={[VarColors.Orange100, VarColors.Orange400]}
/>
<Title headingLevel="h4">{`${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts byteRateData={data.traffic} />
</>
)}

{(!!data?.trafficServer.txTimeSerie?.data.length || !!data?.trafficServer.rxTimeSerie?.data.length) && (
<>
{!isLoading && isRefetching && <SkIsLoading />}
<Title headingLevel="h4">{`Server ${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts
byteRateData={data.trafficServer}
colorScale={[VarColors.Purple100, VarColors.Purple400]}
/>
</>
)}
{isOnlyClientOrServer &&
(!!data?.trafficClient.txTimeSerie?.data.length || !!data?.trafficClient.rxTimeSerie?.data.length) && (
<>
{!isLoading && isRefetching && <SkIsLoading />}
<Title headingLevel="h4">{`Client ${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts
byteRateData={data.trafficClient}
colorScale={[VarColors.Orange100, VarColors.Orange400]}
/>
</>
)}

{isOnlyClientOrServer &&
(!!data?.trafficServer.txTimeSerie?.data.length || !!data?.trafficServer.rxTimeSerie?.data.length) && (
<>
{!isLoading && isRefetching && <SkIsLoading />}
<Title headingLevel="h4">{`Server ${MetricsLabels.ByteRateTitle}`} </Title>
<TrafficCharts
byteRateData={data.trafficServer}
colorScale={[VarColors.Purple100, VarColors.Purple400]}
/>
</>
)}

{!isLoading && !data?.traffic.txTimeSerie?.data.length && !data?.traffic.rxTimeSerie?.data.length && (
<SKEmptyData
Expand Down
Loading