diff --git a/.i18nrc.json b/.i18nrc.json index 98c36b43e5d8..1230151212f5 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -40,7 +40,7 @@ "visTypeMetric": "src/legacy/core_plugins/vis_type_metric", "visTypeTable": "src/legacy/core_plugins/vis_type_table", "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud", - "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries", + "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"], "visTypeVega": "src/legacy/core_plugins/vis_type_vega", "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib", "visualizations": [ diff --git a/src/legacy/core_plugins/vis_type_timeseries/index.ts b/src/legacy/core_plugins/vis_type_timeseries/index.ts index a502bb174bc9..3ad8ba3a31c1 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/index.ts +++ b/src/legacy/core_plugins/vis_type_timeseries/index.ts @@ -21,7 +21,6 @@ import { resolve } from 'path'; import { Legacy } from 'kibana'; import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types'; -import { VisTypeTimeseriesSetup } from '../../../plugins/vis_type_timeseries/server'; const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) => new Plugin({ @@ -47,11 +46,6 @@ const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu }, }, }, - init: (server: Legacy.Server) => { - const visTypeTimeSeriesPlugin = server.newPlatform.setup.plugins - .metrics as VisTypeTimeseriesSetup; - visTypeTimeSeriesPlugin.__legacy.registerLegacyAPI({ server }); - }, config(Joi: any) { return Joi.object({ enabled: Joi.boolean().default(true), diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js index 355c4723587d..5bd7f6557e88 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js @@ -36,7 +36,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public'; -import { METRIC_TYPES } from '../../../common/metric_types'; +import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types'; export const FilterRatioAgg = props => { const { series, fields, panel } = props; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js index 5e2f148ab5a6..18daecd69990 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js @@ -23,10 +23,10 @@ import { includes } from 'lodash'; import { injectI18n } from '@kbn/i18n/react'; import { EuiComboBox } from '@elastic/eui'; import { calculateSiblings } from '../lib/calculate_siblings'; -import { calculateLabel } from '../../../common/calculate_label'; -import { basicAggs } from '../../../common/basic_aggs'; -import { toPercentileNumber } from '../../../common/to_percentile_number'; -import { METRIC_TYPES } from '../../../common/metric_types'; +import { calculateLabel } from '../../../../../../plugins/vis_type_timeseries/common/calculate_label'; +import { basicAggs } from '../../../../../../plugins/vis_type_timeseries/common/basic_aggs'; +import { toPercentileNumber } from '../../../../../../plugins/vis_type_timeseries/common/to_percentile_number'; +import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types'; function createTypeFilter(restrict, exclude) { return metric => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js index 3b9d0ab28268..5843eab3f470 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js @@ -36,7 +36,7 @@ import { EuiFieldNumber, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { MODEL_TYPES } from '../../../common/model_options'; +import { MODEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/model_options'; const DEFAULTS = { model_type: MODEL_TYPES.UNWEIGHTED, diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js index 67fe9403e402..61e5c60cbd72 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js @@ -34,7 +34,7 @@ import { } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public'; -import { METRIC_TYPES } from '../../../common/metric_types'; +import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types'; export function StandardAgg(props) { const { model, panel, series, fields, uiRestrictions } = props; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js index fa92713046ac..df13b9439406 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js @@ -36,7 +36,7 @@ import { } from '@elastic/eui'; import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public'; -import { PANEL_TYPES } from '../../../common/panel_types'; +import { PANEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/panel_types'; const isFieldTypeEnabled = (fieldRestrictions, fieldType) => fieldRestrictions.length ? fieldRestrictions.includes(fieldType) : true; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js index 352747013fe2..de8469adfb8a 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js @@ -42,8 +42,11 @@ import { AUTO_INTERVAL, } from './lib/get_interval'; import { i18n } from '@kbn/i18n'; -import { TIME_RANGE_DATA_MODES, TIME_RANGE_MODE_KEY } from '../../common/timerange_data_modes'; -import { PANEL_TYPES } from '../../common/panel_types'; +import { + TIME_RANGE_DATA_MODES, + TIME_RANGE_MODE_KEY, +} from '../../../../../plugins/vis_type_timeseries/common/timerange_data_modes'; +import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types'; import { isTimerangeModeEnabled } from '../lib/check_ui_restrictions'; import { VisDataContext } from '../contexts/vis_data_context'; @@ -138,8 +141,8 @@ export const IndexPattern = ({ fields, prefix, onChange, disabled, model: _model {i18n.translate('visTypeTimeseries.indexPattern.timeRange.hint', { - defaultMessage: `This setting controls the timespan used for matching documents. - "Entire timerange" will match all the documents selected in the timepicker. + defaultMessage: `This setting controls the timespan used for matching documents. + "Entire timerange" will match all the documents selected in the timepicker. "Last value" will match only the documents for the specified interval from the end of the timerange.`, })} diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js index bcab9ec026d9..73fc8dac2b56 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { getLastValue } from '../../../common/get_last_value'; +import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import { createTickFormatter } from './tick_formatter'; import moment from 'moment'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js index 05d00f6bede1..a6aefe067dd6 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js @@ -20,7 +20,7 @@ import moment from 'moment'; import { i18n } from '@kbn/i18n'; import { get } from 'lodash'; import { parseEsInterval } from '../../../../data/public'; -import { GTE_INTERVAL_RE } from '../../../common/interval_regexp'; +import { GTE_INTERVAL_RE } from '../../../../../../plugins/vis_type_timeseries/common/interval_regexp'; export const AUTO_INTERVAL = 'auto'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js index b13f89c20429..e773782969d1 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js @@ -19,7 +19,7 @@ import _ from 'lodash'; import { newMetricAggFn } from './new_metric_agg_fn'; -import { isBasicAgg } from '../../../common/agg_lookup'; +import { isBasicAgg } from '../../../../../../plugins/vis_type_timeseries/common/agg_lookup'; import { handleAdd, handleChange } from './collection_actions'; export const seriesChangeHandler = (props, items) => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js index 111da86d71ec..0fddc4f8c1d8 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js @@ -36,7 +36,7 @@ import { EuiFieldText, } from '@elastic/eui'; import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; -import { FIELD_TYPES } from '../../../common/field_types'; +import { FIELD_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/field_types'; import { STACKED_OPTIONS } from '../../visualizations/constants'; const DEFAULTS = { terms_direction: 'desc', terms_size: 10, terms_order_by: '_count' }; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js index ae39d75c7a2d..3dedb67bd1d9 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js @@ -28,7 +28,7 @@ import { VisPicker } from './vis_picker'; import { PanelConfig } from './panel_config'; import { createBrushHandler } from '../lib/create_brush_handler'; import { fetchFields } from '../lib/fetch_fields'; -import { extractIndexPatterns } from '../../common/extract_index_patterns'; +import { extractIndexPatterns } from '../../../../../plugins/vis_type_timeseries/common/extract_index_patterns'; import { esKuery } from '../../../../../plugins/data/public'; import { npStart } from 'ui/new_platform'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js index a376905495c5..c45a4d68e8aa 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js @@ -28,7 +28,7 @@ import { isGteInterval, AUTO_INTERVAL, } from './lib/get_interval'; -import { PANEL_TYPES } from '../../common/panel_types'; +import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types'; import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy'; const MIN_CHART_HEIGHT = 300; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js index 8d2673ea24cb..2c4a11f8880f 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { EuiTabs, EuiTab } from '@elastic/eui'; import { injectI18n } from '@kbn/i18n/react'; -import { PANEL_TYPES } from '../../common/panel_types'; +import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types'; function VisPickerItem(props) { const { label, type, selected } = props; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js index 5d6bb55f33db..7d30a1f0c8df 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js @@ -23,7 +23,7 @@ import { visWithSplits } from '../../vis_with_splits'; import { createTickFormatter } from '../../lib/tick_formatter'; import _, { get, isUndefined, assign, includes } from 'lodash'; import { Gauge } from '../../../visualizations/views/gauge'; -import { getLastValue } from '../../../../common/get_last_value'; +import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value'; function getColors(props) { const { model, visData } = props; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js index e20f3d3fbaeb..a80633908545 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js @@ -26,7 +26,7 @@ import { Markdown } from '../../../../../kibana_react/public'; import { ErrorComponent } from '../../error'; import { replaceVars } from '../../lib/replace_vars'; import { convertSeriesToVars } from '../../lib/convert_series_to_vars'; -import { isBackgroundInverted } from '../../../../common/set_is_reversed'; +import { isBackgroundInverted } from '../../../lib/set_is_reversed'; const getMarkdownId = id => `markdown-${id}`; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js index f463a4494a18..4a907a7b2078 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js @@ -23,8 +23,8 @@ import { visWithSplits } from '../../vis_with_splits'; import { createTickFormatter } from '../../lib/tick_formatter'; import _, { get, isUndefined, assign, includes, pick } from 'lodash'; import { Metric } from '../../../visualizations/views/metric'; -import { getLastValue } from '../../../../common/get_last_value'; -import { isBackgroundInverted } from '../../../../common/set_is_reversed'; +import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value'; +import { isBackgroundInverted } from '../../../lib/set_is_reversed'; function getColors(props) { const { model, visData } = props; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js index 887652a67f40..b44c94131348 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js @@ -17,7 +17,7 @@ * under the License. */ -import { basicAggs } from '../../../../common/basic_aggs'; +import { basicAggs } from '../../../../../../../plugins/vis_type_timeseries/common/basic_aggs'; export function isSortable(metric) { return basicAggs.includes(metric.type); diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js index a82d5bdb1588..94f4506cd017 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js @@ -22,14 +22,14 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { npStart } from 'ui/new_platform'; import { createTickFormatter } from '../../lib/tick_formatter'; -import { calculateLabel } from '../../../../common/calculate_label'; +import { calculateLabel } from '../../../../../../../plugins/vis_type_timeseries/common/calculate_label'; import { isSortable } from './is_sortable'; import { EuiToolTip, EuiIcon } from '@elastic/eui'; import { replaceVars } from '../../lib/replace_vars'; import { fieldFormats } from '../../../../../../../plugins/data/public'; import { FormattedMessage } from '@kbn/i18n/react'; -import { METRIC_TYPES } from '../../../../common/metric_types'; +import { METRIC_TYPES } from '../../../../../../../plugins/vis_type_timeseries/common/metric_types'; function getColor(rules, colorKey, value) { let color; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js index 226aded39050..27a84d9ba40b 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js @@ -35,7 +35,7 @@ import { import { Split } from '../../split'; import { createTextHandler } from '../../lib/create_text_handler'; import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -import { PANEL_TYPES } from '../../../../common/panel_types'; +import { PANEL_TYPES } from '../../../../../../../plugins/vis_type_timeseries/common/panel_types'; const TimeseriesSeriesUI = injectI18n(function(props) { const { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js index d269d7c3546e..5243f5f92a62 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js @@ -34,7 +34,7 @@ import { getAxisLabelString } from '../../lib/get_axis_label_string'; import { getInterval } from '../../lib/get_interval'; import { areFieldsDifferent } from '../../lib/charts'; import { createXaxisFormatter } from '../../lib/create_xaxis_formatter'; -import { isBackgroundDark } from '../../../../common/set_is_reversed'; +import { isBackgroundDark } from '../../../lib/set_is_reversed'; import { STACKED_OPTIONS } from '../../../visualizations/constants'; export class TimeseriesVisualization extends Component { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js index 7d09f33acdec..2ebc60325a42 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js @@ -19,8 +19,8 @@ import { createTickFormatter } from '../../lib/tick_formatter'; import { TopN } from '../../../visualizations/views/top_n'; -import { getLastValue } from '../../../../common/get_last_value'; -import { isBackgroundInverted } from '../../../../common/set_is_reversed'; +import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value'; +import { isBackgroundInverted } from '../../../lib/set_is_reversed'; import { replaceVars } from '../../lib/replace_vars'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js index 91d53b9c2e1d..e36910d9081b 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js @@ -20,7 +20,7 @@ import React from 'react'; import { getDisplayName } from './lib/get_display_name'; import { last, findIndex, first } from 'lodash'; -import { calculateLabel } from '../../common/calculate_label'; +import { calculateLabel } from '../../../../../plugins/vis_type_timeseries/common/calculate_label'; export function visWithSplits(WrappedComponent) { function SplitVisComponent(props) { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js index 1fade6ebe984..5d18c0a2f09c 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js @@ -18,7 +18,10 @@ */ import { get } from 'lodash'; -import { RESTRICTIONS_KEYS, DEFAULT_UI_RESTRICTION } from '../../common/ui_restrictions'; +import { + RESTRICTIONS_KEYS, + DEFAULT_UI_RESTRICTION, +} from '../../../../../plugins/vis_type_timeseries/common/ui_restrictions'; /** * Generic method for checking all types of the UI Restrictions diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js index 21c12b07ff47..68e694f23fa7 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js @@ -19,7 +19,7 @@ import { kfetch } from 'ui/kfetch'; import { toastNotifications } from 'ui/notify'; import { i18n } from '@kbn/i18n'; -import { extractIndexPatterns } from '../../common/extract_index_patterns'; +import { extractIndexPatterns } from '../../../../../plugins/vis_type_timeseries/common/extract_index_patterns'; export async function fetchFields(indexPatterns = ['*']) { const patterns = Array.isArray(indexPatterns) ? indexPatterns : [indexPatterns]; diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js similarity index 92% rename from src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js rename to src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js index b633d004b970..9f66bcd16191 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js @@ -18,9 +18,9 @@ */ import color from 'color'; -import chrome from '../../../ui/public/chrome'; +import { getUISettings } from '../services'; -const IS_DARK_THEME = chrome.getUiSettingsClient().get('theme:darkMode'); +const isDarkTheme = () => getUISettings().get('theme:darkMode'); /** * Returns true if the color that is passed has low luminosity @@ -34,7 +34,7 @@ const isColorDark = c => { * Defaults to checking `theme:darkMode`. */ export const isThemeDark = currentTheme => { - let themeIsDark = currentTheme || IS_DARK_THEME; + let themeIsDark = currentTheme || isDarkTheme(); // If passing a string, check the luminosity if (typeof currentTheme === 'string') { diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js index 2dbcdc4749a6..2992549d38e3 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js @@ -17,7 +17,7 @@ * under the License. */ -import { GTE_INTERVAL_RE } from '../../common/interval_regexp'; +import { GTE_INTERVAL_RE } from '../../../../../plugins/vis_type_timeseries/common/interval_regexp'; import { i18n } from '@kbn/i18n'; import { parseInterval } from '../../../../../plugins/data/public'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts index e7684cd21b79..22d2b3b10e56 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts +++ b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts @@ -26,7 +26,7 @@ import { metricsRequestHandler } from './request_handler'; // @ts-ignore import { EditorController } from './editor_controller'; // @ts-ignore -import { PANEL_TYPES } from '../common/panel_types'; +import { PANEL_TYPES } from '../../../../plugins/vis_type_timeseries/common/panel_types'; export const metricsVisDefinition = { name: 'metrics', diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js index 3be2e9daed58..b518665e5ece 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js @@ -21,8 +21,8 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import classNames from 'classnames'; -import { isBackgroundInverted, isBackgroundDark } from '../../../common/set_is_reversed'; -import { getLastValue } from '../../../common/get_last_value'; +import { isBackgroundInverted, isBackgroundDark } from '../../lib/set_is_reversed'; +import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import { getValueBy } from '../lib/get_value_by'; import { GaugeVis } from './gauge_vis'; import reactcss from 'reactcss'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js index 004d59efca33..5524e17d106e 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js @@ -20,7 +20,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import _ from 'lodash'; -import { getLastValue } from '../../../common/get_last_value'; +import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import reactcss from 'reactcss'; import { calculateCoordinates } from '../lib/calculate_coordinates'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js index 5734d101a09d..99e9cc0b1c21 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js +++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { getLastValue } from '../../../common/get_last_value'; +import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value'; import reactcss from 'reactcss'; const RENDER_MODES = { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts b/src/legacy/core_plugins/vis_type_timeseries/server/init.ts deleted file mode 100644 index ae6eebc00fc1..000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -// @ts-ignore -import { fieldsRoutes } from './routes/fields'; -// @ts-ignore -import { visDataRoutes } from './routes/vis'; -// @ts-ignore -import { SearchStrategiesRegister } from './lib/search_strategies/search_strategies_register'; -// @ts-ignore -import { getVisData } from './lib/get_vis_data'; -import { Framework } from '../../../../plugins/vis_type_timeseries/server'; -import { ValidationTelemetryServiceSetup } from '../../../../plugins/vis_type_timeseries/server'; - -export const init = async ( - framework: Framework, - __LEGACY: any, - validationTelemetry: ValidationTelemetryServiceSetup -) => { - const { core } = framework; - const router = core.http.createRouter(); - - visDataRoutes(router, framework, validationTelemetry); - - // [LEGACY_TODO] - fieldsRoutes(__LEGACY.server); - SearchStrategiesRegister.init(__LEGACY.server); -}; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js deleted file mode 100644 index 361ce132f173..000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { SearchStrategiesRegister } from './search_strategies/search_strategies_register'; -import { uniq } from 'lodash'; -import { getIndexPatternObject } from './vis_data/helpers/get_index_pattern'; -import { isNestedField } from '../../../../../plugins/data/server'; - -export async function getFields(req) { - const indexPattern = req.query.index; - const { indexPatternString } = await getIndexPatternObject(req, indexPattern); - const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy( - req, - indexPatternString - ); - - const fields = ( - await searchStrategy.getFieldsForWildcard(req, indexPatternString, capabilities) - ).filter(field => field.aggregatable && !isNestedField(field)); - - return uniq(fields, field => field.name); -} diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js deleted file mode 100644 index 54e90ab7dd9b..000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { IndexPatternsFetcher } from '../../../../../plugins/data/server/'; -export const getIndexPatternService = { - assign: 'indexPatternsService', - method(req) { - const dataCluster = req.server.plugins.elasticsearch.getCluster('data'); - const callDataCluster = (...args) => { - return dataCluster.callWithRequest(req, ...args); - }; - return new IndexPatternsFetcher(callDataCluster); - }, -}; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js deleted file mode 100644 index 512894f30a61..000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { SearchStrategiesRegister } from './search_strategies_register'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js deleted file mode 100644 index 794e92a1954a..000000000000 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export class AbstractSearchStrategy { - constructor(server, callWithRequestFactory, SearchRequest) { - this.getCallWithRequestInstance = req => callWithRequestFactory(server, req); - - this.getSearchRequest = req => { - const callWithRequest = this.getCallWithRequestInstance(req); - - return new SearchRequest(req, callWithRequest); - }; - } - - async getFieldsForWildcard(req, indexPattern) { - const { indexPatternsService } = req.pre; - - return await indexPatternsService.getFieldsForWildcard({ - pattern: indexPattern, - }); - } - - checkForViability() { - throw new TypeError('Must override method'); - } -} diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap b/src/plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap rename to src/plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.js b/src/plugins/vis_type_timeseries/common/agg_lookup.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.js rename to src/plugins/vis_type_timeseries/common/agg_lookup.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.test.js b/src/plugins/vis_type_timeseries/common/agg_lookup.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.test.js rename to src/plugins/vis_type_timeseries/common/agg_lookup.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/basic_aggs.js b/src/plugins/vis_type_timeseries/common/basic_aggs.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/basic_aggs.js rename to src/plugins/vis_type_timeseries/common/basic_aggs.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.js b/src/plugins/vis_type_timeseries/common/calculate_label.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.js rename to src/plugins/vis_type_timeseries/common/calculate_label.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.test.js b/src/plugins/vis_type_timeseries/common/calculate_label.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.test.js rename to src/plugins/vis_type_timeseries/common/calculate_label.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.js b/src/plugins/vis_type_timeseries/common/extract_index_patterns.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.js rename to src/plugins/vis_type_timeseries/common/extract_index_patterns.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.test.js b/src/plugins/vis_type_timeseries/common/extract_index_patterns.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.test.js rename to src/plugins/vis_type_timeseries/common/extract_index_patterns.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/field_types.js b/src/plugins/vis_type_timeseries/common/field_types.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/field_types.js rename to src/plugins/vis_type_timeseries/common/field_types.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.js b/src/plugins/vis_type_timeseries/common/get_last_value.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.js rename to src/plugins/vis_type_timeseries/common/get_last_value.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.test.js b/src/plugins/vis_type_timeseries/common/get_last_value.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.test.js rename to src/plugins/vis_type_timeseries/common/get_last_value.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.js b/src/plugins/vis_type_timeseries/common/interval_regexp.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.js rename to src/plugins/vis_type_timeseries/common/interval_regexp.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.test.js b/src/plugins/vis_type_timeseries/common/interval_regexp.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.test.js rename to src/plugins/vis_type_timeseries/common/interval_regexp.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/metric_types.js b/src/plugins/vis_type_timeseries/common/metric_types.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/metric_types.js rename to src/plugins/vis_type_timeseries/common/metric_types.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/model_options.js b/src/plugins/vis_type_timeseries/common/model_options.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/model_options.js rename to src/plugins/vis_type_timeseries/common/model_options.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/model_options.test.js b/src/plugins/vis_type_timeseries/common/model_options.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/model_options.test.js rename to src/plugins/vis_type_timeseries/common/model_options.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/panel_types.js b/src/plugins/vis_type_timeseries/common/panel_types.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/panel_types.js rename to src/plugins/vis_type_timeseries/common/panel_types.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/timerange_data_modes.js b/src/plugins/vis_type_timeseries/common/timerange_data_modes.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/timerange_data_modes.js rename to src/plugins/vis_type_timeseries/common/timerange_data_modes.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/to_percentile_number.js b/src/plugins/vis_type_timeseries/common/to_percentile_number.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/to_percentile_number.js rename to src/plugins/vis_type_timeseries/common/to_percentile_number.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/ui_restrictions.js b/src/plugins/vis_type_timeseries/common/ui_restrictions.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/common/ui_restrictions.js rename to src/plugins/vis_type_timeseries/common/ui_restrictions.js diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts index dfb2394af237..fa74b6e96597 100644 --- a/src/plugins/vis_type_timeseries/server/index.ts +++ b/src/plugins/vis_type_timeseries/server/index.ts @@ -32,6 +32,13 @@ export type VisTypeTimeseriesConfig = TypeOf; export { ValidationTelemetryServiceSetup } from './validation_telemetry'; +// @ts-ignore +export { AbstractSearchStrategy } from './lib/search_strategies/strategies/abstract_search_strategy'; +// @ts-ignore +export { AbstractSearchRequest } from './lib/search_strategies/search_requests/abstract_request'; +// @ts-ignore +export { DefaultSearchCapabilities } from './lib/search_strategies/default_search_capabilities'; + export function plugin(initializerContext: PluginInitializerContext) { return new VisTypeTimeseriesPlugin(initializerContext); } diff --git a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts new file mode 100644 index 000000000000..8eca30dae777 --- /dev/null +++ b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts @@ -0,0 +1,89 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { uniq } from 'lodash'; +import { first, map } from 'rxjs/operators'; +import { KibanaRequest, RequestHandlerContext } from 'kibana/server'; + +// @ts-ignore +import { getIndexPatternObject } from './vis_data/helpers/get_index_pattern'; +import { isNestedField } from '../../../data/server'; +import { Framework } from '../plugin'; +import { FieldDescriptor, IndexPatternsFetcher } from '../../../data/server'; +import { ReqFacade } from './search_strategies/strategies/abstract_search_strategy'; + +export async function getFields( + requestContext: RequestHandlerContext, + request: KibanaRequest, + framework: Framework, + indexPattern: string +) { + // NOTE / TODO: This facade has been put in place to make migrating to the New Platform easier. It + // removes the need to refactor many layers of dependencies on "req", and instead just augments the top + // level object passed from here. The layers should be refactored fully at some point, but for now + // this works and we are still using the New Platform services for these vis data portions. + const reqFacade: ReqFacade = { + ...request, + framework, + payload: {}, + pre: { + indexPatternsService: new IndexPatternsFetcher( + requestContext.core.elasticsearch.dataClient.callAsCurrentUser + ), + }, + getUiSettingsService: () => requestContext.core.uiSettings.client, + getSavedObjectsClient: () => requestContext.core.savedObjects.client, + server: { + plugins: { + elasticsearch: { + getCluster: () => { + return { + callWithRequest: async (req: any, endpoint: string, params: any) => { + return await requestContext.core.elasticsearch.dataClient.callAsCurrentUser( + endpoint, + params + ); + }, + }; + }, + }, + }, + }, + getEsShardTimeout: async () => { + return await framework.globalConfig$ + .pipe( + first(), + map(config => config.elasticsearch.shardTimeout.asMilliseconds()) + ) + .toPromise(); + }, + }; + const { indexPatternString } = await getIndexPatternObject(reqFacade, indexPattern); + const { + searchStrategy, + capabilities, + } = (await framework.searchStrategyRegistry.getViableStrategy(reqFacade, indexPatternString))!; + + const fields = ((await searchStrategy.getFieldsForWildcard( + reqFacade, + indexPatternString, + capabilities + )) as FieldDescriptor[]).filter(field => field.aggregatable && !isNestedField(field)); + + return uniq(fields, field => field.name); +} diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts similarity index 87% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts rename to src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts index 58e624fa1344..aef831eaad43 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts +++ b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts @@ -17,11 +17,12 @@ * under the License. */ -import { RequestHandlerContext } from 'src/core/server'; +import { FakeRequest, RequestHandlerContext } from 'kibana/server'; import _ from 'lodash'; import { first, map } from 'rxjs/operators'; import { getPanelData } from './vis_data/get_panel_data'; -import { Framework } from '../../../../../plugins/vis_type_timeseries/server'; +import { Framework } from '../index'; +import { ReqFacade } from './search_strategies/strategies/abstract_search_strategy'; interface GetVisDataResponse { [key: string]: GetVisDataPanel; @@ -56,15 +57,18 @@ export type GetVisData = ( export function getVisData( requestContext: RequestHandlerContext, - options: GetVisDataOptions, + request: FakeRequest & { body: GetVisDataOptions }, framework: Framework ): Promise { // NOTE / TODO: This facade has been put in place to make migrating to the New Platform easier. It // removes the need to refactor many layers of dependencies on "req", and instead just augments the top // level object passed from here. The layers should be refactored fully at some point, but for now // this works and we are still using the New Platform services for these vis data portions. - const reqFacade: any = { - payload: options, + const reqFacade: ReqFacade = { + ...request, + framework, + pre: {}, + payload: request.body, getUiSettingsService: () => requestContext.core.uiSettings.client, getSavedObjectsClient: () => requestContext.core.savedObjects.client, server: { @@ -92,7 +96,7 @@ export function getVisData( .toPromise(); }, }; - const promises = reqFacade.payload.panels.map(getPanelData(reqFacade)); + const promises = (reqFacade.payload as GetVisDataOptions).panels.map(getPanelData(reqFacade)); return Promise.all(promises).then(res => { return res.reduce((acc, data) => { return _.assign(acc as any, data); diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts similarity index 87% rename from src/legacy/core_plugins/vis_type_timeseries/server/index.ts rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts index c010628ca04b..d53683882252 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts @@ -17,5 +17,4 @@ * under the License. */ -export { init } from './init'; -export { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data'; +export { SearchStrategyRegistry } from './search_strategy_registry'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts similarity index 61% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts index e03d776b8ee0..ecd09653b3b4 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts @@ -16,10 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import { SearchStrategiesRegister } from './search_strategies_register'; + +import { SearchStrategyRegistry } from './search_strategy_registry'; +// @ts-ignore import { AbstractSearchStrategy } from './strategies/abstract_search_strategy'; +// @ts-ignore import { DefaultSearchStrategy } from './strategies/default_search_strategy'; -import { AbstractSearchRequest } from './searh_requests/abstract_request'; +// @ts-ignore import { DefaultSearchCapabilities } from './default_search_capabilities'; class MockSearchStrategy extends AbstractSearchStrategy { @@ -31,34 +34,21 @@ class MockSearchStrategy extends AbstractSearchStrategy { } } -describe('SearchStrategiesRegister', () => { - let server; - let strategies; - let anotherSearchStrategy; +describe('SearchStrategyRegister', () => { + let registry: SearchStrategyRegistry; beforeAll(() => { - server = { - expose: jest.fn((strategy, func) => { - server[strategy] = func; - }), - }; - strategies = [ - ['AbstractSearchStrategy', AbstractSearchStrategy], - ['AbstractSearchRequest', AbstractSearchRequest], - ['DefaultSearchCapabilities', DefaultSearchCapabilities], - ['addSearchStrategy', expect.any(Function)], - ]; - - SearchStrategiesRegister.init(server); + registry = new SearchStrategyRegistry(); }); test('should init strategies register', () => { - expect(server.expose.mock.calls).toEqual(strategies); - expect(server.addSearchStrategy()[0] instanceof DefaultSearchStrategy).toBe(true); + expect( + registry.addStrategy({} as AbstractSearchStrategy)[0] instanceof DefaultSearchStrategy + ).toBe(true); }); test('should not add a strategy if it is not an instance of AbstractSearchStrategy', () => { - const addedStrategies = server.addSearchStrategy({}); + const addedStrategies = registry.addStrategy({} as AbstractSearchStrategy); expect(addedStrategies.length).toEqual(1); expect(addedStrategies[0] instanceof DefaultSearchStrategy).toBe(true); @@ -68,18 +58,15 @@ describe('SearchStrategiesRegister', () => { const req = {}; const indexPattern = '*'; - const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy( - req, - indexPattern - ); + const { searchStrategy, capabilities } = (await registry.getViableStrategy(req, indexPattern))!; expect(searchStrategy instanceof DefaultSearchStrategy).toBe(true); expect(capabilities instanceof DefaultSearchCapabilities).toBe(true); }); test('should add a strategy if it is an instance of AbstractSearchStrategy', () => { - anotherSearchStrategy = new MockSearchStrategy(); - const addedStrategies = server.addSearchStrategy(anotherSearchStrategy); + const anotherSearchStrategy = new MockSearchStrategy({}, {} as any, {}); + const addedStrategies = registry.addStrategy(anotherSearchStrategy); expect(addedStrategies.length).toEqual(2); expect(addedStrategies[0] instanceof AbstractSearchStrategy).toBe(true); @@ -88,13 +75,12 @@ describe('SearchStrategiesRegister', () => { test('should return a MockSearchStrategy instance', async () => { const req = {}; const indexPattern = '*'; + const anotherSearchStrategy = new MockSearchStrategy({}, {} as any, {}); + registry.addStrategy(anotherSearchStrategy); - const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy( - req, - indexPattern - ); + const { searchStrategy, capabilities } = (await registry.getViableStrategy(req, indexPattern))!; - expect(searchStrategy instanceof AbstractSearchStrategy).toBe(true); + expect(searchStrategy instanceof MockSearchStrategy).toBe(true); expect(capabilities).toEqual({}); }); }); diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts similarity index 57% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts index 5fbb4060862a..6fbed1ddfba0 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts @@ -16,34 +16,32 @@ * specific language governing permissions and limitations * under the License. */ + import { AbstractSearchStrategy } from './strategies/abstract_search_strategy'; -import { AbstractSearchRequest } from './searh_requests/abstract_request'; +// @ts-ignore import { DefaultSearchStrategy } from './strategies/default_search_strategy'; -import { DefaultSearchCapabilities } from './default_search_capabilities'; - +// @ts-ignore import { extractIndexPatterns } from '../../../common/extract_index_patterns'; -const strategies = []; +export type RequestFacade = any; +export type Panel = any; -const addStrategy = searchStrategy => { - if (searchStrategy instanceof AbstractSearchStrategy) { - strategies.unshift(searchStrategy); - } - return strategies; -}; +export class SearchStrategyRegistry { + private strategies: AbstractSearchStrategy[] = []; -export class SearchStrategiesRegister { - static init(server) { - server.expose('AbstractSearchStrategy', AbstractSearchStrategy); - server.expose('AbstractSearchRequest', AbstractSearchRequest); - server.expose('DefaultSearchCapabilities', DefaultSearchCapabilities); - server.expose('addSearchStrategy', searchStrategy => addStrategy(searchStrategy)); + constructor() { + this.addStrategy(new DefaultSearchStrategy()); + } - addStrategy(new DefaultSearchStrategy(server)); + public addStrategy(searchStrategy: AbstractSearchStrategy) { + if (searchStrategy instanceof AbstractSearchStrategy) { + this.strategies.unshift(searchStrategy); + } + return this.strategies; } - static async getViableStrategy(req, indexPattern) { - for (const searchStrategy of strategies) { + async getViableStrategy(req: RequestFacade, indexPattern: string) { + for (const searchStrategy of this.strategies) { const { isViable, capabilities } = await searchStrategy.checkForViability(req, indexPattern); if (isViable) { @@ -55,9 +53,9 @@ export class SearchStrategiesRegister { } } - static async getViableStrategyForPanel(req, panel) { + async getViableStrategyForPanel(req: RequestFacade, panel: Panel) { const indexPattern = extractIndexPatterns(panel).join(','); - return SearchStrategiesRegister.getViableStrategy(req, indexPattern); + return this.getViableStrategy(req, indexPattern); } } diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts new file mode 100644 index 000000000000..4fd4ac251fa3 --- /dev/null +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts @@ -0,0 +1,87 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { + APICaller, + FakeRequest, + IUiSettingsClient, + SavedObjectsClientContract, +} from 'kibana/server'; +import { Framework } from '../../../plugin'; +import { IndexPatternsFetcher } from '../../../../../data/server'; + +/** + * ReqFacade is a regular KibanaRequest object extended with additional service + * references to ensure backwards compatibility for existing integrations. + * + * This will be replaced by standard KibanaRequest and RequestContext objects in a later version. + */ +export type ReqFacade = FakeRequest & { + framework: Framework; + payload: unknown; + pre: { + indexPatternsService?: IndexPatternsFetcher; + }; + getUiSettingsService: () => IUiSettingsClient; + getSavedObjectsClient: () => SavedObjectsClientContract; + server: { + plugins: { + elasticsearch: { + getCluster: () => { + callWithRequest: (req: ReqFacade, endpoint: string, params: any) => Promise; + }; + }; + }; + }; + getEsShardTimeout: () => Promise; +}; + +export class AbstractSearchStrategy { + public getCallWithRequestInstance: (req: ReqFacade) => APICaller; + public getSearchRequest: (req: ReqFacade) => any; + + constructor( + server: any, + callWithRequestFactory: (server: any, req: ReqFacade) => APICaller, + SearchRequest: any + ) { + this.getCallWithRequestInstance = req => callWithRequestFactory(server, req); + + this.getSearchRequest = req => { + const callWithRequest = this.getCallWithRequestInstance(req); + + return new SearchRequest(req, callWithRequest); + }; + } + + async getFieldsForWildcard(req: ReqFacade, indexPattern: string, capabilities: any) { + const { indexPatternsService } = req.pre; + + return await indexPatternsService!.getFieldsForWildcard({ + pattern: indexPattern, + }); + } + + checkForViability( + req: ReqFacade, + indexPattern: string + ): { isViable: boolean; capabilities: any } { + throw new TypeError('Must override method'); + } +} diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js similarity index 95% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js index fba67f448e78..63f2911ce111 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js +++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js @@ -17,7 +17,7 @@ * under the License. */ import { AbstractSearchStrategy } from './abstract_search_strategy'; -import { SearchRequest } from '../searh_requests/search_request'; +import { SearchRequest } from '../search_requests/search_request'; import { DefaultSearchCapabilities } from '../default_search_capabilities'; const callWithRequestFactory = (server, request) => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/build_request_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/build_request_body.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/build_request_body.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/build_request_body.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/get_request_params.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/get_request_params.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/get_request_params.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/get_request_params.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts rename to src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts rename to src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js similarity index 96% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js index 898ff837d4a0..8b8c31912f16 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { handleAnnotationResponse } from './response_processors/annotations/'; -import { getAnnotationRequestParams } from './annorations/get_request_params'; +import { handleAnnotationResponse } from './response_processors/annotations'; +import { getAnnotationRequestParams } from './annotations/get_request_params'; import { getLastSeriesTimestamp } from './helpers/timestamp'; function validAnnotation(annotation) { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js similarity index 91% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js index b4eb9e6b108f..1efeccb4b570 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js @@ -20,15 +20,14 @@ import { getSeriesRequestParams } from './series/get_request_params'; import { handleResponseBody } from './series/handle_response_body'; import { handleErrorResponse } from './handle_error_response'; import { getAnnotations } from './get_annotations'; -import { SearchStrategiesRegister } from '../search_strategies/search_strategies_register'; import { getEsQueryConfig } from './helpers/get_es_query_uisettings'; import { getActiveSeries } from './helpers/get_active_series'; export async function getSeriesData(req, panel) { - const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategyForPanel( - req, - panel - ); + const { + searchStrategy, + capabilities, + } = await req.framework.searchStrategyRegistry.getViableStrategyForPanel(req, panel); const searchRequest = searchStrategy.getSearchRequest(req); const esQueryConfig = await getEsQueryConfig(req); const meta = { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js similarity index 90% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js index 2c92692d2bd1..1d1c24590795 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js @@ -20,16 +20,16 @@ import { buildRequestBody } from './table/build_request_body'; import { handleErrorResponse } from './handle_error_response'; import { get } from 'lodash'; import { processBucket } from './table/process_bucket'; -import { SearchStrategiesRegister } from '../search_strategies/search_strategies_register'; import { getEsQueryConfig } from './helpers/get_es_query_uisettings'; import { getIndexPatternObject } from './helpers/get_index_pattern'; export async function getTableData(req, panel) { const panelIndexPattern = panel.index_pattern; - const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy( - req, - panelIndexPattern - ); + + const { + searchStrategy, + capabilities, + } = await req.framework.searchStrategyRegistry.getViableStrategy(req, panelIndexPattern); const searchRequest = searchStrategy.getSearchRequest(req); const esQueryConfig = await getEsQueryConfig(req); const { indexPatternObject } = await getIndexPatternObject(req, panelIndexPattern); diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js similarity index 97% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js index de23b90b21d6..3ec5454fcee7 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js @@ -24,7 +24,7 @@ import { convertIntervalToUnit, ASCENDING_UNIT_ORDER, } from './unit_to_seconds'; -import { getTimerangeDuration } from '../helpers/get_timerange'; +import { getTimerangeDuration } from './get_timerange'; import { INTERVAL_STRING_RE, GTE_INTERVAL_RE } from '../../../../common/interval_regexp'; const calculateBucketData = (timeInterval, capabilities) => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js similarity index 94% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js index 5a763ce35e35..995790c590e4 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { dateHistogramInterval } from '../../../../../../data/server'; +import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server'; import { getBucketSize } from '../../helpers/get_bucket_size'; import { getTimerange } from '../../helpers/get_timerange'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js similarity index 97% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js index d6514e3bc45d..a4817dac9bd1 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js @@ -19,7 +19,7 @@ import { getBucketSize } from '../../helpers/get_bucket_size'; import { getTimerange } from '../../helpers/get_timerange'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function query(req, panel, annotation, esQueryConfig, indexPattern, capabilities) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js similarity index 96% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js index 3b55e2bf4c15..48da5ac19aa3 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { dateHistogramInterval } from '../../../../../../data/server'; +import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server'; import { getBucketSize } from '../../helpers/get_bucket_size'; import { offsetTime } from '../../offset_time'; import { getIntervalAndTimefield } from '../../get_interval_and_timefield'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js similarity index 96% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js index 53f894322a8e..e5b81912f286 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js @@ -19,7 +19,7 @@ import { offsetTime } from '../../offset_time'; import { getIntervalAndTimefield } from '../../get_interval_and_timefield'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function query(req, panel, series, esQueryConfig, indexPatternObject) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js similarity index 94% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js index 1548c9e17c2e..80b4ef70a3f0 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function splitByFilter(req, panel, series, esQueryConfig, indexPattern) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js similarity index 94% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js index 4295bceed43c..d023c28cdb25 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function splitByFilters(req, panel, series, esQueryConfig, indexPattern) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js similarity index 96% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js index 183785fab9be..f33ce145aa23 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { dateHistogramInterval } from '../../../../../../data/server'; +import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server'; import { getBucketSize } from '../../helpers/get_bucket_size'; import { isLastValueTimerangeMode } from '../../helpers/get_timerange_mode'; import { getIntervalAndTimefield } from '../../get_interval_and_timefield'; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js similarity index 96% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js index 9d46c212e05b..d8d948e01ccc 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js @@ -18,7 +18,7 @@ */ import { getTimerange } from '../../helpers/get_timerange'; import { getIntervalAndTimefield } from '../../get_interval_and_timefield'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function query(req, panel, esQueryConfig, indexPatternObject) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js similarity index 95% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js index 17f99ea431fd..35036abed320 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function splitByEverything(req, panel, esQueryConfig, indexPattern) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js similarity index 95% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js index 042e4d98e276..5b7ae735cd50 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js @@ -18,7 +18,7 @@ */ import { set } from 'lodash'; -import { esQuery } from '../../../../../../../../plugins/data/server'; +import { esQuery } from '../../../../../../data/server'; export function splitByTerms(req, panel, esQueryConfig, indexPattern) { return next => doc => { diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts similarity index 95% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts index 85e1f8f7eb12..9d8f3fca789f 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts +++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts @@ -19,7 +19,7 @@ import { buildProcessorFunction } from '../build_processor_function'; // @ts-ignore -import { processors } from '../request_processors/series'; +import { processors } from '../request_processors/series/index'; /** * Builds series request body diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js rename to src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts index dcd0cd500bbc..6ef6362c6e37 100644 --- a/src/plugins/vis_type_timeseries/server/plugin.ts +++ b/src/plugins/vis_type_timeseries/server/plugin.ts @@ -24,19 +24,19 @@ import { Plugin, RequestHandlerContext, Logger, + IRouter, + FakeRequest, } from 'src/core/server'; import { Observable } from 'rxjs'; import { Server } from 'hapi'; -import { once } from 'lodash'; import { VisTypeTimeseriesConfig } from '.'; -import { - init, - getVisData, - GetVisData, - GetVisDataOptions, -} from '../../../legacy/core_plugins/vis_type_timeseries/server'; -import { ValidationTelemetryService } from './validation_telemetry/validation_telemetry_service'; +import { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data'; +import { ValidationTelemetryService } from './validation_telemetry'; import { UsageCollectionSetup } from '../../usage_collection/server'; +import { visDataRoutes } from './routes/vis'; +// @ts-ignore +import { fieldsRoutes } from './routes/fields'; +import { SearchStrategyRegistry } from './lib/search_strategies'; export interface LegacySetup { server: Server; @@ -47,15 +47,12 @@ interface VisTypeTimeseriesPluginSetupDependencies { } export interface VisTypeTimeseriesSetup { - /** @deprecated */ - __legacy: { - config$: Observable; - registerLegacyAPI: (__LEGACY: LegacySetup) => void; - }; getVisData: ( requestContext: RequestHandlerContext, + fakeRequest: FakeRequest, options: GetVisDataOptions ) => ReturnType; + addSearchStrategy: SearchStrategyRegistry['addStrategy']; } export interface Framework { @@ -64,6 +61,8 @@ export interface Framework { config$: Observable; globalConfig$: PluginInitializerContext['config']['legacy']['globalConfig$']; logger: Logger; + router: IRouter; + searchStrategyRegistry: SearchStrategyRegistry; } export class VisTypeTimeseriesPlugin implements Plugin { @@ -79,6 +78,9 @@ export class VisTypeTimeseriesPlugin implements Plugin { const config$ = this.initializerContext.config.create(); // Global config contains things like the ES shard timeout const globalConfig$ = this.initializerContext.config.legacy.globalConfig$; + const router = core.http.createRouter(); + + const searchStrategyRegistry = new SearchStrategyRegistry(); const framework: Framework = { core, @@ -86,23 +88,29 @@ export class VisTypeTimeseriesPlugin implements Plugin { config$, globalConfig$, logger, + router, + searchStrategyRegistry, }; - return { - __legacy: { - config$, - registerLegacyAPI: once(async (__LEGACY: LegacySetup) => { - const validationTelemetrySetup = await this.validationTelementryService.setup(core, { - ...plugins, - globalConfig$, - }); + (async () => { + const validationTelemetry = await this.validationTelementryService.setup(core, { + ...plugins, + globalConfig$, + }); + visDataRoutes(router, framework, validationTelemetry); - await init(framework, __LEGACY, validationTelemetrySetup); - }), - }, - getVisData: async (requestContext: RequestHandlerContext, options: GetVisDataOptions) => { - return await getVisData(requestContext, options, framework); + fieldsRoutes(framework); + })(); + + return { + getVisData: async ( + requestContext: RequestHandlerContext, + fakeRequest: FakeRequest, + options: GetVisDataOptions + ) => { + return await getVisData(requestContext, { ...fakeRequest, body: options }, framework); }, + addSearchStrategy: searchStrategyRegistry.addStrategy.bind(searchStrategyRegistry), }; } diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js b/src/plugins/vis_type_timeseries/server/routes/fields.ts similarity index 54% rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js rename to src/plugins/vis_type_timeseries/server/routes/fields.ts index d984868afb0b..255c85c9eefa 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js +++ b/src/plugins/vis_type_timeseries/server/routes/fields.ts @@ -17,26 +17,35 @@ * under the License. */ +import { isBoom } from 'boom'; +import { schema } from '@kbn/config-schema'; import { getFields } from '../lib/get_fields'; -import { getIndexPatternService } from '../lib/get_index_pattern_service'; +import { Framework } from '../plugin'; -export const fieldsRoutes = server => { - server.route({ - config: { - pre: [getIndexPatternService], +export const fieldsRoutes = (framework: Framework) => { + framework.router.get( + { + path: '/api/metrics/fields', + validate: { + query: schema.object({ index: schema.string() }), + }, }, - path: '/api/metrics/fields', - method: 'GET', - handler: async req => { + async (context, req, res) => { try { - return await getFields(req); + return res.ok({ body: await getFields(context, req, framework, req.query.index) }); } catch (err) { - if (err.isBoom && err.status === 401) { - return err; + if (isBoom(err) && err.output.statusCode === 401) { + return res.customError({ + body: err.output.payload, + statusCode: err.output.statusCode, + headers: err.output.headers, + }); } - return []; + return res.ok({ + body: [], + }); } - }, - }); + } + ); }; diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts b/src/plugins/vis_type_timeseries/server/routes/post_vis_schema.ts similarity index 100% rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts rename to src/plugins/vis_type_timeseries/server/routes/post_vis_schema.ts diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts b/src/plugins/vis_type_timeseries/server/routes/vis.ts similarity index 85% rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts rename to src/plugins/vis_type_timeseries/server/routes/vis.ts index 32e87f5a3f66..e2d1e4d114ad 100644 --- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts +++ b/src/plugins/vis_type_timeseries/server/routes/vis.ts @@ -17,14 +17,11 @@ * under the License. */ -import { IRouter } from 'kibana/server'; +import { IRouter, KibanaRequest } from 'kibana/server'; import { schema } from '@kbn/config-schema'; -import { getVisData } from '../lib/get_vis_data'; +import { getVisData, GetVisDataOptions } from '../lib/get_vis_data'; import { visPayloadSchema } from './post_vis_schema'; -import { - Framework, - ValidationTelemetryServiceSetup, -} from '../../../../../plugins/vis_type_timeseries/server'; +import { Framework, ValidationTelemetryServiceSetup } from '../index'; const escapeHatch = schema.object({}, { allowUnknowns: true }); @@ -52,7 +49,11 @@ export const visDataRoutes = ( ); } try { - const results = await getVisData(requestContext, request.body, framework); + const results = await getVisData( + requestContext, + request as KibanaRequest<{}, {}, GetVisDataOptions>, + framework + ); return response.ok({ body: results }); } catch (error) { return response.internalError({ diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts index 4409667d8390..4b1aa774a523 100644 --- a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts +++ b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts @@ -241,6 +241,7 @@ export class KibanaFramework { public async makeTSVBRequest( requestContext: RequestHandlerContext, + rawRequest: KibanaRequest, model: TSVBMetricModel, timerange: { min: number; max: number }, filters: any[] @@ -254,6 +255,6 @@ export class KibanaFramework { panels: [model], filters, }; - return getVisData(requestContext, options); + return getVisData(requestContext, rawRequest, options); } } diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts index eb5ac05644a2..5a5f9d0f8f52 100644 --- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts +++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts @@ -51,7 +51,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter { } const requests = options.metrics.map(metricId => - this.makeTSVBRequest(metricId, options, nodeField, requestContext) + this.makeTSVBRequest(metricId, options, nodeField, requestContext, rawRequest) ); return Promise.all(requests) @@ -93,7 +93,8 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter { metricId: InventoryMetric, options: InfraMetricsRequestOptions, nodeField: string, - requestContext: RequestHandlerContext + requestContext: RequestHandlerContext, + rawRequest: KibanaRequest ) { const createTSVBModel = get(metrics, ['tsvb', metricId]) as TSVBMetricModelCreator | undefined; if (!createTSVBModel) { @@ -152,6 +153,6 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter { ? [{ match: { [model.map_field_to]: id } }] : [{ match: { [nodeField]: id } }]; - return this.framework.makeTSVBRequest(requestContext, model, timerange, filters); + return this.framework.makeTSVBRequest(requestContext, rawRequest, model, timerange, filters); } } diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts index 8ab3fdccbe72..347feca67aa9 100644 --- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts +++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts @@ -76,7 +76,13 @@ export const populateSeriesWithTSVBData = ( } // Get TSVB results using the model, timerange and filters - const tsvbResults = await framework.makeTSVBRequest(requestContext, model, timerange, filters); + const tsvbResults = await framework.makeTSVBRequest( + requestContext, + request, + model, + timerange, + filters + ); // If there is no data `custom` will not exist. if (!tsvbResults.custom) { diff --git a/x-pack/legacy/plugins/rollup/index.js b/x-pack/legacy/plugins/rollup/index.js index a10407b19fa9..cace3bba1592 100644 --- a/x-pack/legacy/plugins/rollup/index.js +++ b/x-pack/legacy/plugins/rollup/index.js @@ -60,7 +60,7 @@ export function rollup(kibana) { server.plugins.index_management.addIndexManagementDataEnricher(rollupDataEnricher); } - registerRollupSearchStrategy(this.kbnServer, server); + registerRollupSearchStrategy(this.kbnServer); }, }); } diff --git a/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js index 537c5cf45ad6..284151d404a4 100644 --- a/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js +++ b/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js @@ -8,10 +8,10 @@ import { once } from 'lodash'; import { elasticsearchJsPlugin } from '../../client/elasticsearch_rollup'; const callWithRequest = once(server => { - const config = { plugins: [elasticsearchJsPlugin] }; - const cluster = server.plugins.elasticsearch.createCluster('rollup', config); - - return cluster.callWithRequest; + const client = server.newPlatform.setup.core.elasticsearch.createClient('rollup', { + plugins: [elasticsearchJsPlugin], + }); + return (request, ...args) => client.asScoped(request).callAsCurrentUser(...args); }); export const callWithRequestFactory = (server, request) => { diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js index 5d732c8e7fba..fe65a7f1f30e 100644 --- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js +++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js @@ -6,19 +6,19 @@ import { getRollupSearchStrategy } from './rollup_search_strategy'; import { getRollupSearchRequest } from './rollup_search_request'; import { getRollupSearchCapabilities } from './rollup_search_capabilities'; +import { + AbstractSearchRequest, + DefaultSearchCapabilities, + AbstractSearchStrategy, +} from '../../../../../../../src/plugins/vis_type_timeseries/server'; -export const registerRollupSearchStrategy = (kbnServer, server) => +export const registerRollupSearchStrategy = kbnServer => kbnServer.afterPluginsInit(() => { - if (!server.plugins.metrics) { + if (!kbnServer.newPlatform.setup.plugins.metrics) { return; } - const { - addSearchStrategy, - AbstractSearchRequest, - AbstractSearchStrategy, - DefaultSearchCapabilities, - } = server.plugins.metrics; + const { addSearchStrategy } = kbnServer.newPlatform.setup.plugins.metrics; const RollupSearchRequest = getRollupSearchRequest(AbstractSearchRequest); const RollupSearchCapabilities = getRollupSearchCapabilities(DefaultSearchCapabilities); @@ -28,5 +28,5 @@ export const registerRollupSearchStrategy = (kbnServer, server) => RollupSearchCapabilities ); - addSearchStrategy(new RollupSearchStrategy(server)); + addSearchStrategy(new RollupSearchStrategy(kbnServer)); }); diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js index 5a1e4f27b145..acd016d75f97 100644 --- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js +++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js @@ -14,6 +14,9 @@ describe('Register Rollup Search Strategy', () => { kbnServer = { afterPluginsInit, + newPlatform: { + setup: { plugins: {} }, + }, }; metrics = { @@ -25,27 +28,22 @@ describe('Register Rollup Search Strategy', () => { }); test('should run initialization on "afterPluginsInit" hook', () => { - registerRollupSearchStrategy(kbnServer, { - plugins: {}, - }); + registerRollupSearchStrategy(kbnServer); expect(kbnServer.afterPluginsInit).toHaveBeenCalled(); }); test('should run initialization if metrics plugin available', () => { - registerRollupSearchStrategy(kbnServer, { - plugins: { - metrics, - }, + registerRollupSearchStrategy({ + ...kbnServer, + newPlatform: { setup: { plugins: { metrics } } }, }); expect(metrics.addSearchStrategy).toHaveBeenCalled(); }); test('should not run initialization if metrics plugin unavailable', () => { - registerRollupSearchStrategy(kbnServer, { - plugins: {}, - }); + registerRollupSearchStrategy(kbnServer); expect(metrics.addSearchStrategy).not.toHaveBeenCalled(); });