maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switches rollup usage collector's fetch es client to the new client (#86684)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Christiane (Tina) Heiligers 2021-01-04 11:32:14 -07:00 committed by GitHub
parent 0188b9f7ef
commit d6eda39cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
x-pack/plugins/rollup/server/collectors/register.ts
View file

@ -6,7 +6,7 @@
import { get } from 'lodash';
import { UsageCollectionSetup, CollectorFetchContext } from 'src/plugins/usage_collection/server';
import { LegacyAPICaller } from 'kibana/server';
import { ElasticsearchClient } from 'kibana/server';
interface IdToFlagMap {
[key: string]: boolean;
@ -27,7 +27,7 @@ function createIdToFlagMap(ids: string[]) {
}, {} as any);
}
async function fetchRollupIndexPatterns(kibanaIndex: string, callCluster: LegacyAPICaller) {
async function fetchRollupIndexPatterns(kibanaIndex: string, esClient: ElasticsearchClient) {
const searchParams = {
size: ES_MAX_RESULT_WINDOW_DEFAULT_VALUE,
index: kibanaIndex,
@ -46,7 +46,7 @@ async function fetchRollupIndexPatterns(kibanaIndex: string, callCluster: Legacy
},
};
const esResponse = await callCluster('search', searchParams);
const { body: esResponse } = await esClient.search(searchParams);
return get(esResponse, 'hits.hits', []).map((indexPattern: any) => {
const { _id: savedObjectId } = indexPattern;
@ -56,7 +56,7 @@ async function fetchRollupIndexPatterns(kibanaIndex: string, callCluster: Legacy
async function fetchRollupSavedSearches(
kibanaIndex: string,
callCluster: LegacyAPICaller,
esClient: ElasticsearchClient,
rollupIndexPatternToFlagMap: IdToFlagMap
) {
const searchParams = {
@ -77,7 +77,7 @@ async function fetchRollupSavedSearches(
},
};
const esResponse = await callCluster('search', searchParams);
const { body: esResponse } = await esClient.search(searchParams);
const savedSearches = get(esResponse, 'hits.hits', []);
// Filter for ones with rollup index patterns.
@ -104,7 +104,7 @@ async function fetchRollupSavedSearches(
async function fetchRollupVisualizations(
kibanaIndex: string,
callCluster: LegacyAPICaller,
esClient: ElasticsearchClient,
rollupIndexPatternToFlagMap: IdToFlagMap,
rollupSavedSearchesToFlagMap: IdToFlagMap
) {
@ -130,7 +130,7 @@ async function fetchRollupVisualizations(
},
};
const esResponse = await callCluster('search', searchParams);
const { body: esResponse } = await esClient.search(searchParams);
const visualizations = get(esResponse, 'hits.hits', []);
let rollupVisualizations = 0;
@ -211,13 +211,13 @@ export function registerRollupUsageCollector(
total: { type: 'long' },
},
},
fetch: async ({ callCluster }: CollectorFetchContext) => {
const rollupIndexPatterns = await fetchRollupIndexPatterns(kibanaIndex, callCluster);
fetch: async ({ esClient }: CollectorFetchContext) => {
const rollupIndexPatterns = await fetchRollupIndexPatterns(kibanaIndex, esClient);
const rollupIndexPatternToFlagMap = createIdToFlagMap(rollupIndexPatterns);
const rollupSavedSearches = await fetchRollupSavedSearches(
kibanaIndex,
callCluster,
esClient,
rollupIndexPatternToFlagMap
);
const rollupSavedSearchesToFlagMap = createIdToFlagMap(rollupSavedSearches);
@ -227,7 +227,7 @@ export function registerRollupUsageCollector(
rollupVisualizationsFromSavedSearches,
} = await fetchRollupVisualizations(
kibanaIndex,
callCluster,
esClient,
rollupIndexPatternToFlagMap,
rollupSavedSearchesToFlagMap
);