github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Fix overall stats for saved search on the Data Visualizer page (#57312) (#57362)

Browse source 
* [ML] fix overall stats fetch with a saved search

* [ML] refactor
This commit is contained in:
Dima Arnautov 2020-02-11 23:07:45 +01:00 • committed by GitHub
parent 22ffa8b5a1
commit b893e08acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

70
x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/page.tsx
View file

@ -29,6 +29,7 @@ import {
esQuery,
esKuery,
} from '../../../../../../../../src/plugins/data/public';
import { SavedSearchSavedObject } from '../../../../common/types/kibana';
import { NavigationMenu } from '../../components/navigation_menu';
import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
import { SEARCH_QUERY_LANGUAGE } from '../../../../common/constants/search';
@ -119,9 +120,6 @@ export const Page: FC = () => {
}, [globalState?.refreshInterval?.pause, globalState?.refreshInterval?.value]);
const [lastRefresh, setLastRefresh] = useState(0);
useEffect(() => {
loadOverallStats();
}, [lastRefresh]);
useEffect(() => {
if (currentIndexPattern.timeFieldName !== undefined) {
@ -159,9 +157,15 @@ export const Page: FC = () => {
mlNodesAvailable() &&
currentIndexPattern.timeFieldName !== undefined;
const [searchString, setSearchString] = useState(defaults.searchString);
const [searchQuery, setSearchQuery] = useState(defaults.searchQuery);
const [searchQueryLanguage, setSearchQueryLanguage] = useState(defaults.searchQueryLanguage);
const {
searchQuery: initSearchQuery,
searchString: initSearchString,
queryLanguage: initQueryLanguage,
} = extractSearchData(currentSavedSearch);
const [searchString, setSearchString] = useState(initSearchString);
const [searchQuery, setSearchQuery] = useState(initSearchQuery);
const [searchQueryLanguage] = useState(initQueryLanguage);
const [samplerShardSize, setSamplerShardSize] = useState(defaults.samplerShardSize);
// TODO - type overallStats and stats
@ -208,30 +212,9 @@ export const Page: FC = () => {
};
});
useEffect(() => {
// Check for a saved search being passed in.
if (currentSavedSearch !== null) {
const { query } = getQueryFromSavedSearch(currentSavedSearch);
const queryLanguage = query.language as SEARCH_QUERY_LANGUAGE;
const qryString = query.query;
let qry;
if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) {
const ast = esKuery.fromKueryExpression(qryString);
qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern);
} else {
qry = esQuery.luceneStringToDsl(qryString);
esQuery.decorateQuery(qry, kibanaConfig.get('query:queryString:options'));
}
setSearchQuery(qry);
setSearchString(qryString);
setSearchQueryLanguage(queryLanguage);
}
}, []);
useEffect(() => {
loadOverallStats();
}, [searchQuery, samplerShardSize]);
}, [searchQuery, samplerShardSize, lastRefresh]);
useEffect(() => {
createMetricCards();
@ -254,6 +237,37 @@ export const Page: FC = () => {
createNonMetricCards();
}, [showAllNonMetrics, nonMetricShowFieldType, nonMetricFieldQuery]);
/**
* Extract query data from the saved search object.
*/
function extractSearchData(savedSearch: SavedSearchSavedObject | null) {
if (!savedSearch) {
return {
searchQuery: defaults.searchQuery,
searchString: defaults.searchString,
queryLanguage: defaults.searchQueryLanguage,
};
}
const { query } = getQueryFromSavedSearch(savedSearch);
const queryLanguage = query.language as SEARCH_QUERY_LANGUAGE;
const qryString = query.query;
let qry;
if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) {
const ast = esKuery.fromKueryExpression(qryString);
qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern);
} else {
qry = esQuery.luceneStringToDsl(qryString);
esQuery.decorateQuery(qry, kibanaConfig.get('query:queryString:options'));
}
return {
searchQuery: qry,
searchString: qryString,
queryLanguage,
};
}
async function loadOverallStats() {
const tf = timefilter as any;
let earliest;