[TSVB] Disable using top_hits in pipeline aggregations (#82278)

* [TSVB] Disable using top_hits in bucket script aggregations * remove console message * Correct schema for metrics size * Chanhe hardcoded agg with the exported for the METRIC_TYPES var * Exclude top_hit agg from all Sibling Pipeline Aggregations and all Parent Pipeline Aggregations Co-authored-by: Kibana Machine <[email protected]>
elastic · Nov 10, 2020 · a7a83fd · a7a83fd
1 parent 471c281
commit a7a83fd
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 2 deletions.
diff --git a/src/plugins/vis_type_timeseries/common/vis_schema.ts b/src/plugins/vis_type_timeseries/common/vis_schema.ts
@@ -120,7 +120,7 @@ export const metricsItems = schema.object({
   type: stringRequired,
   value: stringOptionalNullable,
   values: schema.maybe(schema.nullable(schema.arrayOf(schema.nullable(schema.string())))),
-  size: stringOptionalNullable,
+  size: stringOrNumberOptionalNullable,
   agg_with: stringOptionalNullable,
   order: stringOptionalNullable,
   order_by: stringOptionalNullable,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/calculation.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/calculation.js
@@ -26,6 +26,7 @@ import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
 import { createTextHandler } from '../lib/create_text_handler';
 import { CalculationVars, newVariable } from './vars';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import {
@@ -99,6 +100,7 @@ export function CalculationAgg(props) {
             onChange={handleChange}
             name="variables"
             model={model}
+            exclude={[METRIC_TYPES.TOP_HIT]}
           />
         </EuiFlexItem>
 

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js
@@ -24,6 +24,7 @@ import { AggSelect } from './agg_select';
 import { MetricSelect } from './metric_select';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   htmlIdGenerator,
@@ -80,6 +81,7 @@ export function CumulativeSumAgg(props) {
               metrics={siblings}
               metric={model}
               value={model.field}
+              exclude={[METRIC_TYPES.TOP_HIT]}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js
@@ -25,6 +25,7 @@ import { AggRow } from './agg_row';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
 import { createTextHandler } from '../lib/create_text_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -91,6 +92,7 @@ export const DerivativeAgg = (props) => {
               metrics={siblings}
               metric={model}
               value={model.field}
+              exclude={[METRIC_TYPES.TOP_HIT]}
               fullWidth
             />
           </EuiFormRow>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
@@ -25,6 +25,7 @@ import { MetricSelect } from './metric_select';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
 import { createNumberHandler } from '../lib/create_number_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -153,6 +154,7 @@ export const MovingAverageAgg = (props) => {
               metrics={siblings}
               metric={model}
               value={model.field}
+              exclude={[METRIC_TYPES.TOP_HIT]}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js
@@ -24,6 +24,7 @@ import { MetricSelect } from './metric_select';
 import { AggRow } from './agg_row';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -85,6 +86,7 @@ export const PositiveOnlyAgg = (props) => {
               metrics={siblings}
               metric={model}
               value={model.field}
+              exclude={[METRIC_TYPES.TOP_HIT]}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
@@ -25,6 +25,7 @@ import { AggRow } from './agg_row';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
 import { createNumberHandler } from '../lib/create_number_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -87,6 +88,7 @@ export const SerialDiffAgg = (props) => {
               metrics={siblings}
               metric={model}
               value={model.field}
+              exclude={[METRIC_TYPES.TOP_HIT]}
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js
@@ -25,6 +25,8 @@ import { AggSelect } from './agg_select';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
 import { createTextHandler } from '../lib/create_text_handler';
+import { METRIC_TYPES } from '../../../../common/metric_types';
+
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -154,7 +156,7 @@ const StandardSiblingAggUi = (props) => {
           >
             <MetricSelect
               onChange={handleSelectChange('field')}
-              exclude={['percentile']}
+              exclude={[METRIC_TYPES.PERCENTILE, METRIC_TYPES.TOP_HIT]}
               metrics={siblings}
               metric={model}
               value={model.field}
@@ -179,6 +181,7 @@ StandardSiblingAggUi.propTypes = {
   series: PropTypes.object,
   siblings: PropTypes.array,
   uiRestrictions: PropTypes.object,
+  exclude: PropTypes.array,
 };
 
 export const StandardSiblingAgg = injectI18n(StandardSiblingAggUi);
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js
@@ -71,6 +71,7 @@ export class CalculationVars extends Component {
               metric={this.props.model}
               value={row.field}
               includeSiblings={this.props.includeSiblings}
+              exclude={this.props.exclude}
             />
           </EuiFlexItem>
           <EuiFlexItem>