forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[TSVB] Add Positive Rate to Aggregations (elastic#59843) (elastic#63167)
* [TSVB] Add Rate to Aggregations * Fixing i18n labels * Changing from rate to growth_rate; adding message to aggregation form; * Change units to scale; change free text to combobox * Fixing placeholder * Fixing i18n label * Changing from Growth Rate to Positive Rate Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
- Loading branch information
1 parent
3cc05cf
commit 7db5844
Showing
10 changed files
with
410 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/positive_rate.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /* | ||
| * 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 PropTypes from 'prop-types'; | ||
| import React from 'react'; | ||
| import { AggSelect } from './agg_select'; | ||
| import { FieldSelect } from './field_select'; | ||
| import { AggRow } from './agg_row'; | ||
| import { createChangeHandler } from '../lib/create_change_handler'; | ||
| import { createSelectHandler } from '../lib/create_select_handler'; | ||
| import { | ||
| htmlIdGenerator, | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiFormLabel, | ||
| EuiFormRow, | ||
| EuiSpacer, | ||
| EuiText, | ||
| EuiLink, | ||
| EuiComboBox, | ||
| } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public'; | ||
|
|
||
| const UNIT_OPTIONS = [ | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.auto', { defaultMessage: 'auto' }), | ||
| value: '', | ||
| }, | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.perMillisecond', { | ||
| defaultMessage: 'per millisecond', | ||
| }), | ||
| value: '1ms', | ||
| }, | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.perSecond', { defaultMessage: 'per second' }), | ||
| value: '1s', | ||
| }, | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.perMinute', { defaultMessage: 'per minute' }), | ||
| value: '1m', | ||
| }, | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.perHour', { defaultMessage: 'per hour' }), | ||
| value: '1h', | ||
| }, | ||
| { | ||
| label: i18n.translate('visTypeTimeseries.units.perDay', { defaultMessage: 'per day' }), | ||
| value: '1d', | ||
| }, | ||
| ]; | ||
|
|
||
| export const PositiveRateAgg = props => { | ||
| const defaults = { unit: '' }; | ||
| const model = { ...defaults, ...props.model }; | ||
|
|
||
| const handleChange = createChangeHandler(props.onChange, model); | ||
| const handleSelectChange = createSelectHandler(handleChange); | ||
|
|
||
| const htmlId = htmlIdGenerator(); | ||
| const indexPattern = | ||
| (props.series.override_index_pattern && props.series.series_index_pattern) || | ||
| props.panel.index_pattern; | ||
|
|
||
| const selectedUnitOptions = UNIT_OPTIONS.filter(o => o.value === model.unit); | ||
|
|
||
| return ( | ||
| <AggRow | ||
| disableDelete={props.disableDelete} | ||
| model={props.model} | ||
| onAdd={props.onAdd} | ||
| onDelete={props.onDelete} | ||
| siblings={props.siblings} | ||
| dragHandleProps={props.dragHandleProps} | ||
| > | ||
| <EuiFlexGroup gutterSize="s"> | ||
| <EuiFlexItem> | ||
| <EuiFormLabel htmlFor={htmlId('aggregation')}> | ||
| <FormattedMessage | ||
| id="visTypeTimeseries.positiveRate.aggregationLabel" | ||
| defaultMessage="Aggregation" | ||
| /> | ||
| </EuiFormLabel> | ||
| <EuiSpacer size="xs" /> | ||
| <AggSelect | ||
| id={htmlId('aggregation')} | ||
| panelType={props.panel.type} | ||
| siblings={props.siblings} | ||
| value={model.type} | ||
| onChange={handleSelectChange('type')} | ||
| fullWidth | ||
| /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem> | ||
| <EuiFormRow | ||
| id={htmlId('field')} | ||
| label={ | ||
| <FormattedMessage | ||
| id="visTypeTimeseries.postiveRate.fieldLabel" | ||
| defaultMessage="Field" | ||
| /> | ||
| } | ||
| fullWidth | ||
| > | ||
| <FieldSelect | ||
| fields={props.fields} | ||
| type={model.type} | ||
| restrict={KBN_FIELD_TYPES.NUMBER} | ||
| indexPattern={indexPattern} | ||
| value={model.field} | ||
| onChange={handleSelectChange('field')} | ||
| uiRestrictions={props.uiRestrictions} | ||
| fullWidth | ||
| /> | ||
| </EuiFormRow> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem> | ||
| <EuiFormRow | ||
| id={htmlId('units')} | ||
| label={ | ||
| <FormattedMessage | ||
| id="visTypeTimeseries.positiveRate.unitsLabel" | ||
| defaultMessage="Scale" | ||
| /> | ||
| } | ||
| fullWidth | ||
| > | ||
| <EuiComboBox | ||
| placeholder={i18n.translate('visTypeTimeseries.positiveRate.unitSelectPlaceholder', { | ||
| defaultMessage: 'Select scale...', | ||
| })} | ||
| options={UNIT_OPTIONS} | ||
| onChange={handleSelectChange('unit')} | ||
| singleSelection={{ asPlainText: true }} | ||
| selectedOptions={selectedUnitOptions} | ||
| /> | ||
| </EuiFormRow> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| <EuiSpacer size="s" /> | ||
| <EuiText size="xs" color="subdued"> | ||
| <p> | ||
| <FormattedMessage | ||
| id="visTypeTimeseries.positiveRate.helpText" | ||
| defaultMessage="This aggregation should only be applied to {link}, it is a shortcut for applying max, derivative and positive only to a field." | ||
| values={{ | ||
| link: ( | ||
| <EuiLink href="https://en.wikipedia.org/wiki/Monotonic_function" target="_BLANK"> | ||
| <FormattedMessage | ||
| id="visTypeTimeseries.positiveRate.helpTextLink" | ||
| defaultMessage="monotonically increasing numbers" | ||
| /> | ||
| </EuiLink> | ||
| ), | ||
| }} | ||
| /> | ||
| </p> | ||
| </EuiText> | ||
| </AggRow> | ||
| ); | ||
| }; | ||
|
|
||
| PositiveRateAgg.propTypes = { | ||
| disableDelete: PropTypes.bool, | ||
| fields: PropTypes.object, | ||
| model: PropTypes.object, | ||
| onAdd: PropTypes.func, | ||
| onChange: PropTypes.func, | ||
| onDelete: PropTypes.func, | ||
| panel: PropTypes.object, | ||
| series: PropTypes.object, | ||
| siblings: PropTypes.array, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...lugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/positive_rate.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * 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 { getBucketSize } from '../../helpers/get_bucket_size'; | ||
| import { getIntervalAndTimefield } from '../../get_interval_and_timefield'; | ||
| import { bucketTransform } from '../../helpers/bucket_transform'; | ||
| import { set } from 'lodash'; | ||
|
|
||
| export const filter = metric => metric.type === 'positive_rate'; | ||
|
|
||
| export const createPositiveRate = (doc, intervalString, aggRoot) => metric => { | ||
| const maxFn = bucketTransform.max; | ||
| const derivativeFn = bucketTransform.derivative; | ||
| const positiveOnlyFn = bucketTransform.positive_only; | ||
|
|
||
| const maxMetric = { id: `${metric.id}-positive-rate-max`, type: 'max', field: metric.field }; | ||
| const derivativeMetric = { | ||
| id: `${metric.id}-positive-rate-derivative`, | ||
| type: 'derivative', | ||
| field: `${metric.id}-positive-rate-max`, | ||
| unit: metric.unit, | ||
| }; | ||
| const positiveOnlyMetric = { | ||
| id: metric.id, | ||
| type: 'positive_only', | ||
| field: `${metric.id}-positive-rate-derivative`, | ||
| }; | ||
|
|
||
| const fakeSeriesMetrics = [maxMetric, derivativeMetric, positiveOnlyMetric]; | ||
|
|
||
| const maxBucket = maxFn(maxMetric, fakeSeriesMetrics, intervalString); | ||
| const derivativeBucket = derivativeFn(derivativeMetric, fakeSeriesMetrics, intervalString); | ||
| const positiveOnlyBucket = positiveOnlyFn(positiveOnlyMetric, fakeSeriesMetrics, intervalString); | ||
|
|
||
| set(doc, `${aggRoot}.timeseries.aggs.${metric.id}-positive-rate-max`, maxBucket); | ||
| set(doc, `${aggRoot}.timeseries.aggs.${metric.id}-positive-rate-derivative`, derivativeBucket); | ||
| set(doc, `${aggRoot}.timeseries.aggs.${metric.id}`, positiveOnlyBucket); | ||
| }; | ||
|
|
||
| export function positiveRate(req, panel, series, esQueryConfig, indexPatternObject, capabilities) { | ||
| return next => doc => { | ||
| const { interval } = getIntervalAndTimefield(panel, series, indexPatternObject); | ||
| const { intervalString } = getBucketSize(req, interval, capabilities); | ||
| if (series.metrics.some(filter)) { | ||
| series.metrics | ||
| .filter(filter) | ||
| .forEach(createPositiveRate(doc, intervalString, `aggs.${series.id}.aggs`)); | ||
| return next(doc); | ||
| } | ||
| return next(doc); | ||
| }; | ||
| } |
Oops, something went wrong.