diff --git a/src/plugins/discover/public/application/angular/doc_table/doc_table.ts b/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
index 29ea9d5db9a3..6c2a3cbfc951 100644
--- a/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/doc_table.ts
@@ -59,6 +59,10 @@ export function createDocTableDirective(pagerFactory: any, $filter: any) {
$scope.limit += 50;
};
+ $scope.$watch('minimumVisibleRows', (minimumVisibleRows: number) => {
+ $scope.limit = Math.max(minimumVisibleRows || 50, $scope.limit || 50);
+ });
+
$scope.$watch('hits', (hits: any) => {
if (!hits) return;
diff --git a/src/plugins/discover/public/application/components/doc/doc.test.tsx b/src/plugins/discover/public/application/components/doc/doc.test.tsx
index 25f5c1669b92..f96ca6ad9aff 100644
--- a/src/plugins/discover/public/application/components/doc/doc.test.tsx
+++ b/src/plugins/discover/public/application/components/doc/doc.test.tsx
@@ -29,6 +29,13 @@ jest.mock('../../../kibana_services', () => {
search: mockSearchApi,
},
},
+ docLinks: {
+ links: {
+ apis: {
+ indexExists: 'mockUrl',
+ },
+ },
+ },
}),
getDocViewsRegistry: () => ({
addDocView(view: any) {
diff --git a/src/plugins/discover/public/application/components/doc/doc.tsx b/src/plugins/discover/public/application/components/doc/doc.tsx
index aad5b5e95ba3..9f78ae0e29ce 100644
--- a/src/plugins/discover/public/application/components/doc/doc.tsx
+++ b/src/plugins/discover/public/application/components/doc/doc.tsx
@@ -36,7 +36,7 @@ export interface DocProps {
export function Doc(props: DocProps) {
const [reqState, hit, indexPattern] = useEsDocSearch(props);
-
+ const indexExistsLink = getServices().docLinks.links.apis.indexExists;
return (
@@ -91,12 +91,7 @@ export function Doc(props: DocProps) {
defaultMessage="{indexName} is missing."
values={{ indexName: props.index }}
/>{' '}
-
+
{
setIndexPatterns({} as IndexPatternsContract);
- setSavedObjectsClient({} as SavedObjectsClient);
const argValueSuggestions = getArgValueSuggestions();
diff --git a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
index 444559a0b458..919429ca049e 100644
--- a/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/arg_value_suggestions.ts
@@ -7,9 +7,9 @@
*/
import { get } from 'lodash';
-import { getIndexPatterns, getSavedObjectsClient } from './plugin_services';
+import { getIndexPatterns } from './plugin_services';
import { TimelionFunctionArgs } from '../../common/types';
-import { indexPatterns as indexPatternsUtils, IndexPatternAttributes } from '../../../data/public';
+import { indexPatterns as indexPatternsUtils } from '../../../data/public';
export interface Location {
min: number;
@@ -32,7 +32,6 @@ export interface FunctionArg {
export function getArgValueSuggestions() {
const indexPatterns = getIndexPatterns();
- const savedObjectsClient = getSavedObjectsClient();
async function getIndexPattern(functionArgs: FunctionArg[]) {
const indexPatternArg = functionArgs.find(({ name }) => name === 'index');
@@ -42,22 +41,9 @@ export function getArgValueSuggestions() {
}
const indexPatternTitle = get(indexPatternArg, 'value.text');
- const { savedObjects } = await savedObjectsClient.find({
- type: 'index-pattern',
- fields: ['title'],
- search: `"${indexPatternTitle}"`,
- searchFields: ['title'],
- perPage: 10,
- });
- const indexPatternSavedObject = savedObjects.find(
- ({ attributes }) => attributes.title === indexPatternTitle
+ return (await indexPatterns.find(indexPatternTitle)).find(
+ (index) => index.title === indexPatternTitle
);
- if (!indexPatternSavedObject) {
- // index argument does not match an index pattern
- return;
- }
-
- return await indexPatterns.get(indexPatternSavedObject.id);
}
function containsFieldName(partial: string, field: { name: string }) {
@@ -73,18 +59,11 @@ export function getArgValueSuggestions() {
es: {
async index(partial: string) {
const search = partial ? `${partial}*` : '*';
- const resp = await savedObjectsClient.find({
- type: 'index-pattern',
- fields: ['title', 'type'],
- search: `${search}`,
- searchFields: ['title'],
- perPage: 25,
- });
- return resp.savedObjects
- .filter((savedObject) => !savedObject.get('type'))
- .map((savedObject) => {
- return { name: savedObject.attributes.title };
- });
+ const size = 25;
+
+ return (await indexPatterns.find(search, size)).map(({ title }) => ({
+ name: title,
+ }));
},
async metric(partial: string, functionArgs: FunctionArg[]) {
if (!partial || !partial.includes(':')) {
diff --git a/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts b/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
index 0a85b1c1e5fe..5c23652c3207 100644
--- a/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
+++ b/src/plugins/vis_type_timelion/public/helpers/plugin_services.ts
@@ -7,7 +7,6 @@
*/
import type { IndexPatternsContract, ISearchStart } from 'src/plugins/data/public';
-import type { SavedObjectsClientContract } from 'kibana/public';
import { createGetterSetter } from '../../../kibana_utils/public';
export const [getIndexPatterns, setIndexPatterns] = createGetterSetter(
@@ -15,8 +14,3 @@ export const [getIndexPatterns, setIndexPatterns] = createGetterSetter('Search');
-
-export const [
- getSavedObjectsClient,
- setSavedObjectsClient,
-] = createGetterSetter('SavedObjectsClient');
diff --git a/src/plugins/vis_type_timelion/public/plugin.ts b/src/plugins/vis_type_timelion/public/plugin.ts
index e69b42d6c526..1d200be0d276 100644
--- a/src/plugins/vis_type_timelion/public/plugin.ts
+++ b/src/plugins/vis_type_timelion/public/plugin.ts
@@ -25,7 +25,7 @@ import { VisualizationsSetup } from '../../visualizations/public';
import { getTimelionVisualizationConfig } from './timelion_vis_fn';
import { getTimelionVisDefinition } from './timelion_vis_type';
-import { setIndexPatterns, setSavedObjectsClient, setDataSearch } from './helpers/plugin_services';
+import { setIndexPatterns, setDataSearch } from './helpers/plugin_services';
import { ConfigSchema } from '../config';
import { getArgValueSuggestions } from './helpers/arg_value_suggestions';
@@ -92,7 +92,6 @@ export class TimelionVisPlugin
public start(core: CoreStart, plugins: TimelionVisStartDependencies) {
setIndexPatterns(plugins.data.indexPatterns);
- setSavedObjectsClient(core.savedObjects.client);
setDataSearch(plugins.data.search);
return {
diff --git a/src/plugins/vis_type_timelion/server/plugin.ts b/src/plugins/vis_type_timelion/server/plugin.ts
index fca557efc01e..6a108fc76589 100644
--- a/src/plugins/vis_type_timelion/server/plugin.ts
+++ b/src/plugins/vis_type_timelion/server/plugin.ts
@@ -46,7 +46,9 @@ export interface TimelionPluginStartDeps {
export class Plugin {
constructor(private readonly initializerContext: PluginInitializerContext) {}
- public async setup(core: CoreSetup): Promise> {
+ public async setup(
+ core: CoreSetup
+ ): Promise> {
const config = await this.initializerContext.config
.create>()
.pipe(first())
diff --git a/src/plugins/vis_type_timelion/server/routes/run.ts b/src/plugins/vis_type_timelion/server/routes/run.ts
index ae26013cc39f..2f6c0d709fdc 100644
--- a/src/plugins/vis_type_timelion/server/routes/run.ts
+++ b/src/plugins/vis_type_timelion/server/routes/run.ts
@@ -18,6 +18,7 @@ import getNamespacesSettings from '../lib/get_namespaced_settings';
import getTlConfig from '../handlers/lib/tl_config';
import { TimelionFunctionInterface } from '../types';
import { ConfigManager } from '../lib/config_manager';
+import { TimelionPluginStartDeps } from '../plugin';
const timelionDefaults = getNamespacesSettings();
@@ -32,7 +33,7 @@ export function runRoute(
logger: Logger;
getFunction: (name: string) => TimelionFunctionInterface;
configManager: ConfigManager;
- core: CoreSetup;
+ core: CoreSetup;
}
) {
router.post(
@@ -77,17 +78,22 @@ export function runRoute(
},
router.handleLegacyErrors(async (context, request, response) => {
try {
+ const [, { data }] = await core.getStartServices();
const uiSettings = await context.core.uiSettings.client.getAll();
+ const indexPatternsService = await data.indexPatterns.indexPatternsServiceFactory(
+ context.core.savedObjects.client,
+ context.core.elasticsearch.client.asCurrentUser
+ );
const tlConfig = getTlConfig({
context,
request,
settings: _.defaults(uiSettings, timelionDefaults), // Just in case they delete some setting.
getFunction,
+ getIndexPatternsService: () => indexPatternsService,
getStartServices: core.getStartServices,
allowedGraphiteUrls: configManager.getGraphiteUrls(),
esShardTimeout: configManager.getEsShardTimeout(),
- savedObjectsClient: context.core.savedObjects.client,
});
const chainRunner = chainRunnerFn(tlConfig);
const sheet = await Bluebird.all(chainRunner.processRequest(request.body));
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
index 671042ae6f24..8828fd6917fe 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
@@ -22,16 +22,12 @@ import { UI_SETTINGS } from '../../../../data/server';
describe('es', () => {
let tlConfig;
- function stubRequestAndServer(response, indexPatternSavedObjects = []) {
+ function stubRequestAndServer(response) {
return {
context: { search: { search: jest.fn().mockReturnValue(of(response)) } },
- savedObjectsClient: {
- find: function () {
- return Promise.resolve({
- saved_objects: indexPatternSavedObjects,
- });
- },
- },
+ getIndexPatternsService: () => ({
+ find: async () => [],
+ }),
};
}
diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/index.js b/src/plugins/vis_type_timelion/server/series_functions/es/index.js
index bce048503956..7aacc1c1632f 100644
--- a/src/plugins/vis_type_timelion/server/series_functions/es/index.js
+++ b/src/plugins/vis_type_timelion/server/series_functions/es/index.js
@@ -96,23 +96,12 @@ export default new Datasource('es', {
kibana: true,
fit: 'nearest',
});
+ const indexPatternsService = tlConfig.getIndexPatternsService();
+ const indexPatternSpec = (await indexPatternsService.find(config.index)).find(
+ (index) => index.title === config.index
+ );
- const findResp = await tlConfig.savedObjectsClient.find({
- type: 'index-pattern',
- fields: ['title', 'fields'],
- search: `"${config.index}"`,
- search_fields: ['title'],
- });
- const indexPatternSavedObject = findResp.saved_objects.find((savedObject) => {
- return savedObject.attributes.title === config.index;
- });
- let scriptedFields = [];
- if (indexPatternSavedObject) {
- const fields = JSON.parse(indexPatternSavedObject.attributes.fields);
- scriptedFields = fields.filter((field) => {
- return field.scripted;
- });
- }
+ const scriptedFields = indexPatternSpec?.getScriptedFields() ?? [];
const esShardTimeout = tlConfig.esShardTimeout;
diff --git a/src/plugins/visualize/kibana.json b/src/plugins/visualize/kibana.json
index 2256a7a7f550..144d33debe3c 100644
--- a/src/plugins/visualize/kibana.json
+++ b/src/plugins/visualize/kibana.json
@@ -11,7 +11,6 @@
"visualizations",
"embeddable",
"dashboard",
- "uiActions",
"presentationUtil"
],
"optionalPlugins": [
diff --git a/src/plugins/visualize/public/actions/visualize_field_action.ts b/src/plugins/visualize/public/actions/visualize_field_action.ts
deleted file mode 100644
index f83e1f193032..000000000000
--- a/src/plugins/visualize/public/actions/visualize_field_action.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { i18n } from '@kbn/i18n';
-import {
- createAction,
- ACTION_VISUALIZE_FIELD,
- VisualizeFieldContext,
-} from '../../../ui_actions/public';
-import {
- getApplication,
- getUISettings,
- getIndexPatterns,
- getQueryService,
- getShareService,
-} from '../services';
-import { VISUALIZE_APP_URL_GENERATOR, VisualizeUrlGeneratorState } from '../url_generator';
-import { AGGS_TERMS_SIZE_SETTING } from '../../common/constants';
-
-export const visualizeFieldAction = createAction({
- type: ACTION_VISUALIZE_FIELD,
- id: ACTION_VISUALIZE_FIELD,
- getDisplayName: () =>
- i18n.translate('visualize.discover.visualizeFieldLabel', {
- defaultMessage: 'Visualize field',
- }),
- isCompatible: async () => !!getApplication().capabilities.visualize.show,
- getHref: async (context) => {
- const url = await getVisualizeUrl(context);
- return url;
- },
- execute: async (context) => {
- const url = await getVisualizeUrl(context);
- const hash = url.split('#')[1];
-
- getApplication().navigateToApp('visualize', {
- path: `/#${hash}`,
- });
- },
-});
-
-const getVisualizeUrl = async (context: VisualizeFieldContext) => {
- const indexPattern = await getIndexPatterns().get(context.indexPatternId);
- const field = indexPattern.fields.find((fld) => fld.name === context.fieldName);
- const aggsTermSize = getUISettings().get(AGGS_TERMS_SIZE_SETTING);
- let agg;
-
- // If we're visualizing a date field, and our index is time based (and thus has a time filter),
- // then run a date histogram
- if (field?.type === 'date' && indexPattern.timeFieldName === context.fieldName) {
- agg = {
- type: 'date_histogram',
- schema: 'segment',
- params: {
- field: context.fieldName,
- interval: 'auto',
- },
- };
- } else {
- agg = {
- type: 'terms',
- schema: 'segment',
- params: {
- field: context.fieldName,
- size: parseInt(aggsTermSize, 10),
- orderBy: '1',
- },
- };
- }
- const generator = getShareService().urlGenerators.getUrlGenerator(VISUALIZE_APP_URL_GENERATOR);
- const urlState: VisualizeUrlGeneratorState = {
- filters: getQueryService().filterManager.getFilters(),
- query: getQueryService().queryString.getQuery(),
- timeRange: getQueryService().timefilter.timefilter.getTime(),
- indexPatternId: context.indexPatternId,
- type: 'histogram',
- vis: {
- type: 'histogram',
- aggs: [{ schema: 'metric', type: 'count', id: '1' }, agg],
- },
- };
- return generator.createUrl(urlState);
-};
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index 8d02e0854966..e240e391d605 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -39,18 +39,8 @@ import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
import { SavedObjectsStart } from '../../saved_objects/public';
import { EmbeddableStart } from '../../embeddable/public';
import { DashboardStart } from '../../dashboard/public';
-import { UiActionsSetup, VISUALIZE_FIELD_TRIGGER } from '../../ui_actions/public';
import type { SavedObjectTaggingOssPluginStart } from '../../saved_objects_tagging_oss/public';
-import {
- setUISettings,
- setApplication,
- setIndexPatterns,
- setQueryService,
- setShareService,
- setVisEditorsRegistry,
-} from './services';
-import { visualizeFieldAction } from './actions/visualize_field_action';
-import { createVisualizeUrlGenerator } from './url_generator';
+import { setVisEditorsRegistry, setUISettings } from './services';
import { createVisEditorsRegistry, VisEditorsRegistry } from './vis_editors_registry';
export interface VisualizePluginStartDependencies {
@@ -71,7 +61,6 @@ export interface VisualizePluginSetupDependencies {
urlForwarding: UrlForwardingSetup;
data: DataPublicPluginSetup;
share?: SharePluginSetup;
- uiActions: UiActionsSetup;
}
export interface VisualizePluginSetup {
@@ -96,7 +85,7 @@ export class VisualizePlugin
public async setup(
core: CoreSetup,
- { home, urlForwarding, data, share, uiActions }: VisualizePluginSetupDependencies
+ { home, urlForwarding, data }: VisualizePluginSetupDependencies
) {
const {
appMounted,
@@ -129,19 +118,8 @@ export class VisualizePlugin
this.stopUrlTracking = () => {
stopUrlTracker();
};
- if (share) {
- share.urlGenerators.registerUrlGenerator(
- createVisualizeUrlGenerator(async () => {
- const [coreStart] = await core.getStartServices();
- return {
- appBasePath: coreStart.application.getUrlForApp('visualize'),
- useHashedUrl: coreStart.uiSettings.get('state:storeInSessionStorage'),
- };
- })
- );
- }
+
setUISettings(core.uiSettings);
- uiActions.addTriggerAction(VISUALIZE_FIELD_TRIGGER, visualizeFieldAction);
core.application.register({
id: 'visualize',
@@ -245,12 +223,6 @@ export class VisualizePlugin
public start(core: CoreStart, plugins: VisualizePluginStartDependencies) {
setVisEditorsRegistry(this.visEditorsRegistry);
- setApplication(core.application);
- setIndexPatterns(plugins.data.indexPatterns);
- setQueryService(plugins.data.query);
- if (plugins.share) {
- setShareService(plugins.share);
- }
}
stop() {
diff --git a/src/plugins/visualize/public/services.ts b/src/plugins/visualize/public/services.ts
index 48c9965b4210..ced651047814 100644
--- a/src/plugins/visualize/public/services.ts
+++ b/src/plugins/visualize/public/services.ts
@@ -5,28 +5,13 @@
* compliance with, at your election, the Elastic License or the Server Side
* Public License, v 1.
*/
-
-import { ApplicationStart, IUiSettingsClient } from '../../../core/public';
+import { IUiSettingsClient } from '../../../core/public';
import { createGetterSetter } from '../../../plugins/kibana_utils/public';
-import { IndexPatternsContract, DataPublicPluginStart } from '../../../plugins/data/public';
-import { SharePluginStart } from '../../../plugins/share/public';
import { VisEditorsRegistry } from './vis_editors_registry';
export const [getUISettings, setUISettings] = createGetterSetter('UISettings');
-export const [getApplication, setApplication] = createGetterSetter('Application');
-
-export const [getShareService, setShareService] = createGetterSetter('Share');
-
-export const [getIndexPatterns, setIndexPatterns] = createGetterSetter(
- 'IndexPatterns'
-);
-
export const [
getVisEditorsRegistry,
setVisEditorsRegistry,
] = createGetterSetter('VisEditorsRegistry');
-
-export const [getQueryService, setQueryService] = createGetterSetter<
- DataPublicPluginStart['query']
->('Query');
diff --git a/src/plugins/visualize/public/url_generator.test.ts b/src/plugins/visualize/public/url_generator.test.ts
deleted file mode 100644
index 25db806109aa..000000000000
--- a/src/plugins/visualize/public/url_generator.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import { createVisualizeUrlGenerator } from './url_generator';
-import { esFilters } from '../../data/public';
-
-const APP_BASE_PATH: string = 'test/app/visualize';
-const VISUALIZE_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
-const INDEXPATTERN_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
-
-describe('visualize url generator', () => {
- test('creates a link to a new visualization', async () => {
- const generator = createVisualizeUrlGenerator(() =>
- Promise.resolve({
- appBasePath: APP_BASE_PATH,
- useHashedUrl: false,
- })
- );
- const url = await generator.createUrl!({ indexPatternId: INDEXPATTERN_ID, type: 'table' });
- expect(url).toMatchInlineSnapshot(
- `"test/app/visualize#/create?_g=()&_a=()&indexPattern=${INDEXPATTERN_ID}&type=table"`
- );
- });
-
- test('creates a link with global time range set up', async () => {
- const generator = createVisualizeUrlGenerator(() =>
- Promise.resolve({
- appBasePath: APP_BASE_PATH,
- useHashedUrl: false,
- })
- );
- const url = await generator.createUrl!({
- timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
- indexPatternId: INDEXPATTERN_ID,
- type: 'table',
- });
- expect(url).toMatchInlineSnapshot(
- `"test/app/visualize#/create?_g=(time:(from:now-15m,mode:relative,to:now))&_a=()&indexPattern=${INDEXPATTERN_ID}&type=table"`
- );
- });
-
- test('creates a link with filters, time range, refresh interval and query to a saved visualization', async () => {
- const generator = createVisualizeUrlGenerator(() =>
- Promise.resolve({
- appBasePath: APP_BASE_PATH,
- useHashedUrl: false,
- indexPatternId: INDEXPATTERN_ID,
- type: 'table',
- })
- );
- const url = await generator.createUrl!({
- timeRange: { to: 'now', from: 'now-15m', mode: 'relative' },
- refreshInterval: { pause: false, value: 300 },
- visualizationId: VISUALIZE_ID,
- filters: [
- {
- meta: {
- alias: null,
- disabled: false,
- negate: false,
- },
- query: { query: 'q1' },
- },
- {
- meta: {
- alias: null,
- disabled: false,
- negate: false,
- },
- query: { query: 'q1' },
- $state: {
- store: esFilters.FilterStateStore.GLOBAL_STATE,
- },
- },
- ],
- query: { query: 'q2', language: 'kuery' },
- indexPatternId: INDEXPATTERN_ID,
- type: 'table',
- });
- expect(url).toMatchInlineSnapshot(
- `"test/app/visualize#/edit/${VISUALIZE_ID}?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),refreshInterval:(pause:!f,value:300),time:(from:now-15m,mode:relative,to:now))&_a=(filters:!((meta:(alias:!n,disabled:!f,negate:!f),query:(query:q1))),query:(language:kuery,query:q2))&indexPattern=${INDEXPATTERN_ID}&type=table"`
- );
- });
-});
diff --git a/src/plugins/visualize/public/url_generator.ts b/src/plugins/visualize/public/url_generator.ts
deleted file mode 100644
index 57fa9b2ae480..000000000000
--- a/src/plugins/visualize/public/url_generator.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import {
- TimeRange,
- Filter,
- Query,
- esFilters,
- QueryState,
- RefreshInterval,
-} from '../../data/public';
-import { setStateToKbnUrl } from '../../kibana_utils/public';
-import { UrlGeneratorsDefinition } from '../../share/public';
-import { STATE_STORAGE_KEY, GLOBAL_STATE_STORAGE_KEY } from '../common/constants';
-
-export const VISUALIZE_APP_URL_GENERATOR = 'VISUALIZE_APP_URL_GENERATOR';
-
-export interface VisualizeUrlGeneratorState {
- /**
- * If given, it will load the given visualization else will load the create a new visualization page.
- */
- visualizationId?: string;
- /**
- * Optionally set the time range in the time picker.
- */
- timeRange?: TimeRange;
-
- /**
- * Optional set indexPatternId.
- */
- indexPatternId?: string;
-
- /**
- * Optional set visualization type.
- */
- type?: string;
-
- /**
- * Optionally set the visualization.
- */
- vis?: unknown;
-
- /**
- * Optionally set the refresh interval.
- */
- refreshInterval?: RefreshInterval;
-
- /**
- * Optionally apply filers. NOTE: if given and used in conjunction with `dashboardId`, and the
- * saved dashboard has filters saved with it, this will _replace_ those filters.
- */
- filters?: Filter[];
- /**
- * Optionally set a query. NOTE: if given and used in conjunction with `dashboardId`, and the
- * saved dashboard has a query saved with it, this will _replace_ that query.
- */
- query?: Query;
- /**
- * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
- * whether to hash the data in the url to avoid url length issues.
- */
- hash?: boolean;
-}
-
-export const createVisualizeUrlGenerator = (
- getStartServices: () => Promise<{
- appBasePath: string;
- useHashedUrl: boolean;
- }>
-): UrlGeneratorsDefinition => ({
- id: VISUALIZE_APP_URL_GENERATOR,
- createUrl: async ({
- visualizationId,
- filters,
- indexPatternId,
- query,
- refreshInterval,
- vis,
- type,
- timeRange,
- hash,
- }: VisualizeUrlGeneratorState): Promise => {
- const startServices = await getStartServices();
- const useHash = hash ?? startServices.useHashedUrl;
- const appBasePath = startServices.appBasePath;
- const mode = visualizationId ? `edit/${visualizationId}` : `create`;
-
- const appState: {
- query?: Query;
- filters?: Filter[];
- vis?: unknown;
- } = {};
- const queryState: QueryState = {};
-
- if (query) appState.query = query;
- if (filters && filters.length)
- appState.filters = filters?.filter((f) => !esFilters.isFilterPinned(f));
- if (vis) appState.vis = vis;
-
- if (timeRange) queryState.time = timeRange;
- if (filters && filters.length)
- queryState.filters = filters?.filter((f) => esFilters.isFilterPinned(f));
- if (refreshInterval) queryState.refreshInterval = refreshInterval;
-
- let url = `${appBasePath}#/${mode}`;
- url = setStateToKbnUrl(GLOBAL_STATE_STORAGE_KEY, queryState, { useHash }, url);
- url = setStateToKbnUrl(STATE_STORAGE_KEY, appState, { useHash }, url);
-
- if (indexPatternId) {
- url = `${url}&indexPattern=${indexPatternId}`;
- }
-
- if (type) {
- url = `${url}&type=${type}`;
- }
-
- return url;
- },
-});
diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts
index e1b85ddf8bc9..e6d4a8a56af2 100644
--- a/test/common/services/es_archiver.ts
+++ b/test/common/services/es_archiver.ts
@@ -14,7 +14,7 @@ import * as KibanaServer from './kibana_server';
export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiver {
const config = getService('config');
- const client = getService('legacyEs');
+ const client = getService('es');
const log = getService('log');
const kibanaServer = getService('kibanaServer');
const retry = getService('retry');
diff --git a/test/functional/apps/discover/_discover.ts b/test/functional/apps/discover/_discover.ts
index bf0a02755383..552022241a72 100644
--- a/test/functional/apps/discover/_discover.ts
+++ b/test/functional/apps/discover/_discover.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const kibanaServer = getService('kibanaServer');
const queryBar = getService('queryBar');
const inspector = getService('inspector');
+ const elasticChart = getService('elasticChart');
const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
const defaultSettings = {
defaultIndex: 'logstash-*',
@@ -31,7 +32,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// and load a set of makelogs data
await esArchiver.loadIfNeeded('logstash_functional');
await kibanaServer.uiSettings.replace(defaultSettings);
- log.debug('discover');
await PageObjects.common.navigateToApp('discover');
await PageObjects.timePicker.setDefaultAbsoluteRange();
});
@@ -99,11 +99,25 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});
- it.skip('should modify the time range when the histogram is brushed', async function () {
+ it('should modify the time range when the histogram is brushed', async function () {
+ // this is the number of renderings of the histogram needed when new data is fetched
+ // this needs to be improved
+ const renderingCountInc = 3;
+ const prevRenderingCount = await elasticChart.getVisualizationRenderingCount();
await PageObjects.timePicker.setDefaultAbsoluteRange();
+ await PageObjects.discover.waitUntilSearchingHasFinished();
+ await retry.waitFor('chart rendering complete', async () => {
+ const actualRenderingCount = await elasticChart.getVisualizationRenderingCount();
+ log.debug(`Number of renderings before brushing: ${actualRenderingCount}`);
+ return actualRenderingCount === prevRenderingCount + renderingCountInc;
+ });
await PageObjects.discover.brushHistogram();
await PageObjects.discover.waitUntilSearchingHasFinished();
-
+ await retry.waitFor('chart rendering complete after being brushed', async () => {
+ const actualRenderingCount = await elasticChart.getVisualizationRenderingCount();
+ log.debug(`Number of renderings after brushing: ${actualRenderingCount}`);
+ return actualRenderingCount === prevRenderingCount + 6;
+ });
const newDurationHours = await PageObjects.timePicker.getTimeDurationInHours();
expect(Math.round(newDurationHours)).to.be(26);
diff --git a/test/functional/apps/discover/_doc_table.ts b/test/functional/apps/discover/_doc_table.ts
index f8f45d2bc710..d4818d99565e 100644
--- a/test/functional/apps/discover/_doc_table.ts
+++ b/test/functional/apps/discover/_doc_table.ts
@@ -15,6 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const docTable = getService('docTable');
+ const queryBar = getService('queryBar');
const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
const defaultSettings = {
defaultIndex: 'logstash-*',
@@ -107,6 +108,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
// TODO: test something more meaninful here?
});
});
+
+ it('should not close the detail panel actions when data is re-requested', async function () {
+ await retry.try(async function () {
+ const nrOfFetches = await PageObjects.discover.getNrOfFetches();
+ await docTable.clickRowToggle({ isAnchorRow: false, rowIndex: rowToInspect - 1 });
+ const detailsEl = await docTable.getDetailsRows();
+ const defaultMessageEl = await detailsEl[0].findByTestSubject('docTableRowDetailsTitle');
+ expect(defaultMessageEl).to.be.ok();
+ await queryBar.submitQuery();
+ const nrOfFetchesResubmit = await PageObjects.discover.getNrOfFetches();
+ expect(nrOfFetchesResubmit).to.be.above(nrOfFetches);
+ const defaultMessageElResubmit = await detailsEl[0].findByTestSubject(
+ 'docTableRowDetailsTitle'
+ );
+
+ expect(defaultMessageElResubmit).to.be.ok();
+ });
+ });
});
describe('add and remove columns', function () {
diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts
deleted file mode 100644
index e11ef249d8c7..000000000000
--- a/test/functional/apps/discover/_field_visualize.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
- const esArchiver = getService('esArchiver');
- const filterBar = getService('filterBar');
- const inspector = getService('inspector');
- const kibanaServer = getService('kibanaServer');
- const log = getService('log');
- const queryBar = getService('queryBar');
- const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker', 'visualize']);
- const defaultSettings = {
- defaultIndex: 'logstash-*',
- };
-
- describe('discover field visualize button', function () {
- // unskipped on cloud as these tests test the navigation
- // from Discover to Visualize which happens only on OSS
- this.tags(['skipCloud']);
- before(async function () {
- log.debug('load kibana index with default index pattern');
- await esArchiver.load('discover');
-
- // and load a set of makelogs data
- await esArchiver.loadIfNeeded('logstash_functional');
- await kibanaServer.uiSettings.replace(defaultSettings);
- });
-
- beforeEach(async () => {
- log.debug('go to discover');
- await PageObjects.common.navigateToApp('discover');
- await PageObjects.timePicker.setDefaultAbsoluteRange();
- });
-
- it('should be able to visualize a field and save the visualization', async () => {
- await PageObjects.discover.findFieldByName('type');
- log.debug('visualize a type field');
- await PageObjects.discover.clickFieldListItemVisualize('type');
- await PageObjects.visualize.saveVisualizationExpectSuccess('Top 5 server types');
- });
-
- it('should visualize a field in area chart', async () => {
- await PageObjects.discover.findFieldByName('phpmemory');
- log.debug('visualize a phpmemory field');
- await PageObjects.discover.clickFieldListItemVisualize('phpmemory');
- await PageObjects.header.waitUntilLoadingHasFinished();
- const expectedTableData = [
- ['0', '10'],
- ['58,320', '2'],
- ['171,080', '2'],
- ['3,240', '1'],
- ['3,520', '1'],
- ['3,880', '1'],
- ['4,120', '1'],
- ['4,640', '1'],
- ['4,760', '1'],
- ['5,680', '1'],
- ['7,160', '1'],
- ['7,400', '1'],
- ['8,400', '1'],
- ['8,800', '1'],
- ['8,960', '1'],
- ['9,400', '1'],
- ['10,280', '1'],
- ['10,840', '1'],
- ['13,080', '1'],
- ['13,360', '1'],
- ];
- await inspector.open();
- await inspector.expectTableData(expectedTableData);
- await inspector.close();
- });
-
- it('should not show the "Visualize" button for geo field', async () => {
- await PageObjects.discover.findFieldByName('geo.coordinates');
- log.debug('visualize a geo field');
- await PageObjects.discover.expectMissingFieldListItemVisualize('geo.coordinates');
- });
-
- it('should preserve app filters in visualize', async () => {
- await filterBar.addFilter('bytes', 'is between', '3500', '4000');
- await PageObjects.discover.findFieldByName('geo.src');
- log.debug('visualize a geo.src field with filter applied');
- await PageObjects.discover.clickFieldListItemVisualize('geo.src');
- await PageObjects.header.waitUntilLoadingHasFinished();
-
- expect(await filterBar.hasFilter('bytes', '3,500 to 4,000')).to.be(true);
- const expectedTableData = [
- ['CN', '133'],
- ['IN', '120'],
- ['US', '58'],
- ['ID', '28'],
- ['BD', '25'],
- ['BR', '22'],
- ['EG', '14'],
- ['NG', '14'],
- ['PK', '13'],
- ['IR', '12'],
- ['PH', '12'],
- ['JP', '11'],
- ['RU', '11'],
- ['DE', '8'],
- ['FR', '8'],
- ['MX', '8'],
- ['TH', '8'],
- ['TR', '8'],
- ['CA', '6'],
- ['SA', '6'],
- ];
- await inspector.open();
- await inspector.expectTableData(expectedTableData);
- await inspector.close();
- });
-
- it('should preserve query in visualize', async () => {
- await queryBar.setQuery('machine.os : ios');
- await queryBar.submitQuery();
- await PageObjects.discover.findFieldByName('geo.dest');
- log.debug('visualize a geo.dest field with query applied');
- await PageObjects.discover.clickFieldListItemVisualize('geo.dest');
- await PageObjects.header.waitUntilLoadingHasFinished();
-
- expect(await queryBar.getQueryString()).to.equal('machine.os : ios');
- const expectedTableData = [
- ['CN', '519'],
- ['IN', '495'],
- ['US', '275'],
- ['ID', '82'],
- ['PK', '75'],
- ['BR', '71'],
- ['NG', '54'],
- ['BD', '51'],
- ['JP', '47'],
- ['MX', '47'],
- ['IR', '44'],
- ['PH', '44'],
- ['RU', '42'],
- ['ET', '33'],
- ['TH', '33'],
- ['EG', '32'],
- ['VN', '32'],
- ['DE', '31'],
- ['FR', '30'],
- ['GB', '30'],
- ];
- await inspector.open();
- await inspector.expectTableData(expectedTableData);
- await inspector.close();
- });
- });
-}
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index 4f42b41a1e02..b4fc4ead2d52 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -27,7 +27,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_discover'));
loadTestFile(require.resolve('./_discover_histogram'));
loadTestFile(require.resolve('./_doc_table'));
- loadTestFile(require.resolve('./_field_visualize'));
loadTestFile(require.resolve('./_filter_editor'));
loadTestFile(require.resolve('./_errors'));
loadTestFile(require.resolve('./_field_data'));
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 62edbc50879a..d1a4c93cec04 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -27,13 +27,12 @@ import expect from '@kbn/expect';
export default function ({ getService, getPageObjects }) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
+ const deployment = getService('deployment');
const log = getService('log');
const browser = getService('browser');
const retry = getService('retry');
- const inspector = getService('inspector');
const testSubjects = getService('testSubjects');
const filterBar = getService('filterBar');
- const deployment = getService('deployment');
const PageObjects = getPageObjects([
'common',
'header',
@@ -188,39 +187,11 @@ export default function ({ getService, getPageObjects }) {
});
it('should visualize scripted field in vertical bar chart', async function () {
- await filterBar.removeAllFilters();
- await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName);
- await PageObjects.header.waitUntilLoadingHasFinished();
-
- if (await deployment.isOss()) {
- // OSS renders a vertical bar chart and we check the data in the Inspect panel
- const expectedChartValues = [
- ['14', '31'],
- ['10', '29'],
- ['7', '24'],
- ['11', '24'],
- ['12', '23'],
- ['20', '23'],
- ['19', '21'],
- ['6', '20'],
- ['17', '20'],
- ['30', '20'],
- ['13', '19'],
- ['18', '18'],
- ['16', '17'],
- ['5', '16'],
- ['8', '16'],
- ['15', '14'],
- ['3', '13'],
- ['2', '12'],
- ['9', '10'],
- ['4', '9'],
- ];
-
- await inspector.open();
- await inspector.setTablePageSize(50);
- await inspector.expectTableData(expectedChartValues);
- } else {
+ const isOss = await deployment.isOss();
+ if (!isOss) {
+ await filterBar.removeAllFilters();
+ await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName);
+ await PageObjects.header.waitUntilLoadingHasFinished();
// verify Lens opens a visualization
expect(await testSubjects.getVisibleTextAll('lns-dimensionTrigger')).to.contain(
'Average of ram_Pain1'
@@ -306,16 +277,10 @@ export default function ({ getService, getPageObjects }) {
});
it('should visualize scripted field in vertical bar chart', async function () {
- await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
- await PageObjects.header.waitUntilLoadingHasFinished();
- if (await deployment.isOss()) {
- // OSS renders a vertical bar chart and we check the data in the Inspect panel
- await inspector.open();
- await inspector.expectTableData([
- ['good', '359'],
- ['bad', '27'],
- ]);
- } else {
+ const isOss = await deployment.isOss();
+ if (!isOss) {
+ await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
+ await PageObjects.header.waitUntilLoadingHasFinished();
// verify Lens opens a visualization
expect(await testSubjects.getVisibleTextAll('lns-dimensionTrigger')).to.contain(
'Top values of painString'
@@ -402,16 +367,10 @@ export default function ({ getService, getPageObjects }) {
});
it('should visualize scripted field in vertical bar chart', async function () {
- await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
- await PageObjects.header.waitUntilLoadingHasFinished();
- if (await deployment.isOss()) {
- // OSS renders a vertical bar chart and we check the data in the Inspect panel
- await inspector.open();
- await inspector.expectTableData([
- ['true', '359'],
- ['false', '27'],
- ]);
- } else {
+ const isOss = await deployment.isOss();
+ if (!isOss) {
+ await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
+ await PageObjects.header.waitUntilLoadingHasFinished();
// verify Lens opens a visualization
expect(await testSubjects.getVisibleTextAll('lns-dimensionTrigger')).to.contain(
'Top values of painBool'
@@ -501,36 +460,10 @@ export default function ({ getService, getPageObjects }) {
});
it('should visualize scripted field in vertical bar chart', async function () {
- await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
- await PageObjects.header.waitUntilLoadingHasFinished();
-
- if (await deployment.isOss()) {
- // OSS renders a vertical bar chart and we check the data in the Inspect panel
- await inspector.open();
- await inspector.setTablePageSize(50);
- await inspector.expectTableData([
- ['2015-09-17 20:00', '1'],
- ['2015-09-17 21:00', '1'],
- ['2015-09-17 23:00', '1'],
- ['2015-09-18 00:00', '1'],
- ['2015-09-18 03:00', '1'],
- ['2015-09-18 04:00', '1'],
- ['2015-09-18 04:00', '1'],
- ['2015-09-18 04:00', '1'],
- ['2015-09-18 04:00', '1'],
- ['2015-09-18 05:00', '1'],
- ['2015-09-18 05:00', '1'],
- ['2015-09-18 05:00', '1'],
- ['2015-09-18 05:00', '1'],
- ['2015-09-18 06:00', '1'],
- ['2015-09-18 06:00', '1'],
- ['2015-09-18 06:00', '1'],
- ['2015-09-18 06:00', '1'],
- ['2015-09-18 07:00', '1'],
- ['2015-09-18 07:00', '1'],
- ['2015-09-18 07:00', '1'],
- ]);
- } else {
+ const isOss = await deployment.isOss();
+ if (!isOss) {
+ await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
+ await PageObjects.header.waitUntilLoadingHasFinished();
// verify Lens opens a visualization
expect(await testSubjects.getVisibleTextAll('lns-dimensionTrigger')).to.contain(
'painDate'
diff --git a/test/functional/apps/management/index.ts b/test/functional/apps/management/index.ts
index ca8985387502..3de11fbf4c99 100644
--- a/test/functional/apps/management/index.ts
+++ b/test/functional/apps/management/index.ts
@@ -31,10 +31,10 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_index_pattern_results_sort'));
loadTestFile(require.resolve('./_index_pattern_popularity'));
loadTestFile(require.resolve('./_kibana_settings'));
- loadTestFile(require.resolve('./_scripted_fields'));
loadTestFile(require.resolve('./_scripted_fields_preview'));
loadTestFile(require.resolve('./_mgmt_import_saved_objects'));
loadTestFile(require.resolve('./_index_patterns_empty'));
+ loadTestFile(require.resolve('./_scripted_fields'));
});
describe('', function () {
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 88a138ee09bf..33cee4f40d08 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -136,12 +136,14 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
}
public async clickHistogramBar() {
+ await elasticChart.waitForRenderComplete();
const el = await elasticChart.getCanvas();
await browser.getActions().move({ x: 0, y: 20, origin: el._webElement }).click().perform();
}
public async brushHistogram() {
+ await elasticChart.waitForRenderComplete();
const el = await elasticChart.getCanvas();
await browser.dragAndDrop(
diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts
index 777306017083..064f43040c47 100644
--- a/test/visual_regression/services/visual_testing/visual_testing.ts
+++ b/test/visual_regression/services/visual_testing/visual_testing.ts
@@ -7,10 +7,8 @@
*/
import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils';
-import { Test } from 'mocha';
-
import testSubjSelector from '@kbn/test-subj-selector';
-
+import { Test } from '@kbn/test/types/ftr';
import { pkg } from '../../../../src/core/server/utils';
import { FtrProviderContext } from '../../ftr_provider_context';
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
index 5224aa7463d7..eead00c082ba 100644
--- a/vars/githubPr.groovy
+++ b/vars/githubPr.groovy
@@ -300,7 +300,12 @@ def getDocsChangesLink() {
try {
// httpRequest throws on status codes >400 and failures
- httpRequest([ method: "GET", url: url ])
+ def resp = httpRequest([ method: "GET", url: url ])
+
+ if (resp.contains("There aren't any differences!")) {
+ return ""
+ }
+
return "* [Documentation Changes](${url})"
} catch (ex) {
print "Failed to reach ${url}"
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 3032d88c26d9..17349f6b566d 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -128,9 +128,11 @@ def functionalTestProcess(String name, String script) {
}
}
-def ossCiGroupProcess(ciGroup) {
+def ossCiGroupProcess(ciGroup, withDelay = false) {
return functionalTestProcess("ciGroup" + ciGroup) {
- sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
+ if (withDelay) {
+ sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
+ }
withEnv([
"CI_GROUP=${ciGroup}",
@@ -143,9 +145,11 @@ def ossCiGroupProcess(ciGroup) {
}
}
-def xpackCiGroupProcess(ciGroup) {
+def xpackCiGroupProcess(ciGroup, withDelay = false) {
return functionalTestProcess("xpack-ciGroup" + ciGroup) {
- sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
+ if (withDelay) {
+ sleep((ciGroup-1)*30) // smooth out CPU spikes from ES startup
+ }
withEnv([
"CI_GROUP=${ciGroup}",
"JOB=xpack-kibana-ciGroup${ciGroup}",
diff --git a/vars/prChanges.groovy b/vars/prChanges.groovy
index 2cc22e73857b..d082672c065a 100644
--- a/vars/prChanges.groovy
+++ b/vars/prChanges.groovy
@@ -11,10 +11,8 @@ def getSkippablePaths() {
/^.ci\/.+\.yml$/,
/^.ci\/es-snapshots\//,
/^.ci\/pipeline-library\//,
- /^.ci\/teamcity\//,
/^.ci\/Jenkinsfile_[^\/]+$/,
/^\.github\//,
- /^\.teamcity\//,
/\.md$/,
]
}
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 6c4f89769113..7c40966ff5e0 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -51,7 +51,7 @@ def functionalOss(Map params = [:]) {
if (config.ciGroups) {
def ciGroups = 1..12
- tasks(ciGroups.collect { kibanaPipeline.ossCiGroupProcess(it) })
+ tasks(ciGroups.collect { kibanaPipeline.ossCiGroupProcess(it, true) })
}
if (config.firefox) {
@@ -92,7 +92,7 @@ def functionalXpack(Map params = [:]) {
if (config.ciGroups) {
def ciGroups = 1..13
- tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it) })
+ tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it, true) })
}
if (config.firefox) {
diff --git a/x-pack/examples/embedded_lens_example/public/app.tsx b/x-pack/examples/embedded_lens_example/public/app.tsx
index 9f35907ca335..661e01038c5d 100644
--- a/x-pack/examples/embedded_lens_example/public/app.tsx
+++ b/x-pack/examples/embedded_lens_example/public/app.tsx
@@ -19,7 +19,11 @@ import {
} from '@elastic/eui';
import { IndexPattern } from 'src/plugins/data/public';
import { CoreStart } from 'kibana/public';
-import { TypedLensByValueInput } from '../../../plugins/lens/public';
+import {
+ TypedLensByValueInput,
+ PersistedIndexPatternLayer,
+ XYState,
+} from '../../../plugins/lens/public';
import { StartDependencies } from './plugin';
// Generate a Lens state based on some app-specific input parameters.
@@ -28,6 +32,48 @@ function getLensAttributes(
defaultIndexPattern: IndexPattern,
color: string
): TypedLensByValueInput['attributes'] {
+ const dataLayer: PersistedIndexPatternLayer = {
+ columnOrder: ['col1', 'col2'],
+ columns: {
+ col2: {
+ dataType: 'number',
+ isBucketed: false,
+ label: 'Count of records',
+ operationType: 'count',
+ scale: 'ratio',
+ sourceField: 'Records',
+ },
+ col1: {
+ dataType: 'date',
+ isBucketed: true,
+ label: '@timestamp',
+ operationType: 'date_histogram',
+ params: { interval: 'auto' },
+ scale: 'interval',
+ sourceField: defaultIndexPattern.timeFieldName!,
+ },
+ },
+ };
+
+ const xyConfig: XYState = {
+ axisTitlesVisibilitySettings: { x: true, yLeft: true, yRight: true },
+ fittingFunction: 'None',
+ gridlinesVisibilitySettings: { x: true, yLeft: true, yRight: true },
+ layers: [
+ {
+ accessors: ['col2'],
+ layerId: 'layer1',
+ seriesType: 'bar_stacked',
+ xAccessor: 'col1',
+ yConfig: [{ forAccessor: 'col2', color }],
+ },
+ ],
+ legend: { isVisible: true, position: 'right' },
+ preferredSeriesType: 'bar_stacked',
+ tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true },
+ valueLabels: 'hide',
+ };
+
return {
visualizationType: 'lnsXY',
title: 'Prefilled from example app',
@@ -47,51 +93,13 @@ function getLensAttributes(
datasourceStates: {
indexpattern: {
layers: {
- layer1: {
- columnOrder: ['col1', 'col2'],
- columns: {
- col2: {
- dataType: 'number',
- isBucketed: false,
- label: 'Count of records',
- operationType: 'count',
- scale: 'ratio',
- sourceField: 'Records',
- },
- col1: {
- dataType: 'date',
- isBucketed: true,
- label: '@timestamp',
- operationType: 'date_histogram',
- params: { interval: 'auto' },
- scale: 'interval',
- sourceField: defaultIndexPattern.timeFieldName!,
- },
- },
- },
+ layer1: dataLayer,
},
},
},
filters: [],
query: { language: 'kuery', query: '' },
- visualization: {
- axisTitlesVisibilitySettings: { x: true, yLeft: true, yRight: true },
- fittingFunction: 'None',
- gridlinesVisibilitySettings: { x: true, yLeft: true, yRight: true },
- layers: [
- {
- accessors: ['col2'],
- layerId: 'layer1',
- seriesType: 'bar_stacked',
- xAccessor: 'col1',
- yConfig: [{ forAccessor: 'col2', color }],
- },
- ],
- legend: { isVisible: true, position: 'right' },
- preferredSeriesType: 'bar_stacked',
- tickLabelsVisibilitySettings: { x: true, yLeft: true, yRight: true },
- valueLabels: 'hide',
- },
+ visualization: xyConfig,
},
};
}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
index 0e5a7d56e906..6f0d8571ab28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
@@ -174,8 +174,7 @@ export const EngineNav: React.FC = () => {
)}
{canManageEngineRelevanceTuning && (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
index aa8b406cf777..f4fabc29a6b5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
@@ -16,6 +16,7 @@ import { Switch, Redirect, useParams } from 'react-router-dom';
import { Loading } from '../../../shared/loading';
import { EngineOverview } from '../engine_overview';
import { AnalyticsRouter } from '../analytics';
+import { RelevanceTuning } from '../relevance_tuning';
import { EngineRouter } from './engine_router';
@@ -93,4 +94,11 @@ describe('EngineRouter', () => {
expect(wrapper.find(AnalyticsRouter)).toHaveLength(1);
});
+
+ it('renders an relevance tuning view', () => {
+ setMockValues({ ...values, myRole: { canManageEngineRelevanceTuning: true } });
+ const wrapper = shallow();
+
+ expect(wrapper.find(RelevanceTuning)).toHaveLength(1);
+ });
});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
index fd21507a427d..ba0079223797 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
@@ -23,7 +23,7 @@ import {
// ENGINE_SCHEMA_PATH,
// ENGINE_CRAWLER_PATH,
// META_ENGINE_SOURCE_ENGINES_PATH,
- // ENGINE_RELEVANCE_TUNING_PATH,
+ ENGINE_RELEVANCE_TUNING_PATH,
// ENGINE_SYNONYMS_PATH,
// ENGINE_CURATIONS_PATH,
// ENGINE_RESULT_SETTINGS_PATH,
@@ -37,6 +37,7 @@ import { Loading } from '../../../shared/loading';
import { EngineOverview } from '../engine_overview';
import { AnalyticsRouter } from '../analytics';
import { DocumentDetail, Documents } from '../documents';
+import { RelevanceTuning } from '../relevance_tuning';
import { EngineLogic } from './';
@@ -44,13 +45,13 @@ export const EngineRouter: React.FC = () => {
const {
myRole: {
canViewEngineAnalytics,
+ canManageEngineRelevanceTuning,
// canViewEngineDocuments,
// canViewEngineSchema,
// canViewEngineCrawler,
// canViewMetaEngineSourceEngines,
// canManageEngineSynonyms,
// canManageEngineCurations,
- // canManageEngineRelevanceTuning,
// canManageEngineResultSettings,
// canManageEngineSearchUi,
// canViewEngineApiLogs,
@@ -95,6 +96,11 @@ export const EngineRouter: React.FC = () => {
+ {canManageEngineRelevanceTuning && (
+
+
+
+ )}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts
index 40f3ddbf2899..55070255ac81 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/index.ts
@@ -5,3 +5,4 @@
*/
export { RELEVANCE_TUNING_TITLE } from './constants';
+export { RelevanceTuning } from './relevance_tuning';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx
new file mode 100644
index 000000000000..5934aca6be5f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { RelevanceTuning } from './relevance_tuning';
+
+describe('RelevanceTuning', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('renders', () => {
+ const wrapper = shallow();
+ expect(wrapper.isEmptyRender()).toBe(false);
+ });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.tsx
new file mode 100644
index 000000000000..cca352904930
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import {
+ EuiPageHeader,
+ EuiPageHeaderSection,
+ EuiTitle,
+ EuiPageContentBody,
+ EuiPageContent,
+} from '@elastic/eui';
+
+import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
+import { FlashMessages } from '../../../shared/flash_messages';
+
+import { RELEVANCE_TUNING_TITLE } from './constants';
+
+interface Props {
+ engineBreadcrumb: string[];
+}
+
+export const RelevanceTuning: React.FC = ({ engineBreadcrumb }) => {
+ return (
+ <>
+
+
+
+
+ {RELEVANCE_TUNING_TITLE}
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
index 7f12f7d29671..080f6efcc71f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
@@ -41,7 +41,7 @@ export const ENGINE_CRAWLER_PATH = `${ENGINE_PATH}/crawler`;
export const META_ENGINE_SOURCE_ENGINES_PATH = `${ENGINE_PATH}/engines`;
-export const ENGINE_RELEVANCE_TUNING_PATH = `${ENGINE_PATH}/search-settings`;
+export const ENGINE_RELEVANCE_TUNING_PATH = `${ENGINE_PATH}/relevance_tuning`;
export const ENGINE_SYNONYMS_PATH = `${ENGINE_PATH}/synonyms`;
export const ENGINE_CURATIONS_PATH = `${ENGINE_PATH}/curations`;
// TODO: Curations sub-pages
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
index c02d5cf0ff13..819cabec44f0 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
@@ -50,12 +50,7 @@ export class MockRouter {
};
public callRoute = async (request: MockRouterRequest) => {
- const routerCalls = this.router[this.method].mock.calls as any[];
- if (!routerCalls.length) throw new Error('No routes registered.');
-
- const route = routerCalls.find(([router]: any) => router.path === this.path);
- if (!route) throw new Error('No matching registered routes found - check method/path keys');
-
+ const route = this.findRouteRegistration();
const [, handler] = route;
const context = {} as jest.Mocked;
await handler(context, httpServerMock.createKibanaRequest(request as any), this.response);
@@ -68,7 +63,8 @@ export class MockRouter {
public validateRoute = (request: MockRouterRequest) => {
if (!this.payload) throw new Error('Cannot validate wihout a payload type specified.');
- const [config] = this.router[this.method].mock.calls[0];
+ const route = this.findRouteRegistration();
+ const [config] = route;
const validate = config.validate as RouteValidatorConfig<{}, {}, {}>;
const payloadValidation = validate[this.payload] as { validate(request: KibanaRequest): void };
@@ -84,6 +80,16 @@ export class MockRouter {
public shouldThrow = (request: MockRouterRequest) => {
expect(() => this.validateRoute(request)).toThrow();
};
+
+ private findRouteRegistration = () => {
+ const routerCalls = this.router[this.method].mock.calls as any[];
+ if (!routerCalls.length) throw new Error('No routes registered.');
+
+ const route = routerCalls.find(([router]: any) => router.path === this.path);
+ if (!route) throw new Error('No matching registered routes found - check method/path keys');
+
+ return route;
+ };
}
/**
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
index a20e7854db17..c384826f469f 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
@@ -11,6 +11,7 @@ import { registerCredentialsRoutes } from './credentials';
import { registerSettingsRoutes } from './settings';
import { registerAnalyticsRoutes } from './analytics';
import { registerDocumentsRoutes, registerDocumentRoutes } from './documents';
+import { registerSearchSettingsRoutes } from './search_settings';
export const registerAppSearchRoutes = (dependencies: RouteDependencies) => {
registerEnginesRoutes(dependencies);
@@ -19,4 +20,5 @@ export const registerAppSearchRoutes = (dependencies: RouteDependencies) => {
registerAnalyticsRoutes(dependencies);
registerDocumentsRoutes(dependencies);
registerDocumentRoutes(dependencies);
+ registerSearchSettingsRoutes(dependencies);
};
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts
new file mode 100644
index 000000000000..56a6e6297d1f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.test.ts
@@ -0,0 +1,216 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
+
+import { registerSearchSettingsRoutes } from './search_settings';
+
+describe('search settings routes', () => {
+ const boosts = {
+ types: [
+ {
+ type: 'value',
+ factor: 6.2,
+ value: ['1313'],
+ },
+ ],
+ hp: [
+ {
+ function: 'exponential',
+ type: 'functional',
+ factor: 1,
+ operation: 'add',
+ },
+ ],
+ };
+ const resultFields = {
+ id: {
+ raw: {},
+ },
+ hp: {
+ raw: {},
+ },
+ name: {
+ raw: {},
+ },
+ };
+ const searchFields = {
+ hp: {
+ weight: 1,
+ },
+ name: {
+ weight: 1,
+ },
+ id: {
+ weight: 1,
+ },
+ };
+ const searchSettings = {
+ boosts,
+ result_fields: resultFields,
+ search_fields: searchFields,
+ };
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ describe('GET /api/app_search/engines/{name}/search_settings/details', () => {
+ const mockRouter = new MockRouter({
+ method: 'get',
+ path: '/api/app_search/engines/{engineName}/search_settings/details',
+ });
+
+ beforeEach(() => {
+ registerSearchSettingsRoutes({
+ ...mockDependencies,
+ router: mockRouter.router,
+ });
+ });
+
+ it('creates a request to enterprise search', () => {
+ mockRouter.callRoute({
+ params: { engineName: 'some-engine' },
+ });
+
+ expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+ path: '/as/engines/:engineName/search_settings/details',
+ });
+ });
+ });
+
+ describe('PUT /api/app_search/engines/{name}/search_settings', () => {
+ const mockRouter = new MockRouter({
+ method: 'put',
+ path: '/api/app_search/engines/{engineName}/search_settings',
+ payload: 'body',
+ });
+
+ beforeEach(() => {
+ registerSearchSettingsRoutes({
+ ...mockDependencies,
+ router: mockRouter.router,
+ });
+ });
+
+ it('creates a request to enterprise search', () => {
+ mockRouter.callRoute({
+ params: { engineName: 'some-engine' },
+ body: searchSettings,
+ });
+
+ expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+ path: '/as/engines/:engineName/search_settings',
+ });
+ });
+
+ describe('validates', () => {
+ it('correctly', () => {
+ const request = { body: searchSettings };
+ mockRouter.shouldValidate(request);
+ });
+
+ it('missing required fields', () => {
+ const request = { body: {} };
+ mockRouter.shouldThrow(request);
+ });
+ });
+ });
+
+ describe('POST /api/app_search/engines/{name}/search_settings/reset', () => {
+ const mockRouter = new MockRouter({
+ method: 'post',
+ path: '/api/app_search/engines/{engineName}/search_settings/reset',
+ });
+
+ beforeEach(() => {
+ registerSearchSettingsRoutes({
+ ...mockDependencies,
+ router: mockRouter.router,
+ });
+ });
+
+ it('creates a request to enterprise search', () => {
+ mockRouter.callRoute({
+ params: { engineName: 'some-engine' },
+ });
+
+ expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+ path: '/as/engines/:engineName/search_settings/reset',
+ });
+ });
+ });
+
+ describe('POST /api/app_search/engines/{name}/search_settings_search', () => {
+ const mockRouter = new MockRouter({
+ method: 'post',
+ path: '/api/app_search/engines/{engineName}/search_settings_search',
+ payload: 'body',
+ });
+
+ beforeEach(() => {
+ registerSearchSettingsRoutes({
+ ...mockDependencies,
+ router: mockRouter.router,
+ });
+ });
+
+ it('creates a request to enterprise search', () => {
+ mockRouter.callRoute({
+ params: { engineName: 'some-engine' },
+ body: searchSettings,
+ });
+
+ expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+ path: '/as/engines/:engineName/search_settings_search',
+ });
+ });
+
+ describe('validates body', () => {
+ it('correctly', () => {
+ const request = {
+ body: {
+ boosts,
+ search_fields: searchFields,
+ },
+ };
+ mockRouter.shouldValidate(request);
+ });
+
+ it('missing required fields', () => {
+ const request = { body: {} };
+ mockRouter.shouldThrow(request);
+ });
+ });
+
+ describe('validates query', () => {
+ const queryRouter = new MockRouter({
+ method: 'post',
+ path: '/api/app_search/engines/{engineName}/search_settings_search',
+ payload: 'query',
+ });
+
+ it('correctly', () => {
+ registerSearchSettingsRoutes({
+ ...mockDependencies,
+ router: queryRouter.router,
+ });
+
+ const request = {
+ query: {
+ query: 'foo',
+ },
+ };
+ queryRouter.shouldValidate(request);
+ });
+
+ it('missing required fields', () => {
+ const request = { query: {} };
+ queryRouter.shouldThrow(request);
+ });
+ });
+ });
+});
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts
new file mode 100644
index 000000000000..eb50d736ac97
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search_settings.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { RouteDependencies } from '../../plugin';
+
+// We only do a very light type check here, and allow unknowns, because the request is validated
+// on the ent-search server, so it would be redundant to check it here as well.
+const boosts = schema.recordOf(
+ schema.string(),
+ schema.arrayOf(schema.object({}, { unknowns: 'allow' }))
+);
+const resultFields = schema.recordOf(schema.string(), schema.object({}, { unknowns: 'allow' }));
+const searchFields = schema.recordOf(schema.string(), schema.object({}, { unknowns: 'allow' }));
+
+const searchSettingsSchema = schema.object({
+ boosts,
+ result_fields: resultFields,
+ search_fields: searchFields,
+});
+
+export function registerSearchSettingsRoutes({
+ router,
+ enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+ router.get(
+ {
+ path: '/api/app_search/engines/{engineName}/search_settings/details',
+ validate: {
+ params: schema.object({
+ engineName: schema.string(),
+ }),
+ },
+ },
+ enterpriseSearchRequestHandler.createRequest({
+ path: `/as/engines/:engineName/search_settings/details`,
+ })
+ );
+
+ router.post(
+ {
+ path: '/api/app_search/engines/{engineName}/search_settings/reset',
+ validate: {
+ params: schema.object({
+ engineName: schema.string(),
+ }),
+ },
+ },
+ enterpriseSearchRequestHandler.createRequest({
+ path: `/as/engines/:engineName/search_settings/reset`,
+ })
+ );
+
+ router.put(
+ {
+ path: '/api/app_search/engines/{engineName}/search_settings',
+ validate: {
+ params: schema.object({
+ engineName: schema.string(),
+ }),
+ body: searchSettingsSchema,
+ },
+ },
+ enterpriseSearchRequestHandler.createRequest({
+ path: `/as/engines/:engineName/search_settings`,
+ })
+ );
+
+ router.post(
+ {
+ path: '/api/app_search/engines/{engineName}/search_settings_search',
+ validate: {
+ params: schema.object({
+ engineName: schema.string(),
+ }),
+ body: schema.object({
+ boosts,
+ search_fields: searchFields,
+ }),
+ query: schema.object({
+ query: schema.string(),
+ }),
+ },
+ },
+ enterpriseSearchRequestHandler.createRequest({
+ path: `/as/engines/:engineName/search_settings_search`,
+ })
+ );
+}
diff --git a/x-pack/plugins/fleet/server/services/agents/crud_so.ts b/x-pack/plugins/fleet/server/services/agents/crud_so.ts
index eb8f389741a6..7111a2413914 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud_so.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud_so.ts
@@ -12,18 +12,35 @@ import { AgentSOAttributes, Agent, ListWithKuery } from '../../types';
import { escapeSearchQueryPhrase, normalizeKuery, findAllSOs } from '../saved_object';
import { savedObjectToAgent } from './saved_objects';
import { appContextService } from '../../services';
+import { esKuery, KueryNode } from '../../../../../../src/plugins/data/server';
const ACTIVE_AGENT_CONDITION = `${AGENT_SAVED_OBJECT_TYPE}.attributes.active:true`;
const INACTIVE_AGENT_CONDITION = `NOT (${ACTIVE_AGENT_CONDITION})`;
-function _joinFilters(filters: string[], operator = 'AND') {
- return filters.reduce((acc: string | undefined, filter) => {
- if (acc) {
- return `${acc} ${operator} (${filter})`;
- }
-
- return `(${filter})`;
- }, undefined);
+function _joinFilters(filters: Array) {
+ return filters
+ .filter((filter) => filter !== undefined)
+ .reduce((acc: KueryNode | undefined, kuery: string | KueryNode | undefined):
+ | KueryNode
+ | undefined => {
+ if (kuery === undefined) {
+ return acc;
+ }
+ const kueryNode: KueryNode =
+ typeof kuery === 'string'
+ ? esKuery.fromKueryExpression(normalizeKuery(AGENT_SAVED_OBJECT_TYPE, kuery))
+ : kuery;
+
+ if (!acc) {
+ return kueryNode;
+ }
+
+ return {
+ type: 'function',
+ function: 'and',
+ arguments: [acc, kueryNode],
+ };
+ }, undefined as KueryNode | undefined);
}
export async function listAgents(
@@ -46,19 +63,18 @@ export async function listAgents(
showInactive = false,
showUpgradeable,
} = options;
- const filters = [];
+ const filters: Array = [];
if (kuery && kuery !== '') {
- filters.push(normalizeKuery(AGENT_SAVED_OBJECT_TYPE, kuery));
+ filters.push(kuery);
}
if (showInactive === false) {
filters.push(ACTIVE_AGENT_CONDITION);
}
-
let { saved_objects: agentSOs, total } = await soClient.find({
type: AGENT_SAVED_OBJECT_TYPE,
- filter: _joinFilters(filters),
+ filter: _joinFilters(filters) || '',
sortField,
sortOrder,
page,
@@ -94,7 +110,7 @@ export async function listAllAgents(
const filters = [];
if (kuery && kuery !== '') {
- filters.push(normalizeKuery(AGENT_SAVED_OBJECT_TYPE, kuery));
+ filters.push(kuery);
}
if (showInactive === false) {
diff --git a/x-pack/plugins/fleet/server/services/agents/status.ts b/x-pack/plugins/fleet/server/services/agents/status.ts
index ba8f8fc36385..726d188f723d 100644
--- a/x-pack/plugins/fleet/server/services/agents/status.ts
+++ b/x-pack/plugins/fleet/server/services/agents/status.ts
@@ -11,6 +11,8 @@ import { AGENT_EVENT_SAVED_OBJECT_TYPE, AGENT_SAVED_OBJECT_TYPE } from '../../co
import { AgentStatus } from '../../types';
import { AgentStatusKueryHelper } from '../../../common/services';
+import { esKuery, KueryNode } from '../../../../../../src/plugins/data/server';
+import { normalizeKuery } from '../saved_object';
export async function getAgentStatusById(
soClient: SavedObjectsClientContract,
@@ -26,13 +28,24 @@ export const getAgentStatus = AgentStatusKueryHelper.getAgentStatus;
function joinKuerys(...kuerys: Array) {
return kuerys
.filter((kuery) => kuery !== undefined)
- .reduce((acc, kuery) => {
- if (acc === '') {
- return `(${kuery})`;
+ .reduce((acc: KueryNode | undefined, kuery: string | undefined): KueryNode | undefined => {
+ if (kuery === undefined) {
+ return acc;
}
+ const normalizedKuery: KueryNode = esKuery.fromKueryExpression(
+ normalizeKuery(AGENT_SAVED_OBJECT_TYPE, kuery || '')
+ );
- return `${acc} and (${kuery})`;
- }, '');
+ if (!acc) {
+ return normalizedKuery;
+ }
+
+ return {
+ type: 'function',
+ function: 'and',
+ arguments: [acc, normalizedKuery],
+ };
+ }, undefined as KueryNode | undefined);
}
export async function getAgentStatusForAgentPolicy(
@@ -58,6 +71,7 @@ export async function getAgentStatusForAgentPolicy(
...[
kuery,
filterKuery,
+ `${AGENT_SAVED_OBJECT_TYPE}.attributes.active:true`,
agentPolicyId ? `${AGENT_SAVED_OBJECT_TYPE}.policy_id:"${agentPolicyId}"` : undefined,
]
),
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/common.ts b/x-pack/plugins/fleet/server/types/rest_spec/common.ts
index cdb23da5b6b1..88d60116672d 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/common.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/common.ts
@@ -11,7 +11,12 @@ export const ListWithKuerySchema = schema.object({
sortField: schema.maybe(schema.string()),
sortOrder: schema.maybe(schema.oneOf([schema.literal('desc'), schema.literal('asc')])),
showUpgradeable: schema.maybe(schema.boolean()),
- kuery: schema.maybe(schema.string()),
+ kuery: schema.maybe(
+ schema.oneOf([
+ schema.string(),
+ schema.any(), // KueryNode
+ ])
+ ),
});
export type ListWithKuery = TypeOf;
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
index d9256ec916ec..5d5d8a85163c 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -197,7 +197,9 @@ export const setup = async (arg?: { appServicesContext: Partial async (value: string) => {
- await createFormToggleAction(`${phase}-setReplicasSwitch`)(true);
+ if (!exists(`${phase}-selectedReplicaCount`)) {
+ await createFormToggleAction(`${phase}-setReplicasSwitch`)(true);
+ }
await createFormSetValueAction(`${phase}-selectedReplicaCount`)(value);
};
@@ -248,8 +250,11 @@ export const setup = async (arg?: { appServicesContext: Partial exists('policyFormErrorsCallout'),
timeline: {
hasRolloverIndicator: () => exists('timelineHotPhaseRolloverToolTip'),
hasHotPhase: () => exists('ilmTimelineHotPhase'),
@@ -263,6 +268,7 @@ export const setup = async (arg?: { appServicesContext: Partial exists('phaseErrorIndicator-hot'),
...createForceMergeActions('hot'),
...createIndexPriorityActions('hot'),
...createShrinkActions('hot'),
@@ -276,6 +282,7 @@ export const setup = async (arg?: { appServicesContext: Partial exists('phaseErrorIndicator-warm'),
...createShrinkActions('warm'),
...createForceMergeActions('warm'),
setReadonly: setReadonly('warm'),
@@ -290,6 +297,7 @@ export const setup = async (arg?: { appServicesContext: Partial exists('phaseErrorIndicator-cold'),
...createIndexPriorityActions('cold'),
...createSearchableSnapshotActions('cold'),
},
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
index 05793a4bed58..9cff3953c2e1 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
@@ -29,6 +29,7 @@ window.scrollTo = jest.fn();
describe('', () => {
let testBed: EditPolicyTestBed;
const { server, httpRequestsMockHelpers } = setupEnvironment();
+
afterAll(() => {
server.restore();
});
@@ -852,4 +853,132 @@ describe('', () => {
expect(actions.timeline.hasRolloverIndicator()).toBe(false);
});
});
+
+ describe('policy error notifications', () => {
+ beforeAll(() => {
+ jest.useFakeTimers();
+ });
+
+ afterAll(() => {
+ jest.useRealTimers();
+ });
+ beforeEach(async () => {
+ httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
+ httpRequestsMockHelpers.setListNodes({
+ nodesByRoles: {},
+ nodesByAttributes: { test: ['123'] },
+ isUsingDeprecatedDataRoleConfig: false,
+ });
+ httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+
+ await act(async () => {
+ testBed = await setup();
+ });
+
+ const { component } = testBed;
+ component.update();
+ });
+
+ // For new we rely on a setTimeout to ensure that error messages have time to populate
+ // the form object before we look at the form object. See:
+ // x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/form_errors_context.tsx
+ // for where this logic lives.
+ const runTimers = () => {
+ const { component } = testBed;
+ act(() => {
+ jest.runAllTimers();
+ });
+ component.update();
+ };
+
+ test('shows phase error indicators correctly', async () => {
+ // This test simulates a user configuring a policy phase by phase. The flow is the following:
+ // 0. Start with policy with no validation issues present
+ // 1. Configure hot, introducing a validation error
+ // 2. Configure warm, introducing a validation error
+ // 3. Configure cold, introducing a validation error
+ // 4. Fix validation error in hot
+ // 5. Fix validation error in warm
+ // 6. Fix validation error in cold
+ // We assert against each of these progressive states.
+
+ const { actions } = testBed;
+
+ // 0. No validation issues
+ expect(actions.hasGlobalErrorCallout()).toBe(false);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+
+ // 1. Hot phase validation issue
+ await actions.hot.toggleForceMerge(true);
+ await actions.hot.setForcemergeSegmentsCount('-22');
+ runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(true);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+
+ // 2. Warm phase validation issue
+ await actions.warm.enable(true);
+ await actions.warm.toggleForceMerge(true);
+ await actions.warm.setForcemergeSegmentsCount('-22');
+ await runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(true);
+ expect(actions.warm.hasErrorIndicator()).toBe(true);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+
+ // 3. Cold phase validation issue
+ await actions.cold.enable(true);
+ await actions.cold.setReplicas('-33');
+ await runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(true);
+ expect(actions.warm.hasErrorIndicator()).toBe(true);
+ expect(actions.cold.hasErrorIndicator()).toBe(true);
+
+ // 4. Fix validation issue in hot
+ await actions.hot.setForcemergeSegmentsCount('1');
+ await runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(true);
+ expect(actions.cold.hasErrorIndicator()).toBe(true);
+
+ // 5. Fix validation issue in warm
+ await actions.warm.setForcemergeSegmentsCount('1');
+ await runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(true);
+
+ // 6. Fix validation issue in cold
+ await actions.cold.setReplicas('1');
+ await runTimers();
+ expect(actions.hasGlobalErrorCallout()).toBe(false);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+ });
+
+ test('global error callout should show if there are any form errors', async () => {
+ const { actions } = testBed;
+
+ expect(actions.hasGlobalErrorCallout()).toBe(false);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+
+ await actions.saveAsNewPolicy(true);
+ await actions.setPolicyName('');
+ await runTimers();
+
+ expect(actions.hasGlobalErrorCallout()).toBe(true);
+ expect(actions.hot.hasErrorIndicator()).toBe(false);
+ expect(actions.warm.hasErrorIndicator()).toBe(false);
+ expect(actions.cold.hasErrorIndicator()).toBe(false);
+ });
+ });
});
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/described_form_row/toggle_field_with_described_form_row.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/described_form_row/toggle_field_with_described_form_row.tsx
index 779dbe47914a..cddcd92a0f72 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/described_form_row/toggle_field_with_described_form_row.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/described_form_row/toggle_field_with_described_form_row.tsx
@@ -5,7 +5,7 @@
*/
import React, { FunctionComponent } from 'react';
-import { UseField } from '../../../../../shared_imports';
+import { UseField } from '../../form';
import {
DescribedFormRow,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx
deleted file mode 100644
index ed7ca6041767..000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { cloneElement, Children, Fragment, ReactElement } from 'react';
-import { EuiFormRow, EuiFormRowProps } from '@elastic/eui';
-
-type Props = EuiFormRowProps & {
- isShowingErrors: boolean;
- errors?: string | string[] | null;
-};
-
-export const ErrableFormRow: React.FunctionComponent = ({
- isShowingErrors,
- errors,
- children,
- ...rest
-}) => {
- const _errors = errors ? (Array.isArray(errors) ? errors : [errors]) : undefined;
- return (
- 0)}
- error={errors}
- {...rest}
- >
-
- {Children.map(children, (child) =>
- cloneElement(child as ReactElement, {
- isInvalid: errors && isShowingErrors && errors.length > 0,
- })
- )}
-
-
- );
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors_callout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors_callout.tsx
new file mode 100644
index 000000000000..4e4adc6530f3
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors_callout.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FunctionComponent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiCallOut, EuiSpacer } from '@elastic/eui';
+
+import { useFormErrorsContext } from '../form';
+
+const i18nTexts = {
+ callout: {
+ title: i18n.translate('xpack.indexLifecycleMgmt.policyErrorCalloutTitle', {
+ defaultMessage: 'This policy contains errors',
+ }),
+ body: i18n.translate('xpack.indexLifecycleMgmt.policyErrorCalloutDescription', {
+ defaultMessage: 'Please fix all errors before saving the policy.',
+ }),
+ },
+};
+
+export const FormErrorsCallout: FunctionComponent = () => {
+ const {
+ errors: { hasErrors },
+ } = useFormErrorsContext();
+
+ if (!hasErrors) {
+ return null;
+ }
+
+ return (
+ <>
+
+ {i18nTexts.callout.body}
+
+
+
+ );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
index 960b632d70bd..c384ef7531bb 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/index.ts
@@ -5,7 +5,6 @@
*/
export { ActiveBadge } from './active_badge';
-export { ErrableFormRow } from './form_errors';
export { LearnMoreLink } from './learn_more_link';
export { OptionalLabel } from './optional_label';
export { PolicyJsonFlyout } from './policy_json_flyout';
@@ -13,5 +12,6 @@ export { DescribedFormRow, ToggleFieldWithDescribedFormRow } from './described_f
export { FieldLoadingError } from './field_loading_error';
export { ActiveHighlight } from './active_highlight';
export { Timeline } from './timeline';
+export { FormErrorsCallout } from './form_errors_callout';
export * from './phases';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
index 976f584ef4d3..405cdd5bcde7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
@@ -23,6 +23,7 @@ import {
IndexPriorityField,
ReplicasField,
} from '../shared_fields';
+
import { Phase } from '../phase';
const i18nTexts = {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
index 5c43bb413eb5..a3196ddcf023 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
@@ -9,7 +9,9 @@ import { get } from 'lodash';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiDescribedFormGroup, EuiTextColor, EuiFormRow } from '@elastic/eui';
-import { useFormData, UseField, ToggleField } from '../../../../../../shared_imports';
+import { useFormData, ToggleField } from '../../../../../../shared_imports';
+
+import { UseField } from '../../../form';
import { ActiveBadge, LearnMoreLink, OptionalLabel } from '../../index';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
index 02de47f8c56e..70740ddb81f8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
@@ -19,11 +19,11 @@ import {
EuiIcon,
} from '@elastic/eui';
-import { useFormData, UseField, SelectField, NumericField } from '../../../../../../shared_imports';
+import { useFormData, SelectField, NumericField } from '../../../../../../shared_imports';
import { i18nTexts } from '../../../i18n_texts';
-import { ROLLOVER_EMPTY_VALIDATION, useConfigurationIssues } from '../../../form';
+import { ROLLOVER_EMPTY_VALIDATION, useConfigurationIssues, UseField } from '../../../form';
import { useEditPolicyContext } from '../../../edit_policy_context';
@@ -38,8 +38,8 @@ import {
ReadonlyField,
ShrinkField,
} from '../shared_fields';
-
import { Phase } from '../phase';
+
import { maxSizeStoredUnits, maxAgeUnits } from './constants';
export const HotPhase: FunctionComponent = () => {
diff --git a/x-pack/plugins/infra/common/graphql/root/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/index.ts
similarity index 84%
rename from x-pack/plugins/infra/common/graphql/root/index.ts
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/index.ts
index 47417b637630..d8c6fec557dc 100644
--- a/x-pack/plugins/infra/common/graphql/root/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/index.ts
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { rootSchema } from './schema.gql';
+export { Phase } from './phase';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
similarity index 79%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase.tsx
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
index 6de18f1c1d3c..829c75bdced6 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
@@ -18,11 +18,14 @@ import {
import { get } from 'lodash';
import { FormattedMessage } from '@kbn/i18n/react';
-import { ToggleField, UseField, useFormData } from '../../../../../shared_imports';
-import { i18nTexts } from '../../i18n_texts';
+import { ToggleField, useFormData } from '../../../../../../shared_imports';
+import { i18nTexts } from '../../../i18n_texts';
-import { ActiveHighlight } from '../active_highlight';
-import { MinAgeField } from './shared_fields';
+import { UseField } from '../../../form';
+import { ActiveHighlight } from '../../active_highlight';
+import { MinAgeField } from '../shared_fields';
+
+import { PhaseErrorIndicator } from './phase_error_indicator';
interface Props {
phase: 'hot' | 'warm' | 'cold';
@@ -63,9 +66,16 @@ export const Phase: FunctionComponent = ({ children, phase }) => {
)}
-
- {i18nTexts.editPolicy.titles[phase]}
-
+
+
+
+ {i18nTexts.editPolicy.titles[phase]}
+
+
+
+
+
+
@@ -74,7 +84,7 @@ export const Phase: FunctionComponent = ({ children, phase }) => {
@@ -102,7 +112,7 @@ export const Phase: FunctionComponent = ({ children, phase }) => {
)}
-
+
{i18nTexts.editPolicy.descriptions[phase]}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase_error_indicator.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase_error_indicator.tsx
new file mode 100644
index 000000000000..f156ddcaee96
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase_error_indicator.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import React, { FunctionComponent, memo } from 'react';
+import { EuiIconTip } from '@elastic/eui';
+
+import { useFormErrorsContext } from '../../../form';
+
+interface Props {
+ phase: 'hot' | 'warm' | 'cold';
+}
+
+const i18nTexts = {
+ toolTipContent: i18n.translate('xpack.indexLifecycleMgmt.phaseErrorIcon.tooltipDescription', {
+ defaultMessage: 'This phase contains errors.',
+ }),
+};
+
+/**
+ * This component hooks into the form state and updates whenever new form data is inputted.
+ */
+export const PhaseErrorIndicator: FunctionComponent = memo(({ phase }) => {
+ const { errors } = useFormErrorsContext();
+
+ if (Object.keys(errors[phase]).length) {
+ return (
+
+
+
+ );
+ }
+
+ return null;
+});
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/data_tier_allocation.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/data_tier_allocation.tsx
index 8af5314c16b1..3dc0d6d45a9b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/data_tier_allocation.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/data_tier_allocation.tsx
@@ -4,16 +4,18 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { i18n } from '@kbn/i18n';
import React, { FunctionComponent } from 'react';
import { get } from 'lodash';
-import { i18n } from '@kbn/i18n';
import { EuiText, EuiSpacer, EuiSuperSelectOption } from '@elastic/eui';
-import { UseField, SuperSelectField, useFormData } from '../../../../../../../../shared_imports';
+import { SuperSelectField, useFormData } from '../../../../../../../../shared_imports';
import { PhaseWithAllocation } from '../../../../../../../../../common/types';
import { DataTierAllocationType } from '../../../../../types';
+import { UseField } from '../../../../../form';
+
import { NodeAllocation } from './node_allocation';
import { SharedProps } from './types';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/node_allocation.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/node_allocation.tsx
index 9f60337166f4..371cb95f8091 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/node_allocation.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/data_tier_allocation_field/components/node_allocation.tsx
@@ -4,13 +4,15 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { i18n } from '@kbn/i18n';
import React, { useState, FunctionComponent } from 'react';
import { get } from 'lodash';
import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
import { EuiButtonEmpty, EuiText, EuiSpacer } from '@elastic/eui';
-import { UseField, SelectField, useFormData } from '../../../../../../../../shared_imports';
+import { SelectField, useFormData } from '../../../../../../../../shared_imports';
+
+import { UseField } from '../../../../../form';
import { LearnMoreLink } from '../../../../learn_more_link';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
index 8d6807c90dae..cd6e9f83eb13 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
@@ -7,12 +7,14 @@
import React, { useMemo } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
-import { UseField, CheckBoxField, NumericField } from '../../../../../../shared_imports';
+import { CheckBoxField, NumericField } from '../../../../../../shared_imports';
import { i18nTexts } from '../../../i18n_texts';
import { useEditPolicyContext } from '../../../edit_policy_context';
+import { UseField } from '../../../form';
+
import { LearnMoreLink, DescribedFormRow } from '../../';
interface Props {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
index 570033812c24..79b4b49cbb65 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
@@ -4,14 +4,17 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { i18n } from '@kbn/i18n';
import React, { FunctionComponent, useMemo } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
import { EuiSpacer, EuiTextColor } from '@elastic/eui';
-import { UseField, NumericField } from '../../../../../../shared_imports';
-import { LearnMoreLink, DescribedFormRow } from '../..';
+import { NumericField } from '../../../../../../shared_imports';
+
import { useEditPolicyContext } from '../../../edit_policy_context';
+import { UseField } from '../../../form';
+
+import { LearnMoreLink, DescribedFormRow } from '../..';
interface Props {
phase: 'hot' | 'warm' | 'cold';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
index 8a84b7fa0e76..9937ae2a0b5b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
@@ -3,8 +3,8 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import React, { FunctionComponent } from 'react';
import { i18n } from '@kbn/i18n';
+import React, { FunctionComponent } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import {
@@ -17,7 +17,9 @@ import {
EuiText,
} from '@elastic/eui';
-import { UseField, getFieldValidityAndErrorMessage } from '../../../../../../../shared_imports';
+import { getFieldValidityAndErrorMessage } from '../../../../../../../shared_imports';
+
+import { UseField } from '../../../../form';
import { getUnitsAriaLabelForPhase, getTimingLabelForPhase } from './util';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx
index 6d8e019ff8a0..189fdc2fdf6d 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/replicas_field.tsx
@@ -7,8 +7,11 @@
import React, { FunctionComponent } from 'react';
import { i18n } from '@kbn/i18n';
-import { UseField, NumericField } from '../../../../../../shared_imports';
+import { NumericField } from '../../../../../../shared_imports';
+
import { useEditPolicyContext } from '../../../edit_policy_context';
+import { UseField } from '../../../form';
+
import { DescribedFormRow } from '../../described_form_row';
interface Props {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
index 5fa192158fb3..0050fe1d87e9 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { get } from 'lodash';
import { i18n } from '@kbn/i18n';
+import { get } from 'lodash';
import React, { FunctionComponent, useState, useEffect } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import {
@@ -17,7 +17,6 @@ import {
} from '@elastic/eui';
import {
- UseField,
ComboBoxField,
useKibana,
fieldValidators,
@@ -25,7 +24,7 @@ import {
} from '../../../../../../../shared_imports';
import { useEditPolicyContext } from '../../../../edit_policy_context';
-import { useConfigurationIssues } from '../../../../form';
+import { useConfigurationIssues, UseField } from '../../../../form';
import { i18nTexts } from '../../../../i18n_texts';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
index da200e9e68d1..33f6fc83b184 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/shrink_field.tsx
@@ -7,9 +7,10 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTextColor } from '@elastic/eui';
import React, { FunctionComponent } from 'react';
-import { UseField, NumericField } from '../../../../../../shared_imports';
+import { NumericField } from '../../../../../../shared_imports';
import { useEditPolicyContext } from '../../../edit_policy_context';
+import { UseField } from '../../../form';
import { i18nTexts } from '../../../i18n_texts';
import { LearnMoreLink, DescribedFormRow } from '../../';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
index 05f12f6ba61c..ece362e5ae01 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/snapshot_policies_field.tsx
@@ -11,9 +11,11 @@ import { i18n } from '@kbn/i18n';
import { EuiCallOut, EuiComboBoxOptionOption, EuiLink, EuiSpacer } from '@elastic/eui';
-import { UseField, ComboBoxField, useFormData } from '../../../../../../shared_imports';
+import { ComboBoxField, useFormData } from '../../../../../../shared_imports';
import { useLoadSnapshotPolicies } from '../../../../../services/api';
+
import { useEditPolicyContext } from '../../../edit_policy_context';
+import { UseField } from '../../../form';
import { FieldLoadingError } from '../../';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
index b1cf41773de3..420abdf02013 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
@@ -4,15 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
import React, { Fragment, useEffect, useMemo, useState } from 'react';
import { get } from 'lodash';
import { RouteComponentProps } from 'react-router-dom';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { i18n } from '@kbn/i18n';
-
import {
EuiButton,
EuiButtonEmpty,
@@ -31,9 +29,12 @@ import {
EuiTitle,
} from '@elastic/eui';
-import { TextField, UseField, useForm, useFormData } from '../../../shared_imports';
+import { TextField, useForm, useFormData } from '../../../shared_imports';
import { toasts } from '../../services/notification';
+import { createDocLink } from '../../services/documentation';
+
+import { UseField } from './form';
import { savePolicy } from './save_policy';
@@ -44,6 +45,7 @@ import {
PolicyJsonFlyout,
WarmPhase,
Timeline,
+ FormErrorsCallout,
} from './components';
import { createPolicyNameValidations, createSerializer, deserializer, Form, schema } from './form';
@@ -51,7 +53,6 @@ import { createPolicyNameValidations, createSerializer, deserializer, Form, sche
import { useEditPolicyContext } from './edit_policy_context';
import { FormInternal } from './types';
-import { createDocLink } from '../../services/documentation';
export interface Props {
history: RouteComponentProps['history'];
@@ -253,6 +254,8 @@ export const EditPolicy: React.FunctionComponent = ({ history }) => {
+
+
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
new file mode 100644
index 000000000000..332a8c2ba369
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/enhanced_use_field.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useRef, useMemo, useCallback } from 'react';
+
+// We wrap this component for edit policy so we do not export it from the "shared_imports" dir to avoid
+// accidentally using the non-enhanced version.
+import { UseField } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
+
+import { Phases } from '../../../../../../common/types';
+
+import { UseFieldProps, FormData } from '../../../../../shared_imports';
+
+import { useFormErrorsContext } from '../form_errors_context';
+
+const isXPhaseField = (phase: keyof Phases) => (fieldPath: string): boolean =>
+ fieldPath.startsWith(`phases.${phase}`) || fieldPath.startsWith(`_meta.${phase}`);
+
+const isHotPhaseField = isXPhaseField('hot');
+const isWarmPhaseField = isXPhaseField('warm');
+const isColdPhaseField = isXPhaseField('cold');
+const isDeletePhaseField = isXPhaseField('delete');
+
+const determineFieldPhase = (fieldPath: string): keyof Phases | 'other' => {
+ if (isHotPhaseField(fieldPath)) {
+ return 'hot';
+ }
+ if (isWarmPhaseField(fieldPath)) {
+ return 'warm';
+ }
+ if (isColdPhaseField(fieldPath)) {
+ return 'cold';
+ }
+ if (isDeletePhaseField(fieldPath)) {
+ return 'delete';
+ }
+ return 'other';
+};
+
+export const EnhancedUseField = (
+ props: UseFieldProps
+): React.ReactElement | null => {
+ const { path } = props;
+ const isMounted = useRef(false);
+ const phase = useMemo(() => determineFieldPhase(path), [path]);
+ const { addError, clearError } = useFormErrorsContext();
+
+ const onError = useCallback(
+ (errors: string[] | null) => {
+ if (!isMounted.current) {
+ return;
+ }
+ if (errors) {
+ addError(phase, path, errors);
+ } else {
+ clearError(phase, path);
+ }
+ },
+ [phase, path, addError, clearError]
+ );
+
+ useEffect(() => {
+ isMounted.current = true;
+ return () => {
+ isMounted.current = false;
+ };
+ }, []);
+
+ return ;
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx
index 2b3411e394a9..cad029478c49 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/form.tsx
@@ -9,6 +9,7 @@ import React, { FunctionComponent } from 'react';
import { Form as LibForm, FormHook } from '../../../../../shared_imports';
import { ConfigurationIssuesProvider } from '../configuration_issues_context';
+import { FormErrorsProvider } from '../form_errors_context';
interface Props {
form: FormHook;
@@ -16,6 +17,8 @@ interface Props {
export const Form: FunctionComponent = ({ form, children }) => (
- {children}
+
+ {children}
+
);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/index.ts
index 15d8d4ed272e..06cfa5daf599 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/components/index.ts
@@ -5,3 +5,5 @@
*/
export { Form } from './form';
+
+export { EnhancedUseField } from './enhanced_use_field';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/form_errors_context.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/form_errors_context.tsx
new file mode 100644
index 000000000000..e4c01e35476f
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/form_errors_context.tsx
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { createContext, useContext, FunctionComponent, useState, useCallback } from 'react';
+
+import { Phases as _Phases } from '../../../../../common/types';
+
+import { useFormContext } from '../../../../shared_imports';
+
+import { FormInternal } from '../types';
+
+type Phases = keyof _Phases;
+
+type PhasesAndOther = Phases | 'other';
+
+interface ErrorGroup {
+ [fieldPath: string]: string[];
+}
+
+interface Errors {
+ hasErrors: boolean;
+ hot: ErrorGroup;
+ warm: ErrorGroup;
+ cold: ErrorGroup;
+ delete: ErrorGroup;
+ /**
+ * Errors that are not specific to a phase should go here.
+ */
+ other: ErrorGroup;
+}
+
+interface ContextValue {
+ errors: Errors;
+ addError(phase: PhasesAndOther, fieldPath: string, errorMessages: string[]): void;
+ clearError(phase: PhasesAndOther, fieldPath: string): void;
+}
+
+const FormErrorsContext = createContext(null as any);
+
+const createEmptyErrors = (): Errors => ({
+ hasErrors: false,
+ hot: {},
+ warm: {},
+ cold: {},
+ delete: {},
+ other: {},
+});
+
+export const FormErrorsProvider: FunctionComponent = ({ children }) => {
+ const [errors, setErrors] = useState(createEmptyErrors);
+ const form = useFormContext();
+
+ const addError: ContextValue['addError'] = useCallback(
+ (phase, fieldPath, errorMessages) => {
+ setErrors((previousErrors) => ({
+ ...previousErrors,
+ hasErrors: true,
+ [phase]: {
+ ...previousErrors[phase],
+ [fieldPath]: errorMessages,
+ },
+ }));
+ },
+ [setErrors]
+ );
+
+ const clearError: ContextValue['clearError'] = useCallback(
+ (phase, fieldPath) => {
+ if (form.getErrors().length) {
+ setErrors((previousErrors) => {
+ const {
+ [phase]: { [fieldPath]: fieldErrorToOmit, ...restOfPhaseErrors },
+ ...otherPhases
+ } = previousErrors;
+
+ const hasErrors =
+ Object.keys(restOfPhaseErrors).length === 0 &&
+ Object.keys(otherPhases).some((phaseErrors) => !!Object.keys(phaseErrors).length);
+
+ return {
+ ...previousErrors,
+ hasErrors,
+ [phase]: restOfPhaseErrors,
+ };
+ });
+ } else {
+ setErrors(createEmptyErrors);
+ }
+ },
+ [form, setErrors]
+ );
+
+ return (
+
+ {children}
+
+ );
+};
+
+export const useFormErrorsContext = () => {
+ const ctx = useContext(FormErrorsContext);
+ if (!ctx) {
+ throw new Error('useFormErrorsContext can only be used inside of FormErrorsProvider');
+ }
+
+ return ctx;
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts
index 66fe498cbac8..e8a63295b4b0 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/index.ts
@@ -12,9 +12,11 @@ export { schema } from './schema';
export * from './validations';
-export { Form } from './components';
+export { Form, EnhancedUseField as UseField } from './components';
export {
ConfigurationIssuesProvider,
useConfigurationIssues,
} from './configuration_issues_context';
+
+export { FormErrorsProvider, useFormErrorsContext } from './form_errors_context';
diff --git a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
index fdb25dec6f1f..daaf1fa6ffd6 100644
--- a/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/shared_imports.ts
@@ -12,7 +12,9 @@ export {
useFormData,
Form,
FormHook,
- UseField,
+ FieldHook,
+ FormData,
+ Props as UseFieldProps,
FieldConfig,
OnFormUpdateArg,
ValidationFunc,
diff --git a/x-pack/plugins/infra/common/graphql/root/schema.gql.ts b/x-pack/plugins/infra/common/graphql/root/schema.gql.ts
deleted file mode 100644
index 1665334827e8..000000000000
--- a/x-pack/plugins/infra/common/graphql/root/schema.gql.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const rootSchema = gql`
- schema {
- query: Query
- mutation: Mutation
- }
-
- type Query
-
- type Mutation
-`;
diff --git a/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts b/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts
deleted file mode 100644
index c324813b65ef..000000000000
--- a/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const sharedFragments = {
- InfraTimeKey: gql`
- fragment InfraTimeKeyFields on InfraTimeKey {
- time
- tiebreaker
- }
- `,
- InfraSourceFields: gql`
- fragment InfraSourceFields on InfraSource {
- id
- version
- updatedAt
- origin
- }
- `,
- InfraLogEntryFields: gql`
- fragment InfraLogEntryFields on InfraLogEntry {
- gid
- key {
- time
- tiebreaker
- }
- columns {
- ... on InfraLogEntryTimestampColumn {
- columnId
- timestamp
- }
- ... on InfraLogEntryMessageColumn {
- columnId
- message {
- ... on InfraLogMessageFieldSegment {
- field
- value
- }
- ... on InfraLogMessageConstantSegment {
- constant
- }
- }
- }
- ... on InfraLogEntryFieldColumn {
- columnId
- field
- value
- }
- }
- }
- `,
- InfraLogEntryHighlightFields: gql`
- fragment InfraLogEntryHighlightFields on InfraLogEntry {
- gid
- key {
- time
- tiebreaker
- }
- columns {
- ... on InfraLogEntryMessageColumn {
- columnId
- message {
- ... on InfraLogMessageFieldSegment {
- field
- highlights
- }
- }
- }
- ... on InfraLogEntryFieldColumn {
- columnId
- field
- highlights
- }
- }
- }
- `,
-};
diff --git a/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts b/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts
deleted file mode 100644
index 071313817eff..000000000000
--- a/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const sharedSchema = gql`
- "A representation of the log entry's position in the event stream"
- type InfraTimeKey {
- "The timestamp of the event that the log entry corresponds to"
- time: Float!
- "The tiebreaker that disambiguates events with the same timestamp"
- tiebreaker: Float!
- }
-
- input InfraTimeKeyInput {
- time: Float!
- tiebreaker: Float!
- }
-
- enum InfraIndexType {
- ANY
- LOGS
- METRICS
- }
-
- enum InfraNodeType {
- pod
- container
- host
- awsEC2
- awsS3
- awsRDS
- awsSQS
- }
-`;
diff --git a/x-pack/plugins/infra/common/graphql/types.ts b/x-pack/plugins/infra/common/graphql/types.ts
deleted file mode 100644
index ee536feb1ce6..000000000000
--- a/x-pack/plugins/infra/common/graphql/types.ts
+++ /dev/null
@@ -1,780 +0,0 @@
-/* tslint:disable */
-
-// ====================================================
-// START: Typescript template
-// ====================================================
-
-// ====================================================
-// Types
-// ====================================================
-
-export interface Query {
- /** Get an infrastructure data source by id.The resolution order for the source configuration attributes is as followswith the first defined value winning:1. The attributes of the saved object with the given 'id'.2. The attributes defined in the static Kibana configuration key'xpack.infra.sources.default'.3. The hard-coded default values.As a consequence, querying a source that doesn't exist doesn't error out,but returns the configured or hardcoded defaults. */
- source: InfraSource;
- /** Get a list of all infrastructure data sources */
- allSources: InfraSource[];
-}
-/** A source of infrastructure data */
-export interface InfraSource {
- /** The id of the source */
- id: string;
- /** The version number the source configuration was last persisted with */
- version?: string | null;
- /** The timestamp the source configuration was last persisted at */
- updatedAt?: number | null;
- /** The origin of the source (one of 'fallback', 'internal', 'stored') */
- origin: string;
- /** The raw configuration of the source */
- configuration: InfraSourceConfiguration;
- /** The status of the source */
- status: InfraSourceStatus;
-
- /** A snapshot of nodes */
- snapshot?: InfraSnapshotResponse | null;
-
- metrics: InfraMetricData[];
-}
-/** A set of configuration options for an infrastructure data source */
-export interface InfraSourceConfiguration {
- /** The name of the data source */
- name: string;
- /** A description of the data source */
- description: string;
- /** The alias to read metric data from */
- metricAlias: string;
- /** The alias to read log data from */
- logAlias: string;
- /** The field mapping to use for this source */
- fields: InfraSourceFields;
- /** The columns to use for log display */
- logColumns: InfraSourceLogColumn[];
-}
-/** A mapping of semantic fields to their document counterparts */
-export interface InfraSourceFields {
- /** The field to identify a container by */
- container: string;
- /** The fields to identify a host by */
- host: string;
- /** The fields to use as the log message */
- message: string[];
- /** The field to identify a pod by */
- pod: string;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker: string;
- /** The field to use as a timestamp for metrics and logs */
- timestamp: string;
-}
-/** The built-in timestamp log column */
-export interface InfraSourceTimestampLogColumn {
- timestampColumn: InfraSourceTimestampLogColumnAttributes;
-}
-
-export interface InfraSourceTimestampLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** The built-in message log column */
-export interface InfraSourceMessageLogColumn {
- messageColumn: InfraSourceMessageLogColumnAttributes;
-}
-
-export interface InfraSourceMessageLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** A log column containing a field value */
-export interface InfraSourceFieldLogColumn {
- fieldColumn: InfraSourceFieldLogColumnAttributes;
-}
-
-export interface InfraSourceFieldLogColumnAttributes {
- /** A unique id for the column */
- id: string;
- /** The field name this column refers to */
- field: string;
-}
-/** The status of an infrastructure data source */
-export interface InfraSourceStatus {
- /** Whether the configured metric alias exists */
- metricAliasExists: boolean;
- /** Whether the configured log alias exists */
- logAliasExists: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any metric indices */
- metricIndicesExist: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any log indices */
- logIndicesExist: boolean;
- /** The list of indices in the metric alias */
- metricIndices: string[];
- /** The list of indices in the log alias */
- logIndices: string[];
- /** The list of fields defined in the index mappings */
- indexFields: InfraIndexField[];
-}
-/** A descriptor of a field in an index */
-export interface InfraIndexField {
- /** The name of the field */
- name: string;
- /** The type of the field's values as recognized by Kibana */
- type: string;
- /** Whether the field's values can be efficiently searched for */
- searchable: boolean;
- /** Whether the field's values can be aggregated */
- aggregatable: boolean;
- /** Whether the field should be displayed based on event.module and a ECS allowed list */
- displayable: boolean;
-}
-
-export interface InfraSnapshotResponse {
- /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
- nodes: InfraSnapshotNode[];
-}
-
-export interface InfraSnapshotNode {
- path: InfraSnapshotNodePath[];
-
- metric: InfraSnapshotNodeMetric;
-}
-
-export interface InfraSnapshotNodePath {
- value: string;
-
- label: string;
-
- ip?: string | null;
-}
-
-export interface InfraSnapshotNodeMetric {
- name: InfraSnapshotMetricType;
-
- value?: number | null;
-
- avg?: number | null;
-
- max?: number | null;
-}
-
-export interface InfraMetricData {
- id?: InfraMetric | null;
-
- series: InfraDataSeries[];
-}
-
-export interface InfraDataSeries {
- id: string;
-
- label: string;
-
- data: InfraDataPoint[];
-}
-
-export interface InfraDataPoint {
- timestamp: number;
-
- value?: number | null;
-}
-
-export interface Mutation {
- /** Create a new source of infrastructure data */
- createSource: UpdateSourceResult;
- /** Modify an existing source */
- updateSource: UpdateSourceResult;
- /** Delete a source of infrastructure data */
- deleteSource: DeleteSourceResult;
-}
-/** The result of a successful source update */
-export interface UpdateSourceResult {
- /** The source that was updated */
- source: InfraSource;
-}
-/** The result of a source deletion operations */
-export interface DeleteSourceResult {
- /** The id of the source that was deleted */
- id: string;
-}
-
-// ====================================================
-// InputTypes
-// ====================================================
-
-export interface InfraTimerangeInput {
- /** The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan. */
- interval: string;
- /** The end of the timerange */
- to: number;
- /** The beginning of the timerange */
- from: number;
-}
-
-export interface InfraSnapshotGroupbyInput {
- /** The label to use in the results for the group by for the terms group by */
- label?: string | null;
- /** The field to group by from a terms aggregation, this is ignored by the filter type */
- field?: string | null;
-}
-
-export interface InfraSnapshotMetricInput {
- /** The type of metric */
- type: InfraSnapshotMetricType;
-}
-
-export interface InfraNodeIdsInput {
- nodeId: string;
-
- cloudId?: string | null;
-}
-/** The properties to update the source with */
-export interface UpdateSourceInput {
- /** The name of the data source */
- name?: string | null;
- /** A description of the data source */
- description?: string | null;
- /** The alias to read metric data from */
- metricAlias?: string | null;
- /** The alias to read log data from */
- logAlias?: string | null;
- /** The field mapping to use for this source */
- fields?: UpdateSourceFieldsInput | null;
- /** Default view for inventory */
- inventoryDefaultView?: string | null;
- /** Default view for Metrics Explorer */
- metricsExplorerDefaultView?: string | null;
- /** The log columns to display for this source */
- logColumns?: UpdateSourceLogColumnInput[] | null;
-}
-/** The mapping of semantic fields of the source to be created */
-export interface UpdateSourceFieldsInput {
- /** The field to identify a container by */
- container?: string | null;
- /** The fields to identify a host by */
- host?: string | null;
- /** The field to identify a pod by */
- pod?: string | null;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker?: string | null;
- /** The field to use as a timestamp for metrics and logs */
- timestamp?: string | null;
-}
-/** One of the log column types to display for this source */
-export interface UpdateSourceLogColumnInput {
- /** A custom field log column */
- fieldColumn?: UpdateSourceFieldLogColumnInput | null;
- /** A built-in message log column */
- messageColumn?: UpdateSourceMessageLogColumnInput | null;
- /** A built-in timestamp log column */
- timestampColumn?: UpdateSourceTimestampLogColumnInput | null;
-}
-
-export interface UpdateSourceFieldLogColumnInput {
- id: string;
-
- field: string;
-}
-
-export interface UpdateSourceMessageLogColumnInput {
- id: string;
-}
-
-export interface UpdateSourceTimestampLogColumnInput {
- id: string;
-}
-
-// ====================================================
-// Arguments
-// ====================================================
-
-export interface SourceQueryArgs {
- /** The id of the source */
- id: string;
-}
-export interface SnapshotInfraSourceArgs {
- timerange: InfraTimerangeInput;
-
- filterQuery?: string | null;
-}
-export interface MetricsInfraSourceArgs {
- nodeIds: InfraNodeIdsInput;
-
- nodeType: InfraNodeType;
-
- timerange: InfraTimerangeInput;
-
- metrics: InfraMetric[];
-}
-export interface IndexFieldsInfraSourceStatusArgs {
- indexType?: InfraIndexType | null;
-}
-export interface NodesInfraSnapshotResponseArgs {
- type: InfraNodeType;
-
- groupBy: InfraSnapshotGroupbyInput[];
-
- metric: InfraSnapshotMetricInput;
-}
-export interface CreateSourceMutationArgs {
- /** The id of the source */
- id: string;
-
- sourceProperties: UpdateSourceInput;
-}
-export interface UpdateSourceMutationArgs {
- /** The id of the source */
- id: string;
- /** The properties to update the source with */
- sourceProperties: UpdateSourceInput;
-}
-export interface DeleteSourceMutationArgs {
- /** The id of the source */
- id: string;
-}
-
-// ====================================================
-// Enums
-// ====================================================
-
-export enum InfraIndexType {
- ANY = 'ANY',
- LOGS = 'LOGS',
- METRICS = 'METRICS',
-}
-
-export enum InfraNodeType {
- pod = 'pod',
- container = 'container',
- host = 'host',
- awsEC2 = 'awsEC2',
- awsS3 = 'awsS3',
- awsRDS = 'awsRDS',
- awsSQS = 'awsSQS',
-}
-
-export enum InfraSnapshotMetricType {
- count = 'count',
- cpu = 'cpu',
- load = 'load',
- memory = 'memory',
- tx = 'tx',
- rx = 'rx',
- logRate = 'logRate',
- diskIOReadBytes = 'diskIOReadBytes',
- diskIOWriteBytes = 'diskIOWriteBytes',
- s3TotalRequests = 's3TotalRequests',
- s3NumberOfObjects = 's3NumberOfObjects',
- s3BucketSize = 's3BucketSize',
- s3DownloadBytes = 's3DownloadBytes',
- s3UploadBytes = 's3UploadBytes',
- rdsConnections = 'rdsConnections',
- rdsQueriesExecuted = 'rdsQueriesExecuted',
- rdsActiveTransactions = 'rdsActiveTransactions',
- rdsLatency = 'rdsLatency',
- sqsMessagesVisible = 'sqsMessagesVisible',
- sqsMessagesDelayed = 'sqsMessagesDelayed',
- sqsMessagesSent = 'sqsMessagesSent',
- sqsMessagesEmpty = 'sqsMessagesEmpty',
- sqsOldestMessage = 'sqsOldestMessage',
-}
-
-export enum InfraMetric {
- hostSystemOverview = 'hostSystemOverview',
- hostCpuUsage = 'hostCpuUsage',
- hostFilesystem = 'hostFilesystem',
- hostK8sOverview = 'hostK8sOverview',
- hostK8sCpuCap = 'hostK8sCpuCap',
- hostK8sDiskCap = 'hostK8sDiskCap',
- hostK8sMemoryCap = 'hostK8sMemoryCap',
- hostK8sPodCap = 'hostK8sPodCap',
- hostLoad = 'hostLoad',
- hostMemoryUsage = 'hostMemoryUsage',
- hostNetworkTraffic = 'hostNetworkTraffic',
- hostDockerOverview = 'hostDockerOverview',
- hostDockerInfo = 'hostDockerInfo',
- hostDockerTop5ByCpu = 'hostDockerTop5ByCpu',
- hostDockerTop5ByMemory = 'hostDockerTop5ByMemory',
- podOverview = 'podOverview',
- podCpuUsage = 'podCpuUsage',
- podMemoryUsage = 'podMemoryUsage',
- podLogUsage = 'podLogUsage',
- podNetworkTraffic = 'podNetworkTraffic',
- containerOverview = 'containerOverview',
- containerCpuKernel = 'containerCpuKernel',
- containerCpuUsage = 'containerCpuUsage',
- containerDiskIOOps = 'containerDiskIOOps',
- containerDiskIOBytes = 'containerDiskIOBytes',
- containerMemory = 'containerMemory',
- containerNetworkTraffic = 'containerNetworkTraffic',
- nginxHits = 'nginxHits',
- nginxRequestRate = 'nginxRequestRate',
- nginxActiveConnections = 'nginxActiveConnections',
- nginxRequestsPerConnection = 'nginxRequestsPerConnection',
- awsOverview = 'awsOverview',
- awsCpuUtilization = 'awsCpuUtilization',
- awsNetworkBytes = 'awsNetworkBytes',
- awsNetworkPackets = 'awsNetworkPackets',
- awsDiskioBytes = 'awsDiskioBytes',
- awsDiskioOps = 'awsDiskioOps',
- awsEC2CpuUtilization = 'awsEC2CpuUtilization',
- awsEC2DiskIOBytes = 'awsEC2DiskIOBytes',
- awsEC2NetworkTraffic = 'awsEC2NetworkTraffic',
- awsS3TotalRequests = 'awsS3TotalRequests',
- awsS3NumberOfObjects = 'awsS3NumberOfObjects',
- awsS3BucketSize = 'awsS3BucketSize',
- awsS3DownloadBytes = 'awsS3DownloadBytes',
- awsS3UploadBytes = 'awsS3UploadBytes',
- awsRDSCpuTotal = 'awsRDSCpuTotal',
- awsRDSConnections = 'awsRDSConnections',
- awsRDSQueriesExecuted = 'awsRDSQueriesExecuted',
- awsRDSActiveTransactions = 'awsRDSActiveTransactions',
- awsRDSLatency = 'awsRDSLatency',
- awsSQSMessagesVisible = 'awsSQSMessagesVisible',
- awsSQSMessagesDelayed = 'awsSQSMessagesDelayed',
- awsSQSMessagesSent = 'awsSQSMessagesSent',
- awsSQSMessagesEmpty = 'awsSQSMessagesEmpty',
- awsSQSOldestMessage = 'awsSQSOldestMessage',
- custom = 'custom',
-}
-
-// ====================================================
-// Unions
-// ====================================================
-
-/** All known log column types */
-export type InfraSourceLogColumn =
- | InfraSourceTimestampLogColumn
- | InfraSourceMessageLogColumn
- | InfraSourceFieldLogColumn;
-
-// ====================================================
-// END: Typescript template
-// ====================================================
-
-// ====================================================
-// Documents
-// ====================================================
-
-export namespace MetricsQuery {
- export type Variables = {
- sourceId: string;
- timerange: InfraTimerangeInput;
- metrics: InfraMetric[];
- nodeId: string;
- cloudId?: string | null;
- nodeType: InfraNodeType;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- id: string;
-
- metrics: Metrics[];
- };
-
- export type Metrics = {
- __typename?: 'InfraMetricData';
-
- id?: InfraMetric | null;
-
- series: Series[];
- };
-
- export type Series = {
- __typename?: 'InfraDataSeries';
-
- id: string;
-
- label: string;
-
- data: Data[];
- };
-
- export type Data = {
- __typename?: 'InfraDataPoint';
-
- timestamp: number;
-
- value?: number | null;
- };
-}
-
-export namespace CreateSourceConfigurationMutation {
- export type Variables = {
- sourceId: string;
- sourceProperties: UpdateSourceInput;
- };
-
- export type Mutation = {
- __typename?: 'Mutation';
-
- createSource: CreateSource;
- };
-
- export type CreateSource = {
- __typename?: 'UpdateSourceResult';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace SourceQuery {
- export type Variables = {
- sourceId?: string | null;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace UpdateSourceMutation {
- export type Variables = {
- sourceId?: string | null;
- sourceProperties: UpdateSourceInput;
- };
-
- export type Mutation = {
- __typename?: 'Mutation';
-
- updateSource: UpdateSource;
- };
-
- export type UpdateSource = {
- __typename?: 'UpdateSourceResult';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace WaffleNodesQuery {
- export type Variables = {
- sourceId: string;
- timerange: InfraTimerangeInput;
- filterQuery?: string | null;
- metric: InfraSnapshotMetricInput;
- groupBy: InfraSnapshotGroupbyInput[];
- type: InfraNodeType;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- id: string;
-
- snapshot?: Snapshot | null;
- };
-
- export type Snapshot = {
- __typename?: 'InfraSnapshotResponse';
-
- nodes: Nodes[];
- };
-
- export type Nodes = {
- __typename?: 'InfraSnapshotNode';
-
- path: Path[];
-
- metric: Metric;
- };
-
- export type Path = {
- __typename?: 'InfraSnapshotNodePath';
-
- value: string;
-
- label: string;
-
- ip?: string | null;
- };
-
- export type Metric = {
- __typename?: 'InfraSnapshotNodeMetric';
-
- name: InfraSnapshotMetricType;
-
- value?: number | null;
-
- avg?: number | null;
-
- max?: number | null;
- };
-}
-
-export namespace SourceConfigurationFields {
- export type Fragment = {
- __typename?: 'InfraSourceConfiguration';
-
- name: string;
-
- description: string;
-
- logAlias: string;
-
- metricAlias: string;
-
- fields: Fields;
-
- logColumns: LogColumns[];
-
- inventoryDefaultView: string;
-
- metricsExplorerDefaultView: string;
- };
-
- export type Fields = {
- __typename?: 'InfraSourceFields';
-
- container: string;
-
- host: string;
-
- message: string[];
-
- pod: string;
-
- tiebreaker: string;
-
- timestamp: string;
- };
-
- export type LogColumns =
- | InfraSourceTimestampLogColumnInlineFragment
- | InfraSourceMessageLogColumnInlineFragment
- | InfraSourceFieldLogColumnInlineFragment;
-
- export type InfraSourceTimestampLogColumnInlineFragment = {
- __typename?: 'InfraSourceTimestampLogColumn';
-
- timestampColumn: TimestampColumn;
- };
-
- export type TimestampColumn = {
- __typename?: 'InfraSourceTimestampLogColumnAttributes';
-
- id: string;
- };
-
- export type InfraSourceMessageLogColumnInlineFragment = {
- __typename?: 'InfraSourceMessageLogColumn';
-
- messageColumn: MessageColumn;
- };
-
- export type MessageColumn = {
- __typename?: 'InfraSourceMessageLogColumnAttributes';
-
- id: string;
- };
-
- export type InfraSourceFieldLogColumnInlineFragment = {
- __typename?: 'InfraSourceFieldLogColumn';
-
- fieldColumn: FieldColumn;
- };
-
- export type FieldColumn = {
- __typename?: 'InfraSourceFieldLogColumnAttributes';
-
- id: string;
-
- field: string;
- };
-}
-
-export namespace SourceStatusFields {
- export type Fragment = {
- __typename?: 'InfraSourceStatus';
-
- indexFields: IndexFields[];
-
- logIndicesExist: boolean;
-
- metricIndicesExist: boolean;
- };
-
- export type IndexFields = {
- __typename?: 'InfraIndexField';
-
- name: string;
-
- type: string;
-
- searchable: boolean;
-
- aggregatable: boolean;
-
- displayable: boolean;
- };
-}
-
-export namespace InfraTimeKeyFields {
- export type Fragment = {
- __typename?: 'InfraTimeKey';
-
- time: number;
-
- tiebreaker: number;
- };
-}
-
-export namespace InfraSourceFields {
- export type Fragment = {
- __typename?: 'InfraSource';
-
- id: string;
-
- version?: string | null;
-
- updatedAt?: number | null;
-
- origin: string;
- };
-}
diff --git a/x-pack/plugins/infra/common/http_api/node_details_api.ts b/x-pack/plugins/infra/common/http_api/node_details_api.ts
index 0ef5ae82baeb..6de21da53c36 100644
--- a/x-pack/plugins/infra/common/http_api/node_details_api.ts
+++ b/x-pack/plugins/infra/common/http_api/node_details_api.ts
@@ -17,18 +17,20 @@ const NodeDetailsDataPointRT = rt.intersection([
}),
]);
-const NodeDetailsDataSeries = rt.type({
+const NodeDetailsDataSeriesRT = rt.type({
id: rt.string,
label: rt.string,
data: rt.array(NodeDetailsDataPointRT),
});
+export type NodeDetailsDataSeries = rt.TypeOf;
+
export const NodeDetailsMetricDataRT = rt.intersection([
rt.partial({
id: rt.union([InventoryMetricRT, rt.null]),
}),
rt.type({
- series: rt.array(NodeDetailsDataSeries),
+ series: rt.array(NodeDetailsDataSeriesRT),
}),
]);
diff --git a/x-pack/plugins/infra/common/http_api/source_api.ts b/x-pack/plugins/infra/common/http_api/source_api.ts
index be50989358c7..52a8d43da53b 100644
--- a/x-pack/plugins/infra/common/http_api/source_api.ts
+++ b/x-pack/plugins/infra/common/http_api/source_api.ts
@@ -39,18 +39,30 @@ const SavedSourceConfigurationFieldsRuntimeType = rt.partial({
timestamp: rt.string,
});
+export type InfraSavedSourceConfigurationFields = rt.TypeOf<
+ typeof SavedSourceConfigurationFieldColumnRuntimeType
+>;
+
export const SavedSourceConfigurationTimestampColumnRuntimeType = rt.type({
timestampColumn: rt.type({
id: rt.string,
}),
});
+export type InfraSourceConfigurationTimestampColumn = rt.TypeOf<
+ typeof SavedSourceConfigurationTimestampColumnRuntimeType
+>;
+
export const SavedSourceConfigurationMessageColumnRuntimeType = rt.type({
messageColumn: rt.type({
id: rt.string,
}),
});
+export type InfraSourceConfigurationMessageColumn = rt.TypeOf<
+ typeof SavedSourceConfigurationMessageColumnRuntimeType
+>;
+
export const SavedSourceConfigurationFieldColumnRuntimeType = rt.type({
fieldColumn: rt.type({
id: rt.string,
@@ -64,6 +76,10 @@ export const SavedSourceConfigurationColumnRuntimeType = rt.union([
SavedSourceConfigurationFieldColumnRuntimeType,
]);
+export type InfraSavedSourceConfigurationColumn = rt.TypeOf<
+ typeof SavedSourceConfigurationColumnRuntimeType
+>;
+
export const SavedSourceConfigurationRuntimeType = rt.partial({
name: rt.string,
description: rt.string,
@@ -136,12 +152,30 @@ const SourceConfigurationFieldsRuntimeType = rt.type({
...StaticSourceConfigurationFieldsRuntimeType.props,
});
+export type InfraSourceConfigurationFields = rt.TypeOf;
+
export const SourceConfigurationRuntimeType = rt.type({
...SavedSourceConfigurationRuntimeType.props,
fields: SourceConfigurationFieldsRuntimeType,
logColumns: rt.array(SavedSourceConfigurationColumnRuntimeType),
});
+const SourceStatusFieldRuntimeType = rt.type({
+ name: rt.string,
+ type: rt.string,
+ searchable: rt.boolean,
+ aggregatable: rt.boolean,
+ displayable: rt.boolean,
+});
+
+export type InfraSourceIndexField = rt.TypeOf;
+
+const SourceStatusRuntimeType = rt.type({
+ logIndicesExist: rt.boolean,
+ metricIndicesExist: rt.boolean,
+ indexFields: rt.array(SourceStatusFieldRuntimeType),
+});
+
export const SourceRuntimeType = rt.intersection([
rt.type({
id: rt.string,
@@ -155,31 +189,19 @@ export const SourceRuntimeType = rt.intersection([
rt.partial({
version: rt.string,
updatedAt: rt.number,
+ status: SourceStatusRuntimeType,
}),
]);
+export interface InfraSourceStatus extends rt.TypeOf {}
+
export interface InfraSourceConfiguration
extends rt.TypeOf {}
export interface InfraSource extends rt.TypeOf {}
-const SourceStatusFieldRuntimeType = rt.type({
- name: rt.string,
- type: rt.string,
- searchable: rt.boolean,
- aggregatable: rt.boolean,
- displayable: rt.boolean,
-});
-
-const SourceStatusRuntimeType = rt.type({
- logIndicesExist: rt.boolean,
- metricIndicesExist: rt.boolean,
- indexFields: rt.array(SourceStatusFieldRuntimeType),
-});
-
export const SourceResponseRuntimeType = rt.type({
source: SourceRuntimeType,
- status: SourceStatusRuntimeType,
});
export type SourceResponse = rt.TypeOf;
diff --git a/x-pack/plugins/infra/common/log_entry/log_entry.ts b/x-pack/plugins/infra/common/log_entry/log_entry.ts
index bf3f9ceb0b08..837249b65b2e 100644
--- a/x-pack/plugins/infra/common/log_entry/log_entry.ts
+++ b/x-pack/plugins/infra/common/log_entry/log_entry.ts
@@ -14,7 +14,6 @@ export type LogEntryTime = TimeKey;
/**
* message parts
*/
-
export const logMessageConstantPartRT = rt.type({
constant: rt.string,
});
diff --git a/x-pack/plugins/infra/docs/arch.md b/x-pack/plugins/infra/docs/arch.md
index f3d7312a3491..89b00cd19d1d 100644
--- a/x-pack/plugins/infra/docs/arch.md
+++ b/x-pack/plugins/infra/docs/arch.md
@@ -7,7 +7,7 @@ In this arch, we use 3 main terms to describe the code:
- **Libs / Domain Libs** - Business logic & data formatting (though complex formatting might call utils)
- **Adapters** - code that directly calls 3rd party APIs and data sources, exposing clean easy to stub APIs
- **Composition Files** - composes adapters into libs based on where the code is running
-- **Implementation layer** - The API such as rest endpoints or graphql schema on the server, and the state management / UI on the client
+- **Implementation layer** - The API such as rest endpoints on the server, and the state management / UI on the client
## Arch Visual Example
@@ -85,7 +85,7 @@ An example structure might be...
| | | | |-- kibana_angular // if an adapter has more than one file...
| | | | | |-- index.html
| | | | | |-- index.ts
- | | | | |
+ | | | | |
| | | | |-- ui_harness.ts
| | | |
| | |-- domains
diff --git a/x-pack/plugins/infra/docs/arch_client.md b/x-pack/plugins/infra/docs/arch_client.md
index cdc474635721..b40c9aaf1ff5 100644
--- a/x-pack/plugins/infra/docs/arch_client.md
+++ b/x-pack/plugins/infra/docs/arch_client.md
@@ -26,7 +26,7 @@ However, components that tweak EUI should go into `/public/components/eui/${comp
If using an EUI component that has not yet been typed, types should be placed into `/types/eui.d.ts`
-## Containers (Also: [see GraphQL docs](docs/graphql.md))
+## Containers
- HOC's based on Apollo.
- One folder per data type e.g. `host`. Folder name should be singular.
diff --git a/x-pack/plugins/infra/docs/graphql.md b/x-pack/plugins/infra/docs/graphql.md
deleted file mode 100644
index 5584a5ce7c0d..000000000000
--- a/x-pack/plugins/infra/docs/graphql.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# GraphQL In Infra UI
-
-- The combined graphql schema collected from both the `public` and `server` directories is exported to `common/all.gql_schema.ts` for the purpose of automatic type generation only.
-
-## Server
-
-- Under `/server/graphql` there are files for each domain of data's graph schema and resolvers.
- - Each file has 2 exports `${domain}Schema` e.g. `fieldsSchema`, and `create${domain}Resolvers` e.g. `createFieldResolvers`
-- `/server/infra_server.ts` imports all schema and resolvers and passing the full schema to the server
-- Resolvers should be used to call composed libs, rather than directly performing any meaningful amount of data processing.
-- Resolvers should, however, only pass the required data into libs; that is to say all args for example would not be passed into a lib unless all were needed.
-
-## Client
-
-- Under `/public/containers/${domain}/` there is a file for each container. Each file has two exports, the query name e.g. `AllHosts` and the apollo HOC in the pattern of `with${queryName}` e.g. `withAllHosts`. This is done for two reasons:
-
- 1. It makes the code uniform, thus easier to reason about later.
- 2. If reformatting the data using a transform, it lets us re-type the data clearly.
-
-- Containers should use the apollo props callback to pass ONLY the props and data needed to children. e.g.
-
- ```ts
- import { Hosts, Pods, HostsAndPods } from '../../common/types';
-
- // used to generate the `HostsAndPods` type imported above
- export const hostsAndPods = gql`
- # ...
- `;
-
- type HostsAndPodsProps = {
- hosts: Hosts;
- pods: Pods;
- }
-
- export const withHostsAndPods = graphql<
- {},
- HostsAndPods.Query,
- HostsAndPods.Variables,
- HostsAndPodsProps
- >(hostsAndPods, {
- props: ({ data, ownProps }) => ({
- hosts: hostForMap(data && data.hosts ? data.hosts : []),
-  pods: podsFromHosts(data && data.hosts ? data.hosts : [])
- ...ownProps,
- }),
- });
- ```
-
- as `ownProps` are the props passed to the wrapped component, they should just be forwarded.
-
-## Types
-
-- The command `yarn build-graphql-types` derives the schema, query and mutation types and stores them in `common/types.ts` for use on both the client and server.
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/__snapshots__/expression_row.test.tsx.snap b/x-pack/plugins/infra/public/alerting/metric_threshold/components/__snapshots__/expression_row.test.tsx.snap
new file mode 100644
index 000000000000..1571b981632d
--- /dev/null
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/__snapshots__/expression_row.test.tsx.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ExpressionRow should render a helpText for the of expression 1`] = `
+
+
+ ,
+ }
+ }
+/>
+`;
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx
index 8fae6c6a5134..ea0c5a6e54b5 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.test.tsx
@@ -81,4 +81,21 @@ describe('ExpressionRow', () => {
wrapper.html().match('0.5') ?? [];
expect(valueMatch).toBeTruthy();
});
+
+ it('should render a helpText for the of expression', async () => {
+ const expression = {
+ metric: 'system.load.1',
+ comparator: Comparator.GT,
+ threshold: [0.5],
+ timeSize: 1,
+ timeUnit: 'm',
+ aggType: 'avg',
+ } as MetricExpression;
+
+ const { wrapper } = await setup(expression as MetricExpression);
+
+ const helpText = wrapper.find('[data-test-subj="ofExpression"]').prop('helpText');
+
+ expect(helpText).toMatchSnapshot();
+ });
});
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
index cdab53c92d32..62c373a7a341 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx
@@ -5,7 +5,15 @@
*/
import React, { useCallback, useState, useMemo } from 'react';
import { i18n } from '@kbn/i18n';
-import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon, EuiSpacer, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiButtonIcon,
+ EuiSpacer,
+ EuiText,
+ EuiLink,
+} from '@elastic/eui';
import { IFieldType } from 'src/plugins/data/public';
import { pctToDecimal, decimalToPct } from '../../../../common/utils/corrected_percent_convert';
import {
@@ -154,6 +162,26 @@ export const ExpressionRow: React.FC = (props) => {
aggType={aggType}
errors={errors}
onChangeSelectedAggField={updateMetric}
+ helpText={
+
+
+
+ ),
+ }}
+ />
+ }
+ data-test-subj="ofExpression"
/>
)}
diff --git a/x-pack/plugins/infra/public/apps/common_providers.tsx b/x-pack/plugins/infra/public/apps/common_providers.tsx
index ebfa412410dd..ad1c1e1129de 100644
--- a/x-pack/plugins/infra/public/apps/common_providers.tsx
+++ b/x-pack/plugins/infra/public/apps/common_providers.tsx
@@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ApolloClient } from 'apollo-client';
import { AppMountParameters, CoreStart } from 'kibana/public';
import React, { useMemo } from 'react';
import {
@@ -15,32 +14,28 @@ import { EuiThemeProvider } from '../../../../../src/plugins/kibana_react/common
import { TriggersAndActionsUIPublicPluginStart } from '../../../triggers_actions_ui/public';
import { createKibanaContextForPlugin } from '../hooks/use_kibana';
import { InfraClientStartDeps } from '../types';
-import { ApolloClientContext } from '../utils/apollo_context';
import { HeaderActionMenuProvider } from '../utils/header_action_menu_provider';
import { NavigationWarningPromptProvider } from '../utils/navigation_warning_prompt';
import { TriggersActionsProvider } from '../utils/triggers_actions_context';
import { Storage } from '../../../../../src/plugins/kibana_utils/public';
export const CommonInfraProviders: React.FC<{
- apolloClient: ApolloClient<{}>;
appName: string;
storage: Storage;
triggersActionsUI: TriggersAndActionsUIPublicPluginStart;
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
-}> = ({ apolloClient, children, triggersActionsUI, setHeaderActionMenu, appName, storage }) => {
+}> = ({ children, triggersActionsUI, setHeaderActionMenu, appName, storage }) => {
const [darkMode] = useUiSetting$('theme:darkMode');
return (
-
-
-
-
- {children}
-
-
-
-
+
+
+
+ {children}
+
+
+
);
};
diff --git a/x-pack/plugins/infra/public/apps/logs_app.tsx b/x-pack/plugins/infra/public/apps/logs_app.tsx
index 381c75c4b9a2..8a6a2e273f2c 100644
--- a/x-pack/plugins/infra/public/apps/logs_app.tsx
+++ b/x-pack/plugins/infra/public/apps/logs_app.tsx
@@ -4,7 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { ApolloClient } from 'apollo-client';
import { History } from 'history';
import { CoreStart } from 'kibana/public';
import React from 'react';
@@ -17,7 +16,6 @@ import { NotFoundPage } from '../pages/404';
import { LinkToLogsPage } from '../pages/link_to/link_to_logs';
import { LogsPage } from '../pages/logs';
import { InfraClientStartDeps } from '../types';
-import { createApolloClient } from '../utils/apollo_client';
import { CommonInfraProviders, CoreProviders } from './common_providers';
import { prepareMountElement } from './common_styles';
@@ -26,14 +24,12 @@ export const renderApp = (
plugins: InfraClientStartDeps,
{ element, history, setHeaderActionMenu }: AppMountParameters
) => {
- const apolloClient = createApolloClient(core.http.fetch);
const storage = new Storage(window.localStorage);
prepareMountElement(element);
ReactDOM.render(
;
core: CoreStart;
history: History;
plugins: InfraClientStartDeps;
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
storage: Storage;
-}> = ({ apolloClient, core, history, plugins, setHeaderActionMenu, storage }) => {
+}> = ({ core, history, plugins, setHeaderActionMenu, storage }) => {
const uiCapabilities = core.application.capabilities;
return (
{
- const apolloClient = createApolloClient(core.http.fetch);
const storage = new Storage(window.localStorage);
prepareMountElement(element);
ReactDOM.render(
;
core: CoreStart;
history: History;
plugins: InfraClientStartDeps;
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
storage: Storage;
-}> = ({ apolloClient, core, history, plugins, setHeaderActionMenu, storage }) => {
+}> = ({ core, history, plugins, setHeaderActionMenu, storage }) => {
const uiCapabilities = core.application.capabilities;
return (
{
+export const useSourceConfigurationFormState = (configuration?: InfraSourceConfiguration) => {
const indicesConfigurationFormState = useIndicesConfigurationFormState({
initialFormState: useMemo(
() =>
diff --git a/x-pack/plugins/infra/public/containers/source/create_source.gql_query.ts b/x-pack/plugins/infra/public/containers/source/create_source.gql_query.ts
deleted file mode 100644
index 6727dea712f3..000000000000
--- a/x-pack/plugins/infra/public/containers/source/create_source.gql_query.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-import { sharedFragments } from '../../../common/graphql/shared';
-import {
- sourceConfigurationFieldsFragment,
- sourceStatusFieldsFragment,
-} from './source_fields_fragment.gql_query';
-
-export const createSourceMutation = gql`
- mutation CreateSourceConfigurationMutation(
- $sourceId: ID!
- $sourceProperties: UpdateSourceInput!
- ) {
- createSource(id: $sourceId, sourceProperties: $sourceProperties) {
- source {
- ...InfraSourceFields
- configuration {
- ...SourceConfigurationFields
- }
- status {
- ...SourceStatusFields
- }
- }
- }
- }
-
- ${sharedFragments.InfraSourceFields}
- ${sourceConfigurationFieldsFragment}
- ${sourceStatusFieldsFragment}
-`;
diff --git a/x-pack/plugins/infra/public/containers/source/query_source.gql_query.ts b/x-pack/plugins/infra/public/containers/source/query_source.gql_query.ts
deleted file mode 100644
index 21b5192e5725..000000000000
--- a/x-pack/plugins/infra/public/containers/source/query_source.gql_query.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-import { sharedFragments } from '../../../common/graphql/shared';
-import {
- sourceConfigurationFieldsFragment,
- sourceStatusFieldsFragment,
-} from './source_fields_fragment.gql_query';
-
-export const sourceQuery = gql`
- query SourceQuery($sourceId: ID = "default") {
- source(id: $sourceId) {
- ...InfraSourceFields
- configuration {
- ...SourceConfigurationFields
- }
- status {
- ...SourceStatusFields
- }
- }
- }
-
- ${sharedFragments.InfraSourceFields}
- ${sourceConfigurationFieldsFragment}
- ${sourceStatusFieldsFragment}
-`;
diff --git a/x-pack/plugins/infra/public/containers/source/source.tsx b/x-pack/plugins/infra/public/containers/source/source.tsx
index 96bbd858c3a4..c84269d6b498 100644
--- a/x-pack/plugins/infra/public/containers/source/source.tsx
+++ b/x-pack/plugins/infra/public/containers/source/source.tsx
@@ -8,20 +8,17 @@ import createContainer from 'constate';
import { useEffect, useMemo, useState } from 'react';
import {
- CreateSourceConfigurationMutation,
- SourceQuery,
- UpdateSourceInput,
- UpdateSourceMutation,
-} from '../../graphql/types';
-import { DependencyError, useApolloClient } from '../../utils/apollo_context';
+ InfraSavedSourceConfiguration,
+ InfraSource,
+ SourceResponse,
+} from '../../../common/http_api/source_api';
import { useTrackedPromise } from '../../utils/use_tracked_promise';
-import { createSourceMutation } from './create_source.gql_query';
-import { sourceQuery } from './query_source.gql_query';
-import { updateSourceMutation } from './update_source.gql_query';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-type Source = SourceQuery.Query['source'];
-
-export const pickIndexPattern = (source: Source | undefined, type: 'logs' | 'metrics' | 'both') => {
+export const pickIndexPattern = (
+ source: InfraSource | undefined,
+ type: 'logs' | 'metrics' | 'both'
+) => {
if (!source) {
return 'unknown-index';
}
@@ -34,96 +31,79 @@ export const pickIndexPattern = (source: Source | undefined, type: 'logs' | 'met
return `${source.configuration.logAlias},${source.configuration.metricAlias}`;
};
+const DEPENDENCY_ERROR_MESSAGE = 'Failed to load source: No fetch client available.';
+
export const useSource = ({ sourceId }: { sourceId: string }) => {
- const apolloClient = useApolloClient();
- const [source, setSource] = useState(undefined);
+ const kibana = useKibana();
+ const fetchService = kibana.services.http?.fetch;
+ const API_URL = `/api/metrics/source/${sourceId}`;
+
+ const [source, setSource] = useState(undefined);
const [loadSourceRequest, loadSource] = useTrackedPromise(
{
cancelPreviousOn: 'resolution',
createPromise: async () => {
- if (!apolloClient) {
- throw new DependencyError('Failed to load source: No apollo client available.');
+ if (!fetchService) {
+ throw new Error(DEPENDENCY_ERROR_MESSAGE);
}
- return await apolloClient.query({
- fetchPolicy: 'no-cache',
- query: sourceQuery,
- variables: {
- sourceId,
- },
+ return await fetchService(`${API_URL}/metrics`, {
+ method: 'GET',
});
},
onResolve: (response) => {
- setSource(response.data.source);
+ setSource(response.source);
},
},
- [apolloClient, sourceId]
+ [fetchService, sourceId]
);
const [createSourceConfigurationRequest, createSourceConfiguration] = useTrackedPromise(
{
- createPromise: async (sourceProperties: UpdateSourceInput) => {
- if (!apolloClient) {
- throw new DependencyError(
- 'Failed to create source configuration: No apollo client available.'
- );
+ createPromise: async (sourceProperties: InfraSavedSourceConfiguration) => {
+ if (!fetchService) {
+ throw new Error(DEPENDENCY_ERROR_MESSAGE);
}
- return await apolloClient.mutate<
- CreateSourceConfigurationMutation.Mutation,
- CreateSourceConfigurationMutation.Variables
- >({
- mutation: createSourceMutation,
- fetchPolicy: 'no-cache',
- variables: {
- sourceId,
- sourceProperties,
- },
+ return await fetchService(API_URL, {
+ method: 'PATCH',
+ body: JSON.stringify(sourceProperties),
});
},
onResolve: (response) => {
- if (response.data) {
- setSource(response.data.createSource.source);
+ if (response) {
+ setSource(response.source);
}
},
},
- [apolloClient, sourceId]
+ [fetchService, sourceId]
);
const [updateSourceConfigurationRequest, updateSourceConfiguration] = useTrackedPromise(
{
- createPromise: async (sourceProperties: UpdateSourceInput) => {
- if (!apolloClient) {
- throw new DependencyError(
- 'Failed to update source configuration: No apollo client available.'
- );
+ createPromise: async (sourceProperties: InfraSavedSourceConfiguration) => {
+ if (!fetchService) {
+ throw new Error(DEPENDENCY_ERROR_MESSAGE);
}
- return await apolloClient.mutate<
- UpdateSourceMutation.Mutation,
- UpdateSourceMutation.Variables
- >({
- mutation: updateSourceMutation,
- fetchPolicy: 'no-cache',
- variables: {
- sourceId,
- sourceProperties,
- },
+ return await fetchService(API_URL, {
+ method: 'PATCH',
+ body: JSON.stringify(sourceProperties),
});
},
onResolve: (response) => {
- if (response.data) {
- setSource(response.data.updateSource.source);
+ if (response) {
+ setSource(response.source);
}
},
},
- [apolloClient, sourceId]
+ [fetchService, sourceId]
);
const createDerivedIndexPattern = (type: 'logs' | 'metrics' | 'both') => {
return {
- fields: source ? source.status.indexFields : [],
+ fields: source?.status ? source.status.indexFields : [],
title: pickIndexPattern(source, type),
};
};
diff --git a/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts b/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts
deleted file mode 100644
index 61312a0f2890..000000000000
--- a/x-pack/plugins/infra/public/containers/source/source_fields_fragment.gql_query.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const sourceConfigurationFieldsFragment = gql`
- fragment SourceConfigurationFields on InfraSourceConfiguration {
- name
- description
- logAlias
- metricAlias
- inventoryDefaultView
- metricsExplorerDefaultView
- fields {
- container
- host
- message
- pod
- tiebreaker
- timestamp
- }
- logColumns {
- ... on InfraSourceTimestampLogColumn {
- timestampColumn {
- id
- }
- }
- ... on InfraSourceMessageLogColumn {
- messageColumn {
- id
- }
- }
- ... on InfraSourceFieldLogColumn {
- fieldColumn {
- id
- field
- }
- }
- }
- }
-`;
-
-export const sourceStatusFieldsFragment = gql`
- fragment SourceStatusFields on InfraSourceStatus {
- indexFields {
- name
- type
- searchable
- aggregatable
- displayable
- }
- logIndicesExist
- metricIndicesExist
- }
-`;
diff --git a/x-pack/plugins/infra/public/containers/source/update_source.gql_query.ts b/x-pack/plugins/infra/public/containers/source/update_source.gql_query.ts
deleted file mode 100644
index ed52780049f6..000000000000
--- a/x-pack/plugins/infra/public/containers/source/update_source.gql_query.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-import { sharedFragments } from '../../../common/graphql/shared';
-import {
- sourceConfigurationFieldsFragment,
- sourceStatusFieldsFragment,
-} from './source_fields_fragment.gql_query';
-
-export const updateSourceMutation = gql`
- mutation UpdateSourceMutation($sourceId: ID = "default", $sourceProperties: UpdateSourceInput!) {
- updateSource(id: $sourceId, sourceProperties: $sourceProperties) {
- source {
- ...InfraSourceFields
- configuration {
- ...SourceConfigurationFields
- }
- status {
- ...SourceStatusFields
- }
- }
- }
- }
-
- ${sharedFragments.InfraSourceFields}
- ${sourceConfigurationFieldsFragment}
- ${sourceStatusFieldsFragment}
-`;
diff --git a/x-pack/plugins/infra/public/containers/source/use_source_via_http.ts b/x-pack/plugins/infra/public/containers/source/use_source_via_http.ts
index 94e2537a67a2..33f74173bee3 100644
--- a/x-pack/plugins/infra/public/containers/source/use_source_via_http.ts
+++ b/x-pack/plugins/infra/public/containers/source/use_source_via_http.ts
@@ -72,7 +72,7 @@ export const useSourceViaHttp = ({
const createDerivedIndexPattern = useCallback(
(indexType: 'logs' | 'metrics' | 'both' = type) => {
return {
- fields: response?.source ? response.status.indexFields : [],
+ fields: response?.source.status ? response.source.status.indexFields : [],
title: pickIndexPattern(response?.source, indexType),
};
},
@@ -80,7 +80,7 @@ export const useSourceViaHttp = ({
);
const source = useMemo(() => {
- return response ? { ...response.source, status: response.status } : null;
+ return response ? response.source : null;
}, [response]);
return {
diff --git a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
index e8c609ae0bad..1681bf85f7f1 100644
--- a/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
+++ b/x-pack/plugins/infra/public/containers/with_source/with_source.tsx
@@ -7,14 +7,17 @@
import React, { useContext } from 'react';
import { IIndexPattern } from 'src/plugins/data/public';
-import { SourceQuery, UpdateSourceInput } from '../../graphql/types';
+import {
+ InfraSavedSourceConfiguration,
+ InfraSourceConfiguration,
+} from '../../../common/http_api/source_api';
import { RendererFunction } from '../../utils/typed_react';
import { Source } from '../source';
interface WithSourceProps {
children: RendererFunction<{
- configuration?: SourceQuery.Query['source']['configuration'];
- create: (sourceProperties: UpdateSourceInput) => Promise | undefined;
+ configuration?: InfraSourceConfiguration;
+ create: (sourceProperties: InfraSavedSourceConfiguration) => Promise | undefined;
createDerivedIndexPattern: (type: 'logs' | 'metrics' | 'both') => IIndexPattern;
exists?: boolean;
hasFailed: boolean;
@@ -25,7 +28,7 @@ interface WithSourceProps {
metricAlias?: string;
metricIndicesExist?: boolean;
sourceId: string;
- update: (sourceProperties: UpdateSourceInput) => Promise | undefined;
+ update: (sourceProperties: InfraSavedSourceConfiguration) => Promise | undefined;
version?: string;
}>;
}
diff --git a/x-pack/plugins/infra/public/graphql/introspection.json b/x-pack/plugins/infra/public/graphql/introspection.json
deleted file mode 100644
index efdca72c1383..000000000000
--- a/x-pack/plugins/infra/public/graphql/introspection.json
+++ /dev/null
@@ -1,2713 +0,0 @@
-{
- "__schema": {
- "queryType": { "name": "Query" },
- "mutationType": { "name": "Mutation" },
- "subscriptionType": null,
- "types": [
- {
- "kind": "OBJECT",
- "name": "Query",
- "description": "",
- "fields": [
- {
- "name": "source",
- "description": "Get an infrastructure data source by id.\n\nThe resolution order for the source configuration attributes is as follows\nwith the first defined value winning:\n\n1. The attributes of the saved object with the given 'id'.\n2. The attributes defined in the static Kibana configuration key\n 'xpack.infra.sources.default'.\n3. The hard-coded default values.\n\nAs a consequence, querying a source that doesn't exist doesn't error out,\nbut returns the configured or hardcoded defaults.",
- "args": [
- {
- "name": "id",
- "description": "The id of the source",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSource", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "allSources",
- "description": "Get a list of all infrastructure data sources",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSource", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "SCALAR",
- "name": "ID",
- "description": "The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `\"4\"`) or integer (such as `4`) input value will be accepted as an ID.",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSource",
- "description": "A source of infrastructure data",
- "fields": [
- {
- "name": "id",
- "description": "The id of the source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "version",
- "description": "The version number the source configuration was last persisted with",
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "updatedAt",
- "description": "The timestamp the source configuration was last persisted at",
- "args": [],
- "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "origin",
- "description": "The origin of the source (one of 'fallback', 'internal', 'stored')",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "configuration",
- "description": "The raw configuration of the source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSourceConfiguration", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "status",
- "description": "The status of the source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSourceStatus", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "snapshot",
- "description": "A snapshot of nodes",
- "args": [
- {
- "name": "timerange",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "INPUT_OBJECT",
- "name": "InfraTimerangeInput",
- "ofType": null
- }
- },
- "defaultValue": null
- },
- {
- "name": "filterQuery",
- "description": "",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- }
- ],
- "type": { "kind": "OBJECT", "name": "InfraSnapshotResponse", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "metrics",
- "description": "",
- "args": [
- {
- "name": "nodeIds",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "INPUT_OBJECT", "name": "InfraNodeIdsInput", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "nodeType",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "InfraNodeType", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "timerange",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "INPUT_OBJECT",
- "name": "InfraTimerangeInput",
- "ofType": null
- }
- },
- "defaultValue": null
- },
- {
- "name": "metrics",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "InfraMetric", "ofType": null }
- }
- }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraMetricData", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "SCALAR",
- "name": "String",
- "description": "The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "SCALAR",
- "name": "Float",
- "description": "The `Float` scalar type represents signed double-precision fractional values as specified by [IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). ",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceConfiguration",
- "description": "A set of configuration options for an infrastructure data source",
- "fields": [
- {
- "name": "name",
- "description": "The name of the data source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": "A description of the data source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "metricAlias",
- "description": "The alias to read metric data from",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "logAlias",
- "description": "The alias to read log data from",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "fields",
- "description": "The field mapping to use for this source",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSourceFields", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "logColumns",
- "description": "The columns to use for log display",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "UNION", "name": "InfraSourceLogColumn", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceFields",
- "description": "A mapping of semantic fields to their document counterparts",
- "fields": [
- {
- "name": "container",
- "description": "The field to identify a container by",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "host",
- "description": "The fields to identify a host by",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "message",
- "description": "The fields to use as the log message",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "pod",
- "description": "The field to identify a pod by",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "tiebreaker",
- "description": "The field to use as a tiebreaker for log events that have identical timestamps",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "timestamp",
- "description": "The field to use as a timestamp for metrics and logs",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "UNION",
- "name": "InfraSourceLogColumn",
- "description": "All known log column types",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": [
- { "kind": "OBJECT", "name": "InfraSourceTimestampLogColumn", "ofType": null },
- { "kind": "OBJECT", "name": "InfraSourceMessageLogColumn", "ofType": null },
- { "kind": "OBJECT", "name": "InfraSourceFieldLogColumn", "ofType": null }
- ]
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceTimestampLogColumn",
- "description": "The built-in timestamp log column",
- "fields": [
- {
- "name": "timestampColumn",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "OBJECT",
- "name": "InfraSourceTimestampLogColumnAttributes",
- "ofType": null
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceTimestampLogColumnAttributes",
- "description": "",
- "fields": [
- {
- "name": "id",
- "description": "A unique id for the column",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceMessageLogColumn",
- "description": "The built-in message log column",
- "fields": [
- {
- "name": "messageColumn",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "OBJECT",
- "name": "InfraSourceMessageLogColumnAttributes",
- "ofType": null
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceMessageLogColumnAttributes",
- "description": "",
- "fields": [
- {
- "name": "id",
- "description": "A unique id for the column",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceFieldLogColumn",
- "description": "A log column containing a field value",
- "fields": [
- {
- "name": "fieldColumn",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "OBJECT",
- "name": "InfraSourceFieldLogColumnAttributes",
- "ofType": null
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceFieldLogColumnAttributes",
- "description": "",
- "fields": [
- {
- "name": "id",
- "description": "A unique id for the column",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "field",
- "description": "The field name this column refers to",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSourceStatus",
- "description": "The status of an infrastructure data source",
- "fields": [
- {
- "name": "metricAliasExists",
- "description": "Whether the configured metric alias exists",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "logAliasExists",
- "description": "Whether the configured log alias exists",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "metricIndicesExist",
- "description": "Whether the configured alias or wildcard pattern resolve to any metric indices",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "logIndicesExist",
- "description": "Whether the configured alias or wildcard pattern resolve to any log indices",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "metricIndices",
- "description": "The list of indices in the metric alias",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "logIndices",
- "description": "The list of indices in the log alias",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "indexFields",
- "description": "The list of fields defined in the index mappings",
- "args": [
- {
- "name": "indexType",
- "description": "",
- "type": { "kind": "ENUM", "name": "InfraIndexType", "ofType": null },
- "defaultValue": "ANY"
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraIndexField", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "SCALAR",
- "name": "Boolean",
- "description": "The `Boolean` scalar type represents `true` or `false`.",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "InfraIndexType",
- "description": "",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- { "name": "ANY", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "LOGS", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "METRICS", "description": "", "isDeprecated": false, "deprecationReason": null }
- ],
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraIndexField",
- "description": "A descriptor of a field in an index",
- "fields": [
- {
- "name": "name",
- "description": "The name of the field",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "type",
- "description": "The type of the field's values as recognized by Kibana",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "searchable",
- "description": "Whether the field's values can be efficiently searched for",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "aggregatable",
- "description": "Whether the field's values can be aggregated",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "displayable",
- "description": "Whether the field should be displayed based on event.module and a ECS allowed list",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "SCALAR",
- "name": "Int",
- "description": "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1. ",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "InfraTimerangeInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "interval",
- "description": "The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan.",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "to",
- "description": "The end of the timerange",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "from",
- "description": "The beginning of the timerange",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSnapshotResponse",
- "description": "",
- "fields": [
- {
- "name": "nodes",
- "description": "Nodes of type host, container or pod grouped by 0, 1 or 2 terms",
- "args": [
- {
- "name": "type",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "InfraNodeType", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "groupBy",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "INPUT_OBJECT",
- "name": "InfraSnapshotGroupbyInput",
- "ofType": null
- }
- }
- }
- },
- "defaultValue": null
- },
- {
- "name": "metric",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "INPUT_OBJECT",
- "name": "InfraSnapshotMetricInput",
- "ofType": null
- }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSnapshotNode", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "InfraNodeType",
- "description": "",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- { "name": "pod", "description": "", "isDeprecated": false, "deprecationReason": null },
- {
- "name": "container",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- { "name": "host", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "awsEC2", "description": "", "isDeprecated": false, "deprecationReason": null }
- ],
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "InfraSnapshotGroupbyInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "label",
- "description": "The label to use in the results for the group by for the terms group by",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "field",
- "description": "The field to group by from a terms aggregation, this is ignored by the filter type",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "InfraSnapshotMetricInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "type",
- "description": "The type of metric",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "InfraSnapshotMetricType", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "InfraSnapshotMetricType",
- "description": "",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- { "name": "count", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "cpu", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "load", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "memory", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "tx", "description": "", "isDeprecated": false, "deprecationReason": null },
- { "name": "rx", "description": "", "isDeprecated": false, "deprecationReason": null },
- {
- "name": "logRate",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "diskIOReadBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "diskIOWriteBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSnapshotNode",
- "description": "",
- "fields": [
- {
- "name": "path",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSnapshotNodePath", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "metric",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSnapshotNodeMetric", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSnapshotNodePath",
- "description": "",
- "fields": [
- {
- "name": "value",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "label",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ip",
- "description": "",
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraSnapshotNodeMetric",
- "description": "",
- "fields": [
- {
- "name": "name",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "InfraSnapshotMetricType", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "value",
- "description": "",
- "args": [],
- "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "avg",
- "description": "",
- "args": [],
- "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "max",
- "description": "",
- "args": [],
- "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "InfraNodeIdsInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "nodeId",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "cloudId",
- "description": "",
- "type": { "kind": "SCALAR", "name": "ID", "ofType": null },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "InfraMetric",
- "description": "",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- {
- "name": "hostSystemOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostCpuUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostFilesystem",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostK8sOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostK8sCpuCap",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostK8sDiskCap",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostK8sMemoryCap",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostK8sPodCap",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostLoad",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostMemoryUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostNetworkTraffic",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostDockerOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostDockerInfo",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostDockerTop5ByCpu",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "hostDockerTop5ByMemory",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "podOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "podCpuUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "podMemoryUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "podLogUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "podNetworkTraffic",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerCpuKernel",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerCpuUsage",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerDiskIOOps",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerDiskIOBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerMemory",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "containerNetworkTraffic",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "nginxHits",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "nginxRequestRate",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "nginxActiveConnections",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "nginxRequestsPerConnection",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsOverview",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsCpuUtilization",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsNetworkBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsNetworkPackets",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsDiskioBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsDiskioOps",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsEC2CpuUtilization",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsEC2NetworkTraffic",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "awsEC2DiskIOBytes",
- "description": "",
- "isDeprecated": false,
- "deprecationReason": null
- },
- { "name": "custom", "description": "", "isDeprecated": false, "deprecationReason": null }
- ],
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraMetricData",
- "description": "",
- "fields": [
- {
- "name": "id",
- "description": "",
- "args": [],
- "type": { "kind": "ENUM", "name": "InfraMetric", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "series",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraDataSeries", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraDataSeries",
- "description": "",
- "fields": [
- {
- "name": "id",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "label",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "data",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraDataPoint", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "InfraDataPoint",
- "description": "",
- "fields": [
- {
- "name": "timestamp",
- "description": "",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "value",
- "description": "",
- "args": [],
- "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "Mutation",
- "description": "",
- "fields": [
- {
- "name": "createSource",
- "description": "Create a new source of infrastructure data",
- "args": [
- {
- "name": "id",
- "description": "The id of the source",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "sourceProperties",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "INPUT_OBJECT", "name": "UpdateSourceInput", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "UpdateSourceResult", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "updateSource",
- "description": "Modify an existing source",
- "args": [
- {
- "name": "id",
- "description": "The id of the source",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "sourceProperties",
- "description": "The properties to update the source with",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "INPUT_OBJECT", "name": "UpdateSourceInput", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "UpdateSourceResult", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "deleteSource",
- "description": "Delete a source of infrastructure data",
- "args": [
- {
- "name": "id",
- "description": "The id of the source",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "DeleteSourceResult", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceInput",
- "description": "The properties to update the source with",
- "fields": null,
- "inputFields": [
- {
- "name": "name",
- "description": "The name of the data source",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "description",
- "description": "A description of the data source",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "metricAlias",
- "description": "The alias to read metric data from",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "logAlias",
- "description": "The alias to read log data from",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "fields",
- "description": "The field mapping to use for this source",
- "type": { "kind": "INPUT_OBJECT", "name": "UpdateSourceFieldsInput", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "logColumns",
- "description": "The log columns to display for this source",
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceLogColumnInput",
- "ofType": null
- }
- }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceFieldsInput",
- "description": "The mapping of semantic fields of the source to be created",
- "fields": null,
- "inputFields": [
- {
- "name": "container",
- "description": "The field to identify a container by",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "host",
- "description": "The fields to identify a host by",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "pod",
- "description": "The field to identify a pod by",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "tiebreaker",
- "description": "The field to use as a tiebreaker for log events that have identical timestamps",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- },
- {
- "name": "timestamp",
- "description": "The field to use as a timestamp for metrics and logs",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceLogColumnInput",
- "description": "One of the log column types to display for this source",
- "fields": null,
- "inputFields": [
- {
- "name": "fieldColumn",
- "description": "A custom field log column",
- "type": {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceFieldLogColumnInput",
- "ofType": null
- },
- "defaultValue": null
- },
- {
- "name": "messageColumn",
- "description": "A built-in message log column",
- "type": {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceMessageLogColumnInput",
- "ofType": null
- },
- "defaultValue": null
- },
- {
- "name": "timestampColumn",
- "description": "A built-in timestamp log column",
- "type": {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceTimestampLogColumnInput",
- "ofType": null
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceFieldLogColumnInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "id",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- },
- {
- "name": "field",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceMessageLogColumnInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "id",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "UpdateSourceTimestampLogColumnInput",
- "description": "",
- "fields": null,
- "inputFields": [
- {
- "name": "id",
- "description": "",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "UpdateSourceResult",
- "description": "The result of a successful source update",
- "fields": [
- {
- "name": "source",
- "description": "The source that was updated",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "InfraSource", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "DeleteSourceResult",
- "description": "The result of a source deletion operations",
- "fields": [
- {
- "name": "id",
- "description": "The id of the source that was deleted",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__Schema",
- "description": "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all available types and directives on the server, as well as the entry points for query, mutation, and subscription operations.",
- "fields": [
- {
- "name": "types",
- "description": "A list of all types supported by this server.",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "queryType",
- "description": "The type that query operations will be rooted at.",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "mutationType",
- "description": "If this server supports mutation, the type that mutation operations will be rooted at.",
- "args": [],
- "type": { "kind": "OBJECT", "name": "__Type", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "subscriptionType",
- "description": "If this server support subscription, the type that subscription operations will be rooted at.",
- "args": [],
- "type": { "kind": "OBJECT", "name": "__Type", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "directives",
- "description": "A list of all directives supported by this server.",
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Directive", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__Type",
- "description": "The fundamental unit of any GraphQL Schema is the type. There are many kinds of types in GraphQL as represented by the `__TypeKind` enum.\n\nDepending on the kind of a type, certain fields describe information about that type. Scalar types provide no information beyond a name and description, while Enum types provide their values. Object and Interface types provide the fields they describe. Abstract types, Union and Interface, provide the Object types possible at runtime. List and NonNull types compose other types.",
- "fields": [
- {
- "name": "kind",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "__TypeKind", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "name",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "fields",
- "description": null,
- "args": [
- {
- "name": "includeDeprecated",
- "description": null,
- "type": { "kind": "SCALAR", "name": "Boolean", "ofType": null },
- "defaultValue": "false"
- }
- ],
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Field", "ofType": null }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "interfaces",
- "description": null,
- "args": [],
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "possibleTypes",
- "description": null,
- "args": [],
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "enumValues",
- "description": null,
- "args": [
- {
- "name": "includeDeprecated",
- "description": null,
- "type": { "kind": "SCALAR", "name": "Boolean", "ofType": null },
- "defaultValue": "false"
- }
- ],
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__EnumValue", "ofType": null }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "inputFields",
- "description": null,
- "args": [],
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ofType",
- "description": null,
- "args": [],
- "type": { "kind": "OBJECT", "name": "__Type", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "__TypeKind",
- "description": "An enum describing what kind of type a given `__Type` is.",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- {
- "name": "SCALAR",
- "description": "Indicates this type is a scalar.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "OBJECT",
- "description": "Indicates this type is an object. `fields` and `interfaces` are valid fields.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INTERFACE",
- "description": "Indicates this type is an interface. `fields` and `possibleTypes` are valid fields.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "UNION",
- "description": "Indicates this type is a union. `possibleTypes` is a valid field.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ENUM",
- "description": "Indicates this type is an enum. `enumValues` is a valid field.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INPUT_OBJECT",
- "description": "Indicates this type is an input object. `inputFields` is a valid field.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "LIST",
- "description": "Indicates this type is a list. `ofType` is a valid field.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "NON_NULL",
- "description": "Indicates this type is a non-null. `ofType` is a valid field.",
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__Field",
- "description": "Object and Interface types are described by a list of Fields, each of which has a name, potentially a list of arguments, and a return type.",
- "fields": [
- {
- "name": "name",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "args",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "type",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "isDeprecated",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "deprecationReason",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__InputValue",
- "description": "Arguments provided to Fields or Directives and the input fields of an InputObject are represented as Input Values which describe their type and optionally a default value.",
- "fields": [
- {
- "name": "name",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "type",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "defaultValue",
- "description": "A GraphQL-formatted string representing the default value for this input value.",
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__EnumValue",
- "description": "One possible value for a given Enum. Enum values are unique values, not a placeholder for a string or numeric value. However an Enum value is returned in a JSON response as a string.",
- "fields": [
- {
- "name": "name",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "isDeprecated",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "deprecationReason",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "OBJECT",
- "name": "__Directive",
- "description": "A Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document.\n\nIn some cases, you need to provide options to alter GraphQL's execution behavior in ways field arguments will not suffice, such as conditionally including or skipping a field. Directives provide this by describing additional information to the executor.",
- "fields": [
- {
- "name": "name",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "description",
- "description": null,
- "args": [],
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "locations",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "ENUM", "name": "__DirectiveLocation", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "args",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null }
- }
- }
- },
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "onOperation",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": true,
- "deprecationReason": "Use `locations`."
- },
- {
- "name": "onFragment",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": true,
- "deprecationReason": "Use `locations`."
- },
- {
- "name": "onField",
- "description": null,
- "args": [],
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "isDeprecated": true,
- "deprecationReason": "Use `locations`."
- }
- ],
- "inputFields": null,
- "interfaces": [],
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "ENUM",
- "name": "__DirectiveLocation",
- "description": "A Directive can be adjacent to many parts of the GraphQL language, a __DirectiveLocation describes one such possible adjacencies.",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": [
- {
- "name": "QUERY",
- "description": "Location adjacent to a query operation.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "MUTATION",
- "description": "Location adjacent to a mutation operation.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "SUBSCRIPTION",
- "description": "Location adjacent to a subscription operation.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "FIELD",
- "description": "Location adjacent to a field.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "FRAGMENT_DEFINITION",
- "description": "Location adjacent to a fragment definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "FRAGMENT_SPREAD",
- "description": "Location adjacent to a fragment spread.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INLINE_FRAGMENT",
- "description": "Location adjacent to an inline fragment.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "SCHEMA",
- "description": "Location adjacent to a schema definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "SCALAR",
- "description": "Location adjacent to a scalar definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "OBJECT",
- "description": "Location adjacent to an object type definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "FIELD_DEFINITION",
- "description": "Location adjacent to a field definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ARGUMENT_DEFINITION",
- "description": "Location adjacent to an argument definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INTERFACE",
- "description": "Location adjacent to an interface definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "UNION",
- "description": "Location adjacent to a union definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ENUM",
- "description": "Location adjacent to an enum definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "ENUM_VALUE",
- "description": "Location adjacent to an enum value definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INPUT_OBJECT",
- "description": "Location adjacent to an input object type definition.",
- "isDeprecated": false,
- "deprecationReason": null
- },
- {
- "name": "INPUT_FIELD_DEFINITION",
- "description": "Location adjacent to an input object field definition.",
- "isDeprecated": false,
- "deprecationReason": null
- }
- ],
- "possibleTypes": null
- }
- ],
- "directives": [
- {
- "name": "skip",
- "description": "Directs the executor to skip this field or fragment when the `if` argument is true.",
- "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
- "args": [
- {
- "name": "if",
- "description": "Skipped when true.",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "defaultValue": null
- }
- ]
- },
- {
- "name": "include",
- "description": "Directs the executor to include this field or fragment only when the `if` argument is true.",
- "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
- "args": [
- {
- "name": "if",
- "description": "Included when true.",
- "type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null }
- },
- "defaultValue": null
- }
- ]
- },
- {
- "name": "deprecated",
- "description": "Marks an element of a GraphQL schema as no longer supported.",
- "locations": ["FIELD_DEFINITION", "ENUM_VALUE"],
- "args": [
- {
- "name": "reason",
- "description": "Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted in [Markdown](https://daringfireball.net/projects/markdown/).",
- "type": { "kind": "SCALAR", "name": "String", "ofType": null },
- "defaultValue": "\"No longer supported\""
- }
- ]
- }
- ]
- }
-}
diff --git a/x-pack/plugins/infra/public/graphql/types.ts b/x-pack/plugins/infra/public/graphql/types.ts
deleted file mode 100644
index eb025ee4efd7..000000000000
--- a/x-pack/plugins/infra/public/graphql/types.ts
+++ /dev/null
@@ -1,786 +0,0 @@
-import { SnapshotMetricType } from '../../common/inventory_models/types';
-
-/* tslint:disable */
-
-// ====================================================
-// START: Typescript template
-// ====================================================
-
-// ====================================================
-// Types
-// ====================================================
-
-export interface Query {
- /** Get an infrastructure data source by id.The resolution order for the source configuration attributes is as followswith the first defined value winning:1. The attributes of the saved object with the given 'id'.2. The attributes defined in the static Kibana configuration key'xpack.infra.sources.default'.3. The hard-coded default values.As a consequence, querying a source that doesn't exist doesn't error out,but returns the configured or hardcoded defaults. */
- source: InfraSource;
- /** Get a list of all infrastructure data sources */
- allSources: InfraSource[];
-}
-/** A source of infrastructure data */
-export interface InfraSource {
- /** The id of the source */
- id: string;
- /** The version number the source configuration was last persisted with */
- version?: string | null;
- /** The timestamp the source configuration was last persisted at */
- updatedAt?: number | null;
- /** The origin of the source (one of 'fallback', 'internal', 'stored') */
- origin: string;
- /** The raw configuration of the source */
- configuration: InfraSourceConfiguration;
- /** The status of the source */
- status: InfraSourceStatus;
-
- /** A snapshot of nodes */
- snapshot?: InfraSnapshotResponse | null;
-
- metrics: InfraMetricData[];
-}
-/** A set of configuration options for an infrastructure data source */
-export interface InfraSourceConfiguration {
- /** The name of the data source */
- name: string;
- /** A description of the data source */
- description: string;
- /** The alias to read metric data from */
- metricAlias: string;
- /** The alias to read log data from */
- logAlias: string;
- /** The field mapping to use for this source */
- fields: InfraSourceFields;
- /** Default view for inventory */
- inventoryDefaultView: string;
- /** Default view for Metrics Explorer */
- metricsExplorerDefaultView?: string | null;
- /** The columns to use for log display */
- logColumns: InfraSourceLogColumn[];
-}
-/** A mapping of semantic fields to their document counterparts */
-export interface InfraSourceFields {
- /** The field to identify a container by */
- container: string;
- /** The fields to identify a host by */
- host: string;
- /** The fields to use as the log message */
- message: string[];
- /** The field to identify a pod by */
- pod: string;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker: string;
- /** The field to use as a timestamp for metrics and logs */
- timestamp: string;
-}
-/** The built-in timestamp log column */
-export interface InfraSourceTimestampLogColumn {
- timestampColumn: InfraSourceTimestampLogColumnAttributes;
-}
-
-export interface InfraSourceTimestampLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** The built-in message log column */
-export interface InfraSourceMessageLogColumn {
- messageColumn: InfraSourceMessageLogColumnAttributes;
-}
-
-export interface InfraSourceMessageLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** A log column containing a field value */
-export interface InfraSourceFieldLogColumn {
- fieldColumn: InfraSourceFieldLogColumnAttributes;
-}
-
-export interface InfraSourceFieldLogColumnAttributes {
- /** A unique id for the column */
- id: string;
- /** The field name this column refers to */
- field: string;
-}
-/** The status of an infrastructure data source */
-export interface InfraSourceStatus {
- /** Whether the configured metric alias exists */
- metricAliasExists: boolean;
- /** Whether the configured log alias exists */
- logAliasExists: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any metric indices */
- metricIndicesExist: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any log indices */
- logIndicesExist: boolean;
- /** The list of indices in the metric alias */
- metricIndices: string[];
- /** The list of indices in the log alias */
- logIndices: string[];
- /** The list of fields defined in the index mappings */
- indexFields: InfraIndexField[];
-}
-/** A descriptor of a field in an index */
-export interface InfraIndexField {
- /** The name of the field */
- name: string;
- /** The type of the field's values as recognized by Kibana */
- type: string;
- /** Whether the field's values can be efficiently searched for */
- searchable: boolean;
- /** Whether the field's values can be aggregated */
- aggregatable: boolean;
- /** Whether the field should be displayed based on event.module and a ECS allowed list */
- displayable: boolean;
-}
-
-export interface InfraSnapshotResponse {
- /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
- nodes: InfraSnapshotNode[];
-}
-
-export interface InfraSnapshotNode {
- path: InfraSnapshotNodePath[];
-
- metric: InfraSnapshotNodeMetric;
-}
-
-export interface InfraSnapshotNodePath {
- value: string;
-
- label: string;
-
- ip?: string | null;
-}
-
-export interface InfraSnapshotNodeMetric {
- name: SnapshotMetricType;
-
- value?: number | null;
-
- avg?: number | null;
-
- max?: number | null;
-}
-
-export interface InfraMetricData {
- id?: InfraMetric | null;
-
- series: InfraDataSeries[];
-}
-
-export interface InfraDataSeries {
- id: string;
-
- label: string;
-
- data: InfraDataPoint[];
-}
-
-export interface InfraDataPoint {
- timestamp: number;
-
- value?: number | null;
-}
-
-export interface Mutation {
- /** Create a new source of infrastructure data */
- createSource: UpdateSourceResult;
- /** Modify an existing source */
- updateSource: UpdateSourceResult;
- /** Delete a source of infrastructure data */
- deleteSource: DeleteSourceResult;
-}
-/** The result of a successful source update */
-export interface UpdateSourceResult {
- /** The source that was updated */
- source: InfraSource;
-}
-/** The result of a source deletion operations */
-export interface DeleteSourceResult {
- /** The id of the source that was deleted */
- id: string;
-}
-
-// ====================================================
-// InputTypes
-// ====================================================
-
-export interface InfraTimerangeInput {
- /** The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan. */
- interval: string;
- /** The end of the timerange */
- to: number;
- /** The beginning of the timerange */
- from: number;
-}
-
-export interface InfraSnapshotGroupbyInput {
- /** The label to use in the results for the group by for the terms group by */
- label?: string | null;
- /** The field to group by from a terms aggregation, this is ignored by the filter type */
- field?: string | null;
-}
-
-export interface InfraSnapshotMetricInput {
- /** The type of metric */
- type: InfraSnapshotMetricType;
-}
-
-export interface InfraNodeIdsInput {
- nodeId: string;
-
- cloudId?: string | null;
-}
-/** The properties to update the source with */
-export interface UpdateSourceInput {
- /** The name of the data source */
- name?: string | null;
- /** A description of the data source */
- description?: string | null;
- /** The alias to read metric data from */
- metricAlias?: string | null;
- /** The alias to read log data from */
- logAlias?: string | null;
- /** The field mapping to use for this source */
- fields?: UpdateSourceFieldsInput | null;
- /** Name of default inventory view */
- inventoryDefaultView?: string | null;
- /** Default view for Metrics Explorer */
- metricsExplorerDefaultView?: string | null;
- /** The log columns to display for this source */
- logColumns?: UpdateSourceLogColumnInput[] | null;
-}
-/** The mapping of semantic fields of the source to be created */
-export interface UpdateSourceFieldsInput {
- /** The field to identify a container by */
- container?: string | null;
- /** The fields to identify a host by */
- host?: string | null;
- /** The field to identify a pod by */
- pod?: string | null;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker?: string | null;
- /** The field to use as a timestamp for metrics and logs */
- timestamp?: string | null;
-}
-/** One of the log column types to display for this source */
-export interface UpdateSourceLogColumnInput {
- /** A custom field log column */
- fieldColumn?: UpdateSourceFieldLogColumnInput | null;
- /** A built-in message log column */
- messageColumn?: UpdateSourceMessageLogColumnInput | null;
- /** A built-in timestamp log column */
- timestampColumn?: UpdateSourceTimestampLogColumnInput | null;
-}
-
-export interface UpdateSourceFieldLogColumnInput {
- id: string;
-
- field: string;
-}
-
-export interface UpdateSourceMessageLogColumnInput {
- id: string;
-}
-
-export interface UpdateSourceTimestampLogColumnInput {
- id: string;
-}
-
-// ====================================================
-// Arguments
-// ====================================================
-
-export interface SourceQueryArgs {
- /** The id of the source */
- id: string;
-}
-export interface SnapshotInfraSourceArgs {
- timerange: InfraTimerangeInput;
-
- filterQuery?: string | null;
-}
-export interface MetricsInfraSourceArgs {
- nodeIds: InfraNodeIdsInput;
-
- nodeType: InfraNodeType;
-
- timerange: InfraTimerangeInput;
-
- metrics: InfraMetric[];
-}
-export interface IndexFieldsInfraSourceStatusArgs {
- indexType?: InfraIndexType | null;
-}
-export interface NodesInfraSnapshotResponseArgs {
- type: InfraNodeType;
-
- groupBy: InfraSnapshotGroupbyInput[];
-
- metric: InfraSnapshotMetricInput;
-}
-export interface CreateSourceMutationArgs {
- /** The id of the source */
- id: string;
-
- sourceProperties: UpdateSourceInput;
-}
-export interface UpdateSourceMutationArgs {
- /** The id of the source */
- id: string;
- /** The properties to update the source with */
- sourceProperties: UpdateSourceInput;
-}
-export interface DeleteSourceMutationArgs {
- /** The id of the source */
- id: string;
-}
-
-// ====================================================
-// Enums
-// ====================================================
-
-export enum InfraIndexType {
- ANY = 'ANY',
- LOGS = 'LOGS',
- METRICS = 'METRICS',
-}
-
-export enum InfraNodeType {
- pod = 'pod',
- container = 'container',
- host = 'host',
- awsEC2 = 'awsEC2',
- awsS3 = 'awsS3',
- awsRDS = 'awsRDS',
- awsSQS = 'awsSQS',
-}
-
-export enum InfraSnapshotMetricType {
- count = 'count',
- cpu = 'cpu',
- load = 'load',
- memory = 'memory',
- tx = 'tx',
- rx = 'rx',
- logRate = 'logRate',
- diskIOReadBytes = 'diskIOReadBytes',
- diskIOWriteBytes = 'diskIOWriteBytes',
- s3TotalRequests = 's3TotalRequests',
- s3NumberOfObjects = 's3NumberOfObjects',
- s3BucketSize = 's3BucketSize',
- s3DownloadBytes = 's3DownloadBytes',
- s3UploadBytes = 's3UploadBytes',
- rdsConnections = 'rdsConnections',
- rdsQueriesExecuted = 'rdsQueriesExecuted',
- rdsActiveTransactions = 'rdsActiveTransactions',
- rdsLatency = 'rdsLatency',
- sqsMessagesVisible = 'sqsMessagesVisible',
- sqsMessagesDelayed = 'sqsMessagesDelayed',
- sqsMessagesSent = 'sqsMessagesSent',
- sqsMessagesEmpty = 'sqsMessagesEmpty',
- sqsOldestMessage = 'sqsOldestMessage',
-}
-
-export enum InfraMetric {
- hostSystemOverview = 'hostSystemOverview',
- hostCpuUsage = 'hostCpuUsage',
- hostFilesystem = 'hostFilesystem',
- hostK8sOverview = 'hostK8sOverview',
- hostK8sCpuCap = 'hostK8sCpuCap',
- hostK8sDiskCap = 'hostK8sDiskCap',
- hostK8sMemoryCap = 'hostK8sMemoryCap',
- hostK8sPodCap = 'hostK8sPodCap',
- hostLoad = 'hostLoad',
- hostMemoryUsage = 'hostMemoryUsage',
- hostNetworkTraffic = 'hostNetworkTraffic',
- hostDockerOverview = 'hostDockerOverview',
- hostDockerInfo = 'hostDockerInfo',
- hostDockerTop5ByCpu = 'hostDockerTop5ByCpu',
- hostDockerTop5ByMemory = 'hostDockerTop5ByMemory',
- podOverview = 'podOverview',
- podCpuUsage = 'podCpuUsage',
- podMemoryUsage = 'podMemoryUsage',
- podLogUsage = 'podLogUsage',
- podNetworkTraffic = 'podNetworkTraffic',
- containerOverview = 'containerOverview',
- containerCpuKernel = 'containerCpuKernel',
- containerCpuUsage = 'containerCpuUsage',
- containerDiskIOOps = 'containerDiskIOOps',
- containerDiskIOBytes = 'containerDiskIOBytes',
- containerMemory = 'containerMemory',
- containerNetworkTraffic = 'containerNetworkTraffic',
- nginxHits = 'nginxHits',
- nginxRequestRate = 'nginxRequestRate',
- nginxActiveConnections = 'nginxActiveConnections',
- nginxRequestsPerConnection = 'nginxRequestsPerConnection',
- awsOverview = 'awsOverview',
- awsCpuUtilization = 'awsCpuUtilization',
- awsNetworkBytes = 'awsNetworkBytes',
- awsNetworkPackets = 'awsNetworkPackets',
- awsDiskioBytes = 'awsDiskioBytes',
- awsDiskioOps = 'awsDiskioOps',
- awsEC2CpuUtilization = 'awsEC2CpuUtilization',
- awsEC2DiskIOBytes = 'awsEC2DiskIOBytes',
- awsEC2NetworkTraffic = 'awsEC2NetworkTraffic',
- awsS3TotalRequests = 'awsS3TotalRequests',
- awsS3NumberOfObjects = 'awsS3NumberOfObjects',
- awsS3BucketSize = 'awsS3BucketSize',
- awsS3DownloadBytes = 'awsS3DownloadBytes',
- awsS3UploadBytes = 'awsS3UploadBytes',
- awsRDSCpuTotal = 'awsRDSCpuTotal',
- awsRDSConnections = 'awsRDSConnections',
- awsRDSQueriesExecuted = 'awsRDSQueriesExecuted',
- awsRDSActiveTransactions = 'awsRDSActiveTransactions',
- awsRDSLatency = 'awsRDSLatency',
- awsSQSMessagesVisible = 'awsSQSMessagesVisible',
- awsSQSMessagesDelayed = 'awsSQSMessagesDelayed',
- awsSQSMessagesSent = 'awsSQSMessagesSent',
- awsSQSMessagesEmpty = 'awsSQSMessagesEmpty',
- awsSQSOldestMessage = 'awsSQSOldestMessage',
- custom = 'custom',
-}
-
-// ====================================================
-// Unions
-// ====================================================
-
-/** All known log column types */
-export type InfraSourceLogColumn =
- | InfraSourceTimestampLogColumn
- | InfraSourceMessageLogColumn
- | InfraSourceFieldLogColumn;
-
-// ====================================================
-// END: Typescript template
-// ====================================================
-
-// ====================================================
-// Documents
-// ====================================================
-
-export namespace MetricsQuery {
- export type Variables = {
- sourceId: string;
- timerange: InfraTimerangeInput;
- metrics: InfraMetric[];
- nodeId: string;
- cloudId?: string | null;
- nodeType: InfraNodeType;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- id: string;
-
- metrics: Metrics[];
- };
-
- export type Metrics = {
- __typename?: 'InfraMetricData';
-
- id?: InfraMetric | null;
-
- series: Series[];
- };
-
- export type Series = {
- __typename?: 'InfraDataSeries';
-
- id: string;
-
- label: string;
-
- data: Data[];
- };
-
- export type Data = {
- __typename?: 'InfraDataPoint';
-
- timestamp: number;
-
- value?: number | null;
- };
-}
-
-export namespace CreateSourceConfigurationMutation {
- export type Variables = {
- sourceId: string;
- sourceProperties: UpdateSourceInput;
- };
-
- export type Mutation = {
- __typename?: 'Mutation';
-
- createSource: CreateSource;
- };
-
- export type CreateSource = {
- __typename?: 'UpdateSourceResult';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace SourceQuery {
- export type Variables = {
- sourceId?: string | null;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace UpdateSourceMutation {
- export type Variables = {
- sourceId?: string | null;
- sourceProperties: UpdateSourceInput;
- };
-
- export type Mutation = {
- __typename?: 'Mutation';
-
- updateSource: UpdateSource;
- };
-
- export type UpdateSource = {
- __typename?: 'UpdateSourceResult';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- configuration: Configuration;
-
- status: Status;
- } & InfraSourceFields.Fragment;
-
- export type Configuration = SourceConfigurationFields.Fragment;
-
- export type Status = SourceStatusFields.Fragment;
-}
-
-export namespace WaffleNodesQuery {
- export type Variables = {
- sourceId: string;
- timerange: InfraTimerangeInput;
- filterQuery?: string | null;
- metric: InfraSnapshotMetricInput;
- groupBy: InfraSnapshotGroupbyInput[];
- type: InfraNodeType;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- id: string;
-
- snapshot?: Snapshot | null;
- };
-
- export type Snapshot = {
- __typename?: 'InfraSnapshotResponse';
-
- nodes: Nodes[];
- };
-
- export type Nodes = {
- __typename?: 'InfraSnapshotNode';
-
- path: Path[];
-
- metric: Metric;
- };
-
- export type Path = {
- __typename?: 'InfraSnapshotNodePath';
-
- value: string;
-
- label: string;
-
- ip?: string | null;
- };
-
- export type Metric = {
- __typename?: 'InfraSnapshotNodeMetric';
-
- name: InfraSnapshotMetricType;
-
- value?: number | null;
-
- avg?: number | null;
-
- max?: number | null;
- };
-}
-
-export namespace SourceConfigurationFields {
- export type Fragment = {
- __typename?: 'InfraSourceConfiguration';
-
- name: string;
-
- description: string;
-
- logAlias: string;
-
- metricAlias: string;
-
- fields: Fields;
-
- inventoryDefaultView: string;
-
- metricsExplorerDefaultView: string;
-
- logColumns: LogColumns[];
- };
-
- export type Fields = {
- __typename?: 'InfraSourceFields';
-
- container: string;
-
- host: string;
-
- message: string[];
-
- pod: string;
-
- tiebreaker: string;
-
- timestamp: string;
- };
-
- export type LogColumns =
- | InfraSourceTimestampLogColumnInlineFragment
- | InfraSourceMessageLogColumnInlineFragment
- | InfraSourceFieldLogColumnInlineFragment;
-
- export type InfraSourceTimestampLogColumnInlineFragment = {
- __typename?: 'InfraSourceTimestampLogColumn';
-
- timestampColumn: TimestampColumn;
- };
-
- export type TimestampColumn = {
- __typename?: 'InfraSourceTimestampLogColumnAttributes';
-
- id: string;
- };
-
- export type InfraSourceMessageLogColumnInlineFragment = {
- __typename?: 'InfraSourceMessageLogColumn';
-
- messageColumn: MessageColumn;
- };
-
- export type MessageColumn = {
- __typename?: 'InfraSourceMessageLogColumnAttributes';
-
- id: string;
- };
-
- export type InfraSourceFieldLogColumnInlineFragment = {
- __typename?: 'InfraSourceFieldLogColumn';
-
- fieldColumn: FieldColumn;
- };
-
- export type FieldColumn = {
- __typename?: 'InfraSourceFieldLogColumnAttributes';
-
- id: string;
-
- field: string;
- };
-}
-
-export namespace SourceStatusFields {
- export type Fragment = {
- __typename?: 'InfraSourceStatus';
-
- indexFields: IndexFields[];
-
- logIndicesExist: boolean;
-
- metricIndicesExist: boolean;
- };
-
- export type IndexFields = {
- __typename?: 'InfraIndexField';
-
- name: string;
-
- type: string;
-
- searchable: boolean;
-
- aggregatable: boolean;
-
- displayable: boolean;
- };
-}
-
-export namespace InfraTimeKeyFields {
- export type Fragment = {
- __typename?: 'InfraTimeKey';
-
- time: number;
-
- tiebreaker: number;
- };
-}
-
-export namespace InfraSourceFields {
- export type Fragment = {
- __typename?: 'InfraSource';
-
- id: string;
-
- version?: string | null;
-
- updatedAt?: number | null;
-
- origin: string;
- };
-}
diff --git a/x-pack/plugins/infra/public/lib/lib.ts b/x-pack/plugins/infra/public/lib/lib.ts
index 782f6ce5e0eb..60e1cf0b8bc2 100644
--- a/x-pack/plugins/infra/public/lib/lib.ts
+++ b/x-pack/plugins/infra/public/lib/lib.ts
@@ -13,7 +13,7 @@ import {
SnapshotNodeMetric,
SnapshotNodePath,
} from '../../common/http_api/snapshot_api';
-import { SourceQuery } from '../graphql/types';
+import { InfraSourceConfigurationFields } from '../../common/http_api/source_api';
import { WaffleSortOption } from '../pages/metrics/inventory_view/hooks/use_waffle_options';
export interface InfraWaffleMapNode {
@@ -123,7 +123,7 @@ export enum InfraWaffleMapRuleOperator {
}
export interface InfraWaffleMapOptions {
- fields?: SourceQuery.Query['source']['configuration']['fields'] | null;
+ fields?: InfraSourceConfigurationFields | null;
formatter: InfraFormatterType;
formatTemplate: string;
metric: SnapshotMetricInput;
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index 24f9598484d7..1b2ea9d551a8 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -11,6 +11,7 @@ import { Route, RouteComponentProps, Switch } from 'react-router-dom';
import { EuiErrorBoundary, EuiFlexItem, EuiFlexGroup, EuiButtonEmpty } from '@elastic/eui';
import { IIndexPattern } from 'src/plugins/data/common';
+import { InfraSourceConfiguration } from '../../../common/http_api/source_api';
import { DocumentTitle } from '../../components/document_title';
import { HelpCenterContent } from '../../components/help_center_content';
import { RoutedTabs } from '../../components/navigation/routed_tabs';
@@ -36,7 +37,6 @@ import { WaffleFiltersProvider } from './inventory_view/hooks/use_waffle_filters
import { InventoryAlertDropdown } from '../../alerting/inventory/components/alert_dropdown';
import { MetricsAlertDropdown } from '../../alerting/metric_threshold/components/alert_dropdown';
import { SavedView } from '../../containers/saved_view/saved_view';
-import { SourceConfigurationFields } from '../../graphql/types';
import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabilities';
import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout';
@@ -189,7 +189,7 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
};
const PageContent = (props: {
- configuration: SourceConfigurationFields.Fragment;
+ configuration: InfraSourceConfiguration;
createDerivedIndexPattern: (type: 'logs' | 'metrics' | 'both') => IIndexPattern;
}) => {
const { createDerivedIndexPattern, configuration } = props;
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
index 6055b60719a6..82a24fe8163e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/bottom_drawer.tsx
@@ -67,12 +67,13 @@ export const BottomDrawer: React.FC<{
const BottomActionContainer = euiStyled.div<{ isOpen: boolean }>`
padding: ${(props) => props.theme.eui.paddingSizes.m} 0;
- position: fixed;
+ position: absolute;
+ height: ${(props) => (props.isOpen ? '244px' : '48px')};
+ overflow: ${(props) => (props.isOpen ? 'visible' : 'hidden')};
left: 0;
bottom: 0;
right: 0;
- transition: transform ${TRANSITION_MS}ms;
- transform: translateY(${(props) => (props.isOpen ? 0 : '224px')})
+ transition: height ${TRANSITION_MS}ms;
`;
const BottomActionTopBar = euiStyled(EuiFlexGroup).attrs({
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/helpers.ts b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/helpers.ts
index c2cde7eb15e9..3bcf24793b6c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/helpers.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/helpers.ts
@@ -8,14 +8,16 @@ import { ReactText } from 'react';
import Color from 'color';
import { get, first, last, min, max } from 'lodash';
import { createFormatter } from '../../../../../common/formatters';
-import { InfraDataSeries } from '../../../../graphql/types';
import {
InventoryVisTypeRT,
InventoryFormatterType,
InventoryVisType,
} from '../../../../../common/inventory_models/types';
import { SeriesOverrides } from '../types';
-import { NodeDetailsMetricData } from '../../../../../common/http_api/node_details_api';
+import {
+ NodeDetailsDataSeries,
+ NodeDetailsMetricData,
+} from '../../../../../common/http_api/node_details_api';
/**
* Returns a formatter
@@ -28,7 +30,7 @@ export const getFormatter = (
/**
* Does a series have more then two points?
*/
-export const seriesHasLessThen2DataPoints = (series: InfraDataSeries): boolean => {
+export const seriesHasLessThen2DataPoints = (series: NodeDetailsDataSeries): boolean => {
return series.data.length < 2;
};
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx
index bda2a5941e02..9eb7df26565e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/page_error.tsx
@@ -4,12 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
-// import { GraphQLFormattedError } from 'graphql';
import React from 'react';
import { i18n } from '@kbn/i18n';
import { IHttpFetchError } from 'src/core/public';
import { InvalidNodeError } from './invalid_node';
-// import { InfraMetricsErrorCodes } from '../../../../common/errors';
import { DocumentTitle } from '../../../../components/document_title';
import { ErrorPageBody } from '../../../error';
diff --git a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/series_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/series_chart.tsx
index 0d7716ad3cc6..91b1bb9b0c1c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/series_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metric_detail/components/series_chart.tsx
@@ -13,14 +13,14 @@ import {
BarSeriesStyle,
AreaSeriesStyle,
} from '@elastic/charts';
-import { InfraDataSeries } from '../../../../graphql/types';
+import { NodeDetailsDataSeries } from '../../../../../common/http_api/node_details_api';
import { InventoryVisType } from '../../../../../common/inventory_models/types';
interface Props {
id: string;
name: string;
color: string | null;
- series: InfraDataSeries;
+ series: NodeDetailsDataSeries;
type: InventoryVisType;
stack: boolean | undefined;
}
@@ -59,7 +59,7 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
);
};
-export const BarChart = ({ id, color, series, name, type, stack }: Props) => {
+export const BarChart = ({ id, color, series, name, stack }: Props) => {
const style: RecursivePartial = {
rectBorder: {
stroke: color || void 0,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
index c228f09cbb64..256fabdb792f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
@@ -18,6 +18,7 @@ import {
} from '@elastic/charts';
import { first, last } from 'lodash';
import moment from 'moment';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
import {
MetricsExplorerOptions,
@@ -29,7 +30,6 @@ import { euiStyled } from '../../../../../../../../src/plugins/kibana_react/comm
import { createFormatterForMetric } from './helpers/create_formatter_for_metric';
import { MetricExplorerSeriesChart } from './series_chart';
import { MetricsExplorerChartContextMenu } from './chart_context_menu';
-import { SourceQuery } from '../../../../graphql/types';
import { MetricsExplorerEmptyChart } from './empty_chart';
import { MetricsExplorerNoMetrics } from './no_metrics';
import { getChartTheme } from './helpers/get_chart_theme';
@@ -46,7 +46,7 @@ interface Props {
options: MetricsExplorerOptions;
chartOptions: MetricsExplorerChartOptions;
series: MetricsExplorerSeries;
- source: SourceQuery.Query['source']['configuration'] | undefined;
+ source: InfraSourceConfiguration | undefined;
timeRange: MetricsExplorerTimeOptions;
onTimeChange: (start: string, end: string) => void;
}
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
index 5d38fd436fcc..4fb13f72217b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart_context_menu.tsx
@@ -14,6 +14,7 @@ import {
} from '@elastic/eui';
import DateMath from '@elastic/datemath';
import { Capabilities } from 'src/core/public';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
import { AlertFlyout } from '../../../../alerting/metric_threshold/components/alert_flyout';
import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
import {
@@ -23,7 +24,6 @@ import {
} from '../hooks/use_metrics_explorer_options';
import { createTSVBLink } from './helpers/create_tsvb_link';
import { getNodeDetailUrl } from '../../../link_to/redirect_to_node_detail';
-import { SourceConfiguration } from '../../../../utils/source_configuration';
import { InventoryItemType } from '../../../../../common/inventory_models/types';
import { useLinkProps } from '../../../../hooks/use_link_props';
@@ -31,14 +31,14 @@ export interface Props {
options: MetricsExplorerOptions;
onFilter?: (query: string) => void;
series: MetricsExplorerSeries;
- source?: SourceConfiguration;
+ source?: InfraSourceConfiguration;
timeRange: MetricsExplorerTimeOptions;
uiCapabilities?: Capabilities;
chartOptions: MetricsExplorerChartOptions;
}
const fieldToNodeType = (
- source: SourceConfiguration,
+ source: InfraSourceConfiguration,
groupBy: string | string[]
): InventoryItemType | undefined => {
const fields = Array.isArray(groupBy) ? groupBy : [groupBy];
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/charts.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/charts.tsx
index 270ccac00063..b9c00101d7b3 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/charts.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/charts.tsx
@@ -8,6 +8,7 @@ import { EuiButton, EuiFlexGrid, EuiFlexItem, EuiText, EuiHorizontalRule } from
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import React from 'react';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
import { MetricsExplorerResponse } from '../../../../../common/http_api/metrics_explorer';
import {
MetricsExplorerOptions,
@@ -17,7 +18,6 @@ import {
import { InfraLoadingPanel } from '../../../../components/loading';
import { NoData } from '../../../../components/empty_states/no_data';
import { MetricsExplorerChart } from './chart';
-import { SourceQuery } from '../../../../graphql/types';
type StringOrNull = string | null;
@@ -30,7 +30,7 @@ interface Props {
onFilter: (filter: string) => void;
onTimeChange: (start: string, end: string) => void;
data: MetricsExplorerResponse | null;
- source: SourceQuery.Query['source']['configuration'] | undefined;
+ source: InfraSourceConfiguration | undefined;
timeRange: MetricsExplorerTimeOptions;
}
export const MetricsExplorerCharts = ({
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index 15ed28c09519..90338d714488 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -7,6 +7,7 @@
import { encode } from 'rison-node';
import uuid from 'uuid';
import { set } from '@elastic/safer-lodash-set';
+import { InfraSourceConfiguration } from '../../../../../../common/http_api/source_api';
import { colorTransformer, Color } from '../../../../../../common/color_palette';
import { MetricsExplorerSeries } from '../../../../../../common/http_api/metrics_explorer';
import {
@@ -19,15 +20,14 @@ import {
} from '../../hooks/use_metrics_explorer_options';
import { metricToFormat } from './metric_to_format';
import { InfraFormatterType } from '../../../../../lib/lib';
-import { SourceQuery } from '../../../../../graphql/types';
import { createMetricLabel } from './create_metric_label';
import { LinkDescriptor } from '../../../../../hooks/use_link_props';
/*
- We've recently changed the default index pattern in Metrics UI from `metricbeat-*` to
+ We've recently changed the default index pattern in Metrics UI from `metricbeat-*` to
`metrics-*,metricbeat-*`. There is a bug in TSVB when there is an empty index in the pattern
the field dropdowns are not populated correctly. This index pattern is a temporary fix.
- See: https://github.com/elastic/kibana/issues/73987
+ See: https://github.com/elastic/kibana/issues/73987
*/
const TSVB_WORKAROUND_INDEX_PATTERN = 'metric*';
@@ -142,7 +142,7 @@ const createTSVBIndexPattern = (alias: string) => {
};
export const createTSVBLink = (
- source: SourceQuery.Query['source']['configuration'] | undefined,
+ source: InfraSourceConfiguration | undefined,
options: MetricsExplorerOptions,
series: MetricsExplorerSeries,
timeRange: MetricsExplorerTimeOptions,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
index 169bc9bcbcdb..7a235b9da64c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
@@ -6,6 +6,7 @@
import { useState, useCallback, useContext } from 'react';
import { IIndexPattern } from 'src/plugins/data/public';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
import {
MetricsExplorerMetric,
MetricsExplorerAggregation,
@@ -17,7 +18,6 @@ import {
MetricsExplorerTimeOptions,
MetricsExplorerOptions,
} from './use_metrics_explorer_options';
-import { SourceQuery } from '../../../../graphql/types';
export interface MetricExplorerViewState {
chartOptions: MetricsExplorerChartOptions;
@@ -26,7 +26,7 @@ export interface MetricExplorerViewState {
}
export const useMetricsExplorerState = (
- source: SourceQuery.Query['source']['configuration'],
+ source: InfraSourceConfiguration,
derivedIndexPattern: IIndexPattern,
shouldLoadImmediately = true
) => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
index f566e5253c61..689a8146afa0 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.test.tsx
@@ -19,9 +19,9 @@ import {
createSeries,
} from '../../../../utils/fixtures/metrics_explorer';
import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
-import { SourceQuery } from '../../../../../common/graphql/types';
import { IIndexPattern } from '../../../../../../../../src/plugins/data/public';
import { HttpHandler } from 'kibana/public';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
const mockedFetch = jest.fn();
@@ -37,7 +37,7 @@ const renderUseMetricsExplorerDataHook = () => {
return renderHook(
(props: {
options: MetricsExplorerOptions;
- source: SourceQuery.Query['source']['configuration'] | undefined;
+ source: InfraSourceConfiguration | undefined;
derivedIndexPattern: IIndexPattern;
timeRange: MetricsExplorerTimeOptions;
afterKey: string | null | Record;
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
index 924f59eb0d1d..1315b5917c97 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_data.ts
@@ -8,7 +8,7 @@ import DateMath from '@elastic/datemath';
import { isEqual } from 'lodash';
import { useEffect, useState, useCallback } from 'react';
import { IIndexPattern } from 'src/plugins/data/public';
-import { SourceQuery } from '../../../../../common/graphql/types';
+import { InfraSourceConfiguration } from '../../../../../common/http_api/source_api';
import {
MetricsExplorerResponse,
metricsExplorerResponseRT,
@@ -24,7 +24,7 @@ function isSameOptions(current: MetricsExplorerOptions, next: MetricsExplorerOpt
export function useMetricsExplorerData(
options: MetricsExplorerOptions,
- source: SourceQuery.Query['source']['configuration'] | undefined,
+ source: InfraSourceConfiguration | undefined,
derivedIndexPattern: IIndexPattern,
timerange: MetricsExplorerTimeOptions,
afterKey: string | null | Record,
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
index 20efca79650a..8ca921f4f266 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -8,8 +8,8 @@ import { EuiErrorBoundary } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
import { IIndexPattern } from 'src/plugins/data/public';
+import { InfraSourceConfiguration } from '../../../../common/http_api/source_api';
import { useTrackPageview } from '../../../../../observability/public';
-import { SourceQuery } from '../../../../common/graphql/types';
import { DocumentTitle } from '../../../components/document_title';
import { NoData } from '../../../components/empty_states';
import { MetricsExplorerCharts } from './components/charts';
@@ -18,7 +18,7 @@ import { useMetricsExplorerState } from './hooks/use_metric_explorer_state';
import { useSavedViewContext } from '../../../containers/saved_view/saved_view';
interface MetricsExplorerPageProps {
- source: SourceQuery.Query['source']['configuration'];
+ source: InfraSourceConfiguration;
derivedIndexPattern: IIndexPattern;
}
diff --git a/x-pack/plugins/infra/public/utils/apollo_client.ts b/x-pack/plugins/infra/public/utils/apollo_client.ts
deleted file mode 100644
index 41831a03cabb..000000000000
--- a/x-pack/plugins/infra/public/utils/apollo_client.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
-import ApolloClient from 'apollo-client';
-import { ApolloLink } from 'apollo-link';
-import { createHttpLink } from 'apollo-link-http';
-import { withClientState } from 'apollo-link-state';
-import { HttpFetchOptions, HttpHandler } from 'src/core/public';
-import introspectionQueryResultData from '../graphql/introspection.json';
-
-export const createApolloClient = (fetch: HttpHandler) => {
- const cache = new InMemoryCache({
- addTypename: false,
- fragmentMatcher: new IntrospectionFragmentMatcher({
- // @ts-expect-error apollo-cache-inmemory types don't match actual introspection data
- introspectionQueryResultData,
- }),
- });
-
- const wrappedFetch = (path: string, options: HttpFetchOptions) => {
- return new Promise(async (resolve, reject) => {
- // core.http.fetch isn't 100% compatible with the Fetch API and will
- // throw Errors on 401s. This top level try / catch handles those scenarios.
- try {
- fetch(path, {
- ...options,
- // Set headers to undefined due to this bug: https://github.com/apollographql/apollo-link/issues/249,
- // Apollo will try to set a "content-type" header which will conflict with the "Content-Type" header that
- // core.http.fetch correctly sets.
- headers: undefined,
- asResponse: true,
- }).then((res) => {
- if (!res.response) {
- return reject();
- }
- // core.http.fetch will parse the Response and set a body before handing it back. As such .text() / .json()
- // will have already been called on the Response instance. However, Apollo will also want to call
- // .text() / .json() on the instance, as it expects the raw Response instance, rather than core's wrapper.
- // .text() / .json() can only be called once, and an Error will be thrown if those methods are accessed again.
- // This hacks around that by setting up a new .text() method that will restringify the JSON response we already have.
- // This does result in an extra stringify / parse cycle, which isn't ideal, but as we only have a few endpoints left using
- // GraphQL this shouldn't create excessive overhead.
- // Ref: https://github.com/apollographql/apollo-link/blob/master/packages/apollo-link-http/src/httpLink.ts#L134
- // and
- // https://github.com/apollographql/apollo-link/blob/master/packages/apollo-link-http-common/src/index.ts#L125
- return resolve({
- ...res.response,
- text: () => {
- return new Promise(async (resolveText, rejectText) => {
- if (res.body) {
- return resolveText(JSON.stringify(res.body));
- } else {
- return rejectText();
- }
- });
- },
- });
- });
- } catch (error) {
- reject(error);
- }
- });
- };
-
- const HttpLink = createHttpLink({
- fetch: wrappedFetch,
- uri: `/api/infra/graphql`,
- });
-
- const graphQLOptions = {
- cache,
- link: ApolloLink.from([
- withClientState({
- cache,
- resolvers: {},
- }),
- HttpLink,
- ]),
- };
-
- return new ApolloClient(graphQLOptions);
-};
diff --git a/x-pack/plugins/infra/public/utils/apollo_context.ts b/x-pack/plugins/infra/public/utils/apollo_context.ts
deleted file mode 100644
index a33a1964c4d8..000000000000
--- a/x-pack/plugins/infra/public/utils/apollo_context.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ApolloClient } from 'apollo-client';
-import { createContext, useContext } from 'react';
-
-/**
- * This is a temporary provider and hook for use with hooks until react-apollo
- * has upgraded to the new-style `createContext` api.
- */
-
-export const ApolloClientContext = createContext | undefined>(undefined);
-
-export const useApolloClient = () => {
- return useContext(ApolloClientContext);
-};
-
-export class DependencyError extends Error {
- constructor(message?: string) {
- super(message);
- Object.setPrototypeOf(this, new.target.prototype);
- }
-}
diff --git a/x-pack/plugins/infra/public/utils/source_configuration.ts b/x-pack/plugins/infra/public/utils/source_configuration.ts
index 5104ed46000f..cbffe7826f81 100644
--- a/x-pack/plugins/infra/public/utils/source_configuration.ts
+++ b/x-pack/plugins/infra/public/utils/source_configuration.ts
@@ -4,14 +4,17 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { SourceConfigurationFields } from '../graphql/types';
+import {
+ InfraSavedSourceConfigurationColumn,
+ InfraSavedSourceConfigurationFields,
+ InfraSourceConfigurationMessageColumn,
+ InfraSourceConfigurationTimestampColumn,
+} from '../../common/http_api/source_api';
-export type SourceConfiguration = SourceConfigurationFields.Fragment;
-
-export type LogColumnConfiguration = SourceConfigurationFields.LogColumns;
-export type FieldLogColumnConfiguration = SourceConfigurationFields.InfraSourceFieldLogColumnInlineFragment;
-export type MessageLogColumnConfiguration = SourceConfigurationFields.InfraSourceMessageLogColumnInlineFragment;
-export type TimestampLogColumnConfiguration = SourceConfigurationFields.InfraSourceTimestampLogColumnInlineFragment;
+export type LogColumnConfiguration = InfraSavedSourceConfigurationColumn;
+export type FieldLogColumnConfiguration = InfraSavedSourceConfigurationFields;
+export type MessageLogColumnConfiguration = InfraSourceConfigurationMessageColumn;
+export type TimestampLogColumnConfiguration = InfraSourceConfigurationTimestampColumn;
export const isFieldLogColumnConfiguration = (
logColumnConfiguration: LogColumnConfiguration
diff --git a/x-pack/plugins/infra/scripts/combined_schema.ts b/x-pack/plugins/infra/scripts/combined_schema.ts
deleted file mode 100644
index 4813a3b674b3..000000000000
--- a/x-pack/plugins/infra/scripts/combined_schema.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { buildSchemaFromTypeDefinitions } from 'graphql-tools';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { schemas as serverSchemas } from '../server/graphql';
-
-export const schemas = [...serverSchemas];
-
-// this default export is used to feed the combined types to the gql-gen tool
-// which generates the corresponding typescript types
-// eslint-disable-next-line import/no-default-export
-export default buildSchemaFromTypeDefinitions(schemas);
diff --git a/x-pack/plugins/infra/scripts/generate_types_from_graphql.js b/x-pack/plugins/infra/scripts/generate_types_from_graphql.js
deleted file mode 100644
index aec5ff6da99c..000000000000
--- a/x-pack/plugins/infra/scripts/generate_types_from_graphql.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-require('../../../../src/setup_node_env');
-
-const { join, resolve } = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
-const { generate } = require('graphql-code-generator');
-
-const GRAPHQL_GLOBS = [
- join('public', 'containers', '**', '*.gql_query.ts{,x}'),
- join('public', 'store', '**', '*.gql_query.ts{,x}'),
- join('common', 'graphql', '**', '*.gql_query.ts{,x}'),
-];
-const CLIENT_CONFIG_PATH = resolve(__dirname, 'gql_gen_client.json');
-const SERVER_CONFIG_PATH = resolve(__dirname, 'gql_gen_server.json');
-const OUTPUT_INTROSPECTION_PATH = resolve('public', 'graphql', 'introspection.json');
-const OUTPUT_CLIENT_TYPES_PATH = resolve('public', 'graphql', 'types.ts');
-const OUTPUT_COMMON_TYPES_PATH = resolve('common', 'graphql', 'types.ts');
-const OUTPUT_SERVER_TYPES_PATH = resolve('server', 'graphql', 'types.ts');
-const SCHEMA_PATH = resolve(__dirname, 'combined_schema.ts');
-
-async function main() {
- await generate(
- {
- args: GRAPHQL_GLOBS,
- config: SERVER_CONFIG_PATH,
- out: OUTPUT_INTROSPECTION_PATH,
- overwrite: true,
- schema: SCHEMA_PATH,
- template: 'graphql-codegen-introspection-template',
- },
- true
- );
- await generate(
- {
- args: GRAPHQL_GLOBS,
- config: CLIENT_CONFIG_PATH,
- out: OUTPUT_CLIENT_TYPES_PATH,
- overwrite: true,
- schema: SCHEMA_PATH,
- template: 'graphql-codegen-typescript-template',
- },
- true
- );
- await generate(
- {
- args: GRAPHQL_GLOBS,
- config: CLIENT_CONFIG_PATH,
- out: OUTPUT_COMMON_TYPES_PATH,
- overwrite: true,
- schema: SCHEMA_PATH,
- template: 'graphql-codegen-typescript-template',
- },
- true
- );
- await generate(
- {
- args: [],
- config: SERVER_CONFIG_PATH,
- out: OUTPUT_SERVER_TYPES_PATH,
- overwrite: true,
- schema: SCHEMA_PATH,
- template: 'graphql-codegen-typescript-resolvers-template',
- },
- true
- );
-}
-
-if (require.main === module) {
- main();
-}
diff --git a/x-pack/plugins/infra/server/graphql/index.ts b/x-pack/plugins/infra/server/graphql/index.ts
deleted file mode 100644
index f5150972a3a6..000000000000
--- a/x-pack/plugins/infra/server/graphql/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { rootSchema } from '../../common/graphql/root/schema.gql';
-import { sharedSchema } from '../../common/graphql/shared/schema.gql';
-import { sourceStatusSchema } from './source_status/schema.gql';
-import { sourcesSchema } from './sources/schema.gql';
-
-export const schemas = [rootSchema, sharedSchema, sourcesSchema, sourceStatusSchema];
diff --git a/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts b/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts
deleted file mode 100644
index bd92dd0f7da8..000000000000
--- a/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { InfraIndexType, InfraSourceStatusResolvers } from '../../graphql/types';
-import { InfraFieldsDomain } from '../../lib/domains/fields_domain';
-import { InfraSourceStatus } from '../../lib/source_status';
-import { ChildResolverOf, InfraResolverOf } from '../../utils/typed_resolvers';
-import { QuerySourceResolver } from '../sources/resolvers';
-
-export type InfraSourceStatusMetricAliasExistsResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusMetricIndicesExistResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusMetricIndicesResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusLogAliasExistsResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusLogIndicesExistResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusLogIndicesResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export type InfraSourceStatusIndexFieldsResolver = ChildResolverOf<
- InfraResolverOf,
- QuerySourceResolver
->;
-
-export const createSourceStatusResolvers = (libs: {
- sourceStatus: InfraSourceStatus;
- fields: InfraFieldsDomain;
-}): {
- InfraSourceStatus: {
- metricAliasExists: InfraSourceStatusMetricAliasExistsResolver;
- metricIndicesExist: InfraSourceStatusMetricIndicesExistResolver;
- metricIndices: InfraSourceStatusMetricIndicesResolver;
- logAliasExists: InfraSourceStatusLogAliasExistsResolver;
- logIndicesExist: InfraSourceStatusLogIndicesExistResolver;
- logIndices: InfraSourceStatusLogIndicesResolver;
- indexFields: InfraSourceStatusIndexFieldsResolver;
- };
-} => ({
- InfraSourceStatus: {
- async metricAliasExists(source, args, { req }) {
- return await libs.sourceStatus.hasMetricAlias(req, source.id);
- },
- async metricIndicesExist(source, args, { req }) {
- return await libs.sourceStatus.hasMetricIndices(req, source.id);
- },
- async metricIndices(source, args, { req }) {
- return await libs.sourceStatus.getMetricIndexNames(req, source.id);
- },
- async logAliasExists(source, args, { req }) {
- return await libs.sourceStatus.hasLogAlias(req, source.id);
- },
- async logIndicesExist(source, args, { req }) {
- return (await libs.sourceStatus.getLogIndexStatus(req, source.id)) !== 'missing';
- },
- async logIndices(source, args, { req }) {
- return await libs.sourceStatus.getLogIndexNames(req, source.id);
- },
- async indexFields(source, args, { req }) {
- const fields = await libs.fields.getFields(
- req,
- source.id,
- args.indexType || InfraIndexType.ANY
- );
- return fields;
- },
- },
-});
diff --git a/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts b/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts
deleted file mode 100644
index e0482382c6d6..000000000000
--- a/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const sourceStatusSchema = gql`
- "A descriptor of a field in an index"
- type InfraIndexField {
- "The name of the field"
- name: String!
- "The type of the field's values as recognized by Kibana"
- type: String!
- "Whether the field's values can be efficiently searched for"
- searchable: Boolean!
- "Whether the field's values can be aggregated"
- aggregatable: Boolean!
- "Whether the field should be displayed based on event.module and a ECS allowed list"
- displayable: Boolean!
- }
-
- extend type InfraSourceStatus {
- "Whether the configured metric alias exists"
- metricAliasExists: Boolean!
- "Whether the configured log alias exists"
- logAliasExists: Boolean!
- "Whether the configured alias or wildcard pattern resolve to any metric indices"
- metricIndicesExist: Boolean!
- "Whether the configured alias or wildcard pattern resolve to any log indices"
- logIndicesExist: Boolean!
- "The list of indices in the metric alias"
- metricIndices: [String!]!
- "The list of indices in the log alias"
- logIndices: [String!]!
- "The list of fields defined in the index mappings"
- indexFields(indexType: InfraIndexType = ANY): [InfraIndexField!]!
- }
-`;
diff --git a/x-pack/plugins/infra/server/graphql/sources/resolvers.ts b/x-pack/plugins/infra/server/graphql/sources/resolvers.ts
deleted file mode 100644
index 15c4a6677946..000000000000
--- a/x-pack/plugins/infra/server/graphql/sources/resolvers.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { UserInputError } from 'apollo-server-errors';
-import { failure } from 'io-ts/lib/PathReporter';
-
-import { identity } from 'fp-ts/lib/function';
-import { pipe } from 'fp-ts/lib/pipeable';
-import { fold } from 'fp-ts/lib/Either';
-import {
- InfraSourceLogColumn,
- InfraSourceResolvers,
- MutationResolvers,
- QueryResolvers,
- UpdateSourceLogColumnInput,
-} from '../../graphql/types';
-import { InfraSourceStatus } from '../../lib/source_status';
-import {
- InfraSources,
- SavedSourceConfigurationFieldColumnRuntimeType,
- SavedSourceConfigurationMessageColumnRuntimeType,
- SavedSourceConfigurationTimestampColumnRuntimeType,
- SavedSourceConfigurationColumnRuntimeType,
-} from '../../lib/sources';
-import {
- ChildResolverOf,
- InfraResolverOf,
- InfraResolverWithFields,
- ResultOf,
-} from '../../utils/typed_resolvers';
-
-export type QuerySourceResolver = InfraResolverWithFields<
- QueryResolvers.SourceResolver,
- 'id' | 'version' | 'updatedAt' | 'configuration'
->;
-
-export type QueryAllSourcesResolver = InfraResolverWithFields<
- QueryResolvers.AllSourcesResolver,
- 'id' | 'version' | 'updatedAt' | 'configuration'
->;
-
-export type InfraSourceStatusResolver = ChildResolverOf<
- InfraResolverOf>>,
- QuerySourceResolver
->;
-
-export type MutationCreateSourceResolver = InfraResolverOf<
- MutationResolvers.CreateSourceResolver<{
- source: ResultOf;
- }>
->;
-
-export type MutationDeleteSourceResolver = InfraResolverOf;
-
-export type MutationUpdateSourceResolver = InfraResolverOf<
- MutationResolvers.UpdateSourceResolver<{
- source: ResultOf;
- }>
->;
-
-interface SourcesResolversDeps {
- sources: InfraSources;
- sourceStatus: InfraSourceStatus;
-}
-
-export const createSourcesResolvers = (
- libs: SourcesResolversDeps
-): {
- Query: {
- source: QuerySourceResolver;
- allSources: QueryAllSourcesResolver;
- };
- InfraSource: {
- status: InfraSourceStatusResolver;
- };
- InfraSourceLogColumn: {
- __resolveType(
- logColumn: InfraSourceLogColumn
- ):
- | 'InfraSourceTimestampLogColumn'
- | 'InfraSourceMessageLogColumn'
- | 'InfraSourceFieldLogColumn'
- | null;
- };
- Mutation: {
- createSource: MutationCreateSourceResolver;
- deleteSource: MutationDeleteSourceResolver;
- updateSource: MutationUpdateSourceResolver;
- };
-} => ({
- Query: {
- async source(root, args, { req }) {
- const requestedSourceConfiguration = await libs.sources.getSourceConfiguration(
- req.core.savedObjects.client,
- args.id
- );
-
- return requestedSourceConfiguration;
- },
- async allSources(root, args, { req }) {
- const sourceConfigurations = await libs.sources.getAllSourceConfigurations(
- req.core.savedObjects.client
- );
-
- return sourceConfigurations;
- },
- },
- InfraSource: {
- async status(source) {
- return source;
- },
- },
- InfraSourceLogColumn: {
- __resolveType(logColumn) {
- if (SavedSourceConfigurationTimestampColumnRuntimeType.is(logColumn)) {
- return 'InfraSourceTimestampLogColumn';
- }
-
- if (SavedSourceConfigurationMessageColumnRuntimeType.is(logColumn)) {
- return 'InfraSourceMessageLogColumn';
- }
-
- if (SavedSourceConfigurationFieldColumnRuntimeType.is(logColumn)) {
- return 'InfraSourceFieldLogColumn';
- }
-
- return null;
- },
- },
- Mutation: {
- async createSource(root, args, { req }) {
- const sourceConfiguration = await libs.sources.createSourceConfiguration(
- req.core.savedObjects.client,
- args.id,
- compactObject({
- ...args.sourceProperties,
- fields: args.sourceProperties.fields
- ? compactObject(args.sourceProperties.fields)
- : undefined,
- logColumns: decodeLogColumns(args.sourceProperties.logColumns),
- })
- );
-
- return {
- source: sourceConfiguration,
- };
- },
- async deleteSource(root, args, { req }) {
- await libs.sources.deleteSourceConfiguration(req.core.savedObjects.client, args.id);
-
- return {
- id: args.id,
- };
- },
- async updateSource(root, args, { req }) {
- const updatedSourceConfiguration = await libs.sources.updateSourceConfiguration(
- req.core.savedObjects.client,
- args.id,
- compactObject({
- ...args.sourceProperties,
- fields: args.sourceProperties.fields
- ? compactObject(args.sourceProperties.fields)
- : undefined,
- logColumns: decodeLogColumns(args.sourceProperties.logColumns),
- })
- );
-
- return {
- source: updatedSourceConfiguration,
- };
- },
- },
-});
-
-type CompactObject = { [K in keyof T]: NonNullable };
-
-const compactObject = (obj: T): CompactObject =>
- Object.entries(obj).reduce>(
- (accumulatedObj, [key, value]) =>
- typeof value === 'undefined' || value === null
- ? accumulatedObj
- : {
- ...(accumulatedObj as any),
- [key]: value,
- },
- {} as CompactObject
- );
-
-const decodeLogColumns = (logColumns?: UpdateSourceLogColumnInput[] | null) =>
- logColumns
- ? logColumns.map((logColumn) =>
- pipe(
- SavedSourceConfigurationColumnRuntimeType.decode(logColumn),
- fold((errors) => {
- throw new UserInputError(failure(errors).join('\n'));
- }, identity)
- )
- )
- : undefined;
diff --git a/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts b/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts
deleted file mode 100644
index dbd0696fe3e0..000000000000
--- a/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import gql from 'graphql-tag';
-
-export const sourcesSchema = gql`
- "A source of infrastructure data"
- type InfraSource {
- "The id of the source"
- id: ID!
- "The version number the source configuration was last persisted with"
- version: String
- "The timestamp the source configuration was last persisted at"
- updatedAt: Float
- "The origin of the source (one of 'fallback', 'internal', 'stored')"
- origin: String!
- "The raw configuration of the source"
- configuration: InfraSourceConfiguration!
- "The status of the source"
- status: InfraSourceStatus!
- }
-
- "The status of an infrastructure data source"
- type InfraSourceStatus
-
- "A set of configuration options for an infrastructure data source"
- type InfraSourceConfiguration {
- "The name of the data source"
- name: String!
- "A description of the data source"
- description: String!
- "The alias to read metric data from"
- metricAlias: String!
- "The alias to read log data from"
- logAlias: String!
- "Default view for inventory"
- inventoryDefaultView: String!
- "Default view for Metrics Explorer"
- metricsExplorerDefaultView: String!
- "The field mapping to use for this source"
- fields: InfraSourceFields!
- "The columns to use for log display"
- logColumns: [InfraSourceLogColumn!]!
- }
-
- "A mapping of semantic fields to their document counterparts"
- type InfraSourceFields {
- "The field to identify a container by"
- container: String!
- "The fields to identify a host by"
- host: String!
- "The fields to use as the log message"
- message: [String!]!
- "The field to identify a pod by"
- pod: String!
- "The field to use as a tiebreaker for log events that have identical timestamps"
- tiebreaker: String!
- "The field to use as a timestamp for metrics and logs"
- timestamp: String!
- }
-
- "The built-in timestamp log column"
- type InfraSourceTimestampLogColumn {
- timestampColumn: InfraSourceTimestampLogColumnAttributes!
- }
-
- type InfraSourceTimestampLogColumnAttributes {
- "A unique id for the column"
- id: ID!
- }
-
- "The built-in message log column"
- type InfraSourceMessageLogColumn {
- messageColumn: InfraSourceMessageLogColumnAttributes!
- }
-
- type InfraSourceMessageLogColumnAttributes {
- "A unique id for the column"
- id: ID!
- }
-
- "A log column containing a field value"
- type InfraSourceFieldLogColumn {
- fieldColumn: InfraSourceFieldLogColumnAttributes!
- }
-
- type InfraSourceFieldLogColumnAttributes {
- "A unique id for the column"
- id: ID!
- "The field name this column refers to"
- field: String!
- }
-
- "All known log column types"
- union InfraSourceLogColumn =
- InfraSourceTimestampLogColumn
- | InfraSourceMessageLogColumn
- | InfraSourceFieldLogColumn
-
- extend type Query {
- """
- Get an infrastructure data source by id.
-
- The resolution order for the source configuration attributes is as follows
- with the first defined value winning:
-
- 1. The attributes of the saved object with the given 'id'.
- 2. The attributes defined in the static Kibana configuration key
- 'xpack.infra.sources.default'.
- 3. The hard-coded default values.
-
- As a consequence, querying a source that doesn't exist doesn't error out,
- but returns the configured or hardcoded defaults.
- """
- source("The id of the source" id: ID!): InfraSource!
- "Get a list of all infrastructure data sources"
- allSources: [InfraSource!]!
- }
-
- "The properties to update the source with"
- input UpdateSourceInput {
- "The name of the data source"
- name: String
- "A description of the data source"
- description: String
- "The alias to read metric data from"
- metricAlias: String
- "The alias to read log data from"
- logAlias: String
- "The field mapping to use for this source"
- fields: UpdateSourceFieldsInput
- "Name of default inventory view"
- inventoryDefaultView: String
- "Default view for Metrics Explorer"
- metricsExplorerDefaultView: String
- "The log columns to display for this source"
- logColumns: [UpdateSourceLogColumnInput!]
- }
-
- "The mapping of semantic fields of the source to be created"
- input UpdateSourceFieldsInput {
- "The field to identify a container by"
- container: String
- "The fields to identify a host by"
- host: String
- "The field to identify a pod by"
- pod: String
- "The field to use as a tiebreaker for log events that have identical timestamps"
- tiebreaker: String
- "The field to use as a timestamp for metrics and logs"
- timestamp: String
- }
-
- "One of the log column types to display for this source"
- input UpdateSourceLogColumnInput {
- "A custom field log column"
- fieldColumn: UpdateSourceFieldLogColumnInput
- "A built-in message log column"
- messageColumn: UpdateSourceMessageLogColumnInput
- "A built-in timestamp log column"
- timestampColumn: UpdateSourceTimestampLogColumnInput
- }
-
- input UpdateSourceFieldLogColumnInput {
- id: ID!
- field: String!
- }
-
- input UpdateSourceMessageLogColumnInput {
- id: ID!
- }
-
- input UpdateSourceTimestampLogColumnInput {
- id: ID!
- }
-
- "The result of a successful source update"
- type UpdateSourceResult {
- "The source that was updated"
- source: InfraSource!
- }
-
- "The result of a source deletion operations"
- type DeleteSourceResult {
- "The id of the source that was deleted"
- id: ID!
- }
-
- extend type Mutation {
- "Create a new source of infrastructure data"
- createSource(
- "The id of the source"
- id: ID!
- sourceProperties: UpdateSourceInput!
- ): UpdateSourceResult!
- "Modify an existing source"
- updateSource(
- "The id of the source"
- id: ID!
- "The properties to update the source with"
- sourceProperties: UpdateSourceInput!
- ): UpdateSourceResult!
- "Delete a source of infrastructure data"
- deleteSource("The id of the source" id: ID!): DeleteSourceResult!
- }
-`;
diff --git a/x-pack/plugins/infra/server/graphql/types.ts b/x-pack/plugins/infra/server/graphql/types.ts
deleted file mode 100644
index 712438ce2bfe..000000000000
--- a/x-pack/plugins/infra/server/graphql/types.ts
+++ /dev/null
@@ -1,1111 +0,0 @@
-/* tslint:disable */
-import { InfraContext } from '../lib/infra_types';
-import { GraphQLResolveInfo } from 'graphql';
-
-export type Resolver = (
- parent: Parent,
- args: Args,
- context: Context,
- info: GraphQLResolveInfo
-) => Promise | Result;
-
-export interface ISubscriptionResolverObject {
- subscribe(
- parent: P,
- args: Args,
- context: Context,
- info: GraphQLResolveInfo
- ): AsyncIterator;
- resolve?(
- parent: P,
- args: Args,
- context: Context,
- info: GraphQLResolveInfo
- ): R | Result | Promise;
-}
-
-export type SubscriptionResolver =
- | ((...args: any[]) => ISubscriptionResolverObject)
- | ISubscriptionResolverObject;
-
-// ====================================================
-// START: Typescript template
-// ====================================================
-
-// ====================================================
-// Types
-// ====================================================
-
-export interface Query {
- /** Get an infrastructure data source by id.The resolution order for the source configuration attributes is as followswith the first defined value winning:1. The attributes of the saved object with the given 'id'.2. The attributes defined in the static Kibana configuration key'xpack.infra.sources.default'.3. The hard-coded default values.As a consequence, querying a source that doesn't exist doesn't error out,but returns the configured or hardcoded defaults. */
- source: InfraSource;
- /** Get a list of all infrastructure data sources */
- allSources: InfraSource[];
-}
-/** A source of infrastructure data */
-export interface InfraSource {
- /** The id of the source */
- id: string;
- /** The version number the source configuration was last persisted with */
- version?: string | null;
- /** The timestamp the source configuration was last persisted at */
- updatedAt?: number | null;
- /** The origin of the source (one of 'fallback', 'internal', 'stored') */
- origin: string;
- /** The raw configuration of the source */
- configuration: InfraSourceConfiguration;
- /** The status of the source */
- status: InfraSourceStatus;
-
- /** A snapshot of nodes */
- snapshot?: InfraSnapshotResponse | null;
-
- metrics: InfraMetricData[];
-}
-/** A set of configuration options for an infrastructure data source */
-export interface InfraSourceConfiguration {
- /** The name of the data source */
- name: string;
- /** A description of the data source */
- description: string;
- /** The alias to read metric data from */
- metricAlias: string;
- /** The alias to read log data from */
- logAlias: string;
- /** The field mapping to use for this source */
- fields: InfraSourceFields;
- /** The columns to use for log display */
- logColumns: InfraSourceLogColumn[];
-}
-/** A mapping of semantic fields to their document counterparts */
-export interface InfraSourceFields {
- /** The field to identify a container by */
- container: string;
- /** The fields to identify a host by */
- host: string;
- /** The fields to use as the log message */
- message: string[];
- /** The field to identify a pod by */
- pod: string;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker: string;
- /** The field to use as a timestamp for metrics and logs */
- timestamp: string;
-}
-/** The built-in timestamp log column */
-export interface InfraSourceTimestampLogColumn {
- timestampColumn: InfraSourceTimestampLogColumnAttributes;
-}
-
-export interface InfraSourceTimestampLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** The built-in message log column */
-export interface InfraSourceMessageLogColumn {
- messageColumn: InfraSourceMessageLogColumnAttributes;
-}
-
-export interface InfraSourceMessageLogColumnAttributes {
- /** A unique id for the column */
- id: string;
-}
-/** A log column containing a field value */
-export interface InfraSourceFieldLogColumn {
- fieldColumn: InfraSourceFieldLogColumnAttributes;
-}
-
-export interface InfraSourceFieldLogColumnAttributes {
- /** A unique id for the column */
- id: string;
- /** The field name this column refers to */
- field: string;
-}
-/** The status of an infrastructure data source */
-export interface InfraSourceStatus {
- /** Whether the configured metric alias exists */
- metricAliasExists: boolean;
- /** Whether the configured log alias exists */
- logAliasExists: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any metric indices */
- metricIndicesExist: boolean;
- /** Whether the configured alias or wildcard pattern resolve to any log indices */
- logIndicesExist: boolean;
- /** The list of indices in the metric alias */
- metricIndices: string[];
- /** The list of indices in the log alias */
- logIndices: string[];
- /** The list of fields defined in the index mappings */
- indexFields: InfraIndexField[];
-}
-/** A descriptor of a field in an index */
-export interface InfraIndexField {
- /** The name of the field */
- name: string;
- /** The type of the field's values as recognized by Kibana */
- type: string;
- /** Whether the field's values can be efficiently searched for */
- searchable: boolean;
- /** Whether the field's values can be aggregated */
- aggregatable: boolean;
- /** Whether the field should be displayed based on event.module and a ECS allowed list */
- displayable: boolean;
-}
-
-export interface InfraSnapshotResponse {
- /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
- nodes: InfraSnapshotNode[];
-}
-
-export interface InfraSnapshotNode {
- path: InfraSnapshotNodePath[];
-
- metric: InfraSnapshotNodeMetric;
-}
-
-export interface InfraSnapshotNodePath {
- value: string;
-
- label: string;
-
- ip?: string | null;
-}
-
-export interface InfraSnapshotNodeMetric {
- name: InfraSnapshotMetricType;
-
- value?: number | null;
-
- avg?: number | null;
-
- max?: number | null;
-}
-
-export interface InfraMetricData {
- id?: InfraMetric | null;
-
- series: InfraDataSeries[];
-}
-
-export interface InfraDataSeries {
- id: string;
-
- label: string;
-
- data: InfraDataPoint[];
-}
-
-export interface InfraDataPoint {
- timestamp: number;
-
- value?: number | null;
-}
-
-export interface Mutation {
- /** Create a new source of infrastructure data */
- createSource: UpdateSourceResult;
- /** Modify an existing source */
- updateSource: UpdateSourceResult;
- /** Delete a source of infrastructure data */
- deleteSource: DeleteSourceResult;
-}
-/** The result of a successful source update */
-export interface UpdateSourceResult {
- /** The source that was updated */
- source: InfraSource;
-}
-/** The result of a source deletion operations */
-export interface DeleteSourceResult {
- /** The id of the source that was deleted */
- id: string;
-}
-
-// ====================================================
-// InputTypes
-// ====================================================
-
-export interface InfraTimerangeInput {
- /** The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan. */
- interval: string;
- /** The end of the timerange */
- to: number;
- /** The beginning of the timerange */
- from: number;
-}
-
-export interface InfraSnapshotGroupbyInput {
- /** The label to use in the results for the group by for the terms group by */
- label?: string | null;
- /** The field to group by from a terms aggregation, this is ignored by the filter type */
- field?: string | null;
-}
-
-export interface InfraSnapshotMetricInput {
- /** The type of metric */
- type: InfraSnapshotMetricType;
-}
-
-export interface InfraNodeIdsInput {
- nodeId: string;
-
- cloudId?: string | null;
-}
-/** The properties to update the source with */
-export interface UpdateSourceInput {
- /** The name of the data source */
- name?: string | null;
- /** A description of the data source */
- description?: string | null;
- /** The alias to read metric data from */
- metricAlias?: string | null;
- /** The alias to read log data from */
- logAlias?: string | null;
- /** The field mapping to use for this source */
- fields?: UpdateSourceFieldsInput | null;
- /** Name of default inventory view */
- inventoryDefaultView?: string | null;
- /** Default view for Metrics Explorer */
- metricsExplorerDefaultView?: string | null;
- /** The log columns to display for this source */
- logColumns?: UpdateSourceLogColumnInput[] | null;
-}
-/** The mapping of semantic fields of the source to be created */
-export interface UpdateSourceFieldsInput {
- /** The field to identify a container by */
- container?: string | null;
- /** The fields to identify a host by */
- host?: string | null;
- /** The field to identify a pod by */
- pod?: string | null;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker?: string | null;
- /** The field to use as a timestamp for metrics and logs */
- timestamp?: string | null;
-}
-/** One of the log column types to display for this source */
-export interface UpdateSourceLogColumnInput {
- /** A custom field log column */
- fieldColumn?: UpdateSourceFieldLogColumnInput | null;
- /** A built-in message log column */
- messageColumn?: UpdateSourceMessageLogColumnInput | null;
- /** A built-in timestamp log column */
- timestampColumn?: UpdateSourceTimestampLogColumnInput | null;
-}
-
-export interface UpdateSourceFieldLogColumnInput {
- id: string;
-
- field: string;
-}
-
-export interface UpdateSourceMessageLogColumnInput {
- id: string;
-}
-
-export interface UpdateSourceTimestampLogColumnInput {
- id: string;
-}
-
-// ====================================================
-// Arguments
-// ====================================================
-
-export interface SourceQueryArgs {
- /** The id of the source */
- id: string;
-}
-export interface SnapshotInfraSourceArgs {
- timerange: InfraTimerangeInput;
-
- filterQuery?: string | null;
-}
-export interface MetricsInfraSourceArgs {
- nodeIds: InfraNodeIdsInput;
-
- nodeType: InfraNodeType;
-
- timerange: InfraTimerangeInput;
-
- metrics: InfraMetric[];
-}
-export interface IndexFieldsInfraSourceStatusArgs {
- indexType?: InfraIndexType | null;
-}
-export interface NodesInfraSnapshotResponseArgs {
- type: InfraNodeType;
-
- groupBy: InfraSnapshotGroupbyInput[];
-
- metric: InfraSnapshotMetricInput;
-}
-export interface CreateSourceMutationArgs {
- /** The id of the source */
- id: string;
-
- sourceProperties: UpdateSourceInput;
-}
-export interface UpdateSourceMutationArgs {
- /** The id of the source */
- id: string;
- /** The properties to update the source with */
- sourceProperties: UpdateSourceInput;
-}
-export interface DeleteSourceMutationArgs {
- /** The id of the source */
- id: string;
-}
-
-// ====================================================
-// Enums
-// ====================================================
-
-export enum InfraIndexType {
- ANY = 'ANY',
- LOGS = 'LOGS',
- METRICS = 'METRICS',
-}
-
-export enum InfraNodeType {
- pod = 'pod',
- container = 'container',
- host = 'host',
- awsEC2 = 'awsEC2',
- awsS3 = 'awsS3',
- awsRDS = 'awsRDS',
- awsSQS = 'awsSQS',
-}
-
-export enum InfraSnapshotMetricType {
- count = 'count',
- cpu = 'cpu',
- load = 'load',
- memory = 'memory',
- tx = 'tx',
- rx = 'rx',
- logRate = 'logRate',
- diskIOReadBytes = 'diskIOReadBytes',
- diskIOWriteBytes = 'diskIOWriteBytes',
- s3TotalRequests = 's3TotalRequests',
- s3NumberOfObjects = 's3NumberOfObjects',
- s3BucketSize = 's3BucketSize',
- s3DownloadBytes = 's3DownloadBytes',
- s3UploadBytes = 's3UploadBytes',
- rdsConnections = 'rdsConnections',
- rdsQueriesExecuted = 'rdsQueriesExecuted',
- rdsActiveTransactions = 'rdsActiveTransactions',
- rdsLatency = 'rdsLatency',
- sqsMessagesVisible = 'sqsMessagesVisible',
- sqsMessagesDelayed = 'sqsMessagesDelayed',
- sqsMessagesSent = 'sqsMessagesSent',
- sqsMessagesEmpty = 'sqsMessagesEmpty',
- sqsOldestMessage = 'sqsOldestMessage',
-}
-
-export enum InfraMetric {
- hostSystemOverview = 'hostSystemOverview',
- hostCpuUsage = 'hostCpuUsage',
- hostFilesystem = 'hostFilesystem',
- hostK8sOverview = 'hostK8sOverview',
- hostK8sCpuCap = 'hostK8sCpuCap',
- hostK8sDiskCap = 'hostK8sDiskCap',
- hostK8sMemoryCap = 'hostK8sMemoryCap',
- hostK8sPodCap = 'hostK8sPodCap',
- hostLoad = 'hostLoad',
- hostMemoryUsage = 'hostMemoryUsage',
- hostNetworkTraffic = 'hostNetworkTraffic',
- hostDockerOverview = 'hostDockerOverview',
- hostDockerInfo = 'hostDockerInfo',
- hostDockerTop5ByCpu = 'hostDockerTop5ByCpu',
- hostDockerTop5ByMemory = 'hostDockerTop5ByMemory',
- podOverview = 'podOverview',
- podCpuUsage = 'podCpuUsage',
- podMemoryUsage = 'podMemoryUsage',
- podLogUsage = 'podLogUsage',
- podNetworkTraffic = 'podNetworkTraffic',
- containerOverview = 'containerOverview',
- containerCpuKernel = 'containerCpuKernel',
- containerCpuUsage = 'containerCpuUsage',
- containerDiskIOOps = 'containerDiskIOOps',
- containerDiskIOBytes = 'containerDiskIOBytes',
- containerMemory = 'containerMemory',
- containerNetworkTraffic = 'containerNetworkTraffic',
- nginxHits = 'nginxHits',
- nginxRequestRate = 'nginxRequestRate',
- nginxActiveConnections = 'nginxActiveConnections',
- nginxRequestsPerConnection = 'nginxRequestsPerConnection',
- awsOverview = 'awsOverview',
- awsCpuUtilization = 'awsCpuUtilization',
- awsNetworkBytes = 'awsNetworkBytes',
- awsNetworkPackets = 'awsNetworkPackets',
- awsDiskioBytes = 'awsDiskioBytes',
- awsDiskioOps = 'awsDiskioOps',
- awsEC2CpuUtilization = 'awsEC2CpuUtilization',
- awsEC2DiskIOBytes = 'awsEC2DiskIOBytes',
- awsEC2NetworkTraffic = 'awsEC2NetworkTraffic',
- awsS3TotalRequests = 'awsS3TotalRequests',
- awsS3NumberOfObjects = 'awsS3NumberOfObjects',
- awsS3BucketSize = 'awsS3BucketSize',
- awsS3DownloadBytes = 'awsS3DownloadBytes',
- awsS3UploadBytes = 'awsS3UploadBytes',
- awsRDSCpuTotal = 'awsRDSCpuTotal',
- awsRDSConnections = 'awsRDSConnections',
- awsRDSQueriesExecuted = 'awsRDSQueriesExecuted',
- awsRDSActiveTransactions = 'awsRDSActiveTransactions',
- awsRDSLatency = 'awsRDSLatency',
- awsSQSMessagesVisible = 'awsSQSMessagesVisible',
- awsSQSMessagesDelayed = 'awsSQSMessagesDelayed',
- awsSQSMessagesSent = 'awsSQSMessagesSent',
- awsSQSMessagesEmpty = 'awsSQSMessagesEmpty',
- awsSQSOldestMessage = 'awsSQSOldestMessage',
- custom = 'custom',
-}
-
-// ====================================================
-// Unions
-// ====================================================
-
-/** All known log column types */
-export type InfraSourceLogColumn =
- | InfraSourceTimestampLogColumn
- | InfraSourceMessageLogColumn
- | InfraSourceFieldLogColumn;
-
-// ====================================================
-// END: Typescript template
-// ====================================================
-
-// ====================================================
-// Resolvers
-// ====================================================
-
-export namespace QueryResolvers {
- export interface Resolvers {
- /** Get an infrastructure data source by id.The resolution order for the source configuration attributes is as followswith the first defined value winning:1. The attributes of the saved object with the given 'id'.2. The attributes defined in the static Kibana configuration key'xpack.infra.sources.default'.3. The hard-coded default values.As a consequence, querying a source that doesn't exist doesn't error out,but returns the configured or hardcoded defaults. */
- source?: SourceResolver;
- /** Get a list of all infrastructure data sources */
- allSources?: AllSourcesResolver;
- }
-
- export type SourceResolver = Resolver<
- R,
- Parent,
- Context,
- SourceArgs
- >;
- export interface SourceArgs {
- /** The id of the source */
- id: string;
- }
-
- export type AllSourcesResolver<
- R = InfraSource[],
- Parent = never,
- Context = InfraContext
- > = Resolver;
-}
-/** A source of infrastructure data */
-export namespace InfraSourceResolvers {
- export interface Resolvers {
- /** The id of the source */
- id?: IdResolver;
- /** The version number the source configuration was last persisted with */
- version?: VersionResolver;
- /** The timestamp the source configuration was last persisted at */
- updatedAt?: UpdatedAtResolver;
- /** The origin of the source (one of 'fallback', 'internal', 'stored') */
- origin?: OriginResolver;
- /** The raw configuration of the source */
- configuration?: ConfigurationResolver;
- /** The status of the source */
- status?: StatusResolver;
-
- /** A snapshot of nodes */
- snapshot?: SnapshotResolver;
-
- metrics?: MetricsResolver;
- }
-
- export type IdResolver = Resolver<
- R,
- Parent,
- Context
- >;
- export type VersionResolver<
- R = string | null,
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
- export type UpdatedAtResolver<
- R = number | null,
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
- export type OriginResolver = Resolver<
- R,
- Parent,
- Context
- >;
- export type ConfigurationResolver<
- R = InfraSourceConfiguration,
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
- export type StatusResolver<
- R = InfraSourceStatus,
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
-
- export type SnapshotResolver<
- R = InfraSnapshotResponse | null,
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
- export interface SnapshotArgs {
- timerange: InfraTimerangeInput;
-
- filterQuery?: string | null;
- }
-
- export type MetricsResolver<
- R = InfraMetricData[],
- Parent = InfraSource,
- Context = InfraContext
- > = Resolver;
- export interface MetricsArgs {
- nodeIds: InfraNodeIdsInput;
-
- nodeType: InfraNodeType;
-
- timerange: InfraTimerangeInput;
-
- metrics: InfraMetric[];
- }
-}
-/** A set of configuration options for an infrastructure data source */
-export namespace InfraSourceConfigurationResolvers {
- export interface Resolvers {
- /** The name of the data source */
- name?: NameResolver;
- /** A description of the data source */
- description?: DescriptionResolver;
- /** The alias to read metric data from */
- metricAlias?: MetricAliasResolver;
- /** The alias to read log data from */
- logAlias?: LogAliasResolver;
- /** The field mapping to use for this source */
- fields?: FieldsResolver;
- /** The columns to use for log display */
- logColumns?: LogColumnsResolver;
- }
-
- export type NameResolver<
- R = string,
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
- export type DescriptionResolver<
- R = string,
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
- export type MetricAliasResolver<
- R = string,
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
- export type LogAliasResolver<
- R = string,
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
- export type FieldsResolver<
- R = InfraSourceFields,
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
- export type LogColumnsResolver<
- R = InfraSourceLogColumn[],
- Parent = InfraSourceConfiguration,
- Context = InfraContext
- > = Resolver;
-}
-/** A mapping of semantic fields to their document counterparts */
-export namespace InfraSourceFieldsResolvers {
- export interface Resolvers {
- /** The field to identify a container by */
- container?: ContainerResolver;
- /** The fields to identify a host by */
- host?: HostResolver;
- /** The fields to use as the log message */
- message?: MessageResolver;
- /** The field to identify a pod by */
- pod?: PodResolver;
- /** The field to use as a tiebreaker for log events that have identical timestamps */
- tiebreaker?: TiebreakerResolver;
- /** The field to use as a timestamp for metrics and logs */
- timestamp?: TimestampResolver;
- }
-
- export type ContainerResolver<
- R = string,
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
- export type HostResolver<
- R = string,
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
- export type MessageResolver<
- R = string[],
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
- export type PodResolver<
- R = string,
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
- export type TiebreakerResolver<
- R = string,
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
- export type TimestampResolver<
- R = string,
- Parent = InfraSourceFields,
- Context = InfraContext
- > = Resolver;
-}
-/** The built-in timestamp log column */
-export namespace InfraSourceTimestampLogColumnResolvers {
- export interface Resolvers {
- timestampColumn?: TimestampColumnResolver<
- InfraSourceTimestampLogColumnAttributes,
- TypeParent,
- Context
- >;
- }
-
- export type TimestampColumnResolver<
- R = InfraSourceTimestampLogColumnAttributes,
- Parent = InfraSourceTimestampLogColumn,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSourceTimestampLogColumnAttributesResolvers {
- export interface Resolvers<
- Context = InfraContext,
- TypeParent = InfraSourceTimestampLogColumnAttributes
- > {
- /** A unique id for the column */
- id?: IdResolver;
- }
-
- export type IdResolver<
- R = string,
- Parent = InfraSourceTimestampLogColumnAttributes,
- Context = InfraContext
- > = Resolver;
-}
-/** The built-in message log column */
-export namespace InfraSourceMessageLogColumnResolvers {
- export interface Resolvers {
- messageColumn?: MessageColumnResolver<
- InfraSourceMessageLogColumnAttributes,
- TypeParent,
- Context
- >;
- }
-
- export type MessageColumnResolver<
- R = InfraSourceMessageLogColumnAttributes,
- Parent = InfraSourceMessageLogColumn,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSourceMessageLogColumnAttributesResolvers {
- export interface Resolvers<
- Context = InfraContext,
- TypeParent = InfraSourceMessageLogColumnAttributes
- > {
- /** A unique id for the column */
- id?: IdResolver;
- }
-
- export type IdResolver<
- R = string,
- Parent = InfraSourceMessageLogColumnAttributes,
- Context = InfraContext
- > = Resolver;
-}
-/** A log column containing a field value */
-export namespace InfraSourceFieldLogColumnResolvers {
- export interface Resolvers {
- fieldColumn?: FieldColumnResolver;
- }
-
- export type FieldColumnResolver<
- R = InfraSourceFieldLogColumnAttributes,
- Parent = InfraSourceFieldLogColumn,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSourceFieldLogColumnAttributesResolvers {
- export interface Resolvers<
- Context = InfraContext,
- TypeParent = InfraSourceFieldLogColumnAttributes
- > {
- /** A unique id for the column */
- id?: IdResolver;
- /** The field name this column refers to */
- field?: FieldResolver;
- }
-
- export type IdResolver<
- R = string,
- Parent = InfraSourceFieldLogColumnAttributes,
- Context = InfraContext
- > = Resolver;
- export type FieldResolver<
- R = string,
- Parent = InfraSourceFieldLogColumnAttributes,
- Context = InfraContext
- > = Resolver;
-}
-/** The status of an infrastructure data source */
-export namespace InfraSourceStatusResolvers {
- export interface Resolvers {
- /** Whether the configured metric alias exists */
- metricAliasExists?: MetricAliasExistsResolver;
- /** Whether the configured log alias exists */
- logAliasExists?: LogAliasExistsResolver;
- /** Whether the configured alias or wildcard pattern resolve to any metric indices */
- metricIndicesExist?: MetricIndicesExistResolver;
- /** Whether the configured alias or wildcard pattern resolve to any log indices */
- logIndicesExist?: LogIndicesExistResolver;
- /** The list of indices in the metric alias */
- metricIndices?: MetricIndicesResolver;
- /** The list of indices in the log alias */
- logIndices?: LogIndicesResolver;
- /** The list of fields defined in the index mappings */
- indexFields?: IndexFieldsResolver;
- }
-
- export type MetricAliasExistsResolver<
- R = boolean,
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type LogAliasExistsResolver<
- R = boolean,
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type MetricIndicesExistResolver<
- R = boolean,
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type LogIndicesExistResolver<
- R = boolean,
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type MetricIndicesResolver<
- R = string[],
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type LogIndicesResolver<
- R = string[],
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export type IndexFieldsResolver<
- R = InfraIndexField[],
- Parent = InfraSourceStatus,
- Context = InfraContext
- > = Resolver;
- export interface IndexFieldsArgs {
- indexType?: InfraIndexType | null;
- }
-}
-/** A descriptor of a field in an index */
-export namespace InfraIndexFieldResolvers {
- export interface Resolvers {
- /** The name of the field */
- name?: NameResolver;
- /** The type of the field's values as recognized by Kibana */
- type?: TypeResolver;
- /** Whether the field's values can be efficiently searched for */
- searchable?: SearchableResolver;
- /** Whether the field's values can be aggregated */
- aggregatable?: AggregatableResolver;
- /** Whether the field should be displayed based on event.module and a ECS allowed list */
- displayable?: DisplayableResolver;
- }
-
- export type NameResolver = Resolver<
- R,
- Parent,
- Context
- >;
- export type TypeResolver = Resolver<
- R,
- Parent,
- Context
- >;
- export type SearchableResolver<
- R = boolean,
- Parent = InfraIndexField,
- Context = InfraContext
- > = Resolver;
- export type AggregatableResolver<
- R = boolean,
- Parent = InfraIndexField,
- Context = InfraContext
- > = Resolver;
- export type DisplayableResolver<
- R = boolean,
- Parent = InfraIndexField,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSnapshotResponseResolvers {
- export interface Resolvers {
- /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
- nodes?: NodesResolver;
- }
-
- export type NodesResolver<
- R = InfraSnapshotNode[],
- Parent = InfraSnapshotResponse,
- Context = InfraContext
- > = Resolver;
- export interface NodesArgs {
- type: InfraNodeType;
-
- groupBy: InfraSnapshotGroupbyInput[];
-
- metric: InfraSnapshotMetricInput;
- }
-}
-
-export namespace InfraSnapshotNodeResolvers {
- export interface Resolvers {
- path?: PathResolver;
-
- metric?: MetricResolver;
- }
-
- export type PathResolver<
- R = InfraSnapshotNodePath[],
- Parent = InfraSnapshotNode,
- Context = InfraContext
- > = Resolver;
- export type MetricResolver<
- R = InfraSnapshotNodeMetric,
- Parent = InfraSnapshotNode,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSnapshotNodePathResolvers {
- export interface Resolvers {
- value?: ValueResolver;
-
- label?: LabelResolver;
-
- ip?: IpResolver;
- }
-
- export type ValueResolver<
- R = string,
- Parent = InfraSnapshotNodePath,
- Context = InfraContext
- > = Resolver;
- export type LabelResolver<
- R = string,
- Parent = InfraSnapshotNodePath,
- Context = InfraContext
- > = Resolver;
- export type IpResolver<
- R = string | null,
- Parent = InfraSnapshotNodePath,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraSnapshotNodeMetricResolvers {
- export interface Resolvers {
- name?: NameResolver;
-
- value?: ValueResolver;
-
- avg?: AvgResolver;
-
- max?: MaxResolver;
- }
-
- export type NameResolver<
- R = InfraSnapshotMetricType,
- Parent = InfraSnapshotNodeMetric,
- Context = InfraContext
- > = Resolver;
- export type ValueResolver<
- R = number | null,
- Parent = InfraSnapshotNodeMetric,
- Context = InfraContext
- > = Resolver;
- export type AvgResolver<
- R = number | null,
- Parent = InfraSnapshotNodeMetric,
- Context = InfraContext
- > = Resolver;
- export type MaxResolver<
- R = number | null,
- Parent = InfraSnapshotNodeMetric,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraMetricDataResolvers {
- export interface Resolvers {
- id?: IdResolver;
-
- series?: SeriesResolver;
- }
-
- export type IdResolver<
- R = InfraMetric | null,
- Parent = InfraMetricData,
- Context = InfraContext
- > = Resolver;
- export type SeriesResolver<
- R = InfraDataSeries[],
- Parent = InfraMetricData,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraDataSeriesResolvers {
- export interface Resolvers {
- id?: IdResolver;
-
- label?: LabelResolver;
-
- data?: DataResolver;
- }
-
- export type IdResolver = Resolver<
- R,
- Parent,
- Context
- >;
- export type LabelResolver<
- R = string,
- Parent = InfraDataSeries,
- Context = InfraContext
- > = Resolver;
- export type DataResolver<
- R = InfraDataPoint[],
- Parent = InfraDataSeries,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace InfraDataPointResolvers {
- export interface Resolvers {
- timestamp?: TimestampResolver;
-
- value?: ValueResolver;
- }
-
- export type TimestampResolver<
- R = number,
- Parent = InfraDataPoint,
- Context = InfraContext
- > = Resolver;
- export type ValueResolver<
- R = number | null,
- Parent = InfraDataPoint,
- Context = InfraContext
- > = Resolver;
-}
-
-export namespace MutationResolvers {
- export interface Resolvers {
- /** Create a new source of infrastructure data */
- createSource?: CreateSourceResolver;
- /** Modify an existing source */
- updateSource?: UpdateSourceResolver;
- /** Delete a source of infrastructure data */
- deleteSource?: DeleteSourceResolver;
- }
-
- export type CreateSourceResolver<
- R = UpdateSourceResult,
- Parent = never,
- Context = InfraContext
- > = Resolver;
- export interface CreateSourceArgs {
- /** The id of the source */
- id: string;
-
- sourceProperties: UpdateSourceInput;
- }
-
- export type UpdateSourceResolver<
- R = UpdateSourceResult,
- Parent = never,
- Context = InfraContext
- > = Resolver;
- export interface UpdateSourceArgs {
- /** The id of the source */
- id: string;
- /** The properties to update the source with */
- sourceProperties: UpdateSourceInput;
- }
-
- export type DeleteSourceResolver<
- R = DeleteSourceResult,
- Parent = never,
- Context = InfraContext
- > = Resolver;
- export interface DeleteSourceArgs {
- /** The id of the source */
- id: string;
- }
-}
-/** The result of a successful source update */
-export namespace UpdateSourceResultResolvers {
- export interface Resolvers {
- /** The source that was updated */
- source?: SourceResolver;
- }
-
- export type SourceResolver<
- R = InfraSource,
- Parent = UpdateSourceResult,
- Context = InfraContext
- > = Resolver;
-}
-/** The result of a source deletion operations */
-export namespace DeleteSourceResultResolvers {
- export interface Resolvers {
- /** The id of the source that was deleted */
- id?: IdResolver;
- }
-
- export type IdResolver<
- R = string,
- Parent = DeleteSourceResult,
- Context = InfraContext
- > = Resolver;
-}
diff --git a/x-pack/plugins/infra/server/infra_server.ts b/x-pack/plugins/infra/server/infra_server.ts
index b510519a4fd0..6ce5d5b8c53e 100644
--- a/x-pack/plugins/infra/server/infra_server.ts
+++ b/x-pack/plugins/infra/server/infra_server.ts
@@ -4,11 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { IResolvers, makeExecutableSchema } from 'graphql-tools';
import { initIpToHostName } from './routes/ip_to_hostname';
-import { schemas } from './graphql';
-import { createSourceStatusResolvers } from './graphql/source_status';
-import { createSourcesResolvers } from './graphql/sources';
import { InfraBackendLibs } from './lib/infra_types';
import {
initGetLogEntryCategoriesRoute,
@@ -44,16 +40,6 @@ import { initGetLogAlertsChartPreviewDataRoute } from './routes/log_alerts';
import { initProcessListRoute } from './routes/process_list';
export const initInfraServer = (libs: InfraBackendLibs) => {
- const schema = makeExecutableSchema({
- resolvers: [
- createSourcesResolvers(libs) as IResolvers,
- createSourceStatusResolvers(libs) as IResolvers,
- ],
- typeDefs: schemas,
- });
-
- libs.framework.registerGraphQLEndpoint('/graphql', schema);
-
initIpToHostName(libs);
initGetLogEntryCategoriesRoute(libs);
initGetLogEntryCategoryDatasetsRoute(libs);
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index b96b0e5bb0b4..6c83dae32912 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -4,9 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { GraphQLSchema } from 'graphql';
-import { runHttpQuery } from 'apollo-server-core';
-import { schema, TypeOf } from '@kbn/config-schema';
import {
InfraRouteConfig,
InfraTSVBResponse,
@@ -23,7 +20,6 @@ import {
CoreSetup,
IRouter,
KibanaRequest,
- KibanaResponseFactory,
RouteMethod,
} from '../../../../../../../src/core/server';
import { RequestHandler } from '../../../../../../../src/core/server';
@@ -73,79 +69,6 @@ export class KibanaFramework {
}
}
- public registerGraphQLEndpoint(routePath: string, gqlSchema: GraphQLSchema) {
- // These endpoints are validated by GraphQL at runtime and with GraphQL generated types
- const body = schema.object({}, { unknowns: 'allow' });
- type Body = TypeOf;
-
- const routeOptions = {
- path: `/api/infra${routePath}`,
- validate: {
- body,
- },
- options: {
- tags: ['access:infra'],
- },
- };
- async function handler(
- context: InfraPluginRequestHandlerContext,
- request: KibanaRequest,
- response: KibanaResponseFactory
- ) {
- try {
- const query =
- request.route.method === 'post'
- ? (request.body as Record)
- : (request.query as Record);
-
- const gqlResponse = await runHttpQuery([context, request], {
- method: request.route.method.toUpperCase(),
- options: (req: InfraPluginRequestHandlerContext, rawReq: KibanaRequest) => ({
- context: { req, rawReq },
- schema: gqlSchema,
- }),
- query,
- });
-
- return response.ok({
- body: gqlResponse,
- headers: {
- 'content-type': 'application/json',
- },
- });
- } catch (error) {
- const errorBody = {
- message: error.message,
- };
-
- if ('HttpQueryError' !== error.name) {
- return response.internalError({
- body: errorBody,
- });
- }
-
- if (error.isGraphQLError === true) {
- return response.customError({
- statusCode: error.statusCode,
- body: errorBody,
- headers: {
- 'Content-Type': 'application/json',
- },
- });
- }
-
- const { headers = [], statusCode = 500 } = error;
- return response.customError({
- statusCode,
- headers,
- body: errorBody,
- });
- }
- }
- this.router.post(routeOptions, handler);
- this.router.get(routeOptions, handler);
- }
-
callWithRequest(
requestContext: InfraPluginRequestHandlerContext,
endpoint: 'search',
@@ -187,7 +110,7 @@ export class KibanaFramework {
options?: CallWithRequestParams
): Promise;
- public async callWithRequest(
+ public async callWithRequest(
requestContext: InfraPluginRequestHandlerContext,
endpoint: string,
params: CallWithRequestParams
diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/lib/errors.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/lib/errors.ts
deleted file mode 100644
index 750858f3ce1f..000000000000
--- a/x-pack/plugins/infra/server/lib/adapters/metrics/lib/errors.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { ApolloError } from 'apollo-server-errors';
-import { InfraMetricsErrorCodes } from '../../../../../common/errors';
-
-export class InvalidNodeError extends ApolloError {
- constructor(message: string) {
- super(message, InfraMetricsErrorCodes.invalid_node);
- Object.defineProperty(this, 'name', { value: 'InvalidNodeError' });
- }
-}
diff --git a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
index a8bd09c28f94..3b0a1c61f6af 100644
--- a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
@@ -5,9 +5,8 @@
*/
import type { InfraPluginRequestHandlerContext } from '../../types';
-import { InfraIndexField, InfraIndexType } from '../../graphql/types';
import { FieldsAdapter } from '../adapters/fields';
-import { InfraSources } from '../sources';
+import { InfraSourceIndexField, InfraSources } from '../sources';
export class InfraFieldsDomain {
constructor(
@@ -18,14 +17,14 @@ export class InfraFieldsDomain {
public async getFields(
requestContext: InfraPluginRequestHandlerContext,
sourceId: string,
- indexType: InfraIndexType
- ): Promise {
+ indexType: 'LOGS' | 'METRICS' | 'ANY'
+ ): Promise {
const { configuration } = await this.libs.sources.getSourceConfiguration(
requestContext.core.savedObjects.client,
sourceId
);
- const includeMetricIndices = [InfraIndexType.ANY, InfraIndexType.METRICS].includes(indexType);
- const includeLogIndices = [InfraIndexType.ANY, InfraIndexType.LOGS].includes(indexType);
+ const includeMetricIndices = ['ANY', 'METRICS'].includes(indexType);
+ const includeLogIndices = ['ANY', 'LOGS'].includes(indexType);
const fields = await this.adapter.getIndexFields(
requestContext,
diff --git a/x-pack/plugins/infra/server/lib/infra_types.ts b/x-pack/plugins/infra/server/lib/infra_types.ts
index 084ece52302b..eb24efb84645 100644
--- a/x-pack/plugins/infra/server/lib/infra_types.ts
+++ b/x-pack/plugins/infra/server/lib/infra_types.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { InfraSourceConfiguration } from '../../common/graphql/types';
+import { InfraSourceConfiguration } from '../../common/http_api/source_api';
import { InfraFieldsDomain } from './domains/fields_domain';
import { InfraLogEntriesDomain } from './domains/log_entries_domain';
import { InfraMetricsDomain } from './domains/metrics_domain';
@@ -13,13 +13,6 @@ import { InfraSourceStatus } from './source_status';
import { InfraConfig } from '../plugin';
import { KibanaFramework } from './adapters/framework/kibana_framework_adapter';
-// NP_TODO: We shouldn't need this context anymore but I am
-// not sure how the graphql stuff uses it, so we can't remove it yet
-export interface InfraContext {
- req: any;
- rawReq?: any;
-}
-
export interface InfraDomainLibs {
fields: InfraFieldsDomain;
logEntries: InfraLogEntriesDomain;
diff --git a/x-pack/plugins/infra/server/routes/log_sources/status.ts b/x-pack/plugins/infra/server/routes/log_sources/status.ts
index e9466f7fa887..71a91e44669d 100644
--- a/x-pack/plugins/infra/server/routes/log_sources/status.ts
+++ b/x-pack/plugins/infra/server/routes/log_sources/status.ts
@@ -11,7 +11,6 @@ import {
LOG_SOURCE_STATUS_PATH,
} from '../../../common/http_api/log_sources';
import { createValidationFunction } from '../../../common/runtime_types';
-import { InfraIndexType } from '../../graphql/types';
import { InfraBackendLibs } from '../../lib/infra_types';
export const initLogSourceStatusRoutes = ({
@@ -34,7 +33,7 @@ export const initLogSourceStatusRoutes = ({
const logIndexStatus = await sourceStatus.getLogIndexStatus(requestContext, sourceId);
const logIndexFields =
logIndexStatus !== 'missing'
- ? await fields.getFields(requestContext, sourceId, InfraIndexType.LOGS)
+ ? await fields.getFields(requestContext, sourceId, 'LOGS')
: [];
return response.ok({
diff --git a/x-pack/plugins/infra/server/routes/source/index.ts b/x-pack/plugins/infra/server/routes/source/index.ts
index 9ff3902f1eae..31d309c6295f 100644
--- a/x-pack/plugins/infra/server/routes/source/index.ts
+++ b/x-pack/plugins/infra/server/routes/source/index.ts
@@ -4,20 +4,25 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { schema } from '@kbn/config-schema';
-import { SourceResponseRuntimeType } from '../../../common/http_api/source_api';
+import Boom from '@hapi/boom';
+import { createValidationFunction } from '../../../common/runtime_types';
+import {
+ InfraSourceStatus,
+ SavedSourceConfigurationRuntimeType,
+ SourceResponseRuntimeType,
+} from '../../../common/http_api/source_api';
import { InfraBackendLibs } from '../../lib/infra_types';
-import { InfraIndexType } from '../../graphql/types';
import { hasData } from '../../lib/sources/has_data';
import { createSearchClient } from '../../lib/create_search_client';
const typeToInfraIndexType = (value: string | undefined) => {
switch (value) {
case 'metrics':
- return InfraIndexType.METRICS;
+ return 'METRICS';
case 'logs':
- return InfraIndexType.LOGS;
+ return 'LOGS';
default:
- return InfraIndexType.ANY;
+ return 'ANY';
}
};
@@ -50,14 +55,14 @@ export const initSourceRoute = (libs: InfraBackendLibs) => {
return response.notFound();
}
- const status = {
+ const status: InfraSourceStatus = {
logIndicesExist: logIndexStatus !== 'missing',
metricIndicesExist,
indexFields,
};
return response.ok({
- body: SourceResponseRuntimeType.encode({ source, status }),
+ body: SourceResponseRuntimeType.encode({ source: { ...source, status } }),
});
} catch (error) {
return response.internalError({
@@ -67,6 +72,79 @@ export const initSourceRoute = (libs: InfraBackendLibs) => {
}
);
+ framework.registerRoute(
+ {
+ method: 'patch',
+ path: '/api/metrics/source/{sourceId}',
+ validate: {
+ params: schema.object({
+ sourceId: schema.string(),
+ }),
+ body: createValidationFunction(SavedSourceConfigurationRuntimeType),
+ },
+ },
+ framework.router.handleLegacyErrors(async (requestContext, request, response) => {
+ const { sources } = libs;
+ const { sourceId } = request.params;
+ const patchedSourceConfigurationProperties = request.body;
+
+ try {
+ const sourceConfiguration = await sources.getSourceConfiguration(
+ requestContext.core.savedObjects.client,
+ sourceId
+ );
+
+ if (sourceConfiguration.origin === 'internal') {
+ response.conflict({
+ body: 'A conflicting read-only source configuration already exists.',
+ });
+ }
+
+ const sourceConfigurationExists = sourceConfiguration.origin === 'stored';
+ const patchedSourceConfiguration = await (sourceConfigurationExists
+ ? sources.updateSourceConfiguration(
+ requestContext.core.savedObjects.client,
+ sourceId,
+ patchedSourceConfigurationProperties
+ )
+ : sources.createSourceConfiguration(
+ requestContext.core.savedObjects.client,
+ sourceId,
+ patchedSourceConfigurationProperties
+ ));
+
+ const [logIndexStatus, metricIndicesExist, indexFields] = await Promise.all([
+ libs.sourceStatus.getLogIndexStatus(requestContext, sourceId),
+ libs.sourceStatus.hasMetricIndices(requestContext, sourceId),
+ libs.fields.getFields(requestContext, sourceId, typeToInfraIndexType('metrics')),
+ ]);
+
+ const status: InfraSourceStatus = {
+ logIndicesExist: logIndexStatus !== 'missing',
+ metricIndicesExist,
+ indexFields,
+ };
+
+ return response.ok({
+ body: SourceResponseRuntimeType.encode({
+ source: { ...patchedSourceConfiguration, status },
+ }),
+ });
+ } catch (error) {
+ if (Boom.isBoom(error)) {
+ throw error;
+ }
+
+ return response.customError({
+ statusCode: error.statusCode ?? 500,
+ body: {
+ message: error.message ?? 'An unexpected error occurred',
+ },
+ });
+ }
+ })
+ );
+
framework.registerRoute(
{
method: 'get',
diff --git a/x-pack/plugins/infra/server/utils/serialized_query.ts b/x-pack/plugins/infra/server/utils/serialized_query.ts
index 8dfe00fcd380..3a38a0de959d 100644
--- a/x-pack/plugins/infra/server/utils/serialized_query.ts
+++ b/x-pack/plugins/infra/server/utils/serialized_query.ts
@@ -4,8 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { UserInputError } from 'apollo-server-errors';
-
import { JsonObject } from '../../../../../src/plugins/kibana_utils/common';
export const parseFilterQuery = (
@@ -26,9 +24,6 @@ export const parseFilterQuery = (
return undefined;
}
} catch (err) {
- throw new UserInputError(`Failed to parse query: ${err}`, {
- query: filterQuery,
- originalError: err,
- });
+ throw new Error(`Failed to parse query: ${err}`);
}
};
diff --git a/x-pack/plugins/infra/server/utils/typed_resolvers.ts b/x-pack/plugins/infra/server/utils/typed_resolvers.ts
deleted file mode 100644
index d5f2d00abd50..000000000000
--- a/x-pack/plugins/infra/server/utils/typed_resolvers.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Resolver } from '../graphql/types';
-
-type ResolverResult = R | Promise;
-
-type InfraResolverResult =
- | Promise
- | Promise<{ [P in keyof R]: () => Promise }>
- | { [P in keyof R]: () => Promise