Skip to content

metrics visualization regression fix #1244

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

Merged
ps48 merged 1 commit into from
Nov 4, 2022
Merged

metrics visualization regression fix #1244

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
32 changes: 24 additions & 8 deletions dashboards-observability/public/components/custom_panels/helpers/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ const queryAccumulator = (
const pplFilterQuery = panelFilterQuery === '' ? '' : ` | ${panelFilterQuery}`;

const finalQuery = indexPartOfQuery + timeQueryFilter + pplFilterQuery + filterPartOfQuery;

return spanParam === undefined
? finalQuery
: updateQuerySpanInterval(finalQuery, timestampField, spanParam);
return finalQuery;
};

// PPL Service requestor
Expand Down Expand Up @@ -233,6 +230,7 @@ export const renderSavedVisualization = async (
setIsError('');

let visualization = {} as SavedVisualizationType;
let updatedVisualizationQuery = '';
visualization = await fetchVisualizationById(http, savedVisualizationId, setIsError);

if (_.isEmpty(visualization)) {
Expand All @@ -248,11 +246,21 @@ export const renderSavedVisualization = async (
setVisualizationType(visualization.type);
}

setVisualizationMetaData(visualization);
if (spanParam !== undefined) {
updatedVisualizationQuery = updateQuerySpanInterval(
visualization.query,
visualization.timeField,
spanParam
);
} else {
updatedVisualizationQuery = visualization.query;
}

setVisualizationMetaData({ ...visualization, query: updatedVisualizationQuery });

getQueryResponse(
pplService,
visualization.query,
updatedVisualizationQuery,
visualization.type,
startTime,
endTime,
Expand Down Expand Up @@ -314,7 +322,15 @@ export const renderCatalogVisualization = async (

const visualizationType = 'line';
const visualizationTimeField = '@timestamp';
const visualizationQuery = `source = ${catalogSource} | stats avg(@value) by span(${visualizationTimeField},1h)`;
let visualizationQuery = `source = ${catalogSource} | stats avg(@value) by span(${visualizationTimeField},1h)`;

if (spanParam !== undefined) {
visualizationQuery = updateQuerySpanInterval(
visualizationQuery,
visualizationTimeField,
spanParam
);
}

const visualizationMetaData = createCatalogVisualizationMetaData(
catalogSource,
Expand All @@ -325,7 +341,7 @@ export const renderCatalogVisualization = async (
setVisualizationTitle(catalogSource);
setVisualizationType(visualizationType);

setVisualizationMetaData(visualizationMetaData);
setVisualizationMetaData({ ...visualizationMetaData, query: visualizationQuery });

getQueryResponse(
pplService,
Expand Down
1 change: 0 additions & 1 deletion dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export const MetricsExportPanel = ({
: createPrometheusMetricById(metricLayout.id);
})
);
console.log('tempVisualizationsMetaData', tempVisualizationsMetaData);
setVisualizationsMetaData(tempVisualizationsMetaData);
};

Expand Down
2 changes: 1 addition & 1 deletion dashboards-observability/public/components/metrics/top_menu/top_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.resolutionSelectText {
width: 100px;
width: 70px;
}

.search-bar-top-menu{
Expand Down
1 change: 1 addition & 0 deletions dashboards-observability/public/components/metrics/top_menu/top_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ export const TopMenu = ({
className="resolutionSelectText"
prepend="Span Interval"
value={spanValue}
isInvalid={spanValue < 1}
onChange={(e) => setSpanValue(e.target.value)}
append={
<EuiSelect
Expand Down