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.

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

fix default strings across pages #51

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 3 additions & 15 deletions public/pages/QueryDetails/Components/QuerySummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,15 @@ const QuerySummary = ({ query }: { query: SearchQueryRecord }) => {
<PanelItem label={TIMESTAMP} value={convertTime(timestamp)} />
<PanelItem
label={LATENCY}
value={
calculateMetric(measurements.latency?.number, measurements.latency?.count) === 'N/A'
? 'N/A'
: `${calculateMetric(measurements.latency?.number, measurements.latency?.count)} ms`
}
value={calculateMetric(measurements.latency?.number, measurements.latency?.count, 'ms')}
/>
<PanelItem
label={CPU_TIME}
value={
calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000) === 'N/A'
? 'N/A'
: `${calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000)} ms`
}
value={calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 'ms', 1000000)}
/>
<PanelItem
label={MEMORY_USAGE}
value={
calculateMetric(measurements.memory?.number, measurements.memory?.count) === 'N/A'
? 'N/A'
: `${calculateMetric(measurements.memory?.number, measurements.memory?.count)} B`
}
value={calculateMetric(measurements.memory?.number, measurements.memory?.count, 'B')}
/>
<PanelItem label={INDICES} value={indices.toString()} />
<PanelItem label={SEARCH_TYPE} value={search_type.replaceAll('_', ' ')} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,20 @@ export const QueryGroupAggregateSummary = ({ query }: { query: any }) => {
<PanelItem label={ID} value={id} />
<PanelItem
label={AVERAGE_LATENCY}
value={
calculateMetric(measurements.latency?.number, measurements.latency?.count, 1) === 'N/A'
? 'N/A'
: `${calculateMetric(
measurements.latency?.number,
measurements.latency?.count,
1
)} ms`
}
value={calculateMetric(
measurements.latency?.number,
measurements.latency?.count,
'ms',
1
)}
/>
<PanelItem
label={AVERAGE_CPU_TIME}
value={
calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000) === 'N/A'
? 'N/A'
: `${calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000)} ms`
}
value={calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 'ms', 1000000)}
/>
<PanelItem
label={AVERAGE_MEMORY_USAGE}
value={
calculateMetric(measurements.memory?.number, measurements.memory?.count, 1) === 'N/A'
? 'N/A'
: `${calculateMetric(measurements.memory?.number, measurements.memory?.count, 1)} B`
}
value={calculateMetric(measurements.memory?.number, measurements.memory?.count, 'B', 1)}
/>
<PanelItem label={GROUP_BY} value={groupBy !== undefined ? `${groupBy}` : 'N/A'} />
</EuiFlexGrid>
Expand Down
14 changes: 7 additions & 7 deletions public/pages/QueryInsights/QueryInsights.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import { QUERY_INSIGHTS } from '../TopNQueries/TopNQueries';
import { SearchQueryRecord } from '../../../types/types';
import {
CPU_TIME,
ID,
INDICES,
LATENCY,
MEMORY_USAGE,
NODE_ID,
QUERY_COUNT,
ID,
SEARCH_TYPE,
TIMESTAMP,
TOTAL_SHARDS,
Expand Down Expand Up @@ -160,13 +160,13 @@ const QueryInsights = ({
field: MEASUREMENTS_FIELD,
name: LATENCY,
render: (measurements: SearchQueryRecord['measurements']) => {
const result = calculateMetric(
return calculateMetric(
measurements?.latency?.number,
measurements?.latency?.count,
'ms',
1,
METRIC_DEFAULT_MSG
);
return `${result} ms`;
},
sortable: true,
truncateText: true,
Expand All @@ -175,13 +175,13 @@ const QueryInsights = ({
field: MEASUREMENTS_FIELD,
name: CPU_TIME,
render: (measurements: SearchQueryRecord['measurements']) => {
const result = calculateMetric(
return calculateMetric(
measurements?.cpu?.number,
measurements?.cpu?.count,
'ms',
1000000, // Divide by 1,000,000 for CPU time
METRIC_DEFAULT_MSG
);
return `${result} ms`;
},
sortable: true,
truncateText: true,
Expand All @@ -190,13 +190,13 @@ const QueryInsights = ({
field: MEASUREMENTS_FIELD,
name: MEMORY_USAGE,
render: (measurements: SearchQueryRecord['measurements']) => {
const result = calculateMetric(
return calculateMetric(
measurements?.memory?.number,
measurements?.memory?.count,
'B',
1,
METRIC_DEFAULT_MSG
);
return `${result} B`;
},
sortable: true,
truncateText: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ exports[`QueryInsights Component renders the table with the correct columns and
<div
class="euiTableCellContent euiTableCellContent--truncateText euiTableCellContent--overflowingContent"
>
Not enabled B
Not enabled
</div>
</td>
<td
Expand Down
3 changes: 2 additions & 1 deletion public/pages/Utils/MetricUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
export function calculateMetric(
value?: number,
count?: number,
unit: string = '',
factor: number = 1,
defaultMsg: string = 'N/A'
): string {
if (value !== undefined && count !== undefined) {
return (value / count / factor).toFixed(2);
return `${(value / count / factor).toFixed(2)} ${unit}`;
}
return defaultMsg;
}
Loading