- Invalid JSON syntax -
- - - - - - - - - -- Image is too large, maximum size is {{conf.options.maxSize.description}} -
- - - - - - - {{conf.value || conf.defVal}} - - - {{(conf.value || conf.defVal).join(', ')}} - - - {{conf.value === undefined ? conf.defVal : conf.value}} - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less
new file mode 100644
index 00000000000000..5201e5781595ad
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less
@@ -0,0 +1,30 @@
+@import (reference) '~ui/styles/variables/colors';
+
+.advancedSettings {
+ padding: 20px;
+ background: @globalColorLightestGray;
+ min-height: calc(~"100vh - 70px");
+
+ > div {
+ max-width: 1000px;
+ margin: 0 auto;
+ }
+
+ .advancedSettings__field {
+ + * {
+ margin-top: 24px;
+ }
+
+ &__wrapper {
+ width: 720px;
+ }
+
+ &__actions {
+ padding-top: 30px;
+ }
+
+ .euiFormHelpText {
+ padding-bottom: 0;
+ }
+ }
+}
diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.js b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.js
new file mode 100644
index 00000000000000..113f23b6b6f4a5
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.js
@@ -0,0 +1,138 @@
+/*
+ * 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 React from 'react';
+import { shallow } from 'enzyme';
+
+import { AdvancedSettings } from './advanced_settings';
+
+jest.mock('./components/field', () => ({
+ Field: () => {
+ return 'field';
+ }
+}));
+
+jest.mock('./components/call_outs', () => ({
+ CallOuts: () => {
+ return 'callOuts';
+ }
+}));
+
+jest.mock('./components/search', () => ({
+ Search: () => {
+ return 'search';
+ }
+}));
+
+const config = {
+ set: () => {},
+ remove: () => {},
+ isCustom: (setting) => setting.isCustom,
+ getAll: () => {
+ return {
+ 'test:array:setting': {
+ value: ['default_value'],
+ name: 'Test array setting',
+ description: 'Description for Test array setting',
+ category: ['elasticsearch'],
+ },
+ 'test:boolean:setting': {
+ value: true,
+ name: 'Test boolean setting',
+ description: 'Description for Test boolean setting',
+ category: ['elasticsearch'],
+ },
+ 'test:image:setting': {
+ value: null,
+ name: 'Test image setting',
+ description: 'Description for Test image setting',
+ type: 'image',
+ },
+ 'test:json:setting': {
+ value: '{"foo": "bar"}',
+ name: 'Test json setting',
+ description: 'Description for Test json setting',
+ type: 'json',
+ },
+ 'test:markdown:setting': {
+ value: '',
+ name: 'Test markdown setting',
+ description: 'Description for Test markdown setting',
+ type: 'markdown',
+ },
+ 'test:number:setting': {
+ value: 5,
+ name: 'Test number setting',
+ description: 'Description for Test number setting',
+ },
+ 'test:select:setting': {
+ value: 'orange',
+ name: 'Test select setting',
+ description: 'Description for Test select setting',
+ type: 'select',
+ options: ['apple', 'orange', 'banana'],
+ },
+ 'test:string:setting': {
+ value: null,
+ name: 'Test string setting',
+ description: 'Description for Test string setting',
+ type: 'string',
+ isCustom: true,
+ },
+ 'test:readonlystring:setting': {
+ value: null,
+ name: 'Test readonly string setting',
+ description: 'Description for Test readonly string setting',
+ type: 'string',
+ readonly: true,
+ },
+ 'test:customstring:setting': {
+ value: null,
+ name: 'Test custom string setting',
+ description: 'Description for Test custom string setting',
+ type: 'string',
+ isCustom: true,
+ },
+ };
+ }
+};
+
+describe('AdvancedSettings', () => {
+
+ it('should render normally', async () => {
+ const component = shallow(
+ Settings
+
+
+
+
+`;
diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js
new file mode 100644
index 00000000000000..db9735d12fff64
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js
@@ -0,0 +1,45 @@
+/*
+ * 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 React from 'react';
+
+import {
+ EuiCallOut,
+} from '@elastic/eui';
+
+export const CallOuts = () => {
+ return (
+ + Be careful in here, these settings are for very advanced users only. Tweaks you make here can break large portions of Kibana. Some of these settings may be undocumented, unsupported or experimental. If a field has a default value, blanking the field will reset it to its default which may be unacceptable given other configuration directives. Deleting a custom setting will permanently remove it from Kibana's config. +
+
+
+
+
+ );
+};
diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.test.js b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.test.js
new file mode 100644
index 00000000000000..4add85d1206ab4
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.test.js
@@ -0,0 +1,33 @@
+/*
+ * 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 React from 'react';
+import { shallow } from 'enzyme';
+
+import { CallOuts } from './call_outs';
+
+describe('CallOuts', () => {
+ it('should render normally', async () => {
+ const component = shallow(
+ + Be careful in here, these settings are for very advanced users only. + Tweaks you make here can break large portions of Kibana. + Some of these settings may be undocumented, unsupported or experimental. + If a field has a default value, blanking the field will reset it to its default which may be + unacceptable given other configuration directives. + Deleting a custom setting will permanently remove it from Kibana's config. +
+
+ Array test setting
+
+ }
+ titleSize="xs"
+ >
+ + Array test setting + +
+ } + titleSize="xs" + > ++ Array test setting + +
+ } + titleSize="xs" + > +
+ Boolean test setting
+
+ }
+ titleSize="xs"
+ >
+ + Boolean test setting + +
+ } + titleSize="xs" + > ++ Boolean test setting + +
+ } + titleSize="xs" + > +
+ Image test setting
+
+ }
+ titleSize="xs"
+ >
+ + Image test setting + +
+ } + titleSize="xs" + > ++ Image test setting + +
+ } + titleSize="xs" + > +
+ Json test setting
+
+ }
+ titleSize="xs"
+ >
+
+
+ + Json test setting + +
+ } + titleSize="xs" + > +
+
+ + Json test setting + +
+ } + titleSize="xs" + > +
+
+
+ Markdown test setting
+
+ }
+ titleSize="xs"
+ >
+
+
+ + Markdown test setting + +
+ } + titleSize="xs" + > +
+
+ + Markdown test setting + +
+ } + titleSize="xs" + > +
+
+
+ Number test setting
+
+ }
+ titleSize="xs"
+ >
+ + Number test setting + +
+ } + titleSize="xs" + > ++ Number test setting + +
+ } + titleSize="xs" + > +
+ Select test setting
+
+ }
+ titleSize="xs"
+ >
+ + Select test setting + +
+ } + titleSize="xs" + > ++ Select test setting + +
+ } + titleSize="xs" + > +
+ String test setting
+
+ }
+ titleSize="xs"
+ >
+ + String test setting + +
+ } + titleSize="xs" + > ++ String test setting + +
+ } + titleSize="xs" + > +
+
+ );
+ case 'image':
+ if(!isDefaultValue(setting) && !changeImage) {
+ return (
+
+ {setting.displayName || setting.name}
+ {setting.isCustom ?
+
+ );
+ }
+
+ renderDescription(setting) {
+ return (
+ + General +
++ Dashboard +
++ X-pack +
+{getCategoryName(category)}
+
-
-
-
-
-
-
-
-
-
- Caution: You can break stuff here
-
-
-
-
-
-
- |
-
- Name
-
- |
-
-
- Value
-
- |
-
-
-
-
- |
-
|---|---|---|
- ' +
- '
- sessionId: restricts operations to execute all search requests on the same shards. ' + - 'This has the benefit of reusing shard caches across requests. ' + - '
- custom: allows you to define a your own preference. ' + - 'Use courier:customRequestPreference to customize your preference value. ' + - '
- none: means do not set a preference. ' + - 'This might provide better performance because requests can be spread across all shard copies. ' + - 'However, results might be inconsistent because different shards might be in different refresh states.' + - '
-
+
- sessionId: restricts operations to execute all search requests on the same shards. + This has the benefit of reusing shard caches across requests. +
- custom: allows you to define a your own preference. + Use courier:customRequestPreference to customize your preference value. +
- none: means do not set a preference. + This might provide better performance because requests can be spread across all shard copies. + However, results might be inconsistent because different shards might be in different refresh states. +
does not have keyboard handlers even though
- // it has mouse handlers, since react-select still takes care, that this works
- // well with keyboard.
- /* eslint-disable jsx-a11y/no-static-element-interactions */
- if (heading) {
- let note;
- if (pipeline) {
- note = (
-
- (requires child aggregation)
-
- );
- }
- return (
- {
diff --git a/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js b/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js
index 09daecef2d7ad8..15276f0d64ad99 100644
--- a/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js
+++ b/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js
@@ -1,3 +1,22 @@
+/*
+ * 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 AggRow from './agg_row';
import React from 'react';
export function UnsupportedAgg(props) {
diff --git a/src/core_plugins/metrics/public/components/aggs/vars.js b/src/core_plugins/metrics/public/components/aggs/vars.js
index 7141c1b4f5ee36..f80537ebd20489 100644
--- a/src/core_plugins/metrics/public/components/aggs/vars.js
+++ b/src/core_plugins/metrics/public/components/aggs/vars.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
@@ -16,7 +35,7 @@ class CalculationVars extends Component {
return (e) => {
const handleChange = collectionActions.handleChange.bind(null, this.props);
const part = {};
- part[name] = _.get(e, 'value', _.get(e, 'target.value'));
+ part[name] = _.get(e, '[0].value', _.get(e, 'target.value'));
handleChange(_.assign({}, item, part));
};
}
diff --git a/src/core_plugins/metrics/public/components/annotations_editor.js b/src/core_plugins/metrics/public/components/annotations_editor.js
index 7c42abc428a2ba..b7c97455c7b76f 100644
--- a/src/core_plugins/metrics/public/components/annotations_editor.js
+++ b/src/core_plugins/metrics/public/components/annotations_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
@@ -37,7 +56,7 @@ class AnnotationsEditor extends Component {
return (e) => {
const handleChange = collectionActions.handleChange.bind(null, this.props);
const part = {};
- part[name] = _.get(e, 'value', _.get(e, 'target.value'));
+ part[name] = _.get(e, '[0].value', _.get(e, 'target.value'));
handleChange(_.assign({}, item, part));
};
}
diff --git a/src/core_plugins/metrics/public/components/color_picker.js b/src/core_plugins/metrics/public/components/color_picker.js
index 707365b3ba95bf..4a9cd63c222ab5 100644
--- a/src/core_plugins/metrics/public/components/color_picker.js
+++ b/src/core_plugins/metrics/public/components/color_picker.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/* eslint-disable jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
// The color picker is not yet accessible.
diff --git a/src/core_plugins/metrics/public/components/color_rules.js b/src/core_plugins/metrics/public/components/color_rules.js
index 27b311fa2fd831..dfec571167ebff 100644
--- a/src/core_plugins/metrics/public/components/color_rules.js
+++ b/src/core_plugins/metrics/public/components/color_rules.js
@@ -1,11 +1,32 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
import AddDeleteButtons from './add_delete_buttons';
-import Select from 'react-select';
import * as collectionActions from './lib/collection_actions';
import ColorPicker from './color_picker';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
class ColorRules extends Component {
@@ -18,7 +39,7 @@ class ColorRules extends Component {
return (e) => {
const handleChange = collectionActions.handleChange.bind(null, this.props);
const part = {};
- part[name] = cast(_.get(e, 'value', _.get(e, 'target.value')));
+ part[name] = cast(_.get(e, '[0].value', _.get(e, 'target.value')));
if (part[name] === 'undefined') part[name] = undefined;
if (part[name] === NaN) part[name] = undefined;
handleChange(_.assign({}, item, part));
@@ -41,6 +62,10 @@ class ColorRules extends Component {
handleChange(_.assign({}, model, part));
};
const htmlId = htmlIdGenerator(model.id);
+ const selectedOperatorOption = operatorOptions.find(option => {
+ return model.opperator === option.value;
+ });
+
let secondary;
if (!this.props.hideSecondary) {
secondary = (
@@ -67,11 +92,12 @@ class ColorRules extends Component {
if metric is
@@ -114,12 +160,13 @@ class TimeseriesPanelConfig extends Component {
/>
-
- {label}
- {note}
-
-
- );
- }
- return (
-
-
- {this.props.children}
-
-
- );
- /* eslint-enable jsx-a11y/no-static-element-interactions */
- }
-}
-
-AggSelectOption.props = {
- children: PropTypes.node,
- className: PropTypes.string,
- isDisabled: PropTypes.bool,
- isFocused: PropTypes.bool,
- isSelected: PropTypes.bool,
- onFocus: PropTypes.func,
- onSelect: PropTypes.func,
- option: PropTypes.object.isRequired,
-};
+const allAggOptions = [
+ ...metricAggs,
+ ...pipelineAggs,
+ ...siblingAggs,
+ ...specialAggs
+];
function filterByPanelType(panelType) {
return agg => {
@@ -136,7 +80,12 @@ function filterByPanelType(panelType) {
}
function AggSelect(props) {
- const { siblings, panelType } = props;
+ const { siblings, panelType, value } = props;
+
+ const selectedOption = allAggOptions.find(option => {
+ return value === option.value;
+ });
+ const selectedOptions = selectedOption ? [selectedOption] : [];
let enablePipelines = siblings.some(
s => !!metricAggs.find(m => m.value === s.type)
@@ -150,55 +99,39 @@ function AggSelect(props) {
options = [
{
label: 'Metric Aggregations',
- value: null,
- heading: true,
- disabled: true,
+ options: metricAggs,
},
- ...metricAggs,
{
label: 'Parent Pipeline Aggregations',
- value: null,
- pipeline: true,
- heading: true,
- disabled: true,
+ options: pipelineAggs
+ .filter(filterByPanelType(panelType))
+ .map(agg => ({ ...agg, disabled: !enablePipelines }))
},
- ...pipelineAggs
- .filter(filterByPanelType(panelType))
- .map(agg => ({ ...agg, disabled: !enablePipelines })),
{
label: 'Sibling Pipeline Aggregations',
- value: null,
- pipeline: true,
- heading: true,
- disabled: true,
+ options: siblingAggs.map(agg => ({ ...agg, disabled: !enablePipelines })),
},
- ...siblingAggs.map(agg => ({ ...agg, disabled: !enablePipelines })),
{
label: 'Special Aggregations',
- value: null,
- pipeline: true,
- heading: true,
- disabled: true,
+ options: specialAggs.map(agg => ({ ...agg, disabled: !enablePipelines })),
},
- ...specialAggs.map(agg => ({ ...agg, disabled: !enablePipelines })),
];
}
- const handleChange = value => {
- if (!value) return;
- if (value.disabled) return;
- if (value.value) props.onChange(value);
+ const handleChange = selectedOptions => {
+ if (!selectedOptions || selectedOptions.length <= 0) return;
+ props.onChange(selectedOptions);
};
return (
-
);
diff --git a/src/core_plugins/metrics/public/components/aggs/calculation.js b/src/core_plugins/metrics/public/components/aggs/calculation.js
index 15ba9fd5e0450d..77bdb2aa251254 100644
--- a/src/core_plugins/metrics/public/components/aggs/calculation.js
+++ b/src/core_plugins/metrics/public/components/aggs/calculation.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js b/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js
index 51e188c2b3806e..9a1d0d9ce03db8 100644
--- a/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js
+++ b/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js
@@ -1,3 +1,22 @@
+/*
+ * 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 AggRow from './agg_row';
diff --git a/src/core_plugins/metrics/public/components/aggs/derivative.js b/src/core_plugins/metrics/public/components/aggs/derivative.js
index ace60f6421c745..73ce9a244aa229 100644
--- a/src/core_plugins/metrics/public/components/aggs/derivative.js
+++ b/src/core_plugins/metrics/public/components/aggs/derivative.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
diff --git a/src/core_plugins/metrics/public/components/aggs/field_select.js b/src/core_plugins/metrics/public/components/aggs/field_select.js
index ecba1127753476..175ae7126bc6a6 100644
--- a/src/core_plugins/metrics/public/components/aggs/field_select.js
+++ b/src/core_plugins/metrics/public/components/aggs/field_select.js
@@ -1,10 +1,31 @@
+/*
+ * 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 Select from 'react-select';
+import {
+ EuiComboBox,
+} from '@elastic/eui';
import generateByTypeFilter from '../lib/generate_by_type_filter';
function FieldSelect(props) {
- const { type, fields, indexPattern } = props;
+ const { type, fields, indexPattern, value, onChange, disabled } = props;
if (type === 'count') {
return null;
}
@@ -14,14 +35,19 @@ function FieldSelect(props) {
return { label: field.name, value: field.name };
});
+ const selectedOption = options.find(option => {
+ return value === option.value;
+ });
+ const selectedOptions = selectedOption ? [selectedOption] : [];
+
return (
-
);
}
diff --git a/src/core_plugins/metrics/public/components/aggs/filter_ratio.js b/src/core_plugins/metrics/public/components/aggs/filter_ratio.js
index c8d4fb0c53e701..6db2d61af91347 100644
--- a/src/core_plugins/metrics/public/components/aggs/filter_ratio.js
+++ b/src/core_plugins/metrics/public/components/aggs/filter_ratio.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
diff --git a/src/core_plugins/metrics/public/components/aggs/math.js b/src/core_plugins/metrics/public/components/aggs/math.js
index 28563c81653bd0..34d25ea7bf82ac 100644
--- a/src/core_plugins/metrics/public/components/aggs/math.js
+++ b/src/core_plugins/metrics/public/components/aggs/math.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React, { Component } from 'react';
import PropTypes from 'prop-types';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/aggs/metric_select.js b/src/core_plugins/metrics/public/components/aggs/metric_select.js
index 4ba469b7c0b029..fb12f085a62542 100644
--- a/src/core_plugins/metrics/public/components/aggs/metric_select.js
+++ b/src/core_plugins/metrics/public/components/aggs/metric_select.js
@@ -1,7 +1,28 @@
+/*
+ * 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 _ from 'lodash';
-import Select from 'react-select';
+import {
+ EuiComboBox,
+} from '@elastic/eui';
import calculateSiblings from '../lib/calculate_siblings';
import calculateLabel from '../../../common/calculate_label';
import basicAggs from '../../../common/basic_aggs';
@@ -67,14 +88,20 @@ function MetricSelect(props) {
const label = calculateLabel(row, metrics);
return { value: row.id, label };
});
+ const allOptions = [...options, ...props.additionalOptions, ...percentileOptions];
+
+ const selectedOption = allOptions.find(option => {
+ return value === option.value;
+ });
+ const selectedOptions = selectedOption ? [selectedOption] : [];
return (
-
);
}
diff --git a/src/core_plugins/metrics/public/components/aggs/moving_average.js b/src/core_plugins/metrics/public/components/aggs/moving_average.js
index cfdc5377a2e872..245037c8959f9f 100644
--- a/src/core_plugins/metrics/public/components/aggs/moving_average.js
+++ b/src/core_plugins/metrics/public/components/aggs/moving_average.js
@@ -1,14 +1,35 @@
+/*
+ * 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 AggRow from './agg_row';
import AggSelect from './agg_select';
import MetricSelect from './metric_select';
-import Select from 'react-select';
import createChangeHandler from '../lib/create_change_handler';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
import createNumberHandler from '../lib/create_number_handler';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
export const MovingAverageAgg = props => {
const { siblings } = props;
@@ -35,6 +56,13 @@ export const MovingAverageAgg = props => {
{ label: 'False', value: 0 }
];
const htmlId = htmlIdGenerator();
+ const selectedModelOption = modelOptions.find(option => {
+ return model.model === option.value;
+ });
+ const selectedMinimizeOption = minimizeOptions.find(option => {
+ return model.minimize === option.value;
+ });
+
return (
-
@@ -90,12 +119,13 @@ export const MovingAverageAgg = props => {
-
diff --git a/src/core_plugins/metrics/public/components/aggs/percentile.js b/src/core_plugins/metrics/public/components/aggs/percentile.js
index 5c601f55e8217a..c9744a8c693405 100644
--- a/src/core_plugins/metrics/public/components/aggs/percentile.js
+++ b/src/core_plugins/metrics/public/components/aggs/percentile.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
@@ -6,11 +25,13 @@ import FieldSelect from './field_select';
import AggRow from './agg_row';
import * as collectionActions from '../lib/collection_actions';
import AddDeleteButtons from '../add_delete_buttons';
-import Select from 'react-select';
import uuid from 'uuid';
import createChangeHandler from '../lib/create_change_handler';
import createSelectHandler from '../lib/create_select_handler';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
const newPercentile = (opts) => {
return _.assign({ id: uuid.v1(), mode: 'line', shade: 0.2 }, opts);
};
@@ -26,7 +47,7 @@ class Percentiles extends Component {
return (e) => {
const handleChange = collectionActions.handleChange.bind(null, this.props);
const part = {};
- part[name] = _.get(e, 'value', _.get(e, 'target.value'));
+ part[name] = _.get(e, '[0].value', _.get(e, 'target.value'));
handleChange(_.assign({}, item, part));
};
}
@@ -45,6 +66,9 @@ class Percentiles extends Component {
optionsStyle.display = 'none';
}
const htmlId = htmlIdGenerator(model.id);
+ const selectedModeOption = modeOptions.find(option => {
+ return model.mode === option.value;
+ });
return (
{
{
-
@@ -59,12 +83,13 @@ class Percentiles extends Component {
/>
-
-
diff --git a/src/core_plugins/metrics/public/components/aggs/static.js b/src/core_plugins/metrics/public/components/aggs/static.js
index 1a3d81a4da8294..bedcbd75a0b298 100644
--- a/src/core_plugins/metrics/public/components/aggs/static.js
+++ b/src/core_plugins/metrics/public/components/aggs/static.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
diff --git a/src/core_plugins/metrics/public/components/aggs/std_agg.js b/src/core_plugins/metrics/public/components/aggs/std_agg.js
index c17aceead90fbe..1e97dca5e8d4d8 100644
--- a/src/core_plugins/metrics/public/components/aggs/std_agg.js
+++ b/src/core_plugins/metrics/public/components/aggs/std_agg.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
diff --git a/src/core_plugins/metrics/public/components/aggs/std_deviation.js b/src/core_plugins/metrics/public/components/aggs/std_deviation.js
index 9b1358b4e1b5ae..d8e4e96720c243 100644
--- a/src/core_plugins/metrics/public/components/aggs/std_deviation.js
+++ b/src/core_plugins/metrics/public/components/aggs/std_deviation.js
@@ -1,13 +1,34 @@
+/*
+ * 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 Select from 'react-select';
import createChangeHandler from '../lib/create_change_handler';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
export const StandardDeviationAgg = props => {
const { series, panel, fields } = props;
@@ -30,6 +51,9 @@ export const StandardDeviationAgg = props => {
const indexPattern = series.override_index_pattern && series.series_index_pattern || panel.index_pattern;
const htmlId = htmlIdGenerator();
+ const selectedModeOption = modeOptions.find(option => {
+ return model.mode === option.value;
+ });
return (
-
diff --git a/src/core_plugins/metrics/public/components/aggs/std_sibling.js b/src/core_plugins/metrics/public/components/aggs/std_sibling.js
index e536371983afd3..4e4fe2e9e9406d 100644
--- a/src/core_plugins/metrics/public/components/aggs/std_sibling.js
+++ b/src/core_plugins/metrics/public/components/aggs/std_sibling.js
@@ -1,13 +1,34 @@
+/*
+ * 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 AggRow from './agg_row';
import MetricSelect from './metric_select';
import AggSelect from './agg_select';
-import Select from 'react-select';
import createChangeHandler from '../lib/create_change_handler';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
export const StandardSiblingAgg = props => {
const { siblings } = props;
@@ -39,15 +60,19 @@ export const StandardSiblingAgg = props => {
{ label: 'Lower Bound', value: 'lower' },
{ label: 'Bounds Band', value: 'band' }
];
+ const selectedModeOption = modeOptions.find(option => {
+ return model.mode === option.value;
+ });
stdDev.mode = (
-
);
diff --git a/src/core_plugins/metrics/public/components/aggs/top_hit.js b/src/core_plugins/metrics/public/components/aggs/top_hit.js
index 0e6cb45ca687b9..bfda4f9780c72f 100644
--- a/src/core_plugins/metrics/public/components/aggs/top_hit.js
+++ b/src/core_plugins/metrics/public/components/aggs/top_hit.js
@@ -1,12 +1,33 @@
+/*
+ * 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 React from 'react';
import AggRow from './agg_row';
import AggSelect from './agg_select';
import FieldSelect from './field_select';
-import Select from 'react-select';
import createChangeHandler from '../lib/create_change_handler';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
export const TopHitAgg = props => {
const { fields, series, panel } = props;
@@ -37,6 +58,12 @@ export const TopHitAgg = props => {
];
const htmlId = htmlIdGenerator();
+ const selectedAggWithOption = aggWithOptions.find(option => {
+ return model.agg_with === option.value;
+ });
+ const selectedOrderOption = orderOptions.find(option => {
+ return model.order === option.value;
+ });
return (
@@ -113,13 +141,14 @@ export const TopHitAgg = props => {
-
-
{
+ return (selectedOptions) => {
+ if (selectedOptions.length < 1) {
+ return;
+ }
+
+ let newValue;
if (name === 'decimals') {
- value = this.decimals;
+ newValue = this.decimals.value;
+ } else {
+ newValue = selectedOptions[0].value;
}
+
this.setState({
- [name]: value.value
+ [name]: newValue
}, () => {
const { from, to, decimals } = this.state;
- this.props.onChange({
+ this.props.onChange([{
value: `${from},${to},${decimals}`
- });
+ }]);
});
};
}
@@ -73,39 +106,51 @@ class DataFormatPicker extends Component {
{ label: 'Duration', value: 'duration' },
{ label: 'Custom', value: 'custom' }
];
+ const selectedOption = options.find(option => {
+ return defaultValue === option.value;
+ });
let custom;
if (defaultValue === 'duration') {
const [from, to, decimals] = value.split(',');
+ const selectedFrom = durationInputOptions.find(option => {
+ return from === option.value;
+ });
+ const selectedTo = durationOutputOptions.find(option => {
+ return to === option.value;
+ });
return (
{this.props.label}
-
From
-
To
-
Decimal Places
@@ -143,11 +188,12 @@ class DataFormatPicker extends Component {
{this.props.label}
-
{custom}
diff --git a/src/core_plugins/metrics/public/components/error.js b/src/core_plugins/metrics/public/components/error.js
index 675542d37baf0e..7aaa7d0da2c6b6 100644
--- a/src/core_plugins/metrics/public/components/error.js
+++ b/src/core_plugins/metrics/public/components/error.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/icon_select.js b/src/core_plugins/metrics/public/components/icon_select.js
index 70dd746c1a7692..d56657dba6824d 100644
--- a/src/core_plugins/metrics/public/components/icon_select.js
+++ b/src/core_plugins/metrics/public/components/icon_select.js
@@ -1,77 +1,31 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Select from 'react-select';
-
-class IconOption extends Component {
-
- constructor(props) {
- super(props);
- this.handleMouseMove = this.handleMouseMove.bind(this);
- this.handleMouseEnter = this.handleMouseEnter.bind(this);
- this.handleMouseDown = this.handleMouseDown.bind(this);
- }
-
- handleMouseDown(event) {
- event.preventDefault();
- event.stopPropagation();
- this.props.onSelect(this.props.option, event);
- }
-
- handleMouseEnter(event) {
- this.props.onFocus(this.props.option, event);
- }
-
- handleMouseMove(event) {
- if (this.props.isFocused) return;
- this.props.onFocus(this.props.option, event);
- }
-
- render() {
- const icon = this.props.option.value;
- const label = this.props.option.label;
- // We can ignore that the does not have keyboard handlers even though
- // it has mouse handlers, since react-select still takes care, that this works
- // well with keyboard.
- /* eslint-disable jsx-a11y/no-static-element-interactions */
- return (
-
diff --git a/src/core_plugins/metrics/public/components/panel_config/metric.js b/src/core_plugins/metrics/public/components/panel_config/metric.js
index 0d8d5afcc9bc12..b8b9709a1101eb 100644
--- a/src/core_plugins/metrics/public/components/panel_config/metric.js
+++ b/src/core_plugins/metrics/public/components/panel_config/metric.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import SeriesEditor from '../series_editor';
diff --git a/src/core_plugins/metrics/public/components/panel_config/table.js b/src/core_plugins/metrics/public/components/panel_config/table.js
index 890976873757a5..2756c579a836ec 100644
--- a/src/core_plugins/metrics/public/components/panel_config/table.js
+++ b/src/core_plugins/metrics/public/components/panel_config/table.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React, { Component } from 'react';
import PropTypes from 'prop-types';
import FieldSelect from '../aggs/field_select';
diff --git a/src/core_plugins/metrics/public/components/panel_config/timeseries.js b/src/core_plugins/metrics/public/components/panel_config/timeseries.js
index 005f1f3e6727fa..85b09047b7d9fb 100644
--- a/src/core_plugins/metrics/public/components/panel_config/timeseries.js
+++ b/src/core_plugins/metrics/public/components/panel_config/timeseries.js
@@ -1,14 +1,35 @@
+/*
+ * 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, { Component } from 'react';
import SeriesEditor from '../series_editor';
import AnnotationsEditor from '../annotations_editor';
import { IndexPattern } from '../index_pattern';
-import Select from 'react-select';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
import ColorPicker from '../color_picker';
import YesNo from '../yes_no';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
class TimeseriesPanelConfig extends Component {
@@ -38,11 +59,25 @@ class TimeseriesPanelConfig extends Component {
{ label: 'Right', value: 'right' },
{ label: 'Left', value: 'left' }
];
+ const selectedPositionOption = positionOptions.find(option => {
+ return model.axis_position === option.value;
+ });
+ const scaleOptions = [
+ { label: 'Normal', value: 'normal' },
+ { label: 'Log', value: 'log' }
+ ];
+ const selectedAxisScaleOption = scaleOptions.find(option => {
+ return model.axis_scale === option.value;
+ });
const legendPositionOptions = [
{ label: 'Right', value: 'right' },
{ label: 'Left', value: 'left' },
{ label: 'Bottom', value: 'bottom' }
];
+ const selectedLegendPosOption = legendPositionOptions.find(option => {
+ return model.legend_position === option.value;
+ });
+
let view;
if (selectedTab === 'data') {
view = (
@@ -89,13 +124,24 @@ class TimeseriesPanelConfig extends Component {
/>
-
-
- { this.props.children }
-
-
- );
- /* eslint-enable jsx-a11y/no-static-element-interactions */
- }
-
-}
-
-IconOption.propTypes = {
- children: PropTypes.node,
- className: PropTypes.string,
- isDisabled: PropTypes.bool,
- isFocused: PropTypes.bool,
- isSelected: PropTypes.bool,
- onFocus: PropTypes.func,
- onSelect: PropTypes.func,
- option: PropTypes.object.isRequired,
-};
+/*
+ * 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 {
+ EuiComboBox,
+} from '@elastic/eui';
-function IconValue(props) {
- const icon = props.value && props.value.value;
- const label = props.value && props.value.label;
+function renderOption(option) {
+ const icon = option.value;
+ const label = option.label;
return (
- { props.children }
+ { label }
);
}
-IconValue.propTypes = {
- children: PropTypes.node,
- placeholder: PropTypes.string,
- value: PropTypes.object.isRequired
-};
-
function IconSelect(props) {
+ const selectedIcon = props.icons.find(option => {
+ return props.value === option.value;
+ });
return (
-
);
}
diff --git a/src/core_plugins/metrics/public/components/index_pattern.js b/src/core_plugins/metrics/public/components/index_pattern.js
index 958ee1e478861f..8a08ec78f5bf4a 100644
--- a/src/core_plugins/metrics/public/components/index_pattern.js
+++ b/src/core_plugins/metrics/public/components/index_pattern.js
@@ -1,3 +1,22 @@
+/*
+ * 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 FieldSelect from './aggs/field_select';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/calculate_siblings.js b/src/core_plugins/metrics/public/components/lib/__tests__/calculate_siblings.js
index 0884cf0bc19354..109fd8b5bad19f 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/calculate_siblings.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/calculate_siblings.js
@@ -1,3 +1,22 @@
+/*
+ * 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 calculateSiblings from '../calculate_siblings';
import { expect } from 'chai';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/collection_actions.js b/src/core_plugins/metrics/public/components/lib/__tests__/collection_actions.js
index da1c7a9d303ce8..1fda26731972aa 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/collection_actions.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/collection_actions.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import { expect } from 'chai';
import {
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/convert_series_to_vars.js b/src/core_plugins/metrics/public/components/lib/__tests__/convert_series_to_vars.js
index c4f1dccd53a68a..15d5019170319b 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/convert_series_to_vars.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/convert_series_to_vars.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
describe('convertSeriesToVars(series, model)', () => {
it('returns and object', () => {
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/create_number_handler.js b/src/core_plugins/metrics/public/components/lib/__tests__/create_number_handler.js
index 4310c5d676427c..7cebbf55e546a7 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/create_number_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/create_number_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import { expect } from 'chai';
import createNumberHandler from '../create_number_handler';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/create_select_handler.js b/src/core_plugins/metrics/public/components/lib/__tests__/create_select_handler.js
index c70f12b44bf60e..cfd74fcfffb7a3 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/create_select_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/create_select_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import { expect } from 'chai';
import createSelectHandler from '../create_select_handler';
@@ -10,7 +29,7 @@ describe('createSelectHandler()', () => {
handleChange = sinon.spy();
changeHandler = createSelectHandler(handleChange);
const fn = changeHandler('test');
- fn({ value: 'foo' });
+ fn([{ value: 'foo' }]);
});
it('calls handleChange() funciton with partial', () => {
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/create_text_handler.js b/src/core_plugins/metrics/public/components/lib/__tests__/create_text_handler.js
index f4e45eb54ddb70..d260a6846a87f3 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/create_text_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/create_text_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import { expect } from 'chai';
import createTextHandler from '../create_text_handler';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/generate_by_type_filter.js b/src/core_plugins/metrics/public/components/lib/__tests__/generate_by_type_filter.js
index 4ec79e929c0cfd..bd1743f3ef3dd4 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/generate_by_type_filter.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/generate_by_type_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 generateByTypeFilter from '../generate_by_type_filter';
import { expect } from 'chai';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/get_axis_label_string.js b/src/core_plugins/metrics/public/components/lib/__tests__/get_axis_label_string.js
index 5e3f15843c0118..7849115408ca19 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/get_axis_label_string.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/get_axis_label_string.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { expect } from 'chai';
import { getAxisLabelString } from '../get_axis_label_string';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/re_id_series.js b/src/core_plugins/metrics/public/components/lib/__tests__/re_id_series.js
index b51944cb35173b..89be84088eb43a 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/re_id_series.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/re_id_series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uuid from 'uuid';
import { expect } from 'chai';
import reIdSeries from '../re_id_series';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/replace_vars.js b/src/core_plugins/metrics/public/components/lib/__tests__/replace_vars.js
index 63d420d668a976..f176c3d148e928 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/replace_vars.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/replace_vars.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { expect } from 'chai';
import replaceVars from '../replace_vars';
diff --git a/src/core_plugins/metrics/public/components/lib/__tests__/tick_formatter.js b/src/core_plugins/metrics/public/components/lib/__tests__/tick_formatter.js
index bbfe1d7ccb7f4d..a557da7fdd24cc 100644
--- a/src/core_plugins/metrics/public/components/lib/__tests__/tick_formatter.js
+++ b/src/core_plugins/metrics/public/components/lib/__tests__/tick_formatter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { expect } from 'chai';
import tickFormatter from '../tick_formatter';
diff --git a/src/core_plugins/metrics/public/components/lib/agg_to_component.js b/src/core_plugins/metrics/public/components/lib/agg_to_component.js
index 80ca6908f7f3c5..d5192ace0669b3 100644
--- a/src/core_plugins/metrics/public/components/lib/agg_to_component.js
+++ b/src/core_plugins/metrics/public/components/lib/agg_to_component.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MovingAverageAgg } from '../aggs/moving_average';
import { DerivativeAgg } from '../aggs/derivative';
import Calculation from '../aggs/calculation';
diff --git a/src/core_plugins/metrics/public/components/lib/calculate_siblings.js b/src/core_plugins/metrics/public/components/lib/calculate_siblings.js
index 868bbe0c1bd767..9e60545e8d045c 100644
--- a/src/core_plugins/metrics/public/components/lib/calculate_siblings.js
+++ b/src/core_plugins/metrics/public/components/lib/calculate_siblings.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
function getAncestors(siblings, item) {
diff --git a/src/core_plugins/metrics/public/components/lib/collection_actions.js b/src/core_plugins/metrics/public/components/lib/collection_actions.js
index 59db5eddcd7692..632f1d483763c2 100644
--- a/src/core_plugins/metrics/public/components/lib/collection_actions.js
+++ b/src/core_plugins/metrics/public/components/lib/collection_actions.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uuid from 'uuid';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/lib/convert_series_to_vars.js b/src/core_plugins/metrics/public/components/lib/convert_series_to_vars.js
index 2cd5d53c28d049..a316bcafa41d6d 100644
--- a/src/core_plugins/metrics/public/components/lib/convert_series_to_vars.js
+++ b/src/core_plugins/metrics/public/components/lib/convert_series_to_vars.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import getLastValue from '../../../common/get_last_value';
import tickFormatter from './tick_formatter';
diff --git a/src/core_plugins/metrics/public/components/lib/create_agg_row_render.js b/src/core_plugins/metrics/public/components/lib/create_agg_row_render.js
index c8dd07f689f910..6fa3cea6ad3a56 100644
--- a/src/core_plugins/metrics/public/components/lib/create_agg_row_render.js
+++ b/src/core_plugins/metrics/public/components/lib/create_agg_row_render.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import seriesChangeHandler from './series_change_handler';
import newMetricAggFn from './new_metric_agg_fn';
diff --git a/src/core_plugins/metrics/public/components/lib/create_change_handler.js b/src/core_plugins/metrics/public/components/lib/create_change_handler.js
index f1d7711ce9ee0e..2997085e8d5b9c 100644
--- a/src/core_plugins/metrics/public/components/lib/create_change_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/create_change_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export default (handleChange, model) => part => {
const doc = _.assign({}, model, part);
diff --git a/src/core_plugins/metrics/public/components/lib/create_number_handler.js b/src/core_plugins/metrics/public/components/lib/create_number_handler.js
index fe84af91af8154..361fe488ecba05 100644
--- a/src/core_plugins/metrics/public/components/lib/create_number_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/create_number_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { detectIE } from './detect_ie';
export default (handleChange) => {
diff --git a/src/core_plugins/metrics/public/components/lib/create_select_handler.js b/src/core_plugins/metrics/public/components/lib/create_select_handler.js
index 987d4957ad15d2..944adccba870d3 100644
--- a/src/core_plugins/metrics/public/components/lib/create_select_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/create_select_handler.js
@@ -1,9 +1,28 @@
+/*
+ * 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 _ from 'lodash';
export default (handleChange) => {
- return (name) => (value) => {
+ return (name) => (selectedOptions) => {
if (_.isFunction(handleChange)) {
return handleChange({
- [name]: value && value.value || null
+ [name]: _.get(selectedOptions, '[0].value', null)
});
}
};
diff --git a/src/core_plugins/metrics/public/components/lib/create_text_handler.js b/src/core_plugins/metrics/public/components/lib/create_text_handler.js
index 8c4894f964b067..542479cbe87727 100644
--- a/src/core_plugins/metrics/public/components/lib/create_text_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/create_text_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { detectIE } from './detect_ie';
diff --git a/src/core_plugins/metrics/public/components/lib/create_xaxis_formatter.js b/src/core_plugins/metrics/public/components/lib/create_xaxis_formatter.js
index 15559ee1223087..34a3905c52f1d1 100644
--- a/src/core_plugins/metrics/public/components/lib/create_xaxis_formatter.js
+++ b/src/core_plugins/metrics/public/components/lib/create_xaxis_formatter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 moment from 'moment';
export function getFormat(interval, rules, dateFormat) {
for (let i = rules.length - 1; i >= 0; i--) {
diff --git a/src/core_plugins/metrics/public/components/lib/detect_ie.js b/src/core_plugins/metrics/public/components/lib/detect_ie.js
index 70c3360bf1b8ce..a0a7d2b72962d1 100644
--- a/src/core_plugins/metrics/public/components/lib/detect_ie.js
+++ b/src/core_plugins/metrics/public/components/lib/detect_ie.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function detectIE() {
const ua = window.navigator.userAgent;
diff --git a/src/core_plugins/metrics/public/components/lib/durations.js b/src/core_plugins/metrics/public/components/lib/durations.js
index 4e15125ea56a04..da4057eaa66af2 100644
--- a/src/core_plugins/metrics/public/components/lib/durations.js
+++ b/src/core_plugins/metrics/public/components/lib/durations.js
@@ -1,3 +1,22 @@
+/*
+ * 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 const durationOutputOptions = [
{ label: 'milliseconds', value: 'ms' },
{ label: 'seconds', value: 's' },
diff --git a/src/core_plugins/metrics/public/components/lib/generate_by_type_filter.js b/src/core_plugins/metrics/public/components/lib/generate_by_type_filter.js
index 1f025dece219a5..a5c528e5b6181d 100644
--- a/src/core_plugins/metrics/public/components/lib/generate_by_type_filter.js
+++ b/src/core_plugins/metrics/public/components/lib/generate_by_type_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export default function byType(type) {
return (field) => {
diff --git a/src/core_plugins/metrics/public/components/lib/get_axis_label_string.js b/src/core_plugins/metrics/public/components/lib/get_axis_label_string.js
index ed384af2542079..726b3ffaa41d90 100644
--- a/src/core_plugins/metrics/public/components/lib/get_axis_label_string.js
+++ b/src/core_plugins/metrics/public/components/lib/get_axis_label_string.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { relativeOptions } from '../../../../../ui/public/timepicker/relative_options';
import _ from 'lodash';
import moment from 'moment';
diff --git a/src/core_plugins/metrics/public/components/lib/get_display_name.js b/src/core_plugins/metrics/public/components/lib/get_display_name.js
index 3480df2d623a1f..5c768fcb97f346 100644
--- a/src/core_plugins/metrics/public/components/lib/get_display_name.js
+++ b/src/core_plugins/metrics/public/components/lib/get_display_name.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function getDisplayName(Component) {
return Component.displayName || Component.name || 'Component';
}
diff --git a/src/core_plugins/metrics/public/components/lib/new_metric_agg_fn.js b/src/core_plugins/metrics/public/components/lib/new_metric_agg_fn.js
index 188126877e0548..9793d53baa874d 100644
--- a/src/core_plugins/metrics/public/components/lib/new_metric_agg_fn.js
+++ b/src/core_plugins/metrics/public/components/lib/new_metric_agg_fn.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uuid from 'uuid';
export default () => {
return {
diff --git a/src/core_plugins/metrics/public/components/lib/new_series_fn.js b/src/core_plugins/metrics/public/components/lib/new_series_fn.js
index bfd9ffde644376..263e0a478245a0 100644
--- a/src/core_plugins/metrics/public/components/lib/new_series_fn.js
+++ b/src/core_plugins/metrics/public/components/lib/new_series_fn.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uuid from 'uuid';
import _ from 'lodash';
import newMetricAggFn from './new_metric_agg_fn';
diff --git a/src/core_plugins/metrics/public/components/lib/re_id_series.js b/src/core_plugins/metrics/public/components/lib/re_id_series.js
index 932a03ed73da63..6c10ca33044e9e 100644
--- a/src/core_plugins/metrics/public/components/lib/re_id_series.js
+++ b/src/core_plugins/metrics/public/components/lib/re_id_series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uuid from 'uuid';
import _ from 'lodash';
export default source => {
diff --git a/src/core_plugins/metrics/public/components/lib/replace_vars.js b/src/core_plugins/metrics/public/components/lib/replace_vars.js
index 7bdef4ecc49fa9..16158e25d04f65 100644
--- a/src/core_plugins/metrics/public/components/lib/replace_vars.js
+++ b/src/core_plugins/metrics/public/components/lib/replace_vars.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import handlebars from 'handlebars/dist/handlebars';
export default function replaceVars(str, args = {}, vars = {}) {
diff --git a/src/core_plugins/metrics/public/components/lib/series_change_handler.js b/src/core_plugins/metrics/public/components/lib/series_change_handler.js
index 16c013244ab380..ac98f77c66ae70 100644
--- a/src/core_plugins/metrics/public/components/lib/series_change_handler.js
+++ b/src/core_plugins/metrics/public/components/lib/series_change_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import newMetricAggFn from './new_metric_agg_fn';
import { isBasicAgg } from '../../../common/agg_lookup';
diff --git a/src/core_plugins/metrics/public/components/lib/sort_keyhandler.js b/src/core_plugins/metrics/public/components/lib/sort_keyhandler.js
index 3f5b64003ebfa5..936395d128088a 100644
--- a/src/core_plugins/metrics/public/components/lib/sort_keyhandler.js
+++ b/src/core_plugins/metrics/public/components/lib/sort_keyhandler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { keyCodes } from '@elastic/eui';
export function createUpDownHandler(callback) {
diff --git a/src/core_plugins/metrics/public/components/lib/tick_formatter.js b/src/core_plugins/metrics/public/components/lib/tick_formatter.js
index e594e4e853fc44..a39fb0d6714bbc 100644
--- a/src/core_plugins/metrics/public/components/lib/tick_formatter.js
+++ b/src/core_plugins/metrics/public/components/lib/tick_formatter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 numeral from '@elastic/numeral';
import handlebars from 'handlebars/dist/handlebars';
import { durationInputOptions } from './durations';
diff --git a/src/core_plugins/metrics/public/components/markdown_editor.js b/src/core_plugins/metrics/public/components/markdown_editor.js
index 44e32b7eda19bf..c327ce1455746e 100644
--- a/src/core_plugins/metrics/public/components/markdown_editor.js
+++ b/src/core_plugins/metrics/public/components/markdown_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/* eslint max-len:0 */
/* eslint-disable jsx-a11y/anchor-is-valid, jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
// Markdown builder is not yet properly accessible
diff --git a/src/core_plugins/metrics/public/components/no_data.js b/src/core_plugins/metrics/public/components/no_data.js
index b7040b8c85f6bd..331d3f3a5c36dd 100644
--- a/src/core_plugins/metrics/public/components/no_data.js
+++ b/src/core_plugins/metrics/public/components/no_data.js
@@ -1,8 +1,27 @@
+/*
+ * 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 React from 'react';
function NoDataComponent() {
return (
-
+
);
diff --git a/src/core_plugins/metrics/public/components/panel_config.js b/src/core_plugins/metrics/public/components/panel_config.js
index 1ed7ac2d7969cf..59e3fb381b2dfd 100644
--- a/src/core_plugins/metrics/public/components/panel_config.js
+++ b/src/core_plugins/metrics/public/components/panel_config.js
@@ -1,3 +1,22 @@
+/*
+ * 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 timeseries from './panel_config/timeseries';
diff --git a/src/core_plugins/metrics/public/components/panel_config/gauge.js b/src/core_plugins/metrics/public/components/panel_config/gauge.js
index af9b5fc7ef9cb8..043133992663d0 100644
--- a/src/core_plugins/metrics/public/components/panel_config/gauge.js
+++ b/src/core_plugins/metrics/public/components/panel_config/gauge.js
@@ -1,15 +1,36 @@
+/*
+ * 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, { Component } from 'react';
import SeriesEditor from '../series_editor';
import { IndexPattern } from '../index_pattern';
-import Select from 'react-select';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
import ColorRules from '../color_rules';
import ColorPicker from '../color_picker';
import uuid from 'uuid';
import YesNo from '../yes_no';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
class GaugePanelConfig extends Component {
@@ -52,6 +73,9 @@ class GaugePanelConfig extends Component {
{ label: 'Half Circle', value: 'half' }
];
const htmlId = htmlIdGenerator();
+ const selectedGaugeStyleOption = styleOptions.find(option => {
+ return model.gauge_style === option.value;
+ });
let view;
if (selectedTab === 'data') {
view = (
@@ -110,13 +134,13 @@ class GaugePanelConfig extends Component {
-
diff --git a/src/core_plugins/metrics/public/components/panel_config/markdown.js b/src/core_plugins/metrics/public/components/panel_config/markdown.js
index 966162b40f4521..29d419b5966963 100644
--- a/src/core_plugins/metrics/public/components/panel_config/markdown.js
+++ b/src/core_plugins/metrics/public/components/panel_config/markdown.js
@@ -1,9 +1,27 @@
+/*
+ * 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, { Component } from 'react';
import SeriesEditor from '../series_editor';
import { IndexPattern } from '../index_pattern';
import 'brace/mode/less';
-import Select from 'react-select';
import createSelectHandler from '../lib/create_select_handler';
import createTextHandler from '../lib/create_text_handler';
import ColorPicker from '../color_picker';
@@ -11,7 +29,10 @@ import YesNo from '../yes_no';
import MarkdownEditor from '../markdown_editor';
import less from 'less/lib/less-browser';
import { KuiCodeEditor } from '@kbn/ui-framework/components';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
const lessC = less(window, { env: 'production' });
class MarkdownPanelConfig extends Component {
@@ -54,6 +75,9 @@ class MarkdownPanelConfig extends Component {
{ label: 'Middle', value: 'middle' },
{ label: 'Bottom', value: 'bottom' }
];
+ const selectedAlignOption = alignOptions.find(option => {
+ return model.markdown_vertical_align === option.value;
+ });
let view;
if (selectedTab === 'markdown') {
view = (No data to display for the selected metrics .
-
-
+
+
+
+
-
Display Grid
diff --git a/src/core_plugins/metrics/public/components/panel_config/top_n.js b/src/core_plugins/metrics/public/components/panel_config/top_n.js
index faa03466e7dfea..98b5155e2c0b5a 100644
--- a/src/core_plugins/metrics/public/components/panel_config/top_n.js
+++ b/src/core_plugins/metrics/public/components/panel_config/top_n.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import SeriesEditor from '../series_editor';
diff --git a/src/core_plugins/metrics/public/components/series.js b/src/core_plugins/metrics/public/components/series.js
index b072e45fd66ba5..9cec7b7eace1d5 100644
--- a/src/core_plugins/metrics/public/components/series.js
+++ b/src/core_plugins/metrics/public/components/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/series_config.js b/src/core_plugins/metrics/public/components/series_config.js
index 7133cd02405d33..3f734aae65ace9 100644
--- a/src/core_plugins/metrics/public/components/series_config.js
+++ b/src/core_plugins/metrics/public/components/series_config.js
@@ -1,3 +1,22 @@
+/*
+ * 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 DataFormatPicker from './data_format_picker';
diff --git a/src/core_plugins/metrics/public/components/series_editor.js b/src/core_plugins/metrics/public/components/series_editor.js
index 0f7493ab6164e9..69aaadc3b343e0 100644
--- a/src/core_plugins/metrics/public/components/series_editor.js
+++ b/src/core_plugins/metrics/public/components/series_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import reIdSeries from './lib/re_id_series';
diff --git a/src/core_plugins/metrics/public/components/split.js b/src/core_plugins/metrics/public/components/split.js
index 5fb10087c9fa37..5b5fc1f28d3e49 100644
--- a/src/core_plugins/metrics/public/components/split.js
+++ b/src/core_plugins/metrics/public/components/split.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import uuid from 'uuid';
diff --git a/src/core_plugins/metrics/public/components/splits/everything.js b/src/core_plugins/metrics/public/components/splits/everything.js
index b2438f81d51b29..73fc8cc185ae26 100644
--- a/src/core_plugins/metrics/public/components/splits/everything.js
+++ b/src/core_plugins/metrics/public/components/splits/everything.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createSelectHandler from '../lib/create_select_handler';
import GroupBySelect from './group_by_select';
import PropTypes from 'prop-types';
diff --git a/src/core_plugins/metrics/public/components/splits/filter.js b/src/core_plugins/metrics/public/components/splits/filter.js
index 0c77be7b56450a..ab50c8f1ff1ac5 100644
--- a/src/core_plugins/metrics/public/components/splits/filter.js
+++ b/src/core_plugins/metrics/public/components/splits/filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createTextHandler from '../lib/create_text_handler';
import createSelectHandler from '../lib/create_select_handler';
import GroupBySelect from './group_by_select';
diff --git a/src/core_plugins/metrics/public/components/splits/filter_items.js b/src/core_plugins/metrics/public/components/splits/filter_items.js
index 09b4cd4574b14a..9e439411cc7058 100644
--- a/src/core_plugins/metrics/public/components/splits/filter_items.js
+++ b/src/core_plugins/metrics/public/components/splits/filter_items.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/splits/filters.js b/src/core_plugins/metrics/public/components/splits/filters.js
index e2157ffe62482b..9f3d72b1c51df1 100644
--- a/src/core_plugins/metrics/public/components/splits/filters.js
+++ b/src/core_plugins/metrics/public/components/splits/filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createSelectHandler from '../lib/create_select_handler';
import GroupBySelect from './group_by_select';
import FilterItems from './filter_items';
diff --git a/src/core_plugins/metrics/public/components/splits/group_by_select.js b/src/core_plugins/metrics/public/components/splits/group_by_select.js
index 1eaafde4609c58..8f377f03fe82b6 100644
--- a/src/core_plugins/metrics/public/components/splits/group_by_select.js
+++ b/src/core_plugins/metrics/public/components/splits/group_by_select.js
@@ -1,6 +1,27 @@
+/*
+ * 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 Select from 'react-select';
+import {
+ EuiComboBox,
+} from '@elastic/eui';
function GroupBySelect(props) {
const modeOptions = [
{ label: 'Everything', value: 'everything' },
@@ -8,12 +29,17 @@ function GroupBySelect(props) {
{ label: 'Filters', value: 'filters' },
{ label: 'Terms', value: 'terms' }
];
+ const selectedValue = props.value || 'everything';
+ const selectedOption = modeOptions.find(option => {
+ return selectedValue === option.value;
+ });
return (
-
);
diff --git a/src/core_plugins/metrics/public/components/splits/terms.js b/src/core_plugins/metrics/public/components/splits/terms.js
index ddedc20210c296..2905ad83d2bc65 100644
--- a/src/core_plugins/metrics/public/components/splits/terms.js
+++ b/src/core_plugins/metrics/public/components/splits/terms.js
@@ -1,3 +1,22 @@
+/*
+ * 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 GroupBySelect from './group_by_select';
@@ -5,7 +24,9 @@ import createTextHandler from '../lib/create_text_handler';
import createSelectHandler from '../lib/create_select_handler';
import FieldSelect from '../aggs/field_select';
import MetricSelect from '../aggs/metric_select';
-import Select from 'react-select';
+import {
+ EuiComboBox,
+} from '@elastic/eui';
export const SplitByTerms = props => {
const handleTextChange = createTextHandler(props.onChange);
@@ -21,6 +42,9 @@ export const SplitByTerms = props => {
{ value: 'desc', label: 'Descending' },
{ value: 'asc', label: 'Ascending' },
];
+ const selectedDirectionOption = dirOptions.find(option => {
+ return model.terms_direction === option.value;
+ });
return (
@@ -61,11 +85,12 @@ export const SplitByTerms = props => {
Direction
-
diff --git a/src/core_plugins/metrics/public/components/vis_editor.js b/src/core_plugins/metrics/public/components/vis_editor.js
index 0fddc0cd84b4a3..5cca22cc3e0946 100644
--- a/src/core_plugins/metrics/public/components/vis_editor.js
+++ b/src/core_plugins/metrics/public/components/vis_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import VisEditorVisualization from './vis_editor_visualization';
diff --git a/src/core_plugins/metrics/public/components/vis_editor_visualization.js b/src/core_plugins/metrics/public/components/vis_editor_visualization.js
index f585ecffea6b2c..71b0bbe5190911 100644
--- a/src/core_plugins/metrics/public/components/vis_editor_visualization.js
+++ b/src/core_plugins/metrics/public/components/vis_editor_visualization.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import { keyCodes } from '@elastic/eui';
diff --git a/src/core_plugins/metrics/public/components/vis_picker.js b/src/core_plugins/metrics/public/components/vis_picker.js
index 6be98770ed3d80..5238bccb92709d 100644
--- a/src/core_plugins/metrics/public/components/vis_picker.js
+++ b/src/core_plugins/metrics/public/components/vis_picker.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
diff --git a/src/core_plugins/metrics/public/components/vis_types/gauge/series.js b/src/core_plugins/metrics/public/components/vis_types/gauge/series.js
index 31f69ddebfda40..b2b702304699cc 100644
--- a/src/core_plugins/metrics/public/components/vis_types/gauge/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/gauge/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ColorPicker from '../../color_picker';
diff --git a/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js b/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js
index 7010a256743923..da113b647a68fe 100644
--- a/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { visWithSplits } from '../../vis_with_splits';
diff --git a/src/core_plugins/metrics/public/components/vis_types/markdown/series.js b/src/core_plugins/metrics/public/components/vis_types/markdown/series.js
index d5f976a26e5fe0..738dddc84f7685 100644
--- a/src/core_plugins/metrics/public/components/vis_types/markdown/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/markdown/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 AddDeleteButtons from '../../add_delete_buttons';
diff --git a/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js b/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js
index 81eebed3a17186..618017e9b369b5 100644
--- a/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
@@ -34,7 +53,7 @@ function MarkdownVisualization(props) {
if (reversed) className += ' reversed';
const markdownError = markdownSource instanceof Error ? markdownSource : null;
markdown = (
-
+
diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js
index b3e28fd9e3e577..b82f8dace2b70c 100644
--- a/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ColorPicker from '../../color_picker';
diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js
index e0df410f576606..73ce37578ff310 100644
--- a/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import tickFormatter from '../../lib/tick_formatter';
@@ -71,6 +90,11 @@ class TimeseriesVisualization extends Component {
if (model.axis_min) mainAxis.min = model.axis_min;
if (model.axis_max) mainAxis.max = model.axis_max;
+ if (model.axis_scale === 'log') {
+ mainAxis.mode = 'log';
+ mainAxis.transform = value => value > 0 ? Math.log(value) / Math.LN10 : null;
+ mainAxis.inverseTransform = value => Math.pow(10, value);
+ }
const yaxes = [mainAxis];
diff --git a/src/core_plugins/metrics/public/components/vis_types/top_n/series.js b/src/core_plugins/metrics/public/components/vis_types/top_n/series.js
index ade1aa206f3140..5daa0d442eb534 100644
--- a/src/core_plugins/metrics/public/components/vis_types/top_n/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/top_n/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ColorPicker from '../../color_picker';
diff --git a/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js b/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js
index 7aa583f27c0197..e2c0ba68729945 100644
--- a/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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 tickFormatter from '../../lib/tick_formatter';
import TopN from '../../../visualizations/components/top_n';
import getLastValue from '../../../../common/get_last_value';
diff --git a/src/core_plugins/metrics/public/components/vis_with_splits.js b/src/core_plugins/metrics/public/components/vis_with_splits.js
index c87ab55831a1c0..18b0bca7c8869c 100644
--- a/src/core_plugins/metrics/public/components/vis_with_splits.js
+++ b/src/core_plugins/metrics/public/components/vis_with_splits.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import { getDisplayName } from './lib/get_display_name';
import { last, findIndex, first } from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/visualization.js b/src/core_plugins/metrics/public/components/visualization.js
index ca145c89d16395..2279244ab10714 100644
--- a/src/core_plugins/metrics/public/components/visualization.js
+++ b/src/core_plugins/metrics/public/components/visualization.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/yes_no.js b/src/core_plugins/metrics/public/components/yes_no.js
index 41b7df6870063d..f76d7b96b42235 100644
--- a/src/core_plugins/metrics/public/components/yes_no.js
+++ b/src/core_plugins/metrics/public/components/yes_no.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/components/yes_no.test.js b/src/core_plugins/metrics/public/components/yes_no.test.js
index a2b05d725493c4..38ab90b61de076 100644
--- a/src/core_plugins/metrics/public/components/yes_no.test.js
+++ b/src/core_plugins/metrics/public/components/yes_no.test.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import { expect } from 'chai';
import { shallow } from 'enzyme';
diff --git a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
index f2b0f32e77c58b..2be8f8903a3279 100644
--- a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
+++ b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { SavedObjectsClientProvider } from 'ui/saved_objects';
diff --git a/src/core_plugins/metrics/public/kbn_vis_types/index.js b/src/core_plugins/metrics/public/kbn_vis_types/index.js
index c530cfca52a413..b5b947a4007c51 100644
--- a/src/core_plugins/metrics/public/kbn_vis_types/index.js
+++ b/src/core_plugins/metrics/public/kbn_vis_types/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '../visualizations/less/main.less';
import '../less/main.less';
import image from '../images/icon-visualbuilder.svg';
@@ -52,6 +71,7 @@ export default function MetricsVisProvider(Private) {
interval: 'auto',
axis_position: 'left',
axis_formatter: 'number',
+ axis_scale: 'normal',
show_legend: 1,
show_grid: 1
},
diff --git a/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js b/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js
index edfc0ff662cc4d..a64c2f6458ad7a 100644
--- a/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js
+++ b/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { validateInterval } from '../lib/validate_interval';
import { dashboardContextProvider } from 'plugins/kibana/dashboard/dashboard_context';
import { timezoneProvider } from 'ui/vis/lib/timezone';
diff --git a/src/core_plugins/metrics/public/lib/__tests__/create_brush_handler.js b/src/core_plugins/metrics/public/lib/__tests__/create_brush_handler.js
index 9c1b865215ccbd..169572b53e1fe2 100644
--- a/src/core_plugins/metrics/public/lib/__tests__/create_brush_handler.js
+++ b/src/core_plugins/metrics/public/lib/__tests__/create_brush_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createBrushHandler from '../create_brush_handler';
import moment from 'moment';
import { expect } from 'chai';
diff --git a/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js b/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js
index ea181c396df400..8d085140b17614 100644
--- a/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js
+++ b/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { extractIndexPatterns } from '../extract_index_patterns';
import { expect } from 'chai';
describe('extractIndexPatterns(vis)', () => {
diff --git a/src/core_plugins/metrics/public/lib/create_brush_handler.js b/src/core_plugins/metrics/public/lib/create_brush_handler.js
index b4eb7ca25e1c57..f4e6f3c5592df4 100644
--- a/src/core_plugins/metrics/public/lib/create_brush_handler.js
+++ b/src/core_plugins/metrics/public/lib/create_brush_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 moment from 'moment';
export default (timefilter) => ranges => {
//$scope.$evalAsync(() => {
diff --git a/src/core_plugins/metrics/public/lib/create_new_panel.js b/src/core_plugins/metrics/public/lib/create_new_panel.js
index dda21a31cdfeb2..5f6927fe4b240d 100644
--- a/src/core_plugins/metrics/public/lib/create_new_panel.js
+++ b/src/core_plugins/metrics/public/lib/create_new_panel.js
@@ -1,3 +1,22 @@
+/*
+ * 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 newSeriesFn from '../components/lib/new_series_fn';
import uuid from 'uuid';
export default () => {
diff --git a/src/core_plugins/metrics/public/lib/extract_index_patterns.js b/src/core_plugins/metrics/public/lib/extract_index_patterns.js
index 81bb6a0cd71050..c7e4f555955e05 100644
--- a/src/core_plugins/metrics/public/lib/extract_index_patterns.js
+++ b/src/core_plugins/metrics/public/lib/extract_index_patterns.js
@@ -1,3 +1,22 @@
+/*
+ * 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';
export function extractIndexPatterns(vis) {
const patternsToFetch = [];
diff --git a/src/core_plugins/metrics/public/lib/fetch_fields.js b/src/core_plugins/metrics/public/lib/fetch_fields.js
index e14cdfef9a7868..5fc68f14378eb4 100644
--- a/src/core_plugins/metrics/public/lib/fetch_fields.js
+++ b/src/core_plugins/metrics/public/lib/fetch_fields.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
const FetchFieldsProvider = (Notifier, $http) => {
const notify = new Notifier({ location: 'Metrics' });
return (indexPatterns = ['*']) => {
diff --git a/src/core_plugins/metrics/public/lib/validate_interval.js b/src/core_plugins/metrics/public/lib/validate_interval.js
index 4ad3fa4a4dd332..00a8c0bef2aba4 100644
--- a/src/core_plugins/metrics/public/lib/validate_interval.js
+++ b/src/core_plugins/metrics/public/lib/validate_interval.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { parseInterval } from 'ui/utils/parse_interval';
import { GTE_INTERVAL_RE } from '../../common/interval_regexp';
export function validateInterval(bounds, panel, maxBuckets) {
diff --git a/src/core_plugins/metrics/public/services/__tests__/executor_provider.js b/src/core_plugins/metrics/public/services/__tests__/executor_provider.js
index 36875a3f7fc0cb..f19ac4677ad741 100644
--- a/src/core_plugins/metrics/public/services/__tests__/executor_provider.js
+++ b/src/core_plugins/metrics/public/services/__tests__/executor_provider.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { expect } from 'chai';
import sinon from 'sinon';
import executorProvider from '../executor_provider';
@@ -17,8 +36,8 @@ describe('$executor service', () => {
$timeout.cancel = (id) => clearTimeout(id);
timefilter = new EventEmitter();
- onSpy = sinon.spy((...args) => timefilter.addListener(...args));
- offSpy = sinon.spy((...args) => timefilter.removeListener(...args));
+ onSpy = sinon.stub().callsFake((...args) => timefilter.addListener(...args));
+ offSpy = sinon.stub().callsFake((...args) => timefilter.removeListener(...args));
timefilter.on = onSpy;
timefilter.off = offSpy;
@@ -59,13 +78,17 @@ describe('$executor service', () => {
it('should execute function if ingorePause is passed (interval set to 1000ms)', (done) => {
timefilter.refreshInterval.value = 1000;
- executor.register({ execute: () => done() });
+ executor.register({
+ execute: () => Promise.resolve().then(done)
+ });
executor.start({ ignorePaused: true });
});
it('should execute function if timefilter is not paused and interval set to 1000ms', (done) => {
timefilter.refreshInterval.value = 1000;
- executor.register({ execute: () => done() });
+ executor.register({
+ execute: () => Promise.resolve().then(done)
+ });
executor.start();
});
diff --git a/src/core_plugins/metrics/public/services/executor.js b/src/core_plugins/metrics/public/services/executor.js
index d42004c83efc03..def1db6e3d5e35 100644
--- a/src/core_plugins/metrics/public/services/executor.js
+++ b/src/core_plugins/metrics/public/services/executor.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from 'ui/modules';
import executorProvider from './executor_provider';
const uiModule = uiModules.get('kibana/metrics_vis/executor', []);
diff --git a/src/core_plugins/metrics/public/services/executor_provider.js b/src/core_plugins/metrics/public/services/executor_provider.js
index 8f58c038b0127e..18c23ff67c3ffe 100644
--- a/src/core_plugins/metrics/public/services/executor_provider.js
+++ b/src/core_plugins/metrics/public/services/executor_provider.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export default function executorProvider(Promise, $timeout, timefilter) {
diff --git a/src/core_plugins/metrics/public/visualizations/components/annotation.js b/src/core_plugins/metrics/public/visualizations/components/annotation.js
index 9dc7a6ad1087f9..09ccf8197dc586 100644
--- a/src/core_plugins/metrics/public/visualizations/components/annotation.js
+++ b/src/core_plugins/metrics/public/visualizations/components/annotation.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import moment from 'moment';
diff --git a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
index a85f140c283658..6b303c2e282ff8 100644
--- a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
+++ b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React, { Component } from 'react';
import PropTypes from 'prop-types';
import { findDOMNode } from 'react-dom';
@@ -32,6 +51,7 @@ class FlotChart extends Component {
axis.max !== this.props.yaxes[i].max ||
axis.min !== this.props.yaxes[i].min ||
axis.axisFormatter !== this.props.yaxes[i].axisFormatter ||
+ axis.mode !== this.props.yaxes[i].mode ||
axis.axisFormatterTemplate !== this.props.yaxes[i].axisFormatterTemplate
);
}
diff --git a/src/core_plugins/metrics/public/visualizations/components/gauge.js b/src/core_plugins/metrics/public/visualizations/components/gauge.js
index 156acde03d0d16..5d6729b724eb40 100644
--- a/src/core_plugins/metrics/public/visualizations/components/gauge.js
+++ b/src/core_plugins/metrics/public/visualizations/components/gauge.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
diff --git a/src/core_plugins/metrics/public/visualizations/components/gauge_vis.js b/src/core_plugins/metrics/public/visualizations/components/gauge_vis.js
index 1f381a937b475b..53d0235b15f6d2 100644
--- a/src/core_plugins/metrics/public/visualizations/components/gauge_vis.js
+++ b/src/core_plugins/metrics/public/visualizations/components/gauge_vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js b/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js
index 0b21f092fc6796..2a76c928d00736 100644
--- a/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js
+++ b/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createLegendSeries from '../lib/create_legend_series';
diff --git a/src/core_plugins/metrics/public/visualizations/components/legend.js b/src/core_plugins/metrics/public/visualizations/components/legend.js
index bc1cc5edb6ae65..f5023b58623d53 100644
--- a/src/core_plugins/metrics/public/visualizations/components/legend.js
+++ b/src/core_plugins/metrics/public/visualizations/components/legend.js
@@ -1,3 +1,22 @@
+/*
+ * 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 VerticalLegend from './vertical_legend';
diff --git a/src/core_plugins/metrics/public/visualizations/components/metric.js b/src/core_plugins/metrics/public/visualizations/components/metric.js
index eead38f5303b77..29655d76057893 100644
--- a/src/core_plugins/metrics/public/visualizations/components/metric.js
+++ b/src/core_plugins/metrics/public/visualizations/components/metric.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
@@ -135,7 +154,13 @@ class Metric extends Component {
{markdownError &&
@@ -253,13 +291,14 @@ function TimeseriesConfig(props) {
Axis Position
diff --git a/src/core_plugins/metrics/public/components/vis_types/metric/series.js b/src/core_plugins/metrics/public/components/vis_types/metric/series.js
index 86751cd9a42331..ae72cfc2d1ba56 100644
--- a/src/core_plugins/metrics/public/components/vis_types/metric/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/metric/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ColorPicker from '../../color_picker';
diff --git a/src/core_plugins/metrics/public/components/vis_types/metric/vis.js b/src/core_plugins/metrics/public/components/vis_types/metric/vis.js
index 33c61b613de3fb..6de3ee527a4605 100644
--- a/src/core_plugins/metrics/public/components/vis_types/metric/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/metric/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { visWithSplits } from '../../vis_with_splits';
diff --git a/src/core_plugins/metrics/public/components/vis_types/table/config.js b/src/core_plugins/metrics/public/components/vis_types/table/config.js
index f6551517831860..c3e3646754e53c 100644
--- a/src/core_plugins/metrics/public/components/vis_types/table/config.js
+++ b/src/core_plugins/metrics/public/components/vis_types/table/config.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React, { Component } from 'react';
import PropTypes from 'prop-types';
import uuid from 'uuid';
@@ -5,10 +24,12 @@ import DataFormatPicker from '../../data_format_picker';
import createSelectHandler from '../../lib/create_select_handler';
import createTextHandler from '../../lib/create_text_handler';
import FieldSelect from '../../aggs/field_select';
-import Select from 'react-select';
import YesNo from '../../yes_no';
import ColorRules from '../../color_rules';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
class TableSeriesConfig extends Component {
@@ -39,6 +60,9 @@ class TableSeriesConfig extends Component {
{ label: 'Overall Avg', value: 'overall_avg' },
{ label: 'Cumlative Sum', value: 'cumlative_sum' },
];
+ const selectedAggFuncOption = functionOptions.find(option => {
+ return model.aggregate_function === option.value;
+ });
return (
diff --git a/src/core_plugins/metrics/public/components/vis_types/table/is_sortable.js b/src/core_plugins/metrics/public/components/vis_types/table/is_sortable.js
index 5364efd90c58da..3f7e20a8df3581 100644
--- a/src/core_plugins/metrics/public/components/vis_types/table/is_sortable.js
+++ b/src/core_plugins/metrics/public/components/vis_types/table/is_sortable.js
@@ -1,3 +1,22 @@
+/*
+ * 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 basicAggs from '../../../../common/basic_aggs';
export function isSortable(metric) {
return basicAggs.includes(metric.type);
diff --git a/src/core_plugins/metrics/public/components/vis_types/table/series.js b/src/core_plugins/metrics/public/components/vis_types/table/series.js
index e9ad38a7011f00..f44df0306f9f55 100644
--- a/src/core_plugins/metrics/public/components/vis_types/table/series.js
+++ b/src/core_plugins/metrics/public/components/vis_types/table/series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import PropTypes from 'prop-types';
import AddDeleteButtons from '../../add_delete_buttons';
diff --git a/src/core_plugins/metrics/public/components/vis_types/table/vis.js b/src/core_plugins/metrics/public/components/vis_types/table/vis.js
index 5d10ca14936620..eaeb12dfa116d4 100644
--- a/src/core_plugins/metrics/public/components/vis_types/table/vis.js
+++ b/src/core_plugins/metrics/public/components/vis_types/table/vis.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js
index b554716c19939d..811d4204293b96 100644
--- a/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js
+++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js
@@ -1,12 +1,33 @@
+/*
+ * 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 Select from 'react-select';
import DataFormatPicker from '../../data_format_picker';
import createSelectHandler from '../../lib/create_select_handler';
import YesNo from '../../yes_no';
import createTextHandler from '../../lib/create_text_handler';
import { IndexPattern } from '../../index_pattern';
-import { htmlIdGenerator } from '@elastic/eui';
+import {
+ htmlIdGenerator,
+ EuiComboBox,
+} from '@elastic/eui';
function TimeseriesConfig(props) {
const handleSelectChange = createSelectHandler(props.onChange);
@@ -32,21 +53,33 @@ function TimeseriesConfig(props) {
{ label: 'Stacked', value: 'stacked' },
{ label: 'Percent', value: 'percent' }
];
+ const selectedStackedOption = stackedOptions.find(option => {
+ return model.stacked === option.value;
+ });
const positionOptions = [
{ label: 'Right', value: 'right' },
{ label: 'Left', value: 'left' }
];
+ const selectedAxisPosOption = positionOptions.find(option => {
+ return model.axis_position === option.value;
+ });
const chartTypeOptions = [
{ label: 'Bar', value: 'bar' },
{ label: 'Line', value: 'line' }
];
+ const selectedChartTypeOption = chartTypeOptions.find(option => {
+ return model.chart_type === option.value;
+ });
const splitColorOptions = [
{ label: 'Gradient', value: 'gradient' },
{ label: 'Rainbow', value: 'rainbow' }
];
+ const selectedSplitColorOption = splitColorOptions.find(option => {
+ return model.split_color_mode === option.value;
+ });
let type;
if (model.chart_type === 'line') {
@@ -56,24 +89,26 @@ function TimeseriesConfig(props) {
Chart Type
@@ -82,11 +106,12 @@ class TableSeriesConfig extends Component {
-
-
-
-
-
-
-
this.inner = el} className="rhythm_metric__inner" style={styles.inner}>
{ value }
+ { value }
);
};
diff --git a/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js b/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js
index 488ea9c9185a55..6b527c132f397a 100644
--- a/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js
+++ b/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js
@@ -1,3 +1,22 @@
+/*
+ * 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 createLegendSeries from '../lib/create_legend_series';
diff --git a/src/core_plugins/metrics/public/visualizations/lib/__tests__/calcualte_bar_width.js b/src/core_plugins/metrics/public/visualizations/lib/__tests__/calcualte_bar_width.js
index 91762bba2b9fe2..a78ebd901d0124 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/__tests__/calcualte_bar_width.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/__tests__/calcualte_bar_width.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { expect } from 'chai';
import calculateBarWidth from '../calculate_bar_width';
diff --git a/src/core_plugins/metrics/public/visualizations/lib/__tests__/get_value_by.js b/src/core_plugins/metrics/public/visualizations/lib/__tests__/get_value_by.js
index ac43a53ea3a98d..366e1b13d92e41 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/__tests__/get_value_by.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/__tests__/get_value_by.js
@@ -1,3 +1,22 @@
+/*
+ * 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 getValueBy from '../get_value_by';
import { expect } from 'chai';
diff --git a/src/core_plugins/metrics/public/visualizations/lib/calc_dimensions.js b/src/core_plugins/metrics/public/visualizations/lib/calc_dimensions.js
index f038c882c8f0a6..e49724642c8c91 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/calc_dimensions.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/calc_dimensions.js
@@ -1,3 +1,22 @@
+/*
+ * 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 default function calcDimensions(el, scale) {
const newWidth = Math.floor(el.clientWidth * scale);
const newHeight = Math.floor(el.clientHeight * scale);
diff --git a/src/core_plugins/metrics/public/visualizations/lib/calculate_bar_width.js b/src/core_plugins/metrics/public/visualizations/lib/calculate_bar_width.js
index 0290049d6e342c..16a95a3ec91e33 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/calculate_bar_width.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/calculate_bar_width.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
// bar sizes are measured in milliseconds so this assumes that the different
// between timestamps is in milliseconds. A normal bar size is 70% which gives
diff --git a/src/core_plugins/metrics/public/visualizations/lib/calculate_corrdinates.js b/src/core_plugins/metrics/public/visualizations/lib/calculate_corrdinates.js
index cfe0d8c3fcc31f..65c3ee6bfe642e 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/calculate_corrdinates.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/calculate_corrdinates.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { findDOMNode } from 'react-dom';
import calcDimensions from './calc_dimensions';
export default function calculateCorrdinates(innerRef, resizeRef, state) {
diff --git a/src/core_plugins/metrics/public/visualizations/lib/colors.js b/src/core_plugins/metrics/public/visualizations/lib/colors.js
index 028af4b7e85a56..f61c0a3c9ca957 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/colors.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/colors.js
@@ -1,3 +1,22 @@
+/*
+ * 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 default {
lineColor: 'rgba(0,0,0,0.2)',
lineColorReversed: 'rgba(255,255,255,0.4)',
diff --git a/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js b/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js
index 5f3beb38f93358..eb4a9aab38b0df 100644
--- a/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js
+++ b/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js
@@ -1,3 +1,22 @@
+/*
+ * 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 React from 'react';
import _ from 'lodash';
export default props => (row, i) => {
@@ -17,6 +36,7 @@ export default props => (row, i) => {
+
+
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
index 818754b15d6fbc..89896727239275 100644
--- a/src/ui/public/agg_types/index.js
+++ b/src/ui/public/agg_types/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '../directives/validate_agg';
import './agg_params';
import { IndexedArray } from '../indexed_array';
diff --git a/src/ui/public/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js
index 8b29aaead0e151..9383ff54344e7f 100644
--- a/src/ui/public/agg_types/metrics/avg.js
+++ b/src/ui/public/agg_types/metrics/avg.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const avgMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/bucket_avg.js b/src/ui/public/agg_types/metrics/bucket_avg.js
index 5e0899932faf11..98b53a41147d59 100644
--- a/src/ui/public/agg_types/metrics/bucket_avg.js
+++ b/src/ui/public/agg_types/metrics/bucket_avg.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { get } from 'lodash';
import { MetricAggType } from './metric_agg_type';
import { makeNestedLabel } from './lib/make_nested_label';
diff --git a/src/ui/public/agg_types/metrics/bucket_max.js b/src/ui/public/agg_types/metrics/bucket_max.js
index 2959c449e13458..aa3badc25b0501 100644
--- a/src/ui/public/agg_types/metrics/bucket_max.js
+++ b/src/ui/public/agg_types/metrics/bucket_max.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { makeNestedLabel } from './lib/make_nested_label';
import { siblingPipelineAggHelper } from './lib/sibling_pipeline_agg_helper';
diff --git a/src/ui/public/agg_types/metrics/bucket_min.js b/src/ui/public/agg_types/metrics/bucket_min.js
index 1edae1f4e2c73c..dd2fa3e6b16383 100644
--- a/src/ui/public/agg_types/metrics/bucket_min.js
+++ b/src/ui/public/agg_types/metrics/bucket_min.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { makeNestedLabel } from './lib/make_nested_label';
import { siblingPipelineAggHelper } from './lib/sibling_pipeline_agg_helper';
diff --git a/src/ui/public/agg_types/metrics/bucket_sum.js b/src/ui/public/agg_types/metrics/bucket_sum.js
index cd5e36af2094c8..9eec111a88bb2e 100644
--- a/src/ui/public/agg_types/metrics/bucket_sum.js
+++ b/src/ui/public/agg_types/metrics/bucket_sum.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { makeNestedLabel } from './lib/make_nested_label';
import { siblingPipelineAggHelper } from './lib/sibling_pipeline_agg_helper';
diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
index 62523ebd5691c4..6c437c91fd6889 100644
--- a/src/ui/public/agg_types/metrics/cardinality.js
+++ b/src/ui/public/agg_types/metrics/cardinality.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { fieldFormats } from '../../registry/field_formats';
diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
index 5aea5547cd016a..6e45ce89399f37 100644
--- a/src/ui/public/agg_types/metrics/count.js
+++ b/src/ui/public/agg_types/metrics/count.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { fieldFormats } from '../../registry/field_formats';
diff --git a/src/ui/public/agg_types/metrics/cumulative_sum.js b/src/ui/public/agg_types/metrics/cumulative_sum.js
index f76b97b1a1e271..a1e077d995a480 100644
--- a/src/ui/public/agg_types/metrics/cumulative_sum.js
+++ b/src/ui/public/agg_types/metrics/cumulative_sum.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { parentPipelineAggHelper } from './lib/parent_pipeline_agg_helper';
import { makeNestedLabel } from './lib/make_nested_label';
diff --git a/src/ui/public/agg_types/metrics/derivative.js b/src/ui/public/agg_types/metrics/derivative.js
index 0bff9d1f49f54d..3221b3ac192a9b 100644
--- a/src/ui/public/agg_types/metrics/derivative.js
+++ b/src/ui/public/agg_types/metrics/derivative.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { parentPipelineAggHelper } from './lib/parent_pipeline_agg_helper';
import { makeNestedLabel } from './lib/make_nested_label';
diff --git a/src/ui/public/agg_types/metrics/geo_bounds.js b/src/ui/public/agg_types/metrics/geo_bounds.js
index 91c4fb80f02505..8d0212de40aa79 100644
--- a/src/ui/public/agg_types/metrics/geo_bounds.js
+++ b/src/ui/public/agg_types/metrics/geo_bounds.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const geoBoundsMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/geo_centroid.js b/src/ui/public/agg_types/metrics/geo_centroid.js
index 6f0de616c855be..64e89d9c4aadfb 100644
--- a/src/ui/public/agg_types/metrics/geo_centroid.js
+++ b/src/ui/public/agg_types/metrics/geo_centroid.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const geoCentroidMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/get_response_agg_config_class.js b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
index 67fbe1e987c4e3..af53fb4dadd027 100644
--- a/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
+++ b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
/**
diff --git a/src/ui/public/agg_types/metrics/lib/make_nested_label.js b/src/ui/public/agg_types/metrics/lib/make_nested_label.js
index c9a99f9f03515d..83b3fa85a6d639 100644
--- a/src/ui/public/agg_types/metrics/lib/make_nested_label.js
+++ b/src/ui/public/agg_types/metrics/lib/make_nested_label.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
const makeNestedLabel = function (aggConfig, label) {
diff --git a/src/ui/public/agg_types/metrics/lib/nested_agg_helpers.js b/src/ui/public/agg_types/metrics/lib/nested_agg_helpers.js
index 4eda3af4488099..363361e76e9828 100644
--- a/src/ui/public/agg_types/metrics/lib/nested_agg_helpers.js
+++ b/src/ui/public/agg_types/metrics/lib/nested_agg_helpers.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* Forwards modifyAggConfigOnSearchRequestStart calls to a nested AggConfig.
* This must be used for each parameter, that accepts a nested aggregation, otherwise
diff --git a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_controller.js b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_controller.js
index d076b5b614ee1f..ddd642b463fe6e 100644
--- a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_controller.js
+++ b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_controller.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { safeMakeLabel } from './safe_make_label';
diff --git a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
index b98be6fc8d5edd..66dae6a70bf0ab 100644
--- a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
+++ b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
@@ -1,3 +1,22 @@
+/*
+ * 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 metricAggTemplate from '../../controls/sub_agg.html';
import _ from 'lodash';
import { AggConfig } from '../../../vis/agg_config';
diff --git a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_writter.js b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_writter.js
index b5e49b3373720c..645f7d69b0c9c7 100644
--- a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_writter.js
+++ b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_writter.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
const parentPipelineAggWritter = function (agg, output) {
const vis = agg.vis;
const selectedMetric = agg.params.customMetric || vis.aggs.getResponseAggById(agg.params.metricAgg);
diff --git a/src/ui/public/agg_types/metrics/lib/safe_make_label.js b/src/ui/public/agg_types/metrics/lib/safe_make_label.js
index b7f346ed5ae934..4d5794142ed573 100644
--- a/src/ui/public/agg_types/metrics/lib/safe_make_label.js
+++ b/src/ui/public/agg_types/metrics/lib/safe_make_label.js
@@ -1,3 +1,22 @@
+/*
+ * 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 const safeMakeLabel = function (agg) {
try {
return agg.makeLabel();
diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_controller.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_controller.js
index b3160c70ebfb56..3704829fdcbb7f 100644
--- a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_controller.js
+++ b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_controller.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { safeMakeLabel } from './safe_make_label';
const siblingPipelineAggController = function (type) {
diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
index 1c65cc63151158..4c8f72df68c0a2 100644
--- a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
+++ b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { AggConfig } from '../../../vis/agg_config';
import { Schemas } from '../../../vis/editors/default/schemas';
diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_writter.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_writter.js
index 2b7b51f64d059c..bc8d957bbeae5c 100644
--- a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_writter.js
+++ b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_writter.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
const siblingPipelineAggWritter = function (agg, output) {
if (!agg.params.customMetric) return;
diff --git a/src/ui/public/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js
index 7d1a712a3e250e..dc97d34a5a5538 100644
--- a/src/ui/public/agg_types/metrics/max.js
+++ b/src/ui/public/agg_types/metrics/max.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const maxMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js
index aa82fc13f78e63..bf904516e38c6e 100644
--- a/src/ui/public/agg_types/metrics/median.js
+++ b/src/ui/public/agg_types/metrics/median.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { percentilesMetricAgg } from './percentiles';
diff --git a/src/ui/public/agg_types/metrics/metric_agg_type.js b/src/ui/public/agg_types/metrics/metric_agg_type.js
index 2db682458cfb53..49a04ef16eee10 100644
--- a/src/ui/public/agg_types/metrics/metric_agg_type.js
+++ b/src/ui/public/agg_types/metrics/metric_agg_type.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { AggType } from '../agg_type';
import { fieldFormats } from '../../registry/field_formats';
diff --git a/src/ui/public/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js
index e415e0223d82fe..89753713482f59 100644
--- a/src/ui/public/agg_types/metrics/min.js
+++ b/src/ui/public/agg_types/metrics/min.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const minMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/moving_avg.js b/src/ui/public/agg_types/metrics/moving_avg.js
index c6bb93c0c646bb..8dbad85a215767 100644
--- a/src/ui/public/agg_types/metrics/moving_avg.js
+++ b/src/ui/public/agg_types/metrics/moving_avg.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { parentPipelineAggHelper } from './lib/parent_pipeline_agg_helper';
import { makeNestedLabel } from './lib/make_nested_label';
diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js
index bd52884c12bf5d..8c696fc9a504ec 100644
--- a/src/ui/public/agg_types/metrics/percentile_ranks.js
+++ b/src/ui/public/agg_types/metrics/percentile_ranks.js
@@ -1,3 +1,22 @@
+/*
+ * 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 valuesEditor from '../controls/percentile_ranks.html';
import '../../number_list';
import { MetricAggType } from './metric_agg_type';
diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js
index 5ec2bd9f0e45e5..0ab7b109064511 100644
--- a/src/ui/public/agg_types/metrics/percentiles.js
+++ b/src/ui/public/agg_types/metrics/percentiles.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { ordinalSuffix } from '../../utils/ordinal_suffix';
import percentsEditor from '../controls/percentiles.html';
import '../../number_list';
diff --git a/src/ui/public/agg_types/metrics/percentiles_get_value.js b/src/ui/public/agg_types/metrics/percentiles_get_value.js
index bcf086bf81a689..33015190f5470c 100644
--- a/src/ui/public/agg_types/metrics/percentiles_get_value.js
+++ b/src/ui/public/agg_types/metrics/percentiles_get_value.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { find } from 'lodash';
export function getPercentileValue(agg, bucket) {
diff --git a/src/ui/public/agg_types/metrics/serial_diff.js b/src/ui/public/agg_types/metrics/serial_diff.js
index adfd11661986ea..0716d7643e4fd6 100644
--- a/src/ui/public/agg_types/metrics/serial_diff.js
+++ b/src/ui/public/agg_types/metrics/serial_diff.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
import { parentPipelineAggHelper } from './lib/parent_pipeline_agg_helper';
import { makeNestedLabel } from './lib/make_nested_label';
diff --git a/src/ui/public/agg_types/metrics/std_deviation.js b/src/ui/public/agg_types/metrics/std_deviation.js
index ddf70f1e1ba9c1..244d840c42c019 100644
--- a/src/ui/public/agg_types/metrics/std_deviation.js
+++ b/src/ui/public/agg_types/metrics/std_deviation.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { MetricAggType } from './metric_agg_type';
import { getResponseAggConfigClass } from './get_response_agg_config_class';
diff --git a/src/ui/public/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js
index dc9ed8a0efe65e..edcb6d4756296c 100644
--- a/src/ui/public/agg_types/metrics/sum.js
+++ b/src/ui/public/agg_types/metrics/sum.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { MetricAggType } from './metric_agg_type';
export const sumMetricAgg = new MetricAggType({
diff --git a/src/ui/public/agg_types/metrics/top_hit.js b/src/ui/public/agg_types/metrics/top_hit.js
index d844087ad12ebb..a28b0e56426df4 100644
--- a/src/ui/public/agg_types/metrics/top_hit.js
+++ b/src/ui/public/agg_types/metrics/top_hit.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { MetricAggType } from './metric_agg_type';
import topSortEditor from '../controls/top_sort.html';
diff --git a/src/ui/public/agg_types/param_types/base.js b/src/ui/public/agg_types/param_types/base.js
index b795b6ae4b761d..39085cd2ed18a4 100644
--- a/src/ui/public/agg_types/param_types/base.js
+++ b/src/ui/public/agg_types/param_types/base.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
function BaseParamType(config) {
diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js
index 9d5d35c45e68b4..e2748d45261e10 100644
--- a/src/ui/public/agg_types/param_types/field.js
+++ b/src/ui/public/agg_types/param_types/field.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { SavedObjectNotFound } from '../../errors';
import _ from 'lodash';
import editorHtml from '../controls/field.html';
diff --git a/src/ui/public/agg_types/param_types/json.js b/src/ui/public/agg_types/param_types/json.js
index 152a5287c75856..6eb7e8662b6297 100644
--- a/src/ui/public/agg_types/param_types/json.js
+++ b/src/ui/public/agg_types/param_types/json.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import editorHtml from '../controls/raw_json.html';
import { BaseParamType } from './base';
diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js
index 6589f1b0946692..a02165b06c4c87 100644
--- a/src/ui/public/agg_types/param_types/optioned.js
+++ b/src/ui/public/agg_types/param_types/optioned.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { IndexedArray } from '../../indexed_array';
import { BaseParamType } from './base';
import { createLegacyClass } from '../../utils/legacy_class';
diff --git a/src/ui/public/agg_types/param_types/regex.js b/src/ui/public/agg_types/param_types/regex.js
index a4cbac16037677..2ac014b4961202 100644
--- a/src/ui/public/agg_types/param_types/regex.js
+++ b/src/ui/public/agg_types/param_types/regex.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import editorHtml from '../controls/regular_expression.html';
import { BaseParamType } from './base';
diff --git a/src/ui/public/agg_types/param_types/string.js b/src/ui/public/agg_types/param_types/string.js
index 7656b63bfb343e..68c7c3aa4bfd58 100644
--- a/src/ui/public/agg_types/param_types/string.js
+++ b/src/ui/public/agg_types/param_types/string.js
@@ -1,3 +1,22 @@
+/*
+ * 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 editorHtml from '../controls/string.html';
import { BaseParamType } from './base';
import { createLegacyClass } from '../../utils/legacy_class';
diff --git a/src/ui/public/autoload/accessibility.js b/src/ui/public/autoload/accessibility.js
index 7d2642c61e1799..1c846177eca872 100644
--- a/src/ui/public/autoload/accessibility.js
+++ b/src/ui/public/autoload/accessibility.js
@@ -1 +1,20 @@
+/*
+ * 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 '../accessibility';
diff --git a/src/ui/public/autoload/all.js b/src/ui/public/autoload/all.js
index 12951c84346e79..fba21aacd19848 100644
--- a/src/ui/public/autoload/all.js
+++ b/src/ui/public/autoload/all.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './accessibility';
import './modules';
import './directives';
diff --git a/src/ui/public/autoload/directives.js b/src/ui/public/autoload/directives.js
index 3908c3e116de1f..c31f62e8db6b4b 100644
--- a/src/ui/public/autoload/directives.js
+++ b/src/ui/public/autoload/directives.js
@@ -1,2 +1,21 @@
+/*
+ * 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.
+ */
+
const context = require.context('../directives', false, /[\/\\](?!\.|_)[^\/\\]+\.js/);
context.keys().forEach(key => context(key));
diff --git a/src/ui/public/autoload/filters.js b/src/ui/public/autoload/filters.js
index 583d1dcead0721..ccdf784044958c 100644
--- a/src/ui/public/autoload/filters.js
+++ b/src/ui/public/autoload/filters.js
@@ -1,2 +1,21 @@
+/*
+ * 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.
+ */
+
const context = require.context('../filters', false, /[\/\\](?!\.|_)[^\/\\]+\.js/);
context.keys().forEach(key => context(key));
diff --git a/src/ui/public/autoload/modules.js b/src/ui/public/autoload/modules.js
index a0661cb97b1ba0..194279dfd05bf9 100644
--- a/src/ui/public/autoload/modules.js
+++ b/src/ui/public/autoload/modules.js
@@ -1,3 +1,22 @@
+/*
+ * 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 'angular';
import '../chrome';
import '../bind';
diff --git a/src/ui/public/autoload/styles.js b/src/ui/public/autoload/styles.js
index abc05918fb69d6..df9e05e6d71c52 100644
--- a/src/ui/public/autoload/styles.js
+++ b/src/ui/public/autoload/styles.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
const theme = require('../theme');
// Kibana UI Framework
diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js
index 4d11e0dabb4639..ce59076df923d6 100644
--- a/src/ui/public/bind/__tests__/bind.js
+++ b/src/ui/public/bind/__tests__/bind.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
describe('$scope.$bind', function () {
diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js
index 275f591a856527..42b090532c5d94 100644
--- a/src/ui/public/bind/bind.js
+++ b/src/ui/public/bind/bind.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import { uiModules } from '../modules';
diff --git a/src/ui/public/bind/index.js b/src/ui/public/bind/index.js
index fd956c1e2a1a3f..d542452d1a80f5 100644
--- a/src/ui/public/bind/index.js
+++ b/src/ui/public/bind/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './bind';
diff --git a/src/ui/public/binder/__tests__/binder.js b/src/ui/public/binder/__tests__/binder.js
index a862259ecdf12e..3a0ddff2137a40 100644
--- a/src/ui/public/binder/__tests__/binder.js
+++ b/src/ui/public/binder/__tests__/binder.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/binder/binder.js b/src/ui/public/binder/binder.js
index fe9930388b3448..ebb0d43f55be4a 100644
--- a/src/ui/public/binder/binder.js
+++ b/src/ui/public/binder/binder.js
@@ -1,3 +1,22 @@
+/*
+ * 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 d3 from 'd3';
import $ from 'jquery';
diff --git a/src/ui/public/binder/index.js b/src/ui/public/binder/index.js
index 61cb7a92d315c0..ce91a987fa570a 100644
--- a/src/ui/public/binder/index.js
+++ b/src/ui/public/binder/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { Binder } from './binder';
diff --git a/src/ui/public/bound_to_config_obj.js b/src/ui/public/bound_to_config_obj.js
index 8ed38bde803c9b..307345d62ea168 100644
--- a/src/ui/public/bound_to_config_obj.js
+++ b/src/ui/public/bound_to_config_obj.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export function BoundToConfigObjProvider(config) {
diff --git a/src/ui/public/check_box/check_box.js b/src/ui/public/check_box/check_box.js
index 900b812ca4af19..2c1f814963a77f 100644
--- a/src/ui/public/check_box/check_box.js
+++ b/src/ui/public/check_box/check_box.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import template from './check_box.html';
diff --git a/src/ui/public/check_box/index.js b/src/ui/public/check_box/index.js
index 54c21f29fb655d..f9d353d7485017 100644
--- a/src/ui/public/check_box/index.js
+++ b/src/ui/public/check_box/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './check_box';
diff --git a/src/ui/public/chrome/__tests__/kbn_loading_indicator.js b/src/ui/public/chrome/__tests__/kbn_loading_indicator.js
deleted file mode 100644
index 30594a05fdb2aa..00000000000000
--- a/src/ui/public/chrome/__tests__/kbn_loading_indicator.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import ngMock from 'ng_mock';
-import expect from 'expect.js';
-import $ from 'jquery';
-
-import '../directives/loading_indicator/loading_indicator';
-
-describe('kbnLoadingIndicator', function () {
- let compile;
-
- beforeEach(() => {
- ngMock.module('kibana');
- ngMock.inject(function ($compile, $rootScope) {
- compile = function (hasActiveConnections) {
- $rootScope.chrome = {
- httpActive: hasActiveConnections ? [1] : []
- };
- const $el = $('}
+ * @return {Function} unsubscribe
+ */
+ subscribe(handler) {
+ handlers.add(handler);
+
+ // send the current count to the handler
+ handler(getCount());
+
+ return () => {
+ handlers.delete(handler);
+ };
+ }
+
+ /**
+ * Increment the loading count by one
+ * @return {undefined}
+ */
+ increment() {
+ update('manual', counts.manual + 1);
+ }
+
+ /**
+ * Decrement the loading count by one
+ * @return {undefined}
+ */
+ decrement() {
+ update('manual', counts.manual - 1);
+ }
+ };
+}
diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
index c1d0ceea932758..5163c083d3013d 100644
--- a/src/ui/public/chrome/api/nav.js
+++ b/src/ui/public/chrome/api/nav.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { remove } from 'lodash';
import { prependPath } from '../../url/prepend_path';
import { relativeToAbsolute } from '../../url/relative_to_absolute';
diff --git a/src/ui/public/chrome/api/template.js b/src/ui/public/chrome/api/template.js
index 12d28b452e74b7..d1295dc8dddaa1 100644
--- a/src/ui/public/chrome/api/template.js
+++ b/src/ui/public/chrome/api/template.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
// eslint-disable-next-line @elastic/kibana-custom/no-default-export
export default function (chrome, internals) {
diff --git a/src/ui/public/chrome/api/theme.js b/src/ui/public/chrome/api/theme.js
index d3f45e5a56e27f..15c4e1f8602624 100644
--- a/src/ui/public/chrome/api/theme.js
+++ b/src/ui/public/chrome/api/theme.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
// eslint-disable-next-line @elastic/kibana-custom/no-default-export
diff --git a/src/ui/public/chrome/api/translations.js b/src/ui/public/chrome/api/translations.js
index a9921d057dc407..589565a46e98e5 100644
--- a/src/ui/public/chrome/api/translations.js
+++ b/src/ui/public/chrome/api/translations.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
// eslint-disable-next-line @elastic/kibana-custom/no-default-export
export default function (chrome, internals) {
/**
diff --git a/src/ui/public/chrome/api/ui_settings.js b/src/ui/public/chrome/api/ui_settings.js
index d54828eee1ff1a..e602c67f0e57fd 100644
--- a/src/ui/public/chrome/api/ui_settings.js
+++ b/src/ui/public/chrome/api/ui_settings.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { metadata } from '../../metadata';
import { Notifier } from '../../notify';
import { UiSettingsClient } from '../../../ui_settings/public/ui_settings_client';
diff --git a/src/ui/public/chrome/api/xsrf.js b/src/ui/public/chrome/api/xsrf.js
index db55043dd4ddeb..ac59d6367aeae8 100644
--- a/src/ui/public/chrome/api/xsrf.js
+++ b/src/ui/public/chrome/api/xsrf.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import { set } from 'lodash';
diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js
index fb23f6ffcbd65f..cfcefadc67bba1 100644
--- a/src/ui/public/chrome/chrome.js
+++ b/src/ui/public/chrome/chrome.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import angular from 'angular';
@@ -23,6 +42,7 @@ import themeApi from './api/theme';
import translationsApi from './api/translations';
import { initChromeXsrfApi } from './api/xsrf';
import { initUiSettingsApi } from './api/ui_settings';
+import { initLoadingCountApi } from './api/loading_count';
export const chrome = {};
const internals = _.defaults(
@@ -44,6 +64,7 @@ initUiSettingsApi(chrome);
appsApi(chrome, internals);
initChromeXsrfApi(chrome, internals);
initChromeNavApi(chrome, internals);
+initLoadingCountApi(chrome, internals);
initAngularApi(chrome, internals);
controlsApi(chrome, internals);
templateApi(chrome, internals);
@@ -52,6 +73,12 @@ translationsApi(chrome, internals);
const waitForBootstrap = new Promise(resolve => {
chrome.bootstrap = function () {
+ // import chrome nav controls and hacks now so that they are executed after
+ // everything else, can safely import the chrome, and interact with services
+ // and such setup by all other modules
+ require('uiExports/chromeNavControls');
+ require('uiExports/hacks');
+
chrome.setupAngular();
angular.bootstrap(document.body, ['kibana']);
resolve();
diff --git a/src/ui/public/chrome/directives/__snapshots__/loading_indicator.test.js.snap b/src/ui/public/chrome/directives/__snapshots__/loading_indicator.test.js.snap
new file mode 100644
index 00000000000000..301e34bb420504
--- /dev/null
+++ b/src/ui/public/chrome/directives/__snapshots__/loading_indicator.test.js.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`kbnLoadingIndicator is hidden by default 1`] = `
+
-
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js
index 243744bb7c1056..7f3b3099df7b0d 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js
@@ -6,6 +6,8 @@
import { uiModules } from 'ui/modules';
import { InitAfterBindingsWorkaround } from 'ui/compat';
+import { EDITOR } from '../../../../../common/constants';
+import { applyEditorOptions } from '../../../../lib/ace';
import template from './custom_patterns_input.html';
import './custom_patterns_input.less';
import 'ui/toggle_panel';
@@ -32,14 +34,7 @@ app.directive('customPatternsInput', function () {
});
$scope.aceLoaded = (editor) => {
this.editor = editor;
- editor.getSession().setUseWrapMode(true);
- editor.setOptions({
- highlightActiveLine: false,
- highlightGutterLine: false,
- minLines: 3,
- maxLines: 25
- });
- editor.$blockScrolling = Infinity;
+ applyEditorOptions(editor, EDITOR.PATTERN_MIN_LINES, EDITOR.PATTERN_MAX_LINES);
};
}
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.html b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.html
index 364e9df0ef770f..ab4f97223a03f4 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.html
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.html
@@ -3,14 +3,16 @@
-
+
{ primaryLabel }
-
{ secondarySnippet }
{additionalLabel}
diff --git a/src/core_plugins/metrics/public/visualizations/components/resize.js b/src/core_plugins/metrics/public/visualizations/components/resize.js
index f7b64aa70ee944..2dd47a35ff942e 100644
--- a/src/core_plugins/metrics/public/visualizations/components/resize.js
+++ b/src/core_plugins/metrics/public/visualizations/components/resize.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import { findDOMNode } from 'react-dom';
diff --git a/src/core_plugins/metrics/public/visualizations/components/timeseries.js b/src/core_plugins/metrics/public/visualizations/components/timeseries.js
index ed55a8d272222c..808b33f1c4ec36 100644
--- a/src/core_plugins/metrics/public/visualizations/components/timeseries.js
+++ b/src/core_plugins/metrics/public/visualizations/components/timeseries.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import _ from 'lodash';
diff --git a/src/core_plugins/metrics/public/visualizations/components/timeseries_chart.js b/src/core_plugins/metrics/public/visualizations/components/timeseries_chart.js
index 52ee5688c63ec4..a9a08b25b93476 100644
--- a/src/core_plugins/metrics/public/visualizations/components/timeseries_chart.js
+++ b/src/core_plugins/metrics/public/visualizations/components/timeseries_chart.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import moment from 'moment';
diff --git a/src/core_plugins/metrics/public/visualizations/components/top_n.js b/src/core_plugins/metrics/public/visualizations/components/top_n.js
index a1c3ebd6bfedce..88dd043a07f97b 100644
--- a/src/core_plugins/metrics/public/visualizations/components/top_n.js
+++ b/src/core_plugins/metrics/public/visualizations/components/top_n.js
@@ -1,3 +1,22 @@
+/*
+ * 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, { Component } from 'react';
import getLastValue from '../../../common/get_last_value';
@@ -47,7 +66,7 @@ class TopN extends Component {
style={styles.innerBar}
/>
- { primaryValue }
+
+ { primaryValue }
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`kbnLoadingIndicator is visible when loadingCount is > 0 1`] = `
+
+
+
+`;
diff --git a/src/ui/public/chrome/directives/__tests__/sub_url_route_filter.js b/src/ui/public/chrome/directives/__tests__/sub_url_route_filter.js
index e4b27b5059950c..fc411b5638b3b1 100644
--- a/src/ui/public/chrome/directives/__tests__/sub_url_route_filter.js
+++ b/src/ui/public/chrome/directives/__tests__/sub_url_route_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
index 471c483848e6ee..f4f3ee7d122bae 100644
--- a/src/ui/public/chrome/directives/append_nav_controls.js
+++ b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { chromeNavControlsRegistry } from '../../registry/chrome_nav_controls';
import { uiModules } from '../../modules';
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
index aa37dbe0aa8ead..bce7b47441f827 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
index 591618858bc2ce..b349435da17c9f 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { DomLocationProvider } from '../../../../dom_location';
import { parse } from 'url';
import { uiModules } from '../../../../modules';
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/index.js b/src/ui/public/chrome/directives/global_nav/app_switcher/index.js
index 634ac427df3f12..e4608515d024cd 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/index.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './app_switcher';
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav.js b/src/ui/public/chrome/directives/global_nav/global_nav.js
index b934abc1347862..7abf81971b7b0a 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './app_switcher';
import './global_nav_link';
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js b/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
index bf67d983fa7d5b..d265df874216dd 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js b/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
index c5d1e05d9c63fa..437bec461ba6ce 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav_link/global_nav_link.js
@@ -1,3 +1,22 @@
+/*
+ * 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 globalNavLinkTemplate from './global_nav_link.html';
import './global_nav_link.less';
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/index.js b/src/ui/public/chrome/directives/global_nav/global_nav_link/index.js
index 2e29dd52bdb663..b485c2302d13bc 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav_link/index.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav_link/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './global_nav_link';
diff --git a/src/ui/public/chrome/directives/global_nav/index.js b/src/ui/public/chrome/directives/global_nav/index.js
index 49e5dcfa431a37..60b503f2dceda5 100644
--- a/src/ui/public/chrome/directives/global_nav/index.js
+++ b/src/ui/public/chrome/directives/global_nav/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './global_nav';
diff --git a/src/ui/public/chrome/directives/index.js b/src/ui/public/chrome/directives/index.js
index d4c4cd1956c597..0cd8d49c0c31a2 100644
--- a/src/ui/public/chrome/directives/index.js
+++ b/src/ui/public/chrome/directives/index.js
@@ -1,9 +1,28 @@
+/*
+ * 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 './global_nav';
import { kbnChromeProvider } from './kbn_chrome';
import { kbnAppendChromeNavControls } from './append_nav_controls';
-import './loading_indicator/loading_indicator';
+import './loading_indicator';
export function directivesProvider(chrome, internals) {
kbnChromeProvider(chrome, internals);
diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
index d4b053df04d38a..1f1b03df53bdd2 100644
--- a/src/ui/public/chrome/directives/kbn_chrome.js
+++ b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -1,11 +1,28 @@
+/*
+ * 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 React from 'react';
import ReactDOM from 'react-dom';
import $ from 'jquery';
-import { remove } from 'lodash';
import './kbn_chrome.less';
import { uiModules } from '../../modules';
-import { isSystemApiRequest } from '../../system_api';
import {
getUnhashableStatesProvider,
unhashUrl,
@@ -68,13 +85,6 @@ export function kbnChromeProvider(chrome, internals) {
$rootScope.$on('$routeUpdate', onRouteChange);
updateSubUrls(); // initialize sub urls
- const allPendingHttpRequests = () => $http.pendingRequests;
- const removeSystemApiRequests = (pendingHttpRequests = []) => remove(pendingHttpRequests, isSystemApiRequest);
- $scope.$watchCollection(allPendingHttpRequests, removeSystemApiRequests);
-
- // and some local values
- chrome.httpActive = $http.pendingRequests;
-
// Notifications
$scope.notifList = notify._notifs;
diff --git a/src/ui/public/chrome/directives/kbn_chrome.less b/src/ui/public/chrome/directives/kbn_chrome.less
index 348f256d52119f..7103decdbbec5a 100644
--- a/src/ui/public/chrome/directives/kbn_chrome.less
+++ b/src/ui/public/chrome/directives/kbn_chrome.less
@@ -8,7 +8,8 @@ body {
}
.app-wrapper {
- .real-flex-parent();
+ display: flex;
+ flex-flow: column nowrap;
position: absolute;
left: @global-nav-closed-width;
top: 0;
@@ -31,6 +32,14 @@ body {
}
}
- .app-wrapper-panel {
- .flex-parent(@shrink: 0);
+.app-wrapper-panel {
+ display: flex;
+ flex-grow: 1;
+ flex-shrink: 0;
+ flex-basis: auto;
+ flex-direction: column;
+
+ > * {
+ flex-shrink: 0;
}
+}
diff --git a/src/ui/public/chrome/directives/loading_indicator.js b/src/ui/public/chrome/directives/loading_indicator.js
new file mode 100644
index 00000000000000..f8f6c671683f58
--- /dev/null
+++ b/src/ui/public/chrome/directives/loading_indicator.js
@@ -0,0 +1,67 @@
+/*
+ * 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 'ngreact';
+import React from 'react';
+import classNames from 'classnames';
+
+import { uiModules } from 'ui/modules';
+import chrome from 'ui/chrome';
+
+import './loading_indicator.less';
+
+export class LoadingIndicator extends React.Component {
+ state = {
+ visible: false,
+ }
+
+ componentDidMount() {
+ this._unsub = chrome.loadingCount.subscribe((count) => {
+ this.setState({
+ visible: count > 0
+ });
+ });
+ }
+
+ componentWillUnmount() {
+ this._unsub();
+ this._unsub = null;
+ }
+
+ render() {
+ const className = classNames(
+ 'loadingIndicator',
+ this.state.visible ? null : 'hidden'
+ );
+
+ const testSubj = this.state.visible
+ ? 'globalLoadingIndicator'
+ : 'globalLoadingIndicator-hidden';
+
+ return (
+
+
+
+ );
+ }
+}
+
+uiModules
+ .get('app/kibana', ['react'])
+ .directive('kbnLoadingIndicator', reactDirective => reactDirective(LoadingIndicator));
diff --git a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.less b/src/ui/public/chrome/directives/loading_indicator.less
similarity index 98%
rename from src/ui/public/chrome/directives/loading_indicator/loading_indicator.less
rename to src/ui/public/chrome/directives/loading_indicator.less
index 660b8a003c8d21..3571fe3e5fd674 100644
--- a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.less
+++ b/src/ui/public/chrome/directives/loading_indicator.less
@@ -18,7 +18,7 @@
overflow: hidden; // 2
height: @loadingIndicatorHeight;
- &.ng-hide {
+ &.hidden {
visibility: hidden;
opacity: 0;
transition-delay: 0.25s;
diff --git a/src/ui/public/chrome/directives/loading_indicator.test.js b/src/ui/public/chrome/directives/loading_indicator.test.js
new file mode 100644
index 00000000000000..ddaab276443fe4
--- /dev/null
+++ b/src/ui/public/chrome/directives/loading_indicator.test.js
@@ -0,0 +1,57 @@
+/*
+ * 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 React from 'react';
+import { shallow } from 'enzyme';
+import chrome from 'ui/chrome';
+
+import { LoadingIndicator } from './loading_indicator';
+
+jest.mock('ui/chrome', () => {
+ return {
+ loadingCount: {
+ subscribe: jest.fn(() => {
+ return () => {};
+ })
+ }
+ };
+});
+
+beforeEach(() => {
+ chrome.loadingCount.subscribe.mockClear();
+});
+
+describe('kbnLoadingIndicator', function () {
+ it('is hidden by default', function () {
+ const wrapper = shallow(
-
-
diff --git a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js b/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
deleted file mode 100644
index fe77f954d501d5..00000000000000
--- a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { uiModules } from '../../../modules';
-import template from './loading_indicator.html';
-import './loading_indicator.less';
-
-uiModules
- .get('ui/kibana')
- .directive('kbnLoadingIndicator', function () {
- return {
- restrict: 'E',
- replace: true,
- template,
- };
- });
diff --git a/src/ui/public/chrome/directives/sub_url_route_filter.js b/src/ui/public/chrome/directives/sub_url_route_filter.js
index ccfc68c834f670..0ccd10d97ad25c 100644
--- a/src/ui/public/chrome/directives/sub_url_route_filter.js
+++ b/src/ui/public/chrome/directives/sub_url_route_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* Creates a function that will be called on each route change
* to determine if the event should be used to update the last
diff --git a/src/ui/public/chrome/index.js b/src/ui/public/chrome/index.js
index 1804ded62c31bb..ad62192704a1e8 100644
--- a/src/ui/public/chrome/index.js
+++ b/src/ui/public/chrome/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { chrome } from './chrome';
// eslint-disable-next-line @elastic/kibana-custom/no-default-export
diff --git a/src/ui/public/chrome/services/global_nav_state.js b/src/ui/public/chrome/services/global_nav_state.js
index a9ba964adae91c..9f2131926c50a3 100644
--- a/src/ui/public/chrome/services/global_nav_state.js
+++ b/src/ui/public/chrome/services/global_nav_state.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../../modules';
diff --git a/src/ui/public/chrome/services/index.js b/src/ui/public/chrome/services/index.js
index 4bac1c4cc8cdd5..3b3967f51b2ffa 100644
--- a/src/ui/public/chrome/services/index.js
+++ b/src/ui/public/chrome/services/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './global_nav_state';
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
index cbafcad929d59f..07f659448c9d74 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './collapsible_sidebar.less';
import _ from 'lodash';
import $ from 'jquery';
diff --git a/src/ui/public/collapsible_sidebar/index.js b/src/ui/public/collapsible_sidebar/index.js
index e10bdc590bfc61..9f818922f71360 100644
--- a/src/ui/public/collapsible_sidebar/index.js
+++ b/src/ui/public/collapsible_sidebar/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './collapsible_sidebar';
diff --git a/src/ui/public/compat/index.js b/src/ui/public/compat/index.js
index 16b9c361ebb84e..8988a7aba79413 100644
--- a/src/ui/public/compat/index.js
+++ b/src/ui/public/compat/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 {
InitAfterBindingsWorkaround,
callAfterBindingsWorkaround
diff --git a/src/ui/public/compat/init_after_bindings_workaround.js b/src/ui/public/compat/init_after_bindings_workaround.js
index bc21fe673a925e..23ee66a564e7e1 100644
--- a/src/ui/public/compat/init_after_bindings_workaround.js
+++ b/src/ui/public/compat/init_after_bindings_workaround.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* WHAT NEEDS THIS WORKAROUND?
* ===========================
diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js
index 92ae1fa3b68ab2..05d2b4bb87c94f 100644
--- a/src/ui/public/config/__tests__/config.js
+++ b/src/ui/public/config/__tests__/config.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import sinon from 'sinon';
diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
index 30989ff8deb710..ee46adf5de3c19 100644
--- a/src/ui/public/config/config.js
+++ b/src/ui/public/config/config.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import chrome from '../chrome';
import { isPlainObject } from 'lodash';
diff --git a/src/ui/public/config/index.js b/src/ui/public/config/index.js
index c791e649224daf..54602df57d65cf 100644
--- a/src/ui/public/config/index.js
+++ b/src/ui/public/config/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './config';
diff --git a/src/ui/public/courier/__tests__/request_queue.js b/src/ui/public/courier/__tests__/request_queue.js
index 3ccda004d99921..8fe6976790c36e 100644
--- a/src/ui/public/courier/__tests__/request_queue.js
+++ b/src/ui/public/courier/__tests__/request_queue.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'sinon';
diff --git a/src/ui/public/courier/__tests__/saved_object.js b/src/ui/public/courier/__tests__/saved_object.js
index ff703687dd5ad1..2c893b8e21128b 100644
--- a/src/ui/public/courier/__tests__/saved_object.js
+++ b/src/ui/public/courier/__tests__/saved_object.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'sinon';
@@ -169,7 +188,7 @@ describe('Saved Object', function () {
const mockDocResponse = getMockedDocResponse('myId');
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
- sinon.stub(savedObjectsClientStub, 'create', function () {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({ type: 'dashboard', id: 'newUniqueId' });
});
@@ -185,7 +204,7 @@ describe('Saved Object', function () {
const mockDocResponse = getMockedDocResponse(originalId);
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: originalId }).then(savedObject => {
- sinon.stub(savedObjectsClientStub, 'create', function () {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.reject('simulated error');
});
savedObject.copyOnSave = true;
@@ -203,7 +222,7 @@ describe('Saved Object', function () {
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
- sinon.stub(savedObjectsClientStub, 'create', function () {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.id).to.be(id);
return BluebirdPromise.resolve(id);
});
@@ -218,7 +237,7 @@ describe('Saved Object', function () {
it('returns id from server on success', function () {
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
const mockDocResponse = getMockedDocResponse('myId');
- sinon.stub(savedObjectsClientStub, 'create', function () {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({ type: 'dashboard', id: 'myId', _version: 2 });
});
@@ -235,7 +254,7 @@ describe('Saved Object', function () {
stubESResponse(getMockedDocResponse(id));
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
- sinon.stub(savedObjectsClientStub, 'create', () => {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.resolve({
type: 'dashboard', id, version: 2
@@ -251,7 +270,7 @@ describe('Saved Object', function () {
it('on failure', function () {
stubESResponse(getMockedDocResponse('id'));
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
- sinon.stub(savedObjectsClientStub, 'create', () => {
+ sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.reject();
});
diff --git a/src/ui/public/courier/_redirect_when_missing.js b/src/ui/public/courier/_redirect_when_missing.js
index e5daa722321274..6d0577aa29339a 100644
--- a/src/ui/public/courier/_redirect_when_missing.js
+++ b/src/ui/public/courier/_redirect_when_missing.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { SavedObjectNotFound } from '../errors';
export function RedirectWhenMissingProvider($location, kbnUrl, Notifier, Promise) {
diff --git a/src/ui/public/courier/_request_queue.js b/src/ui/public/courier/_request_queue.js
index f030fc6a3b68a0..12f75f68288fa8 100644
--- a/src/ui/public/courier/_request_queue.js
+++ b/src/ui/public/courier/_request_queue.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* Queue of pending requests, requests are removed as
diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js
index 4dc8cb99d8be64..1b53c4214de2a7 100644
--- a/src/ui/public/courier/courier.js
+++ b/src/ui/public/courier/courier.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import '../es';
diff --git a/src/ui/public/courier/data_source/__tests__/_migrate_filter.js b/src/ui/public/courier/data_source/__tests__/_migrate_filter.js
index 2335f9d7a2db3e..c671e235772928 100644
--- a/src/ui/public/courier/data_source/__tests__/_migrate_filter.js
+++ b/src/ui/public/courier/data_source/__tests__/_migrate_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import _ from 'lodash';
import { migrateFilter } from '../_migrate_filter';
diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js
index 00bb601726e7f6..29e85f1ee23c98 100644
--- a/src/ui/public/courier/data_source/__tests__/decorate_query.js
+++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import chrome from '../../../chrome';
import { decorateQuery } from '../_decorate_query';
diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
index 911e1ef2009996..7904fec79b84ef 100644
--- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '../../../private';
import ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/courier/data_source/__tests__/search_source.js b/src/ui/public/courier/data_source/__tests__/search_source.js
index 3db1e4ca78c313..f9dbf938d143ec 100644
--- a/src/ui/public/courier/data_source/__tests__/search_source.js
+++ b/src/ui/public/courier/data_source/__tests__/search_source.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'sinon';
diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js
index 9237cd5a146c29..be80394aa646d7 100644
--- a/src/ui/public/courier/data_source/_decorate_query.js
+++ b/src/ui/public/courier/data_source/_decorate_query.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import chrome from '../../chrome';
diff --git a/src/ui/public/courier/data_source/_migrate_filter.js b/src/ui/public/courier/data_source/_migrate_filter.js
index 87ef3c27e962f9..63ad3270a8b2a8 100644
--- a/src/ui/public/courier/data_source/_migrate_filter.js
+++ b/src/ui/public/courier/data_source/_migrate_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { getConvertedValueForField } from '../../filter_manager/lib/phrase';
diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js
index 9c104d68838d9c..aef37de2d11f55 100644
--- a/src/ui/public/courier/data_source/_normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/_normalize_sort_request.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export function NormalizeSortRequestProvider(config) {
diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js
index 0ce205cbfa7843..94943719c36137 100644
--- a/src/ui/public/courier/data_source/_root_search_source.js
+++ b/src/ui/public/courier/data_source/_root_search_source.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { SearchSourceProvider } from './search_source';
export function RootSearchSourceProvider(Private, $rootScope, timefilter) {
@@ -7,7 +26,15 @@ export function RootSearchSourceProvider(Private, $rootScope, timefilter) {
globalSource.inherits(false); // this is the final source, it has no parents
globalSource.filter(function (globalSource) {
// dynamic time filter will be called in the _flatten phase of things
- return timefilter.get(globalSource.get('index'));
+ const filter = timefilter.get(globalSource.get('index'));
+ // Attach a meta property to it, that we check inside visualizations
+ // to remove that timefilter again because we use our explicitly passed in one.
+ // This should be removed as soon as we got rid of inheritance in SearchSource
+ // across the boundary or visualization.
+ if (filter) {
+ filter.meta = { _globalTimefilter: true };
+ }
+ return filter;
});
let appSource; // set in setAppSource()
diff --git a/src/ui/public/courier/data_source/build_query/__tests__/build_es_query.js b/src/ui/public/courier/data_source/build_query/__tests__/build_es_query.js
index bbf0e74a545b76..e2317b1102d4ee 100644
--- a/src/ui/public/courier/data_source/build_query/__tests__/build_es_query.js
+++ b/src/ui/public/courier/data_source/build_query/__tests__/build_es_query.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { BuildESQueryProvider } from '../build_es_query';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/courier/data_source/build_query/__tests__/from_filters.js b/src/ui/public/courier/data_source/build_query/__tests__/from_filters.js
index 5887bddc80d705..b8d766b6fa960f 100644
--- a/src/ui/public/courier/data_source/build_query/__tests__/from_filters.js
+++ b/src/ui/public/courier/data_source/build_query/__tests__/from_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { buildQueryFromFilters } from '../from_filters';
import ngMock from 'ng_mock';
import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
diff --git a/src/ui/public/courier/data_source/build_query/__tests__/from_kuery.js b/src/ui/public/courier/data_source/build_query/__tests__/from_kuery.js
index a6d314b792955e..d574af976ceea5 100644
--- a/src/ui/public/courier/data_source/build_query/__tests__/from_kuery.js
+++ b/src/ui/public/courier/data_source/build_query/__tests__/from_kuery.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { buildQueryFromKuery } from '../from_kuery';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/courier/data_source/build_query/__tests__/from_lucene.js b/src/ui/public/courier/data_source/build_query/__tests__/from_lucene.js
index ee6406bbea90cb..934971cda9ddcb 100644
--- a/src/ui/public/courier/data_source/build_query/__tests__/from_lucene.js
+++ b/src/ui/public/courier/data_source/build_query/__tests__/from_lucene.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { buildQueryFromLucene } from '../from_lucene';
import { decorateQuery } from '../../_decorate_query.js';
import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
diff --git a/src/ui/public/courier/data_source/build_query/__tests__/lucene_string_to_dsl.js b/src/ui/public/courier/data_source/build_query/__tests__/lucene_string_to_dsl.js
index 7a2565d1d8b7c3..20467b99b51e85 100644
--- a/src/ui/public/courier/data_source/build_query/__tests__/lucene_string_to_dsl.js
+++ b/src/ui/public/courier/data_source/build_query/__tests__/lucene_string_to_dsl.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { luceneStringToDsl } from '../lucene_string_to_dsl';
import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
import expect from 'expect.js';
diff --git a/src/ui/public/courier/data_source/build_query/build_es_query.js b/src/ui/public/courier/data_source/build_query/build_es_query.js
index 2b1733308ba125..55a354e26eca22 100644
--- a/src/ui/public/courier/data_source/build_query/build_es_query.js
+++ b/src/ui/public/courier/data_source/build_query/build_es_query.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { groupBy, has } from 'lodash';
import { decorateQuery } from '../_decorate_query';
import { buildQueryFromKuery } from './from_kuery';
diff --git a/src/ui/public/courier/data_source/build_query/from_filters.js b/src/ui/public/courier/data_source/build_query/from_filters.js
index 387319be2eb303..655ea3542757e9 100644
--- a/src/ui/public/courier/data_source/build_query/from_filters.js
+++ b/src/ui/public/courier/data_source/build_query/from_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { migrateFilter } from '../_migrate_filter';
diff --git a/src/ui/public/courier/data_source/build_query/from_kuery.js b/src/ui/public/courier/data_source/build_query/from_kuery.js
index ad428b23fea81b..d79be5f1f5a88a 100644
--- a/src/ui/public/courier/data_source/build_query/from_kuery.js
+++ b/src/ui/public/courier/data_source/build_query/from_kuery.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { fromLegacyKueryExpression, fromKueryExpression, toElasticsearchQuery, nodeTypes } from '../../../kuery';
import { documentationLinks } from '../../../documentation_links';
import { NoLeadingWildcardsError } from '../../../kuery/errors';
diff --git a/src/ui/public/courier/data_source/build_query/from_lucene.js b/src/ui/public/courier/data_source/build_query/from_lucene.js
index c2ecb6142bf1c3..09bef032ef282b 100644
--- a/src/ui/public/courier/data_source/build_query/from_lucene.js
+++ b/src/ui/public/courier/data_source/build_query/from_lucene.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { luceneStringToDsl } from './lucene_string_to_dsl';
diff --git a/src/ui/public/courier/data_source/build_query/index.js b/src/ui/public/courier/data_source/build_query/index.js
index 20cf3a205a90bd..41b77cb74ed20b 100644
--- a/src/ui/public/courier/data_source/build_query/index.js
+++ b/src/ui/public/courier/data_source/build_query/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { BuildESQueryProvider } from './build_es_query';
diff --git a/src/ui/public/courier/data_source/build_query/lucene_string_to_dsl.js b/src/ui/public/courier/data_source/build_query/lucene_string_to_dsl.js
index 89711ab63926e3..36ff621e8a6948 100644
--- a/src/ui/public/courier/data_source/build_query/lucene_string_to_dsl.js
+++ b/src/ui/public/courier/data_source/build_query/lucene_string_to_dsl.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export function luceneStringToDsl(query) {
diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js
index a4d6362f50307b..8de100592518c7 100644
--- a/src/ui/public/courier/data_source/search_source.js
+++ b/src/ui/public/courier/data_source/search_source.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* @name SearchSource
*
diff --git a/src/ui/public/courier/fetch/__tests__/fetch_now.js b/src/ui/public/courier/fetch/__tests__/fetch_now.js
index aff44b1f6f7376..c8a956e8604649 100644
--- a/src/ui/public/courier/fetch/__tests__/fetch_now.js
+++ b/src/ui/public/courier/fetch/__tests__/fetch_now.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/courier/fetch/call_client.js b/src/ui/public/courier/fetch/call_client.js
index 6613ef62181586..130bb57d9840d6 100644
--- a/src/ui/public/courier/fetch/call_client.js
+++ b/src/ui/public/courier/fetch/call_client.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { ErrorAllowExplicitIndexProvider } from '../../error_allow_explicit_index';
diff --git a/src/ui/public/courier/fetch/call_response_handlers.js b/src/ui/public/courier/fetch/call_response_handlers.js
index 80ef0d922f108b..94972fde9f2058 100644
--- a/src/ui/public/courier/fetch/call_response_handlers.js
+++ b/src/ui/public/courier/fetch/call_response_handlers.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { RequestFailure, SearchTimeout, ShardFailure } from '../../errors';
import { RequestStatus } from './req_status';
diff --git a/src/ui/public/courier/fetch/continue_incomplete.js b/src/ui/public/courier/fetch/continue_incomplete.js
index 8bbd1651d3656c..cca5fde71adfe8 100644
--- a/src/ui/public/courier/fetch/continue_incomplete.js
+++ b/src/ui/public/courier/fetch/continue_incomplete.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { RequestStatus } from './req_status';
export function ContinueIncompleteProvider() {
diff --git a/src/ui/public/courier/fetch/fetch_now.js b/src/ui/public/courier/fetch/fetch_now.js
index 3a0e85de38080e..8a35949b5f49af 100644
--- a/src/ui/public/courier/fetch/fetch_now.js
+++ b/src/ui/public/courier/fetch/fetch_now.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { fatalError } from '../../notify';
import { CallClientProvider } from './call_client';
import { CallResponseHandlersProvider } from './call_response_handlers';
diff --git a/src/ui/public/courier/fetch/fetch_soon.js b/src/ui/public/courier/fetch/fetch_soon.js
index c60f0f8508ddc1..f7d0d444d76c26 100644
--- a/src/ui/public/courier/fetch/fetch_soon.js
+++ b/src/ui/public/courier/fetch/fetch_soon.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { requestQueue } from '../_request_queue';
import { FetchNowProvider } from './fetch_now';
diff --git a/src/ui/public/courier/fetch/index.js b/src/ui/public/courier/fetch/index.js
index 9630f2b26651ae..91c3fe67990e30 100644
--- a/src/ui/public/courier/fetch/index.js
+++ b/src/ui/public/courier/fetch/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { FetchSoonProvider } from './fetch_soon';
diff --git a/src/ui/public/courier/fetch/is_request.js b/src/ui/public/courier/fetch/is_request.js
index 9a9966f47c2983..73c54d6f4bca1d 100644
--- a/src/ui/public/courier/fetch/is_request.js
+++ b/src/ui/public/courier/fetch/is_request.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { SearchRequestProvider } from './request';
export function IsRequestProvider(Private) {
diff --git a/src/ui/public/courier/fetch/merge_duplicate_requests.js b/src/ui/public/courier/fetch/merge_duplicate_requests.js
index 8535827242a4c4..eb4cbc29bcb099 100644
--- a/src/ui/public/courier/fetch/merge_duplicate_requests.js
+++ b/src/ui/public/courier/fetch/merge_duplicate_requests.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { IsRequestProvider } from './is_request';
import { RequestStatus } from './req_status';
diff --git a/src/ui/public/courier/fetch/notifier.js b/src/ui/public/courier/fetch/notifier.js
index 58dfdcfe61f741..57cbb18337a7b6 100644
--- a/src/ui/public/courier/fetch/notifier.js
+++ b/src/ui/public/courier/fetch/notifier.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { Notifier } from '../../notify';
export const location = 'Courier fetch';
diff --git a/src/ui/public/courier/fetch/req_status.js b/src/ui/public/courier/fetch/req_status.js
index efec1c26e2a3d4..a5ef380b86c6c2 100644
--- a/src/ui/public/courier/fetch/req_status.js
+++ b/src/ui/public/courier/fetch/req_status.js
@@ -1,3 +1,22 @@
+/*
+ * 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 const RequestStatus = {
ABORTED: 'aborted',
DUPLICATE: 'duplicate',
diff --git a/src/ui/public/courier/fetch/request/__tests__/request_fetch_params_to_body_provider.js b/src/ui/public/courier/fetch/request/__tests__/request_fetch_params_to_body_provider.js
index b276546ed20fad..0aab1d7c4d4ba8 100644
--- a/src/ui/public/courier/fetch/request/__tests__/request_fetch_params_to_body_provider.js
+++ b/src/ui/public/courier/fetch/request/__tests__/request_fetch_params_to_body_provider.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/courier/fetch/request/__tests__/search_request.js b/src/ui/public/courier/fetch/request/__tests__/search_request.js
index 6a1b6e53f4e48d..3d18b494e64e86 100644
--- a/src/ui/public/courier/fetch/request/__tests__/search_request.js
+++ b/src/ui/public/courier/fetch/request/__tests__/search_request.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js
index cec4f55b8b5858..7896ab1165772a 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import expect from 'expect.js';
import ngMock from 'ng_mock';
@@ -18,7 +37,7 @@ describe('SegmentedRequestProvider', () => {
SegmentedReq = Private(SegmentedRequestProvider);
const SearchRequest = Private(SearchRequestProvider);
- abstractReqStart = sinon.stub(SearchRequest.prototype, 'start', () => {
+ abstractReqStart = sinon.stub(SearchRequest.prototype, 'start').callsFake(() => {
const promise = Promise.resolve();
sinon.spy(promise, 'then');
return promise;
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
index edf7e725dc53bb..5e4e678de308f0 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
index 25b8a8426ad469..539722a88db509 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import { times } from 'lodash';
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
index 69ea3bba925c03..0ddb8543ef9dd7 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/courier/fetch/request/index.js b/src/ui/public/courier/fetch/request/index.js
index c73cad3e4bc2a4..6647d0e5b2e102 100644
--- a/src/ui/public/courier/fetch/request/index.js
+++ b/src/ui/public/courier/fetch/request/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { SearchRequestProvider } from './search_request';
diff --git a/src/ui/public/courier/fetch/request/request_fetch_params_to_body.js b/src/ui/public/courier/fetch/request/request_fetch_params_to_body.js
index 97e41473155099..f8daefe1f3e462 100644
--- a/src/ui/public/courier/fetch/request/request_fetch_params_to_body.js
+++ b/src/ui/public/courier/fetch/request/request_fetch_params_to_body.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { toJson } from '../../../../../core_plugins/kibana/common/utils/aggressive_parse';
diff --git a/src/ui/public/courier/fetch/request/request_fetch_params_to_body.test.js b/src/ui/public/courier/fetch/request/request_fetch_params_to_body.test.js
index e289ed82c9131f..d7c6ea8b9c2ef3 100644
--- a/src/ui/public/courier/fetch/request/request_fetch_params_to_body.test.js
+++ b/src/ui/public/courier/fetch/request/request_fetch_params_to_body.test.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { requestFetchParamsToBody } from './request_fetch_params_to_body';
import _ from 'lodash';
diff --git a/src/ui/public/courier/fetch/request/request_fetch_params_to_body_provider.js b/src/ui/public/courier/fetch/request/request_fetch_params_to_body_provider.js
index 82e4e940499373..22f6bf534573d7 100644
--- a/src/ui/public/courier/fetch/request/request_fetch_params_to_body_provider.js
+++ b/src/ui/public/courier/fetch/request/request_fetch_params_to_body_provider.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { requestFetchParamsToBody } from './request_fetch_params_to_body';
export function RequestFetchParamsToBodyProvider(Promise, timefilter, kbnIndex, sessionId, config, esShardTimeout) {
diff --git a/src/ui/public/courier/fetch/request/search_request.js b/src/ui/public/courier/fetch/request/search_request.js
index 425b588a8134a9..9fab732cd8fa7d 100644
--- a/src/ui/public/courier/fetch/request/search_request.js
+++ b/src/ui/public/courier/fetch/request/search_request.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import moment from 'moment';
diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js
index e398e5830bcf08..125737b4ddab6d 100644
--- a/src/ui/public/courier/fetch/request/segmented.js
+++ b/src/ui/public/courier/fetch/request/segmented.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { Notifier } from '../../../notify';
import { SearchRequestProvider } from './search_request';
@@ -88,7 +107,7 @@ export function SegmentedRequestProvider(Private, timefilter, config) {
const indexCount = Math.max(1, Math.floor(this._queue.length / remainingSegments));
const indices = this._active = this._queue.splice(0, indexCount);
- params.index = _.pluck(indices, 'index');
+ params.index = indices.map(({ index }) => index).join(',');
if (_.isNumber(this._desiredSize)) {
params.body.size = this._pickSizeForIndices(indices);
diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js
index cc6721700f01d1..ed443fc94e616d 100644
--- a/src/ui/public/courier/fetch/request/segmented_handle.js
+++ b/src/ui/public/courier/fetch/request/segmented_handle.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { EventsProvider } from '../../../events';
export function SegmentedHandleProvider(Private) {
diff --git a/src/ui/public/courier/index.js b/src/ui/public/courier/index.js
index 96df31b949bf5e..9efb2954c99b24 100644
--- a/src/ui/public/courier/index.js
+++ b/src/ui/public/courier/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './courier';
diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js
index 3025adfb73e4a7..295c98f9d47e7a 100644
--- a/src/ui/public/courier/looper/_looper.js
+++ b/src/ui/public/courier/looper/_looper.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import '../../promises';
diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js
index c75a2d44074ec1..8bdf79400e2e77 100644
--- a/src/ui/public/courier/looper/search.js
+++ b/src/ui/public/courier/looper/search.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { FetchSoonProvider } from '../fetch';
import { requestQueue } from '../_request_queue';
import { LooperProvider } from './_looper';
diff --git a/src/ui/public/courier/saved_object/index.js b/src/ui/public/courier/saved_object/index.js
index ee774221824d3b..b5b0e56bf57a20 100644
--- a/src/ui/public/courier/saved_object/index.js
+++ b/src/ui/public/courier/saved_object/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { SavedObjectProvider } from './saved_object';
diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js
index 64d49c945b54bc..04533d63fb8114 100644
--- a/src/ui/public/courier/saved_object/saved_object.js
+++ b/src/ui/public/courier/saved_object/saved_object.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* @name SavedObject
*
@@ -283,12 +302,21 @@ export function SavedObjectProvider(Promise, Private, Notifier, confirmModalProm
});
};
- /**
- * Returns a promise that resolves to true if either the title is unique, or if the user confirmed they
- * wished to save the duplicate title. Promise is rejected if the user rejects the confirmation.
- */
- const warnIfDuplicateTitle = () => {
- // Don't warn if the user isn't updating the title, otherwise that would become very annoying to have
+ const displayDuplicateTitleConfirmModal = () => {
+ const confirmMessage =
+ `A ${this.getDisplayName()} with the title '${this.title}' already exists. Would you like to save anyway?`;
+
+ return confirmModalPromise(confirmMessage, { confirmButtonText: `Save ${this.getDisplayName()}` })
+ .catch(() => Promise.reject(new Error(SAVE_DUPLICATE_REJECTED)));
+ };
+
+ const checkForDuplicateTitle = (isTitleDuplicateConfirmed, onTitleDuplicate) => {
+ // Don't check for duplicates if user has already confirmed save with duplicate title
+ if (isTitleDuplicateConfirmed) {
+ return Promise.resolve();
+ }
+
+ // Don't check if the user isn't updating the title, otherwise that would become very annoying to have
// to confirm the save every time, except when copyOnSave is true, then we do want to check.
if (this.title === this.lastSavedTitle && !this.copyOnSave) {
return Promise.resolve();
@@ -299,11 +327,14 @@ export function SavedObjectProvider(Promise, Private, Notifier, confirmModalProm
if (!duplicate) return true;
if (duplicate.id === this.id) return true;
- const confirmMessage =
- `A ${this.getDisplayName()} with the title '${this.title}' already exists. Would you like to save anyway?`;
+ if (onTitleDuplicate) {
+ onTitleDuplicate();
+ return Promise.reject(new Error(SAVE_DUPLICATE_REJECTED));
+ }
- return confirmModalPromise(confirmMessage, { confirmButtonText: `Save ${this.getDisplayName()}` })
- .catch(() => Promise.reject(new Error(SAVE_DUPLICATE_REJECTED)));
+ // TODO: make onTitleDuplicate a required prop and remove UI components from this class
+ // Need to leave here until all users pass onTitleDuplicate.
+ return displayDuplicateTitleConfirmModal();
});
};
@@ -313,10 +344,13 @@ export function SavedObjectProvider(Promise, Private, Notifier, confirmModalProm
* @param {object} [options={}]
* @property {boolean} [options.confirmOverwrite=false] - If true, attempts to create the source so it
* can confirm an overwrite if a document with the id already exists.
+ * @property {boolean} [options.isTitleDuplicateConfirmed=false] - If true, save allowed with duplicate title
+ * @property {func} [options.onTitleDuplicate] - function called if duplicate title exists.
+ * When not provided, confirm modal will be displayed asking user to confirm or cancel save.
* @return {Promise}
* @resolved {String} - The id of the doc
*/
- this.save = ({ confirmOverwrite } = {}) => {
+ this.save = ({ confirmOverwrite = false, isTitleDuplicateConfirmed = false, onTitleDuplicate } = {}) => {
// Save the original id in case the save fails.
const originalId = this.id;
// Read https://github.com/elastic/kibana/issues/9056 and
@@ -333,7 +367,7 @@ export function SavedObjectProvider(Promise, Private, Notifier, confirmModalProm
this.isSaving = true;
- return warnIfDuplicateTitle()
+ return checkForDuplicateTitle(isTitleDuplicateConfirmed, onTitleDuplicate)
.then(() => {
if (confirmOverwrite) {
return createSource(source);
diff --git a/src/ui/public/courier/saved_object/saved_object_loader.js b/src/ui/public/courier/saved_object/saved_object_loader.js
index cd662695238995..7a6f2b27db9316 100644
--- a/src/ui/public/courier/saved_object/saved_object_loader.js
+++ b/src/ui/public/courier/saved_object/saved_object_loader.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { Scanner } from '../../utils/scanner';
import { StringUtils } from '../../utils/string_utils';
import { SavedObjectsClient } from '../../saved_objects';
@@ -94,14 +113,15 @@ export class SavedObjectLoader {
* @param size
* @returns {Promise}
*/
- findAll(search = '', size = 100) {
+ findAll(search = '', size = 100, fields) {
return this.savedObjectsClient.find(
{
type: this.lowercaseType,
search: search ? `${search}*` : undefined,
perPage: size,
page: 1,
- searchFields: ['title^3', 'description']
+ searchFields: ['title^3', 'description'],
+ fields,
}).then((resp) => {
return {
total: resp.total,
diff --git a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
index 27c8c5287ae7fc..f3f089653c329a 100644
--- a/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
+++ b/src/ui/public/courier/saved_object/ui/saved_object_save_as_checkbox.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../../../modules';
import saveObjectSaveAsCheckboxTemplate from './saved_object_save_as_checkbox.html';
diff --git a/src/ui/public/crypto/index.js b/src/ui/public/crypto/index.js
index 9951cf805cb85b..eda07d53147e20 100644
--- a/src/ui/public/crypto/index.js
+++ b/src/ui/public/crypto/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { Sha256 } from './sha256';
diff --git a/src/ui/public/crypto/sha256.js b/src/ui/public/crypto/sha256.js
index 1c6de18b1dfab5..c97d9046f9555b 100644
--- a/src/ui/public/crypto/sha256.js
+++ b/src/ui/public/crypto/sha256.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
// ported from https://github.com/spalger/sha.js/blob/6557630d508873e262e94bff70c50bdd797c1df7/sha256.js
// and https://github.com/spalger/sha.js/blob/6557630d508873e262e94bff70c50bdd797c1df7/hash.js
diff --git a/src/ui/public/dashboard_panel_actions/dashboard_context_menu_panel.js b/src/ui/public/dashboard_panel_actions/dashboard_context_menu_panel.js
new file mode 100644
index 00000000000000..03537d846f3b9e
--- /dev/null
+++ b/src/ui/public/dashboard_panel_actions/dashboard_context_menu_panel.js
@@ -0,0 +1,43 @@
+/*
+ * 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 DashboardContextMenuPanel {
+ /**
+ * @param {string} id
+ * @param {string} title
+ * @param {function} getContent
+ */
+ constructor({ id, title, getContent }) {
+ this.id = id;
+ this.title = title;
+
+ if (getContent) {
+ this.getContent = getContent;
+ }
+ }
+
+ /**
+ * Optional, could be composed of actions instead of content.
+ * @param {Embeddable} embeddable
+ * @param {ContainerState} containerState
+ */
+ getContent(/*{ embeddable, containerState }*/) {
+ return null;
+ }
+}
diff --git a/src/ui/public/dashboard_panel_actions/dashboard_panel_action.js b/src/ui/public/dashboard_panel_actions/dashboard_panel_action.js
new file mode 100644
index 00000000000000..15f3178d1eda12
--- /dev/null
+++ b/src/ui/public/dashboard_panel_actions/dashboard_panel_action.js
@@ -0,0 +1,86 @@
+/*
+ * 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 DashboardPanelAction {
+ /**
+ *
+ * @param {string} id
+ * @param {string} displayName
+ * @param {function} onClick
+ * @param {DashboardContextMenuPanel} childContextMenuPanel - optional child panel to open when clicked.
+ * @param {function} isDisabled - optionally set a custom disabled function
+ * @param {function} isVisible - optionally set a custom isVisible function
+ * @param {string} parentPanelId - set if this action belongs on a nested child panel
+ * @param {Element} icon
+ */
+ constructor(
+ {
+ id,
+ displayName,
+ onClick,
+ childContextMenuPanel,
+ isDisabled,
+ isVisible,
+ parentPanelId,
+ icon,
+ } = {}) {
+ this.id = id;
+ this.icon = icon;
+ this.displayName = displayName;
+ this.childContextMenuPanel = childContextMenuPanel;
+ this.parentPanelId = parentPanelId;
+
+ if (onClick) {
+ this.onClick = onClick;
+ }
+
+ if (isDisabled) {
+ this.isDisabled = isDisabled;
+ }
+
+ if (isVisible) {
+ this.isVisible = isVisible;
+ }
+ }
+
+ /**
+ * @param {Embeddable} embeddable
+ * @param ContainerState} containerState
+ */
+ onClick(/*{ embeddable, containerState }*/) {}
+
+ /**
+ * Defaults to always visible.
+ * @param {Embeddable} embeddable
+ * @param ContainerState} containerState
+ * @return {boolean}
+ */
+ isVisible(/*{ embeddable, containerState }*/) {
+ return true;
+ }
+
+ /**
+ * Defaults to always enabled.
+ * @param {Embeddable} embeddable
+ * @param {ContainerState} containerState
+ */
+ isDisabled(/*{ embeddable, containerState }*/) {
+ return false;
+ }
+}
diff --git a/src/ui/public/dashboard_panel_actions/dashboard_panel_actions_registry.js b/src/ui/public/dashboard_panel_actions/dashboard_panel_actions_registry.js
new file mode 100644
index 00000000000000..4d3c017b3cf055
--- /dev/null
+++ b/src/ui/public/dashboard_panel_actions/dashboard_panel_actions_registry.js
@@ -0,0 +1,25 @@
+/*
+ * 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 { uiRegistry } from 'ui/registry/_registry';
+
+export const DashboardPanelActionsRegistryProvider = uiRegistry({
+ name: 'dashboardPanelActions',
+ index: ['name'],
+});
diff --git a/src/ui/public/dashboard_panel_actions/index.js b/src/ui/public/dashboard_panel_actions/index.js
new file mode 100644
index 00000000000000..759ece6ec56a68
--- /dev/null
+++ b/src/ui/public/dashboard_panel_actions/index.js
@@ -0,0 +1,22 @@
+/*
+ * 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 { DashboardPanelAction } from './dashboard_panel_action';
+export { DashboardPanelActionsRegistryProvider } from './dashboard_panel_actions_registry';
+export { DashboardContextMenuPanel } from './dashboard_context_menu_panel';
diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js
index 939ba6b2eda064..5aa4233613ce16 100644
--- a/src/ui/public/debounce/__tests__/debounce.js
+++ b/src/ui/public/debounce/__tests__/debounce.js
@@ -1,3 +1,22 @@
+/*
+ * 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 sinon from 'sinon';
import expect from 'expect.js';
@@ -35,7 +54,7 @@ describe('debounce service', function () {
});
describe('delayed execution', function () {
- const sandbox = sinon.sandbox.create();
+ const sandbox = sinon.createSandbox();
beforeEach(() => sandbox.useFakeTimers());
afterEach(() => sandbox.restore());
@@ -49,7 +68,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledOnce(spy);
- spy.reset();
+ spy.resetHistory();
bouncerFromProvider();
sinon.assert.notCalled(spy);
@@ -66,7 +85,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledTwice(spy);
- spy.reset();
+ spy.resetHistory();
bouncerFromProvider();
sinon.assert.calledOnce(spy);
@@ -83,7 +102,7 @@ describe('debounce service', function () {
$timeout.flush();
sinon.assert.calledOnce(spy);
- spy.reset();
+ spy.resetHistory();
bouncerFromProvider();
sinon.assert.calledOnce(spy);
@@ -105,8 +124,8 @@ describe('debounce service', function () {
sinon.assert.calledOnce(spy);
sinon.assert.calledOnce(cancelSpy);
- spy.reset();
- cancelSpy.reset();
+ spy.resetHistory();
+ cancelSpy.resetHistory();
bouncerFromProvider();
sandbox.clock.tick(1);
@@ -131,7 +150,7 @@ describe('debounce service', function () {
// throws if pending timeouts
$timeout.verifyNoPendingTasks();
- cancelSpy.reset();
+ cancelSpy.resetHistory();
bouncerFromProvider();
bouncerFromProvider.cancel();
diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js
index 3f076d8f8fa740..0791001c32e3a9 100644
--- a/src/ui/public/debounce/debounce.js
+++ b/src/ui/public/debounce/debounce.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../modules';
// Debounce service, angularized version of lodash debounce
diff --git a/src/ui/public/debounce/index.js b/src/ui/public/debounce/index.js
index b267626b201d3f..35b83392636263 100644
--- a/src/ui/public/debounce/index.js
+++ b/src/ui/public/debounce/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './debounce';
export { DebounceProvider } from './debounce';
diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
index 6f5240e5743d1f..0830041207e6cf 100644
--- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js
+++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js
index 12dc2a165d9c1f..08bce6aea47a6c 100644
--- a/src/ui/public/directives/__tests__/confirm-click.js
+++ b/src/ui/public/directives/__tests__/confirm-click.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js
index e78f2f63d89fbf..3c851a7df68427 100644
--- a/src/ui/public/directives/__tests__/css_truncate.js
+++ b/src/ui/public/directives/__tests__/css_truncate.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/fixed_scroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js
index 068e92d1a4aec3..cec917cf4d1f7a 100644
--- a/src/ui/public/directives/__tests__/fixed_scroll.js
+++ b/src/ui/public/directives/__tests__/fixed_scroll.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
@@ -6,7 +25,7 @@ import $ from 'jquery';
import sinon from 'sinon';
describe('FixedScroll directive', function () {
- const sandbox = sinon.sandbox.create();
+ const sandbox = sinon.createSandbox();
let compile;
let flushPendingTasks;
@@ -156,7 +175,7 @@ describe('FixedScroll directive', function () {
$from.scroll();
expect(spy.callCount).to.be(2);
- spy.reset();
+ spy.resetHistory();
$to.scroll();
expect(spy.callCount).to.be(0);
});
diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js
index c777c74b2db94b..a513520e49791c 100644
--- a/src/ui/public/directives/__tests__/inequality.js
+++ b/src/ui/public/directives/__tests__/inequality.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../inequality';
diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js
index 3b11a79bf1e876..9b1bbe25c844c3 100644
--- a/src/ui/public/directives/__tests__/input_focus.js
+++ b/src/ui/public/directives/__tests__/input_focus.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import $ from 'jquery';
diff --git a/src/ui/public/directives/__tests__/input_number.js b/src/ui/public/directives/__tests__/input_number.js
index ca2abbf85b4d89..a60b38839494ee 100644
--- a/src/ui/public/directives/__tests__/input_number.js
+++ b/src/ui/public/directives/__tests__/input_number.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../input_number';
diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js
index 061dae7f088cae..43ecea162f1665 100644
--- a/src/ui/public/directives/__tests__/json_input.js
+++ b/src/ui/public/directives/__tests__/json_input.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../json_input';
diff --git a/src/ui/public/directives/__tests__/paginated_selectable_list.js b/src/ui/public/directives/__tests__/paginated_selectable_list.js
index 30c5f906a5e373..5246cc3568fd8c 100644
--- a/src/ui/public/directives/__tests__/paginated_selectable_list.js
+++ b/src/ui/public/directives/__tests__/paginated_selectable_list.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js
index 4ae124eabc7156..b3c24cc9deb8b1 100644
--- a/src/ui/public/directives/__tests__/parse_query.js
+++ b/src/ui/public/directives/__tests__/parse_query.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
index 7b4f1bd57ea697..64899901532f9a 100644
--- a/src/ui/public/directives/__tests__/timepicker.js
+++ b/src/ui/public/directives/__tests__/timepicker.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import moment from 'moment';
import expect from 'expect.js';
@@ -70,7 +89,7 @@ const init = function () {
describe('timepicker directive', function () {
- const sandbox = sinon.sandbox.create();
+ const sandbox = sinon.createSandbox();
beforeEach(function () {
// Stub out the clock so 'now' doesn't move
diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js
index a3a6df574658ff..864db638056912 100644
--- a/src/ui/public/directives/__tests__/truncate.js
+++ b/src/ui/public/directives/__tests__/truncate.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js
index 434b12b70d901f..b1a6724f18ee69 100644
--- a/src/ui/public/directives/__tests__/validate_cidr_mask.js
+++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../validate_cidr_mask';
diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js
index fccc8ced9bdd7e..e7689984c969b1 100644
--- a/src/ui/public/directives/__tests__/validate_date_math.js
+++ b/src/ui/public/directives/__tests__/validate_date_math.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../validate_date_math';
diff --git a/src/ui/public/directives/__tests__/validate_index_pattern.js b/src/ui/public/directives/__tests__/validate_index_pattern.js
index 3993bee67a7829..ae90248adb098a 100644
--- a/src/ui/public/directives/__tests__/validate_index_pattern.js
+++ b/src/ui/public/directives/__tests__/validate_index_pattern.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../validate_index_pattern';
diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js
index bea95871d04a8c..f2181ea08edfb1 100644
--- a/src/ui/public/directives/__tests__/validate_ip.js
+++ b/src/ui/public/directives/__tests__/validate_ip.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../validate_ip';
diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js
index f8a4fda3994b83..b59ee7bccf7ec4 100644
--- a/src/ui/public/directives/__tests__/validate_json.js
+++ b/src/ui/public/directives/__tests__/validate_json.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/directives/auto_select_if_only_one.js b/src/ui/public/directives/auto_select_if_only_one.js
index 150ef3f0e858d5..1b27132eb2b594 100644
--- a/src/ui/public/directives/auto_select_if_only_one.js
+++ b/src/ui/public/directives/auto_select_if_only_one.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/click_focus.js b/src/ui/public/directives/click_focus.js
index f969f3032a1c97..deccbfd1b3e95b 100644
--- a/src/ui/public/directives/click_focus.js
+++ b/src/ui/public/directives/click_focus.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import $ from 'jquery';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/confirm_click.js b/src/ui/public/directives/confirm_click.js
index 541f6a9b0e72ee..cbee20e01d9693 100644
--- a/src/ui/public/directives/confirm_click.js
+++ b/src/ui/public/directives/confirm_click.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
uiModules
.get('kibana')
diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js
index d34b2c10436517..7105563e0ce5f2 100644
--- a/src/ui/public/directives/css_truncate.js
+++ b/src/ui/public/directives/css_truncate.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/documentation_href.js b/src/ui/public/directives/documentation_href.js
index b84fb24e23f81e..70473746334fbf 100644
--- a/src/ui/public/directives/documentation_href.js
+++ b/src/ui/public/directives/documentation_href.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { getDocLink } from '../documentation_links';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/field_name.js b/src/ui/public/directives/field_name.js
index 5c76fff1753c13..233900e5c963b2 100644
--- a/src/ui/public/directives/field_name.js
+++ b/src/ui/public/directives/field_name.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import '../filters/short_dots';
import booleanFieldNameIcon from './field_name_icons/boolean_field_name_icon.html';
diff --git a/src/ui/public/directives/file_upload.js b/src/ui/public/directives/file_upload.js
index 11091f218e0df6..b0ce52bd2a314a 100644
--- a/src/ui/public/directives/file_upload.js
+++ b/src/ui/public/directives/file_upload.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import $ from 'jquery';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/focus_on.js b/src/ui/public/directives/focus_on.js
index ec8a075fdbb518..9b53c4fd7c780f 100644
--- a/src/ui/public/directives/focus_on.js
+++ b/src/ui/public/directives/focus_on.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/inequality.js b/src/ui/public/directives/inequality.js
index abcbf557438ba5..d3c80d1ff2e969 100644
--- a/src/ui/public/directives/inequality.js
+++ b/src/ui/public/directives/inequality.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
function makeDirectiveDef(id, compare) {
diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js
index ee82275c892589..6f8132e1ee7d97 100644
--- a/src/ui/public/directives/infinite_scroll.js
+++ b/src/ui/public/directives/infinite_scroll.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/input_base64.js b/src/ui/public/directives/input_base64.js
index fe2b7014e89e7b..d6767cb7d80ca0 100644
--- a/src/ui/public/directives/input_base64.js
+++ b/src/ui/public/directives/input_base64.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import { Observable } from 'rxjs/Rx';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js
index 37ff175eb30d01..acc62d309aac73 100644
--- a/src/ui/public/directives/input_datetime.js
+++ b/src/ui/public/directives/input_datetime.js
@@ -1,3 +1,22 @@
+/*
+ * 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 moment from 'moment';
import { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/input_focus.js b/src/ui/public/directives/input_focus.js
index e0da9ab100c1ac..f1ed2a82045a01 100644
--- a/src/ui/public/directives/input_focus.js
+++ b/src/ui/public/directives/input_focus.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/input_number.js b/src/ui/public/directives/input_number.js
index 37d40fcae8ca65..44bef86157882c 100644
--- a/src/ui/public/directives/input_number.js
+++ b/src/ui/public/directives/input_number.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/json_input.js b/src/ui/public/directives/json_input.js
index 552c39dfa9da3c..4ba2df2facd4f4 100644
--- a/src/ui/public/directives/json_input.js
+++ b/src/ui/public/directives/json_input.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import angular from 'angular';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/kbn_href.js b/src/ui/public/directives/kbn_href.js
index 868b654f46991c..9fe513c78b2d52 100644
--- a/src/ui/public/directives/kbn_href.js
+++ b/src/ui/public/directives/kbn_href.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import { words, kebabCase } from 'lodash';
diff --git a/src/ui/public/directives/kbn_src.js b/src/ui/public/directives/kbn_src.js
index 208ecf1144ac8c..1bf19266cbcec1 100644
--- a/src/ui/public/directives/kbn_src.js
+++ b/src/ui/public/directives/kbn_src.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { kbnUrlDirective } from './kbn_href';
kbnUrlDirective('kbnSrc');
diff --git a/src/ui/public/directives/match_pairs.js b/src/ui/public/directives/match_pairs.js
index b175824712987d..a68469340edb9c 100644
--- a/src/ui/public/directives/match_pairs.js
+++ b/src/ui/public/directives/match_pairs.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js
index 065291721a3ad6..4302a48f0f8e78 100644
--- a/src/ui/public/directives/paginate.js
+++ b/src/ui/public/directives/paginate.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../modules';
import paginateControlsTemplate from '../partials/paginate_controls.html';
diff --git a/src/ui/public/directives/paginated_selectable_list.js b/src/ui/public/directives/paginated_selectable_list.js
index d1c2880e11ffaa..e71c6dc67e286d 100644
--- a/src/ui/public/directives/paginated_selectable_list.js
+++ b/src/ui/public/directives/paginated_selectable_list.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../modules';
import paginatedSelectableListTemplate from '../partials/paginated_selectable_list.html';
diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
index fe984b41780a66..01cbb645b1604e 100644
--- a/src/ui/public/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import { prettyDuration } from '../timepicker/pretty_duration';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
index e1eb885abac2a7..97e7a890ce51f1 100644
--- a/src/ui/public/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import _ from 'lodash';
import AggConfigResult from '../vis/agg_config_result';
diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
index 07d7435a2ed33f..ad9905047f0b62 100644
--- a/src/ui/public/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import rison from 'rison-node';
import { keyMap } from '../utils/key_map';
diff --git a/src/ui/public/directives/scroll_bottom.js b/src/ui/public/directives/scroll_bottom.js
index 3b998da586019e..1648cc37aee637 100644
--- a/src/ui/public/directives/scroll_bottom.js
+++ b/src/ui/public/directives/scroll_bottom.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/string_to_number.js b/src/ui/public/directives/string_to_number.js
index 99bcb060b973f2..40ffbe69d499a9 100644
--- a/src/ui/public/directives/string_to_number.js
+++ b/src/ui/public/directives/string_to_number.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/truncated.js b/src/ui/public/directives/truncated.js
index ca17bb79e6ae5c..60bd77136c8fef 100644
--- a/src/ui/public/directives/truncated.js
+++ b/src/ui/public/directives/truncated.js
@@ -1,3 +1,22 @@
+/*
+ * 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 truncText from 'trunc-text';
import truncHTML from 'trunc-html';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/ui_select_focus_on.js b/src/ui/public/directives/ui_select_focus_on.js
index 540c5e65c48ee4..445035d6c036bf 100644
--- a/src/ui/public/directives/ui_select_focus_on.js
+++ b/src/ui/public/directives/ui_select_focus_on.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/validate_agg.js b/src/ui/public/directives/validate_agg.js
index 2295a040aebcf1..3abfba334d8c3f 100644
--- a/src/ui/public/directives/validate_agg.js
+++ b/src/ui/public/directives/validate_agg.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
uiModules
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
index a1e37669249bbb..635beda36bc944 100644
--- a/src/ui/public/directives/validate_cidr_mask.js
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { CidrMask } from '../utils/cidr_mask';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
index 8089906c4842ea..bc7277469f9283 100644
--- a/src/ui/public/directives/validate_date_math.js
+++ b/src/ui/public/directives/validate_date_math.js
@@ -1,3 +1,22 @@
+/*
+ * 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 dateMath from '@kbn/datemath';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/validate_index_pattern.js b/src/ui/public/directives/validate_index_pattern.js
index 2795e3712ecd27..1db3fa05f52b8b 100644
--- a/src/ui/public/directives/validate_index_pattern.js
+++ b/src/ui/public/directives/validate_index_pattern.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../modules';
// See https://github.com/elastic/elasticsearch/issues/6736
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index 58780257f43be9..0120f149c7d476 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,3 +1,22 @@
+/*
+ * 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 Ipv4Address from '../utils/ipv4_address';
import { uiModules } from '../modules';
diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js
index f9f07e4969827b..396cfd13daf88f 100644
--- a/src/ui/public/directives/validate_json.js
+++ b/src/ui/public/directives/validate_json.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
const module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/validate_lowercase.js b/src/ui/public/directives/validate_lowercase.js
index 5a73843f1009ee..7ba8dd472b4549 100644
--- a/src/ui/public/directives/validate_lowercase.js
+++ b/src/ui/public/directives/validate_lowercase.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
uiModules
diff --git a/src/ui/public/dirty_prompt/dirty_prompt.factory.js b/src/ui/public/dirty_prompt/dirty_prompt.factory.js
index 030f2cd0c858d6..102496f82ea3fa 100644
--- a/src/ui/public/dirty_prompt/dirty_prompt.factory.js
+++ b/src/ui/public/dirty_prompt/dirty_prompt.factory.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import { DirtyPrompt } from './dirty_prompt';
diff --git a/src/ui/public/dirty_prompt/dirty_prompt.js b/src/ui/public/dirty_prompt/dirty_prompt.js
index f2bc1f4877c729..af7a73fc43d726 100644
--- a/src/ui/public/dirty_prompt/dirty_prompt.js
+++ b/src/ui/public/dirty_prompt/dirty_prompt.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { noop } from 'lodash';
const confirmMessage = `You have unsaved changes. Proceed and discard changes?`;
diff --git a/src/ui/public/dirty_prompt/index.js b/src/ui/public/dirty_prompt/index.js
index 736fa8521f7710..379d6d00695756 100644
--- a/src/ui/public/dirty_prompt/index.js
+++ b/src/ui/public/dirty_prompt/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './dirty_prompt.factory';
diff --git a/src/ui/public/doc_table/__tests__/actions/filter.js b/src/ui/public/doc_table/__tests__/actions/filter.js
index d30985403e4e7b..e713d73f5a97fd 100644
--- a/src/ui/public/doc_table/__tests__/actions/filter.js
+++ b/src/ui/public/doc_table/__tests__/actions/filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { addFilter } from '../../actions/filter';
import { FilterManagerProvider } from '../../../filter_manager';
import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js
index 1553b4fe21091e..7a00effd88f687 100644
--- a/src/ui/public/doc_table/__tests__/doc_table.js
+++ b/src/ui/public/doc_table/__tests__/doc_table.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import _ from 'lodash';
diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js
index 243dcf73e3f605..3ea586f4579936 100644
--- a/src/ui/public/doc_table/__tests__/lib/get_sort.js
+++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
index 4235fb1e590161..3e1e03131e635b 100644
--- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js
+++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import _ from 'lodash';
import sinon from 'sinon';
diff --git a/src/ui/public/doc_table/actions/columns.js b/src/ui/public/doc_table/actions/columns.js
index 038f17cd28903d..0d66841ccd2c14 100644
--- a/src/ui/public/doc_table/actions/columns.js
+++ b/src/ui/public/doc_table/actions/columns.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function addColumn(columns, columnName) {
if (columns.includes(columnName)) {
return;
diff --git a/src/ui/public/doc_table/actions/filter.js b/src/ui/public/doc_table/actions/filter.js
index b9049519e37676..0156089148f4eb 100644
--- a/src/ui/public/doc_table/actions/filter.js
+++ b/src/ui/public/doc_table/actions/filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function addFilter(field, values = [], operation, index, state, filterManager) {
if (!Array.isArray(values)) {
values = [values];
diff --git a/src/ui/public/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js
index 0429997fc05a9b..12966813331ed3 100644
--- a/src/ui/public/doc_table/components/table_header.js
+++ b/src/ui/public/doc_table/components/table_header.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import './table_header.less';
import '../../filters/short_dots';
diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js
index 85c3111101bb3d..7a25034628246e 100644
--- a/src/ui/public/doc_table/components/table_row.js
+++ b/src/ui/public/doc_table/components/table_row.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import $ from 'jquery';
import rison from 'rison-node';
diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js
index 599d7002de0c4b..c8d1efea19457c 100644
--- a/src/ui/public/doc_table/doc_table.js
+++ b/src/ui/public/doc_table/doc_table.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import html from './doc_table.html';
import { getSort } from './lib/get_sort';
diff --git a/src/ui/public/doc_table/doc_table_strings.js b/src/ui/public/doc_table/doc_table_strings.js
index ff63a8b617e581..9b9b1f7cba47a4 100644
--- a/src/ui/public/doc_table/doc_table_strings.js
+++ b/src/ui/public/doc_table/doc_table_strings.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* A message letting the user know the results that have been retrieved is limited
* to a certain size.
diff --git a/src/ui/public/doc_table/index.js b/src/ui/public/doc_table/index.js
index 278413cfbe5e15..1eb1f10114d532 100644
--- a/src/ui/public/doc_table/index.js
+++ b/src/ui/public/doc_table/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './doc_table';
diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js
index dc4cd0fcce73f4..428dcb846fa797 100644
--- a/src/ui/public/doc_table/lib/get_sort.js
+++ b/src/ui/public/doc_table/lib/get_sort.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
/**
diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js
index 2053d361099dad..4c459a17a6c698 100644
--- a/src/ui/public/doc_title/__tests__/doc_title.js
+++ b/src/ui/public/doc_title/__tests__/doc_title.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js
index 228ec67048e79f..1a0fde0e2486fc 100644
--- a/src/ui/public/doc_title/doc_title.js
+++ b/src/ui/public/doc_title/doc_title.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../modules';
diff --git a/src/ui/public/doc_title/index.js b/src/ui/public/doc_title/index.js
index f6d1effb96e06f..06018b0c20dcf2 100644
--- a/src/ui/public/doc_title/index.js
+++ b/src/ui/public/doc_title/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './doc_title';
export { DocTitleProvider } from './doc_title';
diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
index cc87e2af6afc01..141f41393cf2e4 100644
--- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js
+++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import _ from 'lodash';
import expect from 'expect.js';
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
index 8a14e2e15e1d71..e9036b9443b7a0 100644
--- a/src/ui/public/doc_viewer/doc_viewer.js
+++ b/src/ui/public/doc_viewer/doc_viewer.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import { uiModules } from '../modules';
import { DocViewsRegistryProvider } from '../registry/doc_views';
diff --git a/src/ui/public/doc_viewer/index.js b/src/ui/public/doc_viewer/index.js
index 3384281b2065b6..791a881fd17bc2 100644
--- a/src/ui/public/doc_viewer/index.js
+++ b/src/ui/public/doc_viewer/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './doc_viewer';
diff --git a/src/ui/public/documentation_links/__tests__/documentation_links.js b/src/ui/public/documentation_links/__tests__/documentation_links.js
index 47508f53e0148a..7bc119d5ef7d8c 100644
--- a/src/ui/public/documentation_links/__tests__/documentation_links.js
+++ b/src/ui/public/documentation_links/__tests__/documentation_links.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import { documentationLinks } from '../documentation_links';
import { metadata } from '../../metadata';
diff --git a/src/ui/public/documentation_links/documentation_links.js b/src/ui/public/documentation_links/documentation_links.js
index a8e92235a77058..789386f3e0edc5 100644
--- a/src/ui/public/documentation_links/documentation_links.js
+++ b/src/ui/public/documentation_links/documentation_links.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { metadata } from '../metadata';
export const DOC_LINK_VERSION = metadata.branch;
diff --git a/src/ui/public/documentation_links/get_doc_link.js b/src/ui/public/documentation_links/get_doc_link.js
index dcf44a3bfd3018..dc734453f876a2 100644
--- a/src/ui/public/documentation_links/get_doc_link.js
+++ b/src/ui/public/documentation_links/get_doc_link.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { get } from 'lodash';
import { documentationLinks } from './documentation_links';
diff --git a/src/ui/public/documentation_links/index.js b/src/ui/public/documentation_links/index.js
index 8093a7ce9b8a02..21ca740b216f7d 100644
--- a/src/ui/public/documentation_links/index.js
+++ b/src/ui/public/documentation_links/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 {
ELASTIC_WEBSITE_URL,
DOC_LINK_VERSION,
diff --git a/src/ui/public/dom_location.js b/src/ui/public/dom_location.js
index 3ae54a0994a1da..39266e0eeaac77 100644
--- a/src/ui/public/dom_location.js
+++ b/src/ui/public/dom_location.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function DomLocationProvider($window) {
return {
reload: function (forceFetch) {
diff --git a/src/ui/public/draggable/__tests__/draggable.js b/src/ui/public/draggable/__tests__/draggable.js
index 6b083cb8a481a5..8cba8a8ebb11c8 100644
--- a/src/ui/public/draggable/__tests__/draggable.js
+++ b/src/ui/public/draggable/__tests__/draggable.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/draggable/draggable_container.js b/src/ui/public/draggable/draggable_container.js
index 3855a1a557c6a3..22d1aae7fbdde2 100644
--- a/src/ui/public/draggable/draggable_container.js
+++ b/src/ui/public/draggable/draggable_container.js
@@ -1,3 +1,22 @@
+/*
+ * 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 dragula from 'dragula';
import { uiModules } from '../modules';
import { move } from '../utils/collection';
diff --git a/src/ui/public/draggable/draggable_handle.js b/src/ui/public/draggable/draggable_handle.js
index aa5f68f47f943a..fe6eef0823b084 100644
--- a/src/ui/public/draggable/draggable_handle.js
+++ b/src/ui/public/draggable/draggable_handle.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
uiModules
diff --git a/src/ui/public/draggable/draggable_item.js b/src/ui/public/draggable/draggable_item.js
index 81beb075d563aa..7e4b7fee63ca1f 100644
--- a/src/ui/public/draggable/draggable_item.js
+++ b/src/ui/public/draggable/draggable_item.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import { uiModules } from '../modules';
diff --git a/src/ui/public/elastic_textarea.js b/src/ui/public/elastic_textarea.js
index e58f550f7ade02..fcb0775a050d22 100644
--- a/src/ui/public/elastic_textarea.js
+++ b/src/ui/public/elastic_textarea.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from './modules';
const NL_RE = /\n/g;
diff --git a/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js b/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
index e372c8dc3dc963..bd30781a7d77bb 100644
--- a/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
+++ b/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import { ElasticsearchError } from '../elasticsearch_error';
diff --git a/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js b/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
index c849c7a59d08aa..6820276ee7df53 100644
--- a/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
+++ b/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import { isTermSizeZeroError } from '../is_term_size_zero_error';
diff --git a/src/ui/public/elasticsearch_errors/elasticsearch_error.js b/src/ui/public/elasticsearch_errors/elasticsearch_error.js
index a20e4e267ff7b8..2275b328751a89 100644
--- a/src/ui/public/elasticsearch_errors/elasticsearch_error.js
+++ b/src/ui/public/elasticsearch_errors/elasticsearch_error.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
export class ElasticsearchError {
diff --git a/src/ui/public/elasticsearch_errors/index.js b/src/ui/public/elasticsearch_errors/index.js
index b5fe4727d77ffa..f2929b5b059ac4 100644
--- a/src/ui/public/elasticsearch_errors/index.js
+++ b/src/ui/public/elasticsearch_errors/index.js
@@ -1,2 +1,21 @@
+/*
+ * 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 { ElasticsearchError } from './elasticsearch_error';
export { isTermSizeZeroError } from './is_term_size_zero_error';
diff --git a/src/ui/public/elasticsearch_errors/is_term_size_zero_error.js b/src/ui/public/elasticsearch_errors/is_term_size_zero_error.js
index a5afc5f6f583d1..f83eca3d14cfec 100644
--- a/src/ui/public/elasticsearch_errors/is_term_size_zero_error.js
+++ b/src/ui/public/elasticsearch_errors/is_term_size_zero_error.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { ElasticsearchError } from './elasticsearch_error';
export function isTermSizeZeroError(error) {
diff --git a/src/ui/public/embeddable/embeddable.js b/src/ui/public/embeddable/embeddable.js
index 8b1cf57ff5e399..a98c41b13573a0 100644
--- a/src/ui/public/embeddable/embeddable.js
+++ b/src/ui/public/embeddable/embeddable.js
@@ -1,3 +1,24 @@
+/*
+ * 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';
+
/**
* @typedef {Object} EmbeddableMetadata - data that does not change over the course of the embeddables life span.
* @property {string} title
@@ -5,6 +26,12 @@
* @property {IndexPattern} indexPattern
*/
+export const embeddableShape = PropTypes.shape({
+ metadata: PropTypes.object.isRequired,
+ onContainerStateChanged: PropTypes.func.isRequired,
+ render: PropTypes.func.isRequired,
+ destroy: PropTypes.func.isRequired,
+});
export class Embeddable {
/**
@@ -41,8 +68,9 @@ export class Embeddable {
/**
* @param {Element} domNode - the dom node to mount the rendered embeddable on
+ * @param {ContainerState} containerState
*/
- render(/*domNode*/) {}
+ render(/*domNode, containerState*/) {}
destroy() {}
}
diff --git a/src/ui/public/embeddable/embeddable_factories_registry.js b/src/ui/public/embeddable/embeddable_factories_registry.js
index 1b4a291f3fe2ac..7f69625b02248b 100644
--- a/src/ui/public/embeddable/embeddable_factories_registry.js
+++ b/src/ui/public/embeddable/embeddable_factories_registry.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiRegistry } from '../registry/_registry';
/**
diff --git a/src/ui/public/embeddable/embeddable_factory.js b/src/ui/public/embeddable/embeddable_factory.js
index 349d37a45a50d3..bda401b62c2693 100644
--- a/src/ui/public/embeddable/embeddable_factory.js
+++ b/src/ui/public/embeddable/embeddable_factory.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* @typedef {Object} EmbeddableState
* @property {Object} customization - any customization data that should be stored at the panel level. For
diff --git a/src/ui/public/embeddable/index.js b/src/ui/public/embeddable/index.js
index d9449c54246604..164d6a4f9252b3 100644
--- a/src/ui/public/embeddable/index.js
+++ b/src/ui/public/embeddable/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { EmbeddableFactory } from './embeddable_factory';
-export { Embeddable } from './embeddable';
+export * from './embeddable';
export { EmbeddableFactoriesRegistryProvider } from './embeddable_factories_registry';
diff --git a/src/ui/public/error_allow_explicit_index/error_allow_explicit_index.js b/src/ui/public/error_allow_explicit_index/error_allow_explicit_index.js
index 6694071da401cd..f9f02e167d98bd 100644
--- a/src/ui/public/error_allow_explicit_index/error_allow_explicit_index.js
+++ b/src/ui/public/error_allow_explicit_index/error_allow_explicit_index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { get } from 'lodash';
import uiRoutes from '../routes';
diff --git a/src/ui/public/error_allow_explicit_index/index.js b/src/ui/public/error_allow_explicit_index/index.js
index eee252ff860ef1..a832fde31c987f 100644
--- a/src/ui/public/error_allow_explicit_index/index.js
+++ b/src/ui/public/error_allow_explicit_index/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { ErrorAllowExplicitIndexProvider } from './error_allow_explicit_index';
diff --git a/src/ui/public/error_auto_create_index/error_auto_create_index.js b/src/ui/public/error_auto_create_index/error_auto_create_index.js
index 24b1e92b8782c4..71fc57ac73e6cb 100644
--- a/src/ui/public/error_auto_create_index/error_auto_create_index.js
+++ b/src/ui/public/error_auto_create_index/error_auto_create_index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { get } from 'lodash';
import uiRoutes from '../routes';
diff --git a/src/ui/public/error_auto_create_index/index.js b/src/ui/public/error_auto_create_index/index.js
index eafeda9c2e7278..499753246c9f96 100644
--- a/src/ui/public/error_auto_create_index/index.js
+++ b/src/ui/public/error_auto_create_index/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { ErrorAutoCreateIndexProvider } from './error_auto_create_index';
diff --git a/src/ui/public/error_url_overflow/__tests__/ie_regex.js b/src/ui/public/error_url_overflow/__tests__/ie_regex.js
index e9d5d8ca5faf43..75d114e397fb87 100644
--- a/src/ui/public/error_url_overflow/__tests__/ie_regex.js
+++ b/src/ui/public/error_url_overflow/__tests__/ie_regex.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import { IE_REGEX } from '../url_overflow_service.js';
diff --git a/src/ui/public/error_url_overflow/error_url_overflow.js b/src/ui/public/error_url_overflow/error_url_overflow.js
index 780de70e3fbb12..2ca1049b6e91bf 100644
--- a/src/ui/public/error_url_overflow/error_url_overflow.js
+++ b/src/ui/public/error_url_overflow/error_url_overflow.js
@@ -1,3 +1,22 @@
+/*
+ * 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 uiRoutes from '../routes';
import { KbnUrlProvider } from '../url';
diff --git a/src/ui/public/error_url_overflow/index.js b/src/ui/public/error_url_overflow/index.js
index 3f75e4494bf39a..b3e08fd89c76e5 100644
--- a/src/ui/public/error_url_overflow/index.js
+++ b/src/ui/public/error_url_overflow/index.js
@@ -1,2 +1,21 @@
+/*
+ * 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 './error_url_overflow';
export { UrlOverflowServiceProvider } from './url_overflow_service';
diff --git a/src/ui/public/error_url_overflow/url_overflow_service.js b/src/ui/public/error_url_overflow/url_overflow_service.js
index addd7e125d6bf8..4e4b2ad634f504 100644
--- a/src/ui/public/error_url_overflow/url_overflow_service.js
+++ b/src/ui/public/error_url_overflow/url_overflow_service.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
const URL_MAX_IE = 2000;
const URL_MAX_OTHERS = 25000;
export const IE_REGEX = /(; ?MSIE |Edge\/\d|Trident\/[\d+\.]+;.*rv:*11\.\d+)/;
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
index 2fdff5c6cffac2..d7492d8da3aee7 100644
--- a/src/ui/public/errors.js
+++ b/src/ui/public/errors.js
@@ -1,3 +1,22 @@
+/*
+ * 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 angular from 'angular';
import { createLegacyClass } from './utils/legacy_class';
diff --git a/src/ui/public/es.js b/src/ui/public/es.js
index 5308bf491b00a5..d1204f8316f0d7 100644
--- a/src/ui/public/es.js
+++ b/src/ui/public/es.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* @name es
*
diff --git a/src/ui/public/events.js b/src/ui/public/events.js
index edfeb2c48bdf73..b8ad36ad15e5a3 100644
--- a/src/ui/public/events.js
+++ b/src/ui/public/events.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* @name Events
*
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
index c761e9e586b5b0..913f647db33601 100644
--- a/src/ui/public/factories/__tests__/base_object.js
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import '../../private';
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
index c6d8ce4e173d8c..c9ba7f5798544b 100644
--- a/src/ui/public/factories/__tests__/events.js
+++ b/src/ui/public/factories/__tests__/events.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
index d76e65739f12b8..04fcd5717e112a 100644
--- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js
+++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
diff --git a/src/ui/public/fancy_forms/__tests__/nested_fancy_forms.js b/src/ui/public/fancy_forms/__tests__/nested_fancy_forms.js
index 79cabc279b1a86..005e6441b03a8e 100644
--- a/src/ui/public/fancy_forms/__tests__/nested_fancy_forms.js
+++ b/src/ui/public/fancy_forms/__tests__/nested_fancy_forms.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'sinon';
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
index cb6ae667b8bd73..4d461f657be718 100644
--- a/src/ui/public/fancy_forms/fancy_forms.js
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { uiModules } from '../modules';
import { decorateFormController } from './kbn_form_controller';
diff --git a/src/ui/public/fancy_forms/index.js b/src/ui/public/fancy_forms/index.js
index 38cac2fc5a6b18..927e6d69e3c8a3 100644
--- a/src/ui/public/fancy_forms/index.js
+++ b/src/ui/public/fancy_forms/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './fancy_forms';
diff --git a/src/ui/public/fancy_forms/kbn_form_controller.js b/src/ui/public/fancy_forms/kbn_form_controller.js
index fd29058e8c1dd6..f376d8dfe34606 100644
--- a/src/ui/public/fancy_forms/kbn_form_controller.js
+++ b/src/ui/public/fancy_forms/kbn_form_controller.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function decorateFormController($delegate, $injector) {
const [directive] = $delegate;
const FormController = directive.controller;
diff --git a/src/ui/public/fancy_forms/kbn_model_controller.js b/src/ui/public/fancy_forms/kbn_model_controller.js
index 4345f20c5de1ac..ce4e8a8230be66 100644
--- a/src/ui/public/fancy_forms/kbn_model_controller.js
+++ b/src/ui/public/fancy_forms/kbn_model_controller.js
@@ -1,3 +1,22 @@
+/*
+ * 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 function decorateModelController($delegate, $injector) {
const [directive] = $delegate;
const ModelController = directive.controller;
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
index d42c823075dc04..7cc9d538c00e61 100644
--- a/src/ui/public/field_editor/__tests__/field_editor.js
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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 $ from 'jquery';
import ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index 243bcf497453b6..a43250b3216d81 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '../field_format_editor';
import _ from 'lodash';
@@ -72,7 +91,7 @@ uiModules
}
if (!self.selectedFormatId) {
- delete indexPattern.fieldFormatMap[field.name];
+ indexPattern.fieldFormatMap[field.name] = {};
} else {
indexPattern.fieldFormatMap[field.name] = self.field.format;
}
@@ -116,12 +135,20 @@ uiModules
const changedFormat = cur !== prev;
const missingFormat = cur && (!format || format.type.id !== cur);
- if (!changedFormat || !missingFormat) return;
+ if (!changedFormat || !missingFormat) {
+ return;
+ }
// reset to the defaults, but make sure it's an object
const FieldFormat = getFieldFormatType();
const paramDefaults = new FieldFormat({}, getConfig).getParamDefaults();
+ const currentFormatParams = self.formatParams;
self.formatParams = _.assign({}, _.cloneDeep(paramDefaults));
+ // If there are no current or new params, the watch will not trigger
+ // so manually update the format here
+ if (_.size(currentFormatParams) === 0 && _.size(self.formatParams) === 0) {
+ self.field.format = new FieldFormat(self.formatParams, getConfig);
+ }
});
$scope.$watch('editor.formatParams', function () {
diff --git a/src/ui/public/field_editor/index.js b/src/ui/public/field_editor/index.js
index 7e26c1dcdc21af..d6f4251fa0a6ea 100644
--- a/src/ui/public/field_editor/index.js
+++ b/src/ui/public/field_editor/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './field_editor';
diff --git a/src/ui/public/field_format_editor/editors/color/color.js b/src/ui/public/field_format_editor/editors/color/color.js
index 7d9e02ffcd545a..60c083b4a15a50 100644
--- a/src/ui/public/field_format_editor/editors/color/color.js
+++ b/src/ui/public/field_format_editor/editors/color/color.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './color.less';
import colorTemplate from './color.html';
import { DEFAULT_COLOR } from '../../../../../core_plugins/kibana/common/field_formats/types/color_default';
diff --git a/src/ui/public/field_format_editor/editors/color/index.js b/src/ui/public/field_format_editor/editors/color/index.js
index 39752028181456..5f26c0bea6ab73 100644
--- a/src/ui/public/field_format_editor/editors/color/index.js
+++ b/src/ui/public/field_format_editor/editors/color/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { colorEditor } from './color';
diff --git a/src/ui/public/field_format_editor/editors/date/date.js b/src/ui/public/field_format_editor/editors/date/date.js
index d41c8c5ad50e5f..c35b9ffcfb306f 100644
--- a/src/ui/public/field_format_editor/editors/date/date.js
+++ b/src/ui/public/field_format_editor/editors/date/date.js
@@ -1,3 +1,22 @@
+/*
+ * 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 dateTemplate from './date.html';
import moment from 'moment';
diff --git a/src/ui/public/field_format_editor/editors/date/index.js b/src/ui/public/field_format_editor/editors/date/index.js
index 8ce6806c6a8f12..b859ee5030c0df 100644
--- a/src/ui/public/field_format_editor/editors/date/index.js
+++ b/src/ui/public/field_format_editor/editors/date/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { dateEditor } from './date';
diff --git a/src/ui/public/field_format_editor/editors/duration/duration.js b/src/ui/public/field_format_editor/editors/duration/duration.js
index 2ec1cbf2415a4a..9909ca74236efa 100644
--- a/src/ui/public/field_format_editor/editors/duration/duration.js
+++ b/src/ui/public/field_format_editor/editors/duration/duration.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './duration.less';
import durationTemplate from './duration.html';
diff --git a/src/ui/public/field_format_editor/editors/duration/index.js b/src/ui/public/field_format_editor/editors/duration/index.js
index 8de49d818f83bb..71078715bf3a34 100644
--- a/src/ui/public/field_format_editor/editors/duration/index.js
+++ b/src/ui/public/field_format_editor/editors/duration/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { durationEditor } from './duration';
diff --git a/src/ui/public/field_format_editor/editors/numeral/bytes.js b/src/ui/public/field_format_editor/editors/numeral/bytes.js
index ee4f2b12843eb8..f086464b0edbdf 100644
--- a/src/ui/public/field_format_editor/editors/numeral/bytes.js
+++ b/src/ui/public/field_format_editor/editors/numeral/bytes.js
@@ -1,3 +1,22 @@
+/*
+ * 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 numeralTemplate from './numeral.html';
export function bytesEditor() {
diff --git a/src/ui/public/field_format_editor/editors/numeral/number.js b/src/ui/public/field_format_editor/editors/numeral/number.js
index 65f437655b463b..ddc1e68af5f798 100644
--- a/src/ui/public/field_format_editor/editors/numeral/number.js
+++ b/src/ui/public/field_format_editor/editors/numeral/number.js
@@ -1,3 +1,22 @@
+/*
+ * 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 numeralTemplate from './numeral.html';
export function numberEditor() {
diff --git a/src/ui/public/field_format_editor/editors/numeral/percent.js b/src/ui/public/field_format_editor/editors/numeral/percent.js
index 3aaf46ab9d7b4a..75984eddc281a5 100644
--- a/src/ui/public/field_format_editor/editors/numeral/percent.js
+++ b/src/ui/public/field_format_editor/editors/numeral/percent.js
@@ -1,3 +1,22 @@
+/*
+ * 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 numeralTemplate from './numeral.html';
export function percentEditor() {
diff --git a/src/ui/public/field_format_editor/editors/string/index.js b/src/ui/public/field_format_editor/editors/string/index.js
index 414458b8ed6850..4971d835e88a35 100644
--- a/src/ui/public/field_format_editor/editors/string/index.js
+++ b/src/ui/public/field_format_editor/editors/string/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { stringEditor } from './string';
diff --git a/src/ui/public/field_format_editor/editors/string/string.js b/src/ui/public/field_format_editor/editors/string/string.js
index 4c8788ac493d4e..00efd11d44f028 100644
--- a/src/ui/public/field_format_editor/editors/string/string.js
+++ b/src/ui/public/field_format_editor/editors/string/string.js
@@ -1,3 +1,22 @@
+/*
+ * 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 stringTemplate from './string.html';
export function stringEditor() {
diff --git a/src/ui/public/field_format_editor/editors/truncate/index.js b/src/ui/public/field_format_editor/editors/truncate/index.js
index d8762880564714..7d7b2af1794a70 100644
--- a/src/ui/public/field_format_editor/editors/truncate/index.js
+++ b/src/ui/public/field_format_editor/editors/truncate/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { truncateEditor } from './truncate';
diff --git a/src/ui/public/field_format_editor/editors/truncate/truncate.js b/src/ui/public/field_format_editor/editors/truncate/truncate.js
index d58e0eeb13934f..528fffb24e8379 100644
--- a/src/ui/public/field_format_editor/editors/truncate/truncate.js
+++ b/src/ui/public/field_format_editor/editors/truncate/truncate.js
@@ -1,3 +1,22 @@
+/*
+ * 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 truncateTemplate from './truncate.html';
import largeString from './large.html';
diff --git a/src/ui/public/field_format_editor/editors/url/icons/index.js b/src/ui/public/field_format_editor/editors/url/icons/index.js
index 3c663303977f16..7e251d7cae7127 100644
--- a/src/ui/public/field_format_editor/editors/url/icons/index.js
+++ b/src/ui/public/field_format_editor/editors/url/icons/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '!!file-loader?name=[path][name].[ext]!ui/field_format_editor/editors/url/icons/go.png';
import '!!file-loader?name=[path][name].[ext]!ui/field_format_editor/editors/url/icons/stop.png';
import '!!file-loader?name=[path][name].[ext]!ui/field_format_editor/editors/url/icons/de.png';
diff --git a/src/ui/public/field_format_editor/editors/url/index.js b/src/ui/public/field_format_editor/editors/url/index.js
index 7f58a44a23caa8..157ab469095125 100644
--- a/src/ui/public/field_format_editor/editors/url/index.js
+++ b/src/ui/public/field_format_editor/editors/url/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { urlEditor } from './url';
diff --git a/src/ui/public/field_format_editor/editors/url/url.js b/src/ui/public/field_format_editor/editors/url/url.js
index d2c26669248ba0..938dd4038c3942 100644
--- a/src/ui/public/field_format_editor/editors/url/url.js
+++ b/src/ui/public/field_format_editor/editors/url/url.js
@@ -1,3 +1,22 @@
+/*
+ * 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 urlTemplate from './url.html';
import './icons';
diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
index c7d769c669bd2c..9d94fc23882b65 100644
--- a/src/ui/public/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -1,3 +1,22 @@
+/*
+ * 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 './pattern/pattern';
import './samples/samples';
import _ from 'lodash';
diff --git a/src/ui/public/field_format_editor/index.js b/src/ui/public/field_format_editor/index.js
index d2e94738c0f4ab..28871f415f6010 100644
--- a/src/ui/public/field_format_editor/index.js
+++ b/src/ui/public/field_format_editor/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './field_format_editor';
diff --git a/src/ui/public/field_format_editor/pattern/index.js b/src/ui/public/field_format_editor/pattern/index.js
index 540bdd14d1a469..768a64a34cc98e 100644
--- a/src/ui/public/field_format_editor/pattern/index.js
+++ b/src/ui/public/field_format_editor/pattern/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './pattern';
diff --git a/src/ui/public/field_format_editor/pattern/pattern.js b/src/ui/public/field_format_editor/pattern/pattern.js
index f6c446c1c2d4e5..bd438833430471 100644
--- a/src/ui/public/field_format_editor/pattern/pattern.js
+++ b/src/ui/public/field_format_editor/pattern/pattern.js
@@ -1,3 +1,22 @@
+/*
+ * 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 '../samples/samples';
import { uiModules } from '../../modules';
import patternTemplate from './pattern.html';
diff --git a/src/ui/public/field_format_editor/register.js b/src/ui/public/field_format_editor/register.js
index 3a28eacf3b0a45..4ed528eb1f5309 100644
--- a/src/ui/public/field_format_editor/register.js
+++ b/src/ui/public/field_format_editor/register.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { RegistryFieldFormatEditorsProvider } from '../registry/field_format_editors';
import { bytesEditor } from './editors/numeral/bytes';
import { colorEditor } from './editors/color/color';
diff --git a/src/ui/public/field_format_editor/samples/index.js b/src/ui/public/field_format_editor/samples/index.js
index 161a81bd50b483..0a9b253d3b9b49 100644
--- a/src/ui/public/field_format_editor/samples/index.js
+++ b/src/ui/public/field_format_editor/samples/index.js
@@ -1 +1,20 @@
+/*
+ * 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 './samples';
diff --git a/src/ui/public/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js
index 521933a99ea610..ace7a731c0755b 100644
--- a/src/ui/public/field_format_editor/samples/samples.js
+++ b/src/ui/public/field_format_editor/samples/samples.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import { uiModules } from '../../modules';
import samplesTemplate from './samples.html';
diff --git a/src/ui/public/field_wildcard/__tests__/field_wildcard.js b/src/ui/public/field_wildcard/__tests__/field_wildcard.js
index b290df4a4d5b7c..5b588726204eda 100644
--- a/src/ui/public/field_wildcard/__tests__/field_wildcard.js
+++ b/src/ui/public/field_wildcard/__tests__/field_wildcard.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/field_wildcard/field_wildcard.js b/src/ui/public/field_wildcard/field_wildcard.js
index dcb387fe0b89f8..a07ee552483c69 100644
--- a/src/ui/public/field_wildcard/field_wildcard.js
+++ b/src/ui/public/field_wildcard/field_wildcard.js
@@ -1,3 +1,22 @@
+/*
+ * 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 { escapeRegExp, memoize } from 'lodash';
export function FieldWildcardProvider(config) {
diff --git a/src/ui/public/field_wildcard/index.js b/src/ui/public/field_wildcard/index.js
index dccbb2f5b4e6d2..d03643f8804d89 100644
--- a/src/ui/public/field_wildcard/index.js
+++ b/src/ui/public/field_wildcard/index.js
@@ -1 +1,20 @@
+/*
+ * 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 { FieldWildcardProvider } from './field_wildcard';
diff --git a/src/ui/public/filter_bar/__tests__/_add_filters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js
index 3e7df03bacef29..a744992511432b 100644
--- a/src/ui/public/filter_bar/__tests__/_add_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_add_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/filter_bar/__tests__/_get_filters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js
index e05614f5ba07e9..5b0abd9efcdf43 100644
--- a/src/ui/public/filter_bar/__tests__/_get_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_get_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import ngMock from 'ng_mock';
import expect from 'expect.js';
diff --git a/src/ui/public/filter_bar/__tests__/_invert_filters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js
index e1ca6615dc0c6c..61024873ecb1fd 100644
--- a/src/ui/public/filter_bar/__tests__/_invert_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_invert_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/filter_bar/__tests__/_pin_filters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js
index dc293ece017282..f84d07effc4cad 100644
--- a/src/ui/public/filter_bar/__tests__/_pin_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_pin_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/filter_bar/__tests__/_remove_filters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js
index c3a8143532448d..69a0942e205a27 100644
--- a/src/ui/public/filter_bar/__tests__/_remove_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_remove_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
diff --git a/src/ui/public/filter_bar/__tests__/_toggle_filters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
index 82d36e01fbfefc..d4205d542bdaaa 100644
--- a/src/ui/public/filter_bar/__tests__/_toggle_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ng_mock';
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index 8c94c08e639f3a..b06de1d8b15537 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -1,3 +1,22 @@
+/*
+ * 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 _ from 'lodash';
import ngMock from 'ng_mock';
import expect from 'expect.js';
@@ -114,5 +133,96 @@ describe('Filter Bar Directive', function () {
expect($scope.addFilters.called).to.be(true);
});
});
+
+ describe('show and hide filters', function () {
+ let scope;
+
+ beforeEach(() => {
+ scope = $rootScope.$new();
+ });
+
+ function create(attrs) {
+ const template = `
+ `;
+
+ const element = $compile(template)(scope);
+
+ scope.$apply(() => {
+ Object.assign(scope, attrs);
+ });
+
+ return element;
+ }
+
+
+ describe('collapse filters', function () {
+ let element;
+
+ beforeEach(function () {
+ element = create({
+ filterNavToggle: {
+ isOpen: false
+ }
+ });
+ });
+
+ it('should be able to collapse filters', function () {
+ expect(element.hasClass('filter-panel-close')).to.be(true);
+ });
+
+ it('should be able to see `actions`', function () {
+ expect(element.find('.filter-link.pull-right').hasClass('action-show')).to.be(true);
+ });
+
+ it('should be able to view the same button for `expand`', function () {
+ expect(element.find('.filter-nav-link__icon').hasClass('filter-nav-link--close')).to.be(true);
+ });
+ });
+
+ describe('expand filters', function () {
+ let element;
+
+ beforeEach(function () {
+ element = create({
+ filterNavToggle: {
+ isOpen: true
+ }
+ });
+ });
+
+ it('should be able to expand filters', function () {
+ expect(element.hasClass('filter-panel-close')).to.be(false);
+ });
+
+ it('should be able to view the `actions` at the bottom of the filter-bar', function () {
+ expect(element.find('.filter-link.pull-right').hasClass('action-show')).to.be(false);
+ });
+
+ it('should be able to view the same button for `collapse`', function () {
+ expect(element.find('.filter-nav-link__icon').hasClass('filter-nav-link--close')).to.be(false);
+ });
+ });
+
+ });
+
});
});
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js b/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
index 76582fa3caae20..612956327c18fe 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
@@ -1,3 +1,22 @@
+/*
+ * 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 ngMock from 'ng_mock';
import expect from 'expect.js';
@@ -39,7 +58,7 @@ describe('filterBarClickHandler', function () {
};
}));
- afterEach(function () {
+ beforeEach(function () {
toastNotifications.list.splice(0);
});
diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js
index d45e2a107acd8e..7d8e38b8af7f8b 100644
--- a/src/ui/public/filter_bar/__tests__/push_filter.js
+++ b/src/ui/public/filter_bar/__tests__/push_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import { FilterBarPushFilterProvider } from '../push_filter';
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
index fe87dc0df0b6c1..e3d8a0e8b61d27 100644
--- a/src/ui/public/filter_bar/__tests__/query_filter.js
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -1,3 +1,22 @@
+/*
+ * 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 expect from 'expect.js';
import ngMock from 'ng_mock';
import './_get_filters';
diff --git a/src/ui/public/filter_bar/filter_bar.html b/src/ui/public/filter_bar/filter_bar.html
index ac2ca4cad49e11..30222bfa1977a6 100644
--- a/src/ui/public/filter_bar/filter_bar.html
+++ b/src/ui/public/filter_bar/filter_bar.html
@@ -26,17 +26,20 @@
+
+
+
+
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js
index 870c0353945d4c..24a1fdcbebd5a8 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js
@@ -5,6 +5,8 @@
*/
import { uiModules } from 'ui/modules';
+import { EDITOR } from '../../../../../common/constants';
+import { applyEditorOptions } from '../../../../lib/ace';
import template from './event_input.html';
import './event_input.less';
import 'ace';
@@ -27,14 +29,7 @@ app.directive('eventInput', function () {
});
$scope.aceLoaded = (editor) => {
this.editor = editor;
- editor.getSession().setUseWrapMode(true);
- editor.setOptions({
- highlightActiveLine: false,
- highlightGutterLine: false,
- minLines: 3,
- maxLines: 10
- });
- editor.$blockScrolling = Infinity;
+ applyEditorOptions(editor, EDITOR.SAMPLE_DATA_MIN_LINES, EDITOR.SAMPLE_DATA_MAX_LINES);
};
}
}
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grokdebugger/grokdebugger.less b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grokdebugger/grokdebugger.less
index 9d7df2f2a3e6eb..ac2b1367e20ed0 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grokdebugger/grokdebugger.less
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grokdebugger/grokdebugger.less
@@ -18,4 +18,25 @@ grokdebugger {
.grokdebugger-simulate-button {
margin-bottom: 10px;
}
+
+ .ace_grokStart,
+ .ace_grokEnd,
+ .ace_grokSeparator,
+ .ace_grokEscape {
+ color: #999999; // euiColorMediumShade
+ }
+
+ .ace_grokPatternName {
+ color: #017F75; // euiColorSecondary
+ }
+
+ .ace_grokFieldName,
+ .ace_grokRegex {
+ color: #0079A5; // euiColorPrimary
+ }
+
+ .ace_grokFieldType {
+ color: #0079A5; // euiColorPrimary
+ font-style: italic;
+ }
}
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.html b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.html
index 32f35386ad3208..4c6acc5d374b18 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.html
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.html
@@ -3,14 +3,16 @@
-
+
+
+
diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js
index 7fd4417fb2914d..d3119849dcedcb 100644
--- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js
+++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js
@@ -5,8 +5,13 @@
*/
import { uiModules } from 'ui/modules';
+import { EDITOR } from '../../../../../common/constants';
import template from './pattern_input.html';
import './pattern_input.less';
+import {
+ applyEditorOptions,
+ GrokMode
+} from '../../../../lib/ace';
const app = uiModules.get('xpack/grokdebugger');
@@ -26,14 +31,8 @@ app.directive('patternInput', function () {
});
$scope.aceLoaded = (editor) => {
this.editor = editor;
- editor.getSession().setUseWrapMode(true);
- editor.setOptions({
- highlightActiveLine: false,
- highlightGutterLine: false,
- minLines: 3,
- maxLines: 10
- });
- editor.$blockScrolling = Infinity;
+ applyEditorOptions(editor, EDITOR.PATTERN_MIN_LINES, EDITOR.PATTERN_MAX_LINES);
+ editor.getSession().setMode(new GrokMode());
};
}
}
diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index 7e43f2875870a7..4c8b7380e69cd3 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -32,6 +32,7 @@ jest.mock('react-ace', () => {
}
};
});
+jest.mock('brace/theme/textmate', () => 'brace/theme/textmate');
setHttpClient(axios.create());
let server = null;
diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/show_json/show_json.js b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/show_json/show_json.js
index 855b84eaafbb92..366107a7954724 100644
--- a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/show_json/show_json.js
+++ b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/show_json/show_json.js
@@ -7,6 +7,8 @@
import React from "react";
import { EuiCodeEditor } from "@elastic/eui";
+import 'brace/theme/textmate';
+
export class ShowJson extends React.PureComponent {
componentWillMount() {
this.props.loadIndexData(this.props);
@@ -26,10 +28,13 @@ export class ShowJson extends React.PureComponent {
return (
Update your license
"`;
+exports[`AddLicense component when license is active should display correct verbiage 1`] = `"If you already have a new license, upload it now.
Update your license
"`;
-exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"If you already have a new license, upload it now.
Update your license
"`;
+exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"If you already have a new license, upload it now.
Update your license
"`;
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
index d8782624a7e7e8..7092dd34eb115b 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
@@ -1,5 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`LicenseStatus component should display display warning is expired 1`] = `"If you already have a new license, upload it now.
Your platinum license has expired
Your license expired on
Your Platinum license has expired
Your license expired on
Your gold license is active
Your license will expire on October 12, 2099 7:00 PM EST
Your Gold license is active
Your license will expire on October 12, 2099 7:00 PM EST
Extend your trial
If you’d like to continuing using Security, Machine Learning, and our other awesome platinum features, request an extension now.
Extend your trial
If you’d like to continuing using Security, Machine Learning, and our other awesome platinum features, request an extension now.
Extend your trial
If you’d like to continuing using Security, Machine Learning, and our other awesome platinum features, request an extension now.
Extend your trial
If you’d like to continuing using Security, Machine Learning, and our other awesome platinum features, request an extension now.
Revert to basic license
You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.
Revert to Basic license
You’ll revert to our free features and lose access to security, machine learning and other Platinum features.
Revert to basic license
You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.
Revert to Basic license
You’ll revert to our free features and lose access to security, machine learning and other Platinum features.
Revert to basic license
You’ll revert to our free features and lose access to Security, Machine Learning and other platinum features.
Revert to Basic license
You’ll revert to our free features and lose access to security, machine learning and other Platinum features.
Start a 30-day trial
Experience what Security, Machine Learning, and all our other platinum features have to offer.
Start a 30-day trial
Experience what security, machine learning, and all our other Platinum features have to offer.
Start a 30-day trial
Experience what Security, Machine Learning, and all our other platinum features have to offer.
Start a 30-day trial
Experience what security, machine learning, and all our other Platinum features have to offer.
Start a 30-day trial
Experience what Security, Machine Learning, and all our other platinum features have to offer.
Start a 30-day trial
Experience what security, machine learning, and all our other Platinum features have to offer.
-
+
-
+
@@ -208,7 +212,9 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
BASIC license. Review the list of features below.
@@ -287,14 +293,18 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
-
+
-
+
Your license key is a JSON file with a signature attached.
@@ -318,11 +328,14 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{
const { isActive, type } = getLicense(state);
+ const typeTitleCase = type.charAt(0).toUpperCase() + type.substr(1).toLowerCase();
return {
status: isActive ? 'Active' : 'Inactive',
- type,
+ type: typeTitleCase,
isExpired: isExpired(state),
expiryDate: getExpirationDateFormatted(state)
};
diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.container.js b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.container.js
index 083cb8c771393c..bd7f7c28be26f9 100644
--- a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.container.js
+++ b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.container.js
@@ -13,7 +13,7 @@ import {
shouldShowRevertToBasicLicense,
getStartBasicMessages
} from '../../../store/reducers/licenseManagement';
-import { startBasicLicense } from '../../../store/actions/start_basic';
+import { startBasicLicense, cancelStartBasicLicense } from '../../../store/actions/start_basic';
const mapStateToProps = state => {
return {
@@ -25,7 +25,8 @@ const mapStateToProps = state => {
};
const mapDispatchToProps = {
- startBasicLicense
+ startBasicLicense,
+ cancelStartBasicLicense
};
export const RevertToBasic = connect(mapStateToProps, mapDispatchToProps)(
diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js
index 1131bf2239347d..47116689f1f31b 100644
--- a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js
+++ b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js
@@ -26,6 +26,7 @@ export class RevertToBasic extends React.PureComponent {
needsAcknowledgement,
messages: [firstLine, ...messages] = [],
startBasicLicense,
+ cancelStartBasicLicense,
licenseType
} = this.props;
if (!needsAcknowledgement) {
@@ -35,8 +36,8 @@ export class RevertToBasic extends React.PureComponent {
startBasicLicense(licenseType, HTMLMarqueeElement)}
+ onCancel={cancelStartBasicLicense}
+ onConfirm={() => startBasicLicense(licenseType, true)}
cancelButtonText="Cancel"
confirmButtonText="Confirm"
>
@@ -63,13 +64,13 @@ export class RevertToBasic extends React.PureComponent {
}
const description = (
- You’ll revert to our free features and lose access to Security, Machine
- Learning and other{' '}
+ You’ll revert to our free features and lose access to security, machine
+ learning and other{' '}
- platinum features
+ Platinum features
.
);
@@ -78,11 +79,11 @@ export class RevertToBasic extends React.PureComponent {
{this.acknowledgeModal()}
startBasicLicense(licenseType)}>
- Revert to basic
+ Revert to Basic
}
/>
diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js
index c150762e88bd01..32f12c343611e5 100644
--- a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js
+++ b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js
@@ -49,22 +49,22 @@ export class StartTrial extends React.PureComponent {
diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
index 9904486c48412e..0ba44bf6a53d1e 100644
--- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
+++ b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
@@ -14,7 +14,7 @@ import 'plugins/logstash/services/license';
import 'plugins/logstash/services/security';
import './pipeline_edit.less';
import '../../../../components/tooltip';
-import { TOOLTIPS } from '../../../../../common/constants';
+import { EDITOR, TOOLTIPS } from '../../../../../common/constants';
import 'ace';
const app = uiModules.get('xpack/logstash');
@@ -31,7 +31,7 @@ app.directive('pipelineEdit', function ($injector) {
restrict: 'E',
template: template,
scope: {
- pipeline: '='
+ pipeline: '=',
},
bindToController: true,
controllerAs: 'pipelineEdit',
@@ -46,13 +46,23 @@ app.directive('pipelineEdit', function ($injector) {
} else {
$scope.user = null;
}
- $scope.aceLoaded = (editor) => {
+ $scope.aceLoaded = editor => {
this.editor = editor;
+ /*
+ * This sets the space between the editor's borders and the
+ * edges of the top/bottom lines to make for a less-crowded
+ * typing experience.
+ */
+ editor.renderer.setScrollMargin(
+ EDITOR.PIPELINE_EDITOR_SCROLL_MARGIN_TOP_PX,
+ EDITOR.PIPELINE_EDITOR_SCROLL_MARGIN_BOTTOM_PX,
+ 0,
+ 0
+ );
editor.setReadOnly(this.isReadOnly);
- editor.getSession().setMode("ace/mode/ruby");
editor.setOptions({
minLines: 25,
- maxLines: Infinity
+ maxLines: Infinity,
});
editor.$blockScrolling = Infinity;
};
@@ -62,52 +72,61 @@ app.directive('pipelineEdit', function ($injector) {
this.tooltips = TOOLTIPS;
- dirtyPrompt.register(() => !this.pipeline.isEqualTo(this.originalPipeline));
+ dirtyPrompt.register(
+ () => !this.pipeline.isEqualTo(this.originalPipeline)
+ );
$scope.$on('$destroy', dirtyPrompt.deregister);
}
- onPipelineSave = (username) => {
+ onPipelineSave = username => {
this.pipeline.username = username;
- return pipelineService.savePipeline(this.pipeline)
+ return pipelineService
+ .savePipeline(this.pipeline)
.then(() => {
toastNotifications.addSuccess(`Saved '${this.pipeline.id}'`);
this.close();
})
.catch(err => {
- return licenseService.checkValidity()
+ return licenseService
+ .checkValidity()
.then(() => this.notifier.error(err));
});
- }
+ };
- onPipelineDelete = (pipelineId) => {
+ onPipelineDelete = pipelineId => {
const confirmModalOptions = {
onConfirm: this.deletePipeline,
- confirmButtonText: `Delete pipeline ${pipelineId}`
+ confirmButtonText: `Delete pipeline ${pipelineId}`,
};
- return confirmModal('You cannot recover a deleted pipeline.', confirmModalOptions);
- }
+ return confirmModal(
+ 'You cannot recover a deleted pipeline.',
+ confirmModalOptions
+ );
+ };
onClose = () => {
this.close();
- }
+ };
deletePipeline = () => {
- return pipelineService.deletePipeline(this.pipeline.id)
+ return pipelineService
+ .deletePipeline(this.pipeline.id)
.then(() => {
toastNotifications.addSuccess(`Deleted '${this.pipeline.id}'`);
this.close();
})
.catch(err => {
- return licenseService.checkValidity()
+ return licenseService
+ .checkValidity()
.then(() => this.notifier.error(err));
});
- }
+ };
close = () => {
dirtyPrompt.deregister();
kbnUrl.change('/management/logstash/pipelines', {});
- }
+ };
get isSaveEnabled() {
return !(this.form.$invalid || this.jsonForm.$invalid);
@@ -116,6 +135,6 @@ app.directive('pipelineEdit', function ($injector) {
get isReadOnly() {
return licenseService.isReadOnly;
}
- }
+ },
};
});
diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less
index 56e13a125e9b69..f5c00fc6a495fe 100644
--- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less
+++ b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less
@@ -4,7 +4,6 @@
pipeline-edit {
.pipeline-editor {
- height:400px;
border: 1px solid #ecf0f1;
}
}
diff --git a/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js b/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js
index 3d993cb4f2c462..a160408bcaa023 100644
--- a/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js
+++ b/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js
@@ -6,7 +6,10 @@
import moment from 'moment';
import chrome from 'ui/chrome';
-import { ROUTES } from '../../../common/constants';
+import {
+ ROUTES,
+ MONITORING
+} from '../../../common/constants';
import { PipelineListItem } from 'plugins/logstash/models/pipeline_list_item';
export class MonitoringService {
@@ -34,7 +37,7 @@ export class MonitoringService {
const body = {
timeRange: {
max: now.toISOString(),
- min: now.subtract(30, 'seconds').toISOString()
+ min: now.subtract(MONITORING.ACTIVE_PIPELINE_RANGE_S, 'seconds').toISOString()
}
};
return this.$http.post(url, body);
diff --git a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js
index ac939956afcedd..a276d22f53c889 100644
--- a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js
+++ b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js
@@ -10,5 +10,6 @@ import { PipelineService } from './pipeline_service';
uiModules.get('xpack/logstash')
.factory('pipelineService', ($injector) => {
const $http = $injector.get('$http');
- return new PipelineService($http);
+ const pipelinesService = $injector.get('pipelinesService');
+ return new PipelineService($http, pipelinesService);
});
diff --git a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js
index c027a3e97f6f97..2a299e3fac8408 100644
--- a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js
+++ b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js
@@ -9,8 +9,9 @@ import { ROUTES } from '../../../common/constants';
import { Pipeline } from 'plugins/logstash/models/pipeline';
export class PipelineService {
- constructor($http) {
+ constructor($http, pipelinesService) {
this.$http = $http;
+ this.pipelinesService = pipelinesService;
this.basePath = chrome.addBasePath(ROUTES.API_ROOT);
}
@@ -30,6 +31,7 @@ export class PipelineService {
deletePipeline(id) {
return this.$http.delete(`${this.basePath}/pipeline/${id}`)
+ .then(() => this.pipelinesService.addToRecentlyDeleted(id))
.catch(e => {
throw e.data.message;
});
diff --git a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js
index 0685335e9402ed..7ff42cae7d9997 100644
--- a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js
+++ b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js
@@ -11,7 +11,8 @@ import '../monitoring';
uiModules.get('xpack/logstash')
.factory('pipelinesService', ($injector) => {
const $http = $injector.get('$http');
+ const $window = $injector.get('$window');
const Promise = $injector.get('Promise');
const monitoringService = $injector.get('xpackLogstashMonitoringService');
- return new PipelinesService($http, Promise, monitoringService);
+ return new PipelinesService($http, $window, Promise, monitoringService);
});
diff --git a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js
index 04b612f7344d19..4cdd791b678d24 100644
--- a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js
+++ b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js
@@ -5,12 +5,18 @@
*/
import chrome from 'ui/chrome';
-import { ROUTES } from '../../../common/constants';
+import {
+ ROUTES,
+ MONITORING
+} from '../../../common/constants';
import { PipelineListItem } from 'plugins/logstash/models/pipeline_list_item';
+const RECENTLY_DELETED_PIPELINE_IDS_STORAGE_KEY = 'xpack.logstash.recentlyDeletedPipelines';
+
export class PipelinesService {
- constructor($http, Promise, monitoringService) {
+ constructor($http, $window, Promise, monitoringService) {
this.$http = $http;
+ this.$window = $window;
this.Promise = Promise;
this.monitoringService = monitoringService;
this.basePath = chrome.addBasePath(ROUTES.API_ROOT);
@@ -22,11 +28,38 @@ export class PipelinesService {
this.getMonitoringPipelineList()
])
.then(([managementPipelines, monitoringPipelines]) => {
+ const now = Date.now();
+
+ // Monitoring will report centrally-managed pipelines as well, including recently-deleted centrally-managed ones.
+ // If there's a recently-deleted pipeline we're keeping track of BUT monitoring doesn't report it, that means
+ // it's not running in Logstash any more. So we can stop tracking it as a recently-deleted pipeline.
+ const monitoringPipelineIds = monitoringPipelines.map(pipeline => pipeline.id);
+ this.getRecentlyDeleted().forEach(recentlyDeletedPipeline => {
+ // We don't want to stop tracking the recently-deleted pipeline until Monitoring has had some
+ // time to report on it. Otherwise, if we stop tracking first, *then* Monitoring reports it, we'll
+ // still end up showing it in the list until Monitoring stops reporting it.
+ if (now - recentlyDeletedPipeline.deletedOn < (MONITORING.ACTIVE_PIPELINE_RANGE_S * 1000)) {
+ return;
+ }
+
+ // If Monitoring is still reporting the pipeline, don't stop tracking it yet
+ if (monitoringPipelineIds.includes(recentlyDeletedPipeline.id)) {
+ return;
+ }
+
+ this.removeFromRecentlyDeleted(recentlyDeletedPipeline.id);
+ });
+
// Merge centrally-managed pipelines with pipelines reported by monitoring. Take care to dedupe
- // while merging because monitoring will (rightly) report centrally-managed pipelines as well!
+ // while merging because monitoring will (rightly) report centrally-managed pipelines as well,
+ // including recently-deleted ones!
const managementPipelineIds = managementPipelines.map(pipeline => pipeline.id);
return managementPipelines.concat(
- monitoringPipelines.filter(monitoringPipeline => !managementPipelineIds.includes(monitoringPipeline.id))
+ monitoringPipelines
+ .filter(monitoringPipeline =>
+ !managementPipelineIds.includes(monitoringPipeline.id)
+ && !this.isRecentlyDeleted(monitoringPipeline.id)
+ )
);
});
}
@@ -55,6 +88,48 @@ export class PipelinesService {
headers: { 'Content-Type': 'application/json' }
};
return this.$http.delete(`${this.basePath}/pipelines`, requestOpts)
- .then(response => response.data.results);
+ .then(response => {
+ this.addToRecentlyDeleted(...pipelineIds);
+ return response.data.results;
+ });
+ }
+
+ addToRecentlyDeleted(...pipelineIds) {
+ const recentlyDeletedPipelines = this.getRecentlyDeleted();
+ const recentlyDeletedPipelineIds = recentlyDeletedPipelines.map(pipeline => pipeline.id);
+ pipelineIds.forEach(pipelineId => {
+ if (!recentlyDeletedPipelineIds.includes(pipelineId)) {
+ recentlyDeletedPipelines.push({
+ id: pipelineId,
+ deletedOn: Date.now()
+ });
+ }
+ });
+ this.setRecentlyDeleted(recentlyDeletedPipelines);
+ }
+
+ removeFromRecentlyDeleted(...pipelineIds) {
+ const recentlyDeletedPipelinesToKeep = this.getRecentlyDeleted()
+ .filter(recentlyDeletedPipeline => !pipelineIds.includes(recentlyDeletedPipeline.id));
+ this.setRecentlyDeleted(recentlyDeletedPipelinesToKeep);
+ }
+
+ isRecentlyDeleted(pipelineId) {
+ return this.getRecentlyDeleted()
+ .map(pipeline => pipeline.id)
+ .includes(pipelineId);
+ }
+
+ getRecentlyDeleted() {
+ const recentlyDeletedPipelines = this.$window.localStorage.getItem(RECENTLY_DELETED_PIPELINE_IDS_STORAGE_KEY);
+ if (!recentlyDeletedPipelines) {
+ return [];
+ }
+
+ return JSON.parse(recentlyDeletedPipelines);
+ }
+
+ setRecentlyDeleted(recentlyDeletedPipelineIds) {
+ this.$window.localStorage.setItem(RECENTLY_DELETED_PIPELINE_IDS_STORAGE_KEY, JSON.stringify(recentlyDeletedPipelineIds));
}
}
diff --git a/x-pack/plugins/ml/public/constants/index_patterns.js b/x-pack/plugins/ml/common/constants/index_patterns.js
similarity index 100%
rename from x-pack/plugins/ml/public/constants/index_patterns.js
rename to x-pack/plugins/ml/common/constants/index_patterns.js
diff --git a/x-pack/plugins/ml/public/util/__tests__/anomaly_utils.js b/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js
similarity index 99%
rename from x-pack/plugins/ml/public/util/__tests__/anomaly_utils.js
rename to x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js
index 95631c1218c47b..0f47254bb90cc7 100644
--- a/x-pack/plugins/ml/public/util/__tests__/anomaly_utils.js
+++ b/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js
@@ -265,6 +265,7 @@ describe('ML - anomaly utils', () => {
it('returns true for expected function descriptions', () => {
expect(showTypicalForFunction('count')).to.be(true);
expect(showTypicalForFunction('distinct_count')).to.be(true);
+ expect(showTypicalForFunction('lat_long')).to.be(true);
expect(showTypicalForFunction('mean')).to.be(true);
expect(showTypicalForFunction('max')).to.be(true);
expect(showTypicalForFunction('min')).to.be(true);
@@ -276,7 +277,6 @@ describe('ML - anomaly utils', () => {
});
it('returns false for expected function descriptions', () => {
- expect(showTypicalForFunction('lat_long')).to.be(false);
expect(showTypicalForFunction('rare')).to.be(false);
});
diff --git a/x-pack/plugins/ml/common/util/__tests__/job_utils.js b/x-pack/plugins/ml/common/util/__tests__/job_utils.js
index d535cd92bf970c..d9e03dfe1f6c63 100644
--- a/x-pack/plugins/ml/common/util/__tests__/job_utils.js
+++ b/x-pack/plugins/ml/common/util/__tests__/job_utils.js
@@ -113,7 +113,8 @@ describe('ML - job utils', () => {
{ 'function': 'sum', 'field_name': 'bytes', 'partition_field_name': 'clientip', 'detector_description': 'High bytes client IP' }, // eslint-disable-line max-len
{ 'function': 'freq_rare', 'by_field_name': 'uri', 'over_field_name': 'clientip', 'detector_description': 'Freq rare URI' },
{ 'function': 'count', 'by_field_name': 'mlcategory', 'detector_description': 'Count by category' },
- { 'function': 'count', 'by_field_name': 'hrd', 'detector_description': 'count by hrd' }
+ { 'function': 'count', 'by_field_name': 'hrd', 'detector_description': 'count by hrd' },
+ { 'function': 'mean', 'field_name': 'NetworkDiff', 'detector_description': 'avg NetworkDiff' }
]
},
datafeed_config: {
@@ -123,6 +124,12 @@ describe('ML - job utils', () => {
'inline': 'return domainSplit(doc["query"].value, params).get(1);',
'lang': 'painless'
}
+ },
+ 'NetworkDiff': {
+ 'script': {
+ 'source': 'doc["NetworkOut"].value - doc["NetworkIn"].value',
+ 'lang': 'painless'
+ }
}
}
}
@@ -140,10 +147,14 @@ describe('ML - job utils', () => {
expect(isTimeSeriesViewDetector(job, 2)).to.be(false);
});
- it('returns false for a detector using count on a scripted field', () => {
+ it('returns false for a detector using a script field as a by field', () => {
expect(isTimeSeriesViewDetector(job, 3)).to.be(false);
});
+ it('returns false for a detector using a script field as a metric field_name', () => {
+ expect(isTimeSeriesViewDetector(job, 4)).to.be(false);
+ });
+
});
describe('isTimeSeriesViewFunction', () => {
diff --git a/x-pack/plugins/ml/public/util/anomaly_utils.js b/x-pack/plugins/ml/common/util/anomaly_utils.js
similarity index 98%
rename from x-pack/plugins/ml/public/util/anomaly_utils.js
rename to x-pack/plugins/ml/common/util/anomaly_utils.js
index e2f4f0c3f8be32..d367a061440fb2 100644
--- a/x-pack/plugins/ml/public/util/anomaly_utils.js
+++ b/x-pack/plugins/ml/common/util/anomaly_utils.js
@@ -18,7 +18,7 @@ const DISPLAY_ACTUAL_FUNCTIONS = ['count', 'distinct_count', 'lat_long', 'mean',
'median', 'varp', 'info_content', 'time'];
// List of function descriptions for which typical values from record level results should be displayed.
-const DISPLAY_TYPICAL_FUNCTIONS = ['count', 'distinct_count', 'mean', 'max', 'min', 'sum',
+const DISPLAY_TYPICAL_FUNCTIONS = ['count', 'distinct_count', 'lat_long', 'mean', 'max', 'min', 'sum',
'median', 'varp', 'info_content', 'time'];
// Returns a severity label (one of critical, major, minor, warning or unknown)
diff --git a/x-pack/plugins/ml/common/util/job_utils.js b/x-pack/plugins/ml/common/util/job_utils.js
index e6ce68706d209c..0cd006d8aed3ba 100644
--- a/x-pack/plugins/ml/common/util/job_utils.js
+++ b/x-pack/plugins/ml/common/util/job_utils.js
@@ -67,13 +67,14 @@ export function isTimeSeriesViewDetector(job, dtrIndex) {
(dtr.partition_field_name !== 'mlcategory') &&
(dtr.over_field_name !== 'mlcategory');
- const usesScriptedFields = _.has(job, 'datafeed_config.script_fields');
- const scriptedFields = usesScriptedFields ? _.keys(job.datafeed_config.script_fields) : [];
- if (isDetectorViewable === true && usesScriptedFields === true) {
+ const usesScriptFields = _.has(job, 'datafeed_config.script_fields');
+ if (isDetectorViewable === true && usesScriptFields === true) {
// Perform extra check to see if the detector is using a scripted field.
- isDetectorViewable = (dtr.partition_field_name === undefined || scriptedFields.indexOf(dtr.partition_field_name) === -1) &&
- (dtr.by_field_name === undefined || scriptedFields.indexOf(dtr.by_field_name) === -1) &&
- (dtr.over_field_name === undefined || scriptedFields.indexOf(dtr.over_field_name) === -1);
+ const scriptFields = usesScriptFields ? _.keys(job.datafeed_config.script_fields) : [];
+ isDetectorViewable = scriptFields.indexOf(dtr.field_name) === -1 &&
+ scriptFields.indexOf(dtr.partition_field_name) === -1 &&
+ scriptFields.indexOf(dtr.by_field_name) === -1 &&
+ scriptFields.indexOf(dtr.over_field_name) === -1;
}
}
diff --git a/x-pack/plugins/ml/index.js b/x-pack/plugins/ml/index.js
index 943a14b91b60d1..38a2ce773e65a1 100644
--- a/x-pack/plugins/ml/index.js
+++ b/x-pack/plugins/ml/index.js
@@ -20,6 +20,7 @@ import { dataRecognizer } from './server/routes/modules';
import { dataVisualizerRoutes } from './server/routes/data_visualizer';
import { calendars } from './server/routes/calendars';
import { fieldsService } from './server/routes/fields_service';
+import { resultsServiceRoutes } from './server/routes/results_service';
export const ml = (kibana) => {
return new kibana.Plugin({
@@ -34,14 +35,9 @@ export const ml = (kibana) => {
description: 'Machine Learning for the Elastic Stack',
icon: 'plugins/ml/ml.svg',
main: 'plugins/ml/app',
- uses: [
- 'fieldFormats',
- 'savedObjectTypes',
- ]
},
hacks: ['plugins/ml/hacks/toggle_app_link_in_nav'],
home: ['plugins/ml/register_feature']
-
},
@@ -87,6 +83,7 @@ export const ml = (kibana) => {
dataVisualizerRoutes(server, commonRouteConfig);
calendars(server, commonRouteConfig);
fieldsService(server, commonRouteConfig);
+ resultsServiceRoutes(server, commonRouteConfig);
}
});
diff --git a/x-pack/plugins/ml/jsconfig.json b/x-pack/plugins/ml/jsconfig.json
new file mode 100644
index 00000000000000..4ab033a2f8dcac
--- /dev/null
+++ b/x-pack/plugins/ml/jsconfig.json
@@ -0,0 +1,19 @@
+{
+ "compilerOptions": {
+ "target": "es6",
+ "module": "commonjs",
+ "baseUrl": "../../../.",
+ "paths": {
+ "ui/*": [
+ "src/ui/public/*"
+ ],
+ "plugins/ml/*": [
+ "x-pack/plugins/ml/public/*"
+ ]
+ }
+ },
+ "exclude": [
+ "node_modules",
+ "build"
+ ]
+}
diff --git a/x-pack/plugins/ml/public/app.js b/x-pack/plugins/ml/public/app.js
index cb34a9ec85ee9f..ba1d17bdd9b8d8 100644
--- a/x-pack/plugins/ml/public/app.js
+++ b/x-pack/plugins/ml/public/app.js
@@ -5,6 +5,9 @@
*/
+// import the uiExports that we want to "use"
+import 'uiExports/fieldFormats';
+import 'uiExports/savedObjectTypes';
import 'ui/courier';
import 'ui-bootstrap';
@@ -24,6 +27,7 @@ import 'plugins/ml/explorer';
import 'plugins/ml/timeseriesexplorer';
import 'plugins/ml/components/form_label';
import 'plugins/ml/components/json_tooltip';
+import 'plugins/ml/components/tooltip';
import 'plugins/ml/components/confirm_modal';
import 'plugins/ml/components/nav_menu';
import 'plugins/ml/components/loading_indicator';
@@ -47,4 +51,3 @@ uiRoutes
.otherwise({
redirectTo: '/jobs'
});
-
diff --git a/x-pack/plugins/ml/public/assets/app_ml.svg b/x-pack/plugins/ml/public/assets/app_ml.svg
deleted file mode 100644
index ff87de25f17738..00000000000000
--- a/x-pack/plugins/ml/public/assets/app_ml.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.html b/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.html
deleted file mode 100644
index 913fbbab75133a..00000000000000
--- a/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.html
+++ /dev/null
@@ -1,12 +0,0 @@
- toggleRow(item)}
+ iconType={itemIdToExpandedRowMap[item.rowId] ? 'arrowDown' : 'arrowRight'}
+ aria-label={itemIdToExpandedRowMap[item.rowId] ? 'Hide details' : 'Show details'}
+ data-row-id={item.rowId}
+ />
+ )
+ },
+ {
+ field: 'time',
+ name: 'time',
+ dataType: 'date',
+ render: (date) => renderTime(date, interval),
+ sortable: true
+ },
+ {
+ field: 'severity',
+ name: `${(isAggregatedData === true) ? 'max ' : ''}severity`,
+ render: (score) => (
+
+ {score >= 1 ? Math.floor(score) : '< 1'}
+
+ ),
+ sortable: true
+ },
+ {
+ field: 'detector',
+ name: 'detector',
+ sortable: true
+ }
+ ];
+
+ if (items.some(item => item.entityValue !== undefined)) {
+ columns.push({
+ field: 'entityValue',
+ name: 'found for',
+ render: (entityValue, item) => (
+
+ {examples.map((example, i) => {
+ return {example};
+ }
+ )}
+
+ );
+ }
+ });
+ }
+
+ return columns;
+}
+
+class AnomaliesTable extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ itemIdToExpandedRowMap: {}
+ };
+ }
+
+ isShowingAggregatedData = () => {
+ return (this.props.tableData.interval !== 'second');
+ };
+
+ static getDerivedStateFromProps(nextProps, prevState) {
+ // Update the itemIdToExpandedRowMap state if a change to the table data has resulted
+ // in an anomaly that was previously expanded no longer being in the data.
+ const itemIdToExpandedRowMap = prevState.itemIdToExpandedRowMap;
+ const prevExpandedNotInData = Object.keys(itemIdToExpandedRowMap).find((rowId) => {
+ const matching = nextProps.tableData.anomalies.find((anomaly) => {
+ return anomaly.rowId === rowId;
+ });
+
+ return (matching === undefined);
+ });
+
+ if (prevExpandedNotInData !== undefined) {
+ // Anomaly data has changed and an anomaly that was previously expanded is no longer in the data.
+ return {
+ itemIdToExpandedRowMap: {}
+ };
+ }
+
+ // Return null to indicate no change to state.
+ return null;
+ }
+
+ toggleRow = (item) => {
+ const itemIdToExpandedRowMap = { ...this.state.itemIdToExpandedRowMap };
+ if (itemIdToExpandedRowMap[item.rowId]) {
+ delete itemIdToExpandedRowMap[item.rowId];
+ } else {
+ const examples = (item.entityName === 'mlcategory') ?
+ _.get(this.props.tableData, ['examplesByJobId', item.jobId, item.entityValue]) : undefined;
+ itemIdToExpandedRowMap[item.rowId] = (
+
+
+
+
+
+
+ );
+ }
+
+ const columns = getColumns(
+ tableData.anomalies,
+ tableData.examplesByJobId,
+ this.isShowingAggregatedData(),
+ tableData.interval,
+ timefilter,
+ tableData.showViewSeriesLink,
+ this.state.itemIdToExpandedRowMap,
+ this.toggleRow,
+ filter);
+
+ const sorting = {
+ sort: {
+ field: 'severity',
+ direction: 'desc',
+ }
+ };
+
+ return (
+
+
+
+ {(mvDescription !== undefined) &&
+
+ {mvDescription}
+
+ }
+
+ );
+ }
+
+ renderDetails() {
+ const detailItems = getDetailsItems(this.props.anomaly, this.props.examples, this.props.filter);
+ const isInterimResult = _.get(this.props.anomaly, 'source.is_interim', false);
+ return (
+
+
+ {this.props.isAggregatedData === true ? (
+
+
+ }
+
+
+ );
+ }
+
+ renderInfluencers() {
+ const anomalyInfluencers = this.props.anomaly.influencers;
+ const listItems = [];
+ let othersCount = 0;
+ let numToDisplay = 0;
+ if (anomalyInfluencers !== undefined) {
+ numToDisplay = (this.state.showAllInfluencers === true) ?
+ anomalyInfluencers.length : Math.min(this.props.influencersLimit, anomalyInfluencers.length);
+ othersCount = Math.max(anomalyInfluencers.length - numToDisplay, 0);
+
+ if (othersCount === 1) {
+ // Display the 1 extra influencer as displaying "and 1 more" would also take up a line.
+ numToDisplay++;
+ othersCount = 0;
+ }
+
+ for (let i = 0; i < numToDisplay; i++) {
+ Object.keys(anomalyInfluencers[i]).forEach((influencerFieldName) => {
+ listItems.push({
+ title: influencerFieldName,
+ description: anomalyInfluencers[i][influencerFieldName]
+ });
+ });
+ }
+ }
+
+ if (listItems.length > 0) {
+ return (
+
+
+
+ this.toggleAllInfluencers()}
+ >
+ and {othersCount} more
+
+ }
+ {numToDisplay > (this.props.influencersLimit + 1) &&
+ this.toggleAllInfluencers()}
+ >
+ show less
+
+ }
+
+ );
+ }
+ }
+
+ render() {
+
+ return (
+
+ {iconType !== undefined &&
+
+
+ }
+
+
+
+
+
+ );
+}
+
+DescriptionCell.propTypes = {
+ actual: PropTypes.oneOfType([PropTypes.array, PropTypes.number]),
+ typical: PropTypes.oneOfType([PropTypes.array, PropTypes.number])
+};
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/entity_cell.js b/x-pack/plugins/ml/public/components/anomalies_table/entity_cell.js
new file mode 100644
index 00000000000000..ca6d3cf7e68cd9
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/anomalies_table/entity_cell.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import {
+ EuiButtonIcon,
+ EuiToolTip
+} from '@elastic/eui';
+
+/*
+ * Component for rendering an entity cell in the anomalies table, displaying the value
+ * of the 'partition', 'by' or 'over' field, and optionally links for adding or removing
+ * a filter on this entity.
+ */
+export function EntityCell({ entityName, entityValue, filter }) {
+ const valueText = (entityName !== 'mlcategory') ? entityValue : `mlcategory ${entityValue}`;
+ return (
+
+ {valueText}
+ {filter !== undefined && entityName !== undefined && entityValue !== undefined &&
+
+
+ filter(entityName, entityValue, '+')}
+ iconType="plusInCircle"
+ aria-label="Add filter"
+ />
+
+
+ filter(entityName, entityValue, '-')}
+ iconType="minusInCircle"
+ aria-label="Remove filter"
+ />
+
+
+ }
+
+ );
+}
+
+EntityCell.propTypes = {
+ entityName: PropTypes.string,
+ entityValue: PropTypes.any,
+ filter: PropTypes.func
+};
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row.html b/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row.html
deleted file mode 100644
index df613ab198fafa..00000000000000
--- a/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row_directive.js b/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row_directive.js
deleted file mode 100644
index 64d65d1360bb3a..00000000000000
--- a/x-pack/plugins/ml/public/components/anomalies_table/expanded_row/expanded_row_directive.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-
-
-/*
- * Angular directive for rendering the expanded row content in the
- * Machine Learning anomalies table. It displays more details on the
- * anomaly summarized in the row, including field names,
- * actual and typical values for the analyzed metric,
- * plus causes and examples events according to the detector configuration.
- */
-
-import _ from 'lodash';
-import moment from 'moment';
-
-import template from './expanded_row.html';
-import {
- getSeverity,
- showActualForFunction,
- showTypicalForFunction
-} from 'plugins/ml/util/anomaly_utils';
-import 'plugins/ml/filters/format_value';
-
-import { uiModules } from 'ui/modules';
-const module = uiModules.get('apps/ml');
-
-module.directive('mlAnomaliesTableExpandedRow', function () {
-
- function link(scope) {
- scope.record = scope.$parent.record;
- scope.filter = scope.$parent.filter;
- scope.filteringEnabled = scope.$parent.filteringEnabled;
- scope.isShowingAggregatedData = scope.$parent.isShowingAggregatedData;
- scope.influencersLimit = scope.$parent.influencersLimit;
- scope.influencersNumToDislay = scope.influencersLimit;
-
- const timeFieldName = 'timestamp';
- const momentTime = moment(scope.record.source[timeFieldName]);
- scope.anomalyTime = momentTime.format('MMMM Do YYYY, HH:mm:ss');
- if (_.has(scope.record.source, 'bucket_span')) {
- scope.anomalyEndTime = momentTime.add(scope.record.source.bucket_span, 's').format('MMMM Do YYYY, HH:mm:ss');
- }
-
- scope.$on('initRow', () => {
- // Only build the description and details on metric values,
- // causes and influencers when the row is first expanded.
- buildContent();
- });
-
- scope.toggleAllInfluencers = function () {
- if (_.has(scope.record, 'influencers')) {
- const recordInfluencers = scope.record.influencers;
- if (scope.influencers.length === recordInfluencers.length) {
- scope.influencersNumToDislay = scope.influencersLimit;
- } else {
- scope.influencersNumToDislay = recordInfluencers.length;
- }
- buildInfluencers();
- }
- };
-
- if (scope.$parent.open === true) {
- // Build the content if the row was already open before re-render (e.g. when sorting),
- buildContent();
- }
-
- if (_.has(scope.record, 'entityValue') && scope.record.entityName === 'mlcategory') {
- // For categorization results, controller will obtain the definition when the
- // row is first expanded and place the categoryDefinition in the row scope.
- const unbindWatch = scope.$parent.$watch('categoryDefinition', (categoryDefinition) => {
- if (categoryDefinition !== undefined) {
- scope.examples = categoryDefinition.examples;
- unbindWatch();
- }
- });
- }
-
- function buildContent() {
- buildDescription();
- buildMetrics();
- buildCauses();
- buildInfluencers();
- }
-
- function buildDescription() {
- const record = scope.record;
- let rowDescription = getSeverity(record.source.record_score) + ' anomaly in ' + record.detector;
-
- if (_.has(record, 'entityName')) {
- rowDescription += ' found for ' + record.entityName;
- rowDescription += ' ';
- rowDescription += record.entityValue;
- }
-
- if (_.has(record.source, 'partition_field_name') && (record.source.partition_field_name !== record.entityName)) {
- rowDescription += ' detected in ' + record.source.partition_field_name;
- rowDescription += ' ';
- rowDescription += record.source.partition_field_value;
- }
-
- scope.description = rowDescription;
-
- // Check for a correlatedByFieldValue in the source which will be present for multivariate analyses
- // where the record is anomalous due to relationship with another 'by' field value.
- if (_.has(record.source, 'correlated_by_field_value')) {
- let mvDescription = 'multivariate correlations found in ';
- mvDescription += record.source.by_field_name;
- mvDescription += '; ';
- mvDescription += record.source.by_field_value;
- mvDescription += ' is considered anomalous given ';
- mvDescription += record.source.correlated_by_field_value;
- scope.multiVariateDescription = mvDescription;
- }
-
-
- // Display a warning below the description if the record is an interim result.
- scope.isInterim = _.get(record, 'source.is_interim', false);
- }
-
- function buildMetrics() {
- const record = scope.record;
- const functionDescription = _.get(record, 'source.function_description', '');
- if (showActualForFunction(functionDescription) === true) {
- if (!_.has(scope.record.source, 'causes')) {
- scope.actual = record.source.actual;
- } else {
- const causes = scope.record.source.causes;
- if (causes.length === 1) {
- // If only one 'cause', move value to top level.
- const cause = _.first(causes);
- scope.actual = cause.actual;
- }
- }
- }
- if (showTypicalForFunction(functionDescription) === true) {
- if (!_.has(scope.record.source, 'causes')) {
- scope.typical = record.source.typical;
- } else {
- const causes = scope.record.source.causes;
- if (causes.length === 1) {
- // If only one 'cause', move value to top level.
- const cause = _.first(causes);
- scope.typical = cause.typical;
- }
- }
- }
- }
-
- function buildCauses() {
- if (_.has(scope.record.source, 'causes')) {
- const causes = scope.record.source.causes;
-
- // TODO - build different information depending on whether function is rare, freq_rare or another.
-
- // TODO - look in each cause for a 'correlatedByFieldValue' field,
- // and if so, add to causes scope object for rendering in the template.
- if (causes.length === 1) {
- // Metrics and probability will already have been placed at the top level.
- // If cause has byFieldValue, move it to a top level fields for display.
- const cause = _.first(causes);
- if (_.has(cause, 'by_field_name')) {
- scope.singleCauseByFieldName = cause.by_field_name;
- scope.singleCauseByFieldValue = cause.by_field_value;
- }
- } else {
- scope.causes = _.map(causes, (cause) => {
- const simplified = _.pick(cause, 'typical', 'actual', 'probability');
- // Get the 'entity field name/value' to display in the cause -
- // For by and over, use by_field_name/Value (over_field_name/Value are in the toplevel fields)
- // For just an 'over' field - the over_field_name/Value appear in both top level and cause.
- simplified.entityName = _.has(cause, 'by_field_name') ? cause.by_field_name : cause.over_field_name;
- simplified.entityValue = _.has(cause, 'by_field_value') ? cause.by_field_value : cause.over_field_value;
- return simplified;
- });
- }
-
- }
- }
-
- function buildInfluencers() {
- if (_.has(scope.record, 'influencers')) {
- const recordInfluencers = scope.record.influencers;
- scope.influencersNumToDislay = Math.min(scope.influencersNumToDislay, recordInfluencers.length);
- let othersCount = Math.max(recordInfluencers.length - scope.influencersNumToDislay, 0);
-
- if (othersCount === 1) {
- // Display the 1 extra influencer as displaying "and 1 more" would also take up a line.
- scope.influencersNumToDislay++;
- othersCount = 0;
- }
-
- const influencers = [];
- for (let i = 0; i < scope.influencersNumToDislay; i++) {
- _.each(recordInfluencers[i], (influencerFieldValue, influencerFieldName) => {
- influencers.push({ 'name': influencerFieldName, 'value': influencerFieldValue });
- });
- }
-
- scope.influencers = influencers;
- scope.otherInfluencersCount = othersCount;
- }
- }
- }
-
-
- return {
- restrict: 'AE',
- replace: false,
- scope: {},
- template,
- link: link
- };
-});
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/index.js b/x-pack/plugins/ml/public/components/anomalies_table/index.js
index 65271895fb3133..f9fb2bc0dafa09 100644
--- a/x-pack/plugins/ml/public/components/anomalies_table/index.js
+++ b/x-pack/plugins/ml/public/components/anomalies_table/index.js
@@ -5,7 +5,6 @@
*/
-
-import './styles/main.less';
-import './anomalies_table_directive.js';
+import './anomalies_table_directive';
import './anomalies_table_service.js';
+import './styles/main.less';
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell.js b/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell.js
similarity index 57%
rename from x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell.js
rename to x-pack/plugins/ml/public/components/anomalies_table/influencers_cell.js
index a712904b302985..78400b3fe7ebd2 100644
--- a/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell.js
+++ b/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell.js
@@ -5,7 +5,6 @@
*/
-
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
@@ -21,23 +20,8 @@ export class InfluencersCell extends Component {
constructor(props) {
super(props);
- this.limit = props.limit;
- const recordInfluencers = props.influencers || [];
- this.influencers = [];
- _.each(recordInfluencers, (influencer) => {
- _.each(influencer, (influencerFieldValue, influencerFieldName) => {
- this.influencers.push({
- influencerFieldName,
- influencerFieldValue
- });
- });
- });
-
- // Allow one more influencer than the supplied limit as displaying
- // 'and 1 more' would take up an extra line.
- const showAll = this.influencers.length <= (this.limit + 1);
this.state = {
- showAll
+ showAll: false
};
}
@@ -45,36 +29,42 @@ export class InfluencersCell extends Component {
this.setState({ showAll: !this.state.showAll });
}
- renderInfluencers() {
- const numberToDisplay = this.state.showAll === false ? this.limit : this.influencers.length;
- const displayInfluencers = this.influencers.slice(0, numberToDisplay);
+ renderInfluencers(influencers) {
+ const numberToDisplay = (this.state.showAll === false) ? this.props.limit : influencers.length;
+ const displayInfluencers = influencers.slice(0, numberToDisplay);
- this.othersCount = Math.max(this.influencers.length - numberToDisplay, 0);
- if (this.othersCount === 1) {
+ let othersCount = Math.max(influencers.length - numberToDisplay, 0);
+ if (othersCount === 1) {
// Display the additional influencer.
- displayInfluencers.push(this.influencers[this.limit]);
- this.othersCount = 0;
+ displayInfluencers.push(influencers[this.props.limit]);
+ othersCount = 0;
}
- return displayInfluencers.map((influencer, index) => {
- return (
-
+ {displayRows}
+ {this.renderOthers(influencers.length, othersCount)}
+
+ );
}
- renderOthers() {
- if (this.othersCount > 0) {
+ renderOthers(totalCount, othersCount) {
+ if (othersCount > 0) {
return (
this.toggleAllInfluencers()}
>
- and {this.othersCount} more
+ and {othersCount} more
);
- } else if (this.influencers.length > this.limit + 1) {
+ } else if (totalCount > this.props.limit + 1) {
return (
{
+ _.each(influencer, (influencerFieldValue, influencerFieldName) => {
+ influencers.push({
+ influencerFieldName,
+ influencerFieldValue
+ });
+ });
+ });
+
return (
+ Open link
+
+ );
+
+ const items = [];
+ if (anomaly.customUrls !== undefined) {
+ anomaly.customUrls.forEach((customUrl, index) => {
+ items.push(
+ { this.closePopover(); this.openCustomUrl(customUrl); }}
+ >
+ {customUrl.url_name}
+
+ );
+ });
+ }
+
+ if (showViewSeriesLink === true && anomaly.isTimeSeriesViewDetector === true) {
+ items.push(
+ { this.closePopover(); this.viewSeries(); }}
+ >
+ View series
+
+ );
+ }
+
+ if (anomaly.entityName === 'mlcategory') {
+ items.push(
+ { this.closePopover(); this.viewExamples(); }}
+ >
+ View examples
+
+ );
+ }
+
+ return (
+
+
+ );
+ }
+}
+
+LinksMenu.propTypes = {
+ anomaly: PropTypes.object.isRequired,
+ showViewSeriesLink: PropTypes.bool,
+ isAggregatedData: PropTypes.bool,
+ interval: PropTypes.string,
+ timefilter: PropTypes.object.isRequired
+};
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/styles/main.less b/x-pack/plugins/ml/public/components/anomalies_table/styles/main.less
index 9527ce538d9233..a71d790ce538a9 100644
--- a/x-pack/plugins/ml/public/components/anomalies_table/styles/main.less
+++ b/x-pack/plugins/ml/public/components/anomalies_table/styles/main.less
@@ -1,126 +1,114 @@
-ml-anomalies-table {
+.ml-anomalies-table {
+ .ml-icon-severity-critical,
+ .ml-icon-severity-major,
+ .ml-icon-severity-minor,
+ .ml-icon-severity-warning,
+ .ml-icon-severity-unknown {
+ color: inherit;
+ text-shadow: none;
+ }
- .anomalies-table {
- padding: 10px;
+ .ml-icon-severity-critical {
+ .euiIcon {
+ fill: #fe5050;
+ }
+ }
- .no-results-item {
- text-align: center;
- padding-top: 10px;
+ .ml-icon-severity-major {
+ .euiIcon {
+ fill: #fba740;
}
+ }
- .table {
- margin-bottom: 35px;
+ .ml-icon-severity-minor {
+ .euiIcon {
+ fill: #fdec25;
+ }
+ }
- td, th {
- color: #2d2d2d;
- font-size: 12px;
- white-space: nowrap;
+ .ml-icon-severity-warning {
+ .euiIcon {
+ fill: #8bc8fb;
+ }
+ }
- .kuiButton.dropdown-toggle {
- font-size: 12px;
- }
+ .ml-icon-severity-unknown {
+ .euiIcon {
+ fill: #c0c0c0;
+ }
+ }
- .fa.fa-arrow-up, .fa.fa-arrow-down {
- font-size: 11px;
- color: #686868;
- }
+ tr th:first-child,
+ tr td:first-child {
+ width: 32px;
+ }
- button {
- border: none;
- }
- button:focus {
- outline: none;
- }
- }
+ .euiTableCellContent {
+ .euiHealth {
+ font-size: inherit;
+ }
- td {
- button {
- font-family: inherit;
- background-color: transparent;
- }
- }
+ .filter-button {
+ opacity: 0.3;
+ width: 20px;
+ padding-top: 2px;
- th {
- button {
- background-color: #FFFFFF;
- padding: 0px 2px;
- }
+ .euiIcon {
+ width: 14px;
+ height: 14px;
}
}
- .agg-table-paginated {
- overflow-x: auto;
- .dropdown-menu {
- left: -60px;
- }
+ .filter-button:hover {
+ opacity: 1;
}
+ }
- .ml-anomaly-interim-result {
- font-style:italic;
- padding-bottom: 3px;
- }
+ .euiContextMenuItem {
+ min-width: 150px
+ }
- .ml-tablerow-expanded {
- width: 100%;
- padding: 5px 20px;
- overflow: hidden;
- font-size: 12px;
-
- table {
- td {
- padding: 0px 0px 2px 0px;
- button {
- padding: 0px 0px;
- }
- }
+ .category-example {
+ display: block;
+ white-space: nowrap;
+ }
- tr>td:first-child {
- padding-left: 2px;
- vertical-align: top;
- }
+ .interim-result {
+ font-style: italic;
+ }
- td:first-child {
- width: 140px;
- }
+ .ml-anomalies-table-details {
+ padding: 4px 32px;
+ max-height: 1000px;
+ overflow-y: auto;
- td:nth-child(2) {
- padding-left: 5px;
- }
+ .anomaly-description-list {
+
+ .euiDescriptionList__title {
+ margin-top: 0px;
+ flex-basis: 15%;
+ font-size: inherit;
}
- }
+ .euiDescriptionList__description {
+ margin-top: 0px;
+ flex-basis: 85%;
+ font-size: inherit;
+ }
- .ml-tablerow-expanded-heading {
- font-weight: bold;
- display: block;
- padding-top: 5px;
- }
+ .filter-button {
+ height: 20px;
+ padding-top: 2px;
- .ml-tablerow-expanded-heading:first-child {
- padding-top: 0px;
- }
+ .euiButtonIcon__icon {
+ -webkit-transform: translateY(-7px);
+ transform: translateY(-7px);
+ }
+ }
- .ml-tablerow-expanded-mv-description {
- display: block;
}
-
}
-}
-.ml-anomalies-table.dropdown-menu {
- min-width: 120px;
- font-size: 12px;
}
-.ml-anomalies-table.dropdown-menu > li > a {
- color: #444444;
- text-decoration: none;
-}
-
-.ml-anomalies-table.dropdown-menu > li > a:hover,
-.ml-anomalies-table.dropdown-menu > li > a:active,
-.ml-anomalies-table.dropdown-menu > li > a:focus {
- color: #ffffff;
- box-shadow: none;
-}
diff --git a/x-pack/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js b/x-pack/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js
new file mode 100644
index 00000000000000..5f5c1c465947c4
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/chart_tooltip/__tests__/chart_tooltip.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import ngMock from 'ng_mock';
+import expect from 'expect.js';
+
+describe('ML - mlChartTooltipService', () => {
+ let mlChartTooltipService;
+
+ beforeEach(ngMock.module('kibana'));
+ beforeEach(() => {
+ ngMock.inject(function ($injector) {
+ mlChartTooltipService = $injector.get('mlChartTooltipService');
+ });
+ });
+
+ it('service API duck typing', () => {
+ expect(mlChartTooltipService).to.be.an('object');
+ expect(mlChartTooltipService.show).to.be.a('function');
+ expect(mlChartTooltipService.hide).to.be.a('function');
+ });
+
+});
diff --git a/x-pack/plugins/ml/public/components/chart_tooltip/chart_tooltip.js b/x-pack/plugins/ml/public/components/chart_tooltip/chart_tooltip.js
index 1a0a66fb4efb82..8f2861a0aad3cc 100644
--- a/x-pack/plugins/ml/public/components/chart_tooltip/chart_tooltip.js
+++ b/x-pack/plugins/ml/public/components/chart_tooltip/chart_tooltip.js
@@ -68,20 +68,20 @@ module.directive('mlChartTooltip', function (mlChartTooltipService) {
'display': 'block'
});
}
+ };
- this.hide = function () {
- if (this.element !== null) {
- this.element.css({
- 'opacity': '0',
- });
+ this.hide = function () {
+ if (this.element !== null) {
+ this.element.css({
+ 'opacity': '0',
+ });
- // after the fade out transition has finished, set the display to
- // none so it doesn't block any mouse events underneath it.
- this.fadeTimeout = $timeout(() => {
- this.element.css('display', 'none');
- this.fadeTimeout = null;
- }, FADE_TIMEOUT_MS);
- }
- };
+ // after the fade out transition has finished, set the display to
+ // none so it doesn't block any mouse events underneath it.
+ this.fadeTimeout = $timeout(() => {
+ this.element.css('display', 'none');
+ this.fadeTimeout = null;
+ }, FADE_TIMEOUT_MS);
+ }
};
});
diff --git a/x-pack/plugins/ml/public/components/confirm_modal/confirm_modal_service.js b/x-pack/plugins/ml/public/components/confirm_modal/confirm_modal_service.js
index a4dc6f6697642b..18ffa53c441fc6 100644
--- a/x-pack/plugins/ml/public/components/confirm_modal/confirm_modal_service.js
+++ b/x-pack/plugins/ml/public/components/confirm_modal/confirm_modal_service.js
@@ -13,10 +13,10 @@ import template from './confirm_modal.html';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
-module.service('mlConfirmModalService', function ($modal, $q) {
+module.service('mlConfirmModalService', function ($modal) {
this.open = function (options) {
- return $q((resolve, reject) => {
+ return new Promise((resolve, reject) => {
$modal.open({
template,
controller: 'MlConfirmModal',
diff --git a/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer.js b/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer.js
index 23e55862f34864..cc13feaa4a9cc3 100644
--- a/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer.js
+++ b/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer.js
@@ -13,59 +13,54 @@ import { RecognizedResult } from './recognized_result';
import { ml } from 'plugins/ml/services/ml_api_service';
-export function dataRecognizerProvider() {
+export class DataRecognizer extends Component {
+ constructor(props) {
+ super(props);
- class DataRecognizer extends Component {
- constructor(props) {
- super(props);
+ this.state = {
+ results: []
+ };
- this.state = {
- results: []
- };
-
- this.indexPattern = props.indexPattern;
- this.savedSearch = props.savedSearch;
- this.className = props.className;
- this.results = props.results;
- }
+ this.indexPattern = props.indexPattern;
+ this.savedSearch = props.savedSearch;
+ this.className = props.className;
+ this.results = props.results;
+ }
- componentDidMount() {
- // once the mount is complete, call the recognize endpoint to see if the index format is known to us,
- ml.recognizeIndex({ indexPatternTitle: this.indexPattern.title })
- .then((resp) => {
- const results = resp.map((r) => (
-
-
+ type="card.type"
+ tooltip-enabled="true"
+ />
+`;
+
+exports[`FieldTypeIcon update component 1`] = `
+
+
+ );
+ }
+
+ return
+
+ );
+}
+
+function Influencer({ influencerFieldName, valueData }) {
+ const maxScorePrecise = valueData.maxAnomalyScore;
+ const maxScore = parseInt(maxScorePrecise);
+ const maxScoreLabel = (maxScore !== 0) ? maxScore : '< 1';
+ const severity = getSeverity(maxScore);
+ const totalScore = parseInt(valueData.sumAnomalyScore);
+ const totalScoreLabel = (totalScore !== 0) ? totalScore : '< 1';
+
+ // Ensure the bar has some width for 0 scores.
+ const barScore = (maxScore !== 0) ? maxScore : 1;
+ const barStyle = {
+ width: `${barScore}%`
+ };
+
+ const tooltipContent = getTooltipContent(maxScoreLabel, totalScoreLabel);
+
+ return (
+
Your license key is a JSON file with a signature attached.
@@ -611,6 +630,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
Your license key is a JSON file with a signature attached.
@@ -921,6 +950,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
Your license key is a JSON file with a signature attached.
@@ -1231,6 +1270,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
Your license key is a JSON file with a signature attached.
@@ -1541,6 +1590,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
- This trial is for the full set of Elastic{' '}
+ This trial is for the full set of{' '}
- Machine learning
- Alerting -
- Graph +
- Graph capabilities
- JDBC connectivity for SQL
- Security features, such authentication (native, AD/LDAP, SAML,
+ Security features, such as authentication (native, AD/LDAP, SAML,
PKI), role-based access control, and auditing, require
configuration. See the{' '}
+
+
-
-
-
-
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.js b/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.js
new file mode 100644
index 00000000000000..ef28da7ae23166
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table.js
@@ -0,0 +1,394 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+/*
+ * React table for displaying a list of anomalies.
+ */
+
+import PropTypes from 'prop-types';
+import _ from 'lodash';
+import $ from 'jquery';
+
+import React, {
+ Component
+} from 'react';
+
+import {
+ EuiButtonIcon,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiHealth,
+ EuiInMemoryTable,
+ EuiText
+} from '@elastic/eui';
+
+import { formatDate } from '@elastic/eui/lib/services/format';
+
+import { DescriptionCell } from './description_cell';
+import { EntityCell } from './entity_cell';
+import { InfluencersCell } from './influencers_cell';
+import { AnomalyDetails } from './anomaly_details';
+import { LinksMenu } from './links_menu';
+
+import { mlAnomaliesTableService } from './anomalies_table_service';
+import { mlFieldFormatService } from 'plugins/ml/services/field_format_service';
+import { getSeverityColor } from 'plugins/ml/../common/util/anomaly_utils';
+import { formatValue } from 'plugins/ml/formatters/format_value';
+
+
+const INFLUENCERS_LIMIT = 5; // Maximum number of influencers to display before a 'show more' link is added.
+
+
+function renderTime(date, aggregationInterval) {
+ if (aggregationInterval === 'hour') {
+ return formatDate(date, 'MMMM Do YYYY, HH:mm');
+ } else if (aggregationInterval === 'second') {
+ return formatDate(date, 'MMMM Do YYYY, HH:mm:ss');
+ } else {
+ return formatDate(date, 'MMMM Do YYYY');
+ }
+}
+
+function showLinksMenuForItem(item) {
+ return item.isTimeSeriesViewDetector ||
+ item.entityName === 'mlcategory' ||
+ item.customUrls !== undefined;
+}
+
+function getColumns(
+ items,
+ examplesByJobId,
+ isAggregatedData,
+ interval,
+ timefilter,
+ showViewSeriesLink,
+ itemIdToExpandedRowMap,
+ toggleRow,
+ filter) {
+ const columns = [
+ {
+ name: '',
+ render: (item) => (
+
-
-
- No matching results found
-No matching anomalies found
+
-
- Open link
-
-
-
-
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table_service.js b/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table_service.js
index bfdecbad968860..2c7147650c221d 100644
--- a/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table_service.js
+++ b/x-pack/plugins/ml/public/components/anomalies_table/anomalies_table_service.js
@@ -11,16 +11,14 @@
* anomalies table component.
*/
-import { uiModules } from 'ui/modules';
-const module = uiModules.get('apps/ml');
-
import { listenerFactoryProvider } from 'plugins/ml/factories/listener_factory';
-module.service('mlAnomaliesTableService', function () {
-
- const listenerFactory = listenerFactoryProvider();
- this.anomalyRecordMouseenter = listenerFactory();
- this.anomalyRecordMouseleave = listenerFactory();
- this.filterChange = listenerFactory();
+class AnomaliesTableService {
+ constructor() {
+ const listenerFactory = listenerFactoryProvider();
+ this.anomalyRecordMouseenter = listenerFactory();
+ this.anomalyRecordMouseleave = listenerFactory();
+ }
+}
-});
+export const mlAnomaliesTableService = new AnomaliesTableService();
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js b/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js
new file mode 100644
index 00000000000000..fdd12e1e596062
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js
@@ -0,0 +1,326 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+/*
+ * React component for displaying details of an anomaly in the expanded row section
+ * of the anomalies table.
+ */
+
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import _ from 'lodash';
+
+import {
+ EuiDescriptionList,
+ EuiIcon,
+ EuiLink,
+ EuiSpacer,
+ EuiText
+} from '@elastic/eui';
+import { formatDate } from '@elastic/eui/lib/services/format';
+
+import { EntityCell } from './entity_cell';
+import {
+ getSeverity,
+ showActualForFunction,
+ showTypicalForFunction
+} from 'plugins/ml/../common/util/anomaly_utils';
+import { formatValue } from 'plugins/ml/formatters/format_value';
+
+const TIME_FIELD_NAME = 'timestamp';
+
+
+function getFilterEntity(entityName, entityValue, filter) {
+ return (
+ Description
+ {anomalyDescription} +Details on highest severity anomaly
+ ) : ( +Anomaly details
+ )} + {isInterimResult === true && +Influencers
+
+ {this.renderDescription()}
+
+ );
+ }
+}
+
+AnomalyDetails.propTypes = {
+ anomaly: PropTypes.object.isRequired,
+ examples: PropTypes.array,
+ isAggregatedData: PropTypes.bool,
+ filter: PropTypes.func,
+ influencersLimit: PropTypes.number
+};
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/description_cell.js b/x-pack/plugins/ml/public/components/anomalies_table/description_cell.js
new file mode 100644
index 00000000000000..034bb905aef46f
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/anomalies_table/description_cell.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiIcon,
+ EuiText
+} from '@elastic/eui';
+
+import { getMetricChangeDescription } from 'plugins/ml/formatters/metric_change_description';
+
+/*
+ * Component for rendering the description cell in the anomalies table, which provides a
+ * concise description of how the actual value of an anomaly compares to the typical value.
+ */
+export function DescriptionCell({ actual, typical }) {
+
+ const {
+ iconType,
+ message
+ } = getMetricChangeDescription(actual, typical);
+
+ return (
+ {message}
+{influencer.influencerFieldName}: {influencer.influencerFieldValue}
- );
- });
+ const displayRows = displayInfluencers.map((influencer, index) => (
+ {influencer.influencerFieldName}: {influencer.influencerFieldValue}
+ ));
+
+
+ return (
+
- {this.renderInfluencers()}
- {this.renderOthers()}
+ {this.renderInfluencers(influencers)}
+ {this.renderOthers(influencers)}
);
}
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell_directive.js b/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell_directive.js
deleted file mode 100644
index 09aa97c28f347d..00000000000000
--- a/x-pack/plugins/ml/public/components/anomalies_table/influencers_cell/influencers_cell_directive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-
-
-
-import 'ngreact';
-
-import { InfluencersCell } from './influencers_cell';
-
-import { uiModules } from 'ui/modules';
-const module = uiModules.get('apps/ml', ['react']);
-module.directive('mlInfluencersCell', function (reactDirective) {
- return reactDirective(InfluencersCell, undefined, { restrict: 'E' });
-});
diff --git a/x-pack/plugins/ml/public/components/anomalies_table/links_menu.js b/x-pack/plugins/ml/public/components/anomalies_table/links_menu.js
new file mode 100644
index 00000000000000..d77716049237e3
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/anomalies_table/links_menu.js
@@ -0,0 +1,414 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import _ from 'lodash';
+import moment from 'moment';
+import rison from 'rison-node';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+
+import {
+ EuiButtonEmpty,
+ EuiContextMenuPanel,
+ EuiContextMenuItem,
+ EuiPopover
+} from '@elastic/eui';
+
+import 'ui/timefilter';
+import chrome from 'ui/chrome';
+import { toastNotifications } from 'ui/notify';
+
+import { ES_FIELD_TYPES } from 'plugins/ml/../common/constants/field_types';
+import { parseInterval } from 'plugins/ml/../common/util/parse_interval';
+import { getFieldTypeFromMapping } from 'plugins/ml/services/mapping_service';
+import { ml } from 'plugins/ml/services/ml_api_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
+import { getUrlForRecord } from 'plugins/ml/util/custom_url_utils';
+import { getIndexPatterns } from 'plugins/ml/util/index_utils';
+import { replaceStringTokens } from 'plugins/ml/util/string_utils';
+
+
+/*
+ * Component for rendering the links menu inside a cell in the anomalies table.
+ */
+export class LinksMenu extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ isPopoverOpen: false,
+ toasts: []
+ };
+ }
+
+ openCustomUrl = (customUrl) => {
+ const { anomaly, interval, isAggregatedData } = this.props;
+
+ console.log('Anomalies Table - open customUrl for record:', anomaly);
+
+ // If url_value contains $earliest$ and $latest$ tokens, add in times to the source record.
+ // Create a copy of the record as we are adding properties into it.
+ const record = _.cloneDeep(anomaly.source);
+ const timestamp = record.timestamp;
+ const configuredUrlValue = customUrl.url_value;
+ const timeRangeInterval = parseInterval(customUrl.time_range);
+ if (configuredUrlValue.includes('$earliest$')) {
+ let earliestMoment = moment(timestamp);
+ if (timeRangeInterval !== null) {
+ earliestMoment.subtract(timeRangeInterval);
+ } else {
+ earliestMoment = moment(timestamp).startOf(interval);
+ if (interval === 'hour') {
+ // Start from the previous hour.
+ earliestMoment.subtract(1, 'h');
+ }
+ }
+ record.earliest = earliestMoment.toISOString(); // e.g. 2016-02-08T16:00:00.000Z
+ }
+
+ if (configuredUrlValue.includes('$latest$')) {
+ let latestMoment = moment(timestamp).add(record.bucket_span, 's');
+ if (timeRangeInterval !== null) {
+ latestMoment.add(timeRangeInterval);
+ } else {
+ if (isAggregatedData === true) {
+ latestMoment = moment(timestamp).endOf(interval);
+ if (interval === 'hour') {
+ // Show to the end of the next hour.
+ latestMoment.add(1, 'h'); // e.g. 2016-02-08T18:59:59.999Z
+ }
+ }
+ }
+ record.latest = latestMoment.toISOString();
+ }
+
+ // If url_value contains $mlcategoryterms$ or $mlcategoryregex$, add in the
+ // terms and regex for the selected categoryId to the source record.
+ if ((configuredUrlValue.includes('$mlcategoryterms$') || configuredUrlValue.includes('$mlcategoryregex$'))
+ && _.has(record, 'mlcategory')) {
+ const jobId = record.job_id;
+
+ // mlcategory in the source record will be an array
+ // - use first value (will only ever be more than one if influenced by category other than by/partition/over).
+ const categoryId = record.mlcategory[0];
+
+ ml.results.getCategoryDefinition(jobId, categoryId)
+ .then((resp) => {
+ // Prefix each of the terms with '+' so that the Elasticsearch Query String query
+ // run in a drilldown Kibana dashboard has to match on all terms.
+ const termsArray = resp.terms.split(' ').map(term => `+${term}`);
+ record.mlcategoryterms = termsArray.join(' ');
+ record.mlcategoryregex = resp.regex;
+
+ // Replace any tokens in the configured url_value with values from the source record,
+ // and then open link in a new tab/window.
+ const urlPath = replaceStringTokens(customUrl.url_value, record, true);
+ window.open(urlPath, '_blank');
+
+ }).catch((resp) => {
+ console.log('openCustomUrl(): error loading categoryDefinition:', resp);
+ toastNotifications.addDanger(
+ `Unable to open link as an error occurred loading details on category ID ${categoryId}`);
+ });
+
+ } else {
+ // Replace any tokens in the configured url_value with values from the source record,
+ // and then open link in a new tab/window.
+ const urlPath = getUrlForRecord(customUrl, record);
+ window.open(urlPath, '_blank');
+ }
+
+ };
+
+ viewSeries = () => {
+ const record = this.props.anomaly.source;
+ const bounds = this.props.timefilter.getActiveBounds();
+ const from = bounds.min.toISOString(); // e.g. 2016-02-08T16:00:00.000Z
+ const to = bounds.max.toISOString();
+
+ // Zoom to show 50 buckets either side of the record.
+ const recordTime = moment(record.timestamp);
+ const zoomFrom = recordTime.subtract(50 * record.bucket_span, 's').toISOString();
+ const zoomTo = recordTime.add(100 * record.bucket_span, 's').toISOString();
+
+ // Extract the by, over and partition fields for the record.
+ const entityCondition = {};
+
+ if (_.has(record, 'partition_field_value')) {
+ entityCondition[record.partition_field_name] = record.partition_field_value;
+ }
+
+ if (_.has(record, 'over_field_value')) {
+ entityCondition[record.over_field_name] = record.over_field_value;
+ }
+
+ if (_.has(record, 'by_field_value')) {
+ // Note that analyses with by and over fields, will have a top-level by_field_name,
+ // but the by_field_value(s) will be in the nested causes array.
+ // TODO - drilldown from cause in expanded row only?
+ entityCondition[record.by_field_name] = record.by_field_value;
+ }
+
+ // Use rison to build the URL .
+ const _g = rison.encode({
+ ml: {
+ jobIds: [record.job_id]
+ },
+ refreshInterval: {
+ display: 'Off',
+ pause: false,
+ value: 0
+ },
+ time: {
+ from: from,
+ to: to,
+ mode: 'absolute'
+ }
+ });
+
+ const _a = rison.encode({
+ mlTimeSeriesExplorer: {
+ zoom: {
+ from: zoomFrom,
+ to: zoomTo
+ },
+ detectorIndex: record.detector_index,
+ entities: entityCondition,
+ },
+ filters: [],
+ query: {
+ query_string: {
+ analyze_wildcard: true,
+ query: '*'
+ }
+ }
+ });
+
+ // Need to encode the _a parameter in case any entities contain unsafe characters such as '+'.
+ let path = `${chrome.getBasePath()}/app/ml#/timeseriesexplorer`;
+ path += `?_g=${_g}&_a=${encodeURIComponent(_a)}`;
+ window.open(path, '_blank');
+ }
+
+ viewExamples = () => {
+ const categoryId = this.props.anomaly.entityValue;
+ const record = this.props.anomaly.source;
+ const indexPatterns = getIndexPatterns();
+
+ const job = mlJobService.getJob(this.props.anomaly.jobId);
+ if (job === undefined) {
+ console.log(`viewExamples(): no job found with ID: ${this.props.anomaly.jobId}`);
+ toastNotifications.addDanger(
+ `Unable to view examples as no details could be found for job ID ${this.props.anomaly.jobId}`);
+ return;
+ }
+ const categorizationFieldName = job.analysis_config.categorization_field_name;
+ const datafeedIndices = job.datafeed_config.indices;
+ // Find the type of the categorization field i.e. text (preferred) or keyword.
+ // Uses the first matching field found in the list of indices in the datafeed_config.
+ // attempt to load the field type using each index. we have to do it this way as _field_caps
+ // doesn't specify which index a field came from unless there is a clash.
+ let i = 0;
+ findFieldType(datafeedIndices[i]);
+
+ function findFieldType(index) {
+ getFieldTypeFromMapping(index, categorizationFieldName)
+ .then((resp) => {
+ if (resp !== '') {
+ createAndOpenUrl(index, resp);
+ } else {
+ i++;
+ if (i < datafeedIndices.length) {
+ findFieldType(datafeedIndices[i]);
+ } else {
+ error();
+ }
+ }
+ })
+ .catch(() => {
+ error();
+ });
+ }
+
+ function createAndOpenUrl(index, categorizationFieldType) {
+ // Find the ID of the index pattern with a title attribute which matches the
+ // index configured in the datafeed. If a Kibana index pattern has not been created
+ // for this index, then the user will see a warning message on the Discover tab advising
+ // them that no matching index pattern has been configured.
+ let indexPatternId = index;
+ for (let j = 0; j < indexPatterns.length; j++) {
+ if (indexPatterns[j].get('title') === index) {
+ indexPatternId = indexPatterns[j].id;
+ break;
+ }
+ }
+
+ // Get the definition of the category and use the terms or regex to view the
+ // matching events in the Kibana Discover tab depending on whether the
+ // categorization field is of mapping type text (preferred) or keyword.
+ ml.results.getCategoryDefinition(record.job_id, categoryId)
+ .then((resp) => {
+ let query = null;
+ // Build query using categorization regex (if keyword type) or terms (if text type).
+ // Check for terms or regex in case categoryId represents an anomaly from the absence of the
+ // categorization field in documents (usually indicated by a categoryId of -1).
+ if (categorizationFieldType === ES_FIELD_TYPES.KEYWORD) {
+ if (resp.regex) {
+ query = `${categorizationFieldName}:/${resp.regex}/`;
+ }
+ } else {
+ if (resp.terms) {
+ query = `${categorizationFieldName}:` + resp.terms.split(' ').join(` AND ${categorizationFieldName}:`);
+ }
+ }
+
+ const recordTime = moment(record.timestamp);
+ const from = recordTime.toISOString();
+ const to = recordTime.add(record.bucket_span, 's').toISOString();
+
+ // Use rison to build the URL .
+ const _g = rison.encode({
+ refreshInterval: {
+ display: 'Off',
+ pause: false,
+ value: 0
+ },
+ time: {
+ from: from,
+ to: to,
+ mode: 'absolute'
+ }
+ });
+
+ const appStateProps = {
+ index: indexPatternId,
+ filters: []
+ };
+ if (query !== null) {
+ appStateProps.query = {
+ query_string: {
+ analyze_wildcard: true,
+ query: query
+ }
+ };
+ }
+ const _a = rison.encode(appStateProps);
+
+ // Need to encode the _a parameter as it will contain characters such as '+' if using the regex.
+ let path = chrome.getBasePath();
+ path += '/app/kibana#/discover';
+ path += '?_g=' + _g;
+ path += '&_a=' + encodeURIComponent(_a);
+ window.open(path, '_blank');
+
+ }).catch((resp) => {
+ console.log('viewExamples(): error loading categoryDefinition:', resp);
+ toastNotifications.addDanger(
+ `Unable to view examples as an error occurred loading details on category ID ${categoryId}`);
+ });
+
+ }
+
+ function error() {
+ console.log(`viewExamples(): error finding type of field ${categorizationFieldName} in indices:`,
+ datafeedIndices);
+ toastNotifications.addDanger(
+ `Unable to view examples of documents with mlcategory ${categoryId} ` +
+ `as no mapping could be found for the categorization field ${categorizationFieldName}`);
+ }
+ };
+
+ onButtonClick = () => {
+ this.setState(prevState => ({
+ isPopoverOpen: !prevState.isPopoverOpen,
+ }));
+ };
+
+ closePopover = () => {
+ this.setState({
+ isPopoverOpen: false,
+ });
+ };
+
+ render() {
+ const { anomaly, showViewSeriesLink } = this.props;
+
+ const button = (
+
- {this.state.results}
-
- );
- }
+ });
}
- DataRecognizer.propTypes = {
- indexPattern: PropTypes.object,
- savedSearch: PropTypes.object,
- className: PropTypes.string,
- results: PropTypes.object,
- };
-
- return DataRecognizer;
+ render() {
+ return (
+
+ {this.state.results}
+
+ );
+ }
}
+
+DataRecognizer.propTypes = {
+ indexPattern: PropTypes.object,
+ savedSearch: PropTypes.object,
+ className: PropTypes.string,
+ results: PropTypes.object,
+};
diff --git a/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer_directive.js b/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer_directive.js
index 4edea6330d0767..81186fb9af8128 100644
--- a/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer_directive.js
+++ b/x-pack/plugins/ml/public/components/data_recognizer/data_recognizer_directive.js
@@ -8,11 +8,10 @@
import 'ngreact';
-import { dataRecognizerProvider } from './data_recognizer';
+import { DataRecognizer } from './data_recognizer';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml', ['react']);
-module.directive('mlDataRecognizer', function (reactDirective, Private) {
- const DataRecognizer = Private(dataRecognizerProvider);
+module.directive('mlDataRecognizer', function (reactDirective) {
return reactDirective(DataRecognizer, undefined, { restrict: 'AE' });
});
diff --git a/x-pack/plugins/ml/public/components/documentation_help_link/__snapshots__/documentation_help_link_view.test.js.snap b/x-pack/plugins/ml/public/components/documentation_help_link/__snapshots__/documentation_help_link_view.test.js.snap
new file mode 100644
index 00000000000000..ff953f5a97ca0b
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/documentation_help_link/__snapshots__/documentation_help_link_view.test.js.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DocumentationHelpLink renders the link 1`] = `
+
+ Label Text
+
+
-
-
-
diff --git a/x-pack/plugins/ml/public/components/influencers_list/influencers_list.js b/x-pack/plugins/ml/public/components/influencers_list/influencers_list.js
new file mode 100644
index 00000000000000..eedac15ef04424
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/influencers_list/influencers_list.js
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+/*
+ * React component for rendering a list of Machine Learning influencers.
+ */
+
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiSpacer,
+ EuiText,
+ EuiTitle,
+ EuiToolTip
+} from '@elastic/eui';
+
+import { abbreviateWholeNumber } from 'plugins/ml/formatters/abbreviate_whole_number';
+import { getSeverity } from 'plugins/ml/../common/util/anomaly_utils';
+
+
+function getTooltipContent(maxScoreLabel, totalScoreLabel) {
+ return (
+
-
-
-
-
-
-
- No influencers found
-
-
-
-
-{{influencerfieldname}}
-
-
-
-
-
-
-
-
- {{influencer.influencerFieldValue}}
- mlcategory {{influencer.influencerFieldValue}}
-
-
-
-
- {{influencer.maxScoreLabel}}
-
-
-
-
- {{influencer.totalScore | abbreviateWholeNumber:4}}
-
-
- < 1
-
-
- Maximum anomaly score: {maxScoreLabel}
+Total anomaly score: {totalScoreLabel}
+
+
+
+
+
+ );
+}
+InfluencersByName.propTypes = {
+ influencerFieldName: PropTypes.string.isRequired,
+ fieldValues: PropTypes.array.isRequired
+};
+
+export function InfluencersList({ influencers }) {
+
+ if (influencers === undefined || Object.keys(influencers).length === 0) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ const influencersByName = Object.keys(influencers).map(influencerFieldName => (
+ ', () => {
expect(scope.id).to.be(id);
expect(scope.text).to.be('');
});
+
it('Initialize with existing tooltip attribute', () => {
const id = 'new_job_id';
$element = $compile(``)($scope);
@@ -57,7 +56,7 @@ describe('ML - ', () => {
expect(scope.text).to.be(tooltips[id].text);
// test the rendered span element which should be referenced by aria-describedby
- const span = $element.find('span');
+ const span = $element.find('span.ml-info-tooltip-text');
expect(span[0].id).to.be('ml_aria_description_' + id);
expect(span.text()).to.be(tooltips[id].text);
});
diff --git a/x-pack/plugins/ml/public/components/json_tooltip/json_tooltip.js b/x-pack/plugins/ml/public/components/json_tooltip/json_tooltip.js
index 3df2cdaee64b94..019a11f6462fc3 100644
--- a/x-pack/plugins/ml/public/components/json_tooltip/json_tooltip.js
+++ b/x-pack/plugins/ml/public/components/json_tooltip/json_tooltip.js
@@ -24,26 +24,33 @@ module.service('mlJsonTooltipService', function () {
return '';
}
};
-})
+});
// directive for placing an i icon with a popover tooltip anywhere on a page
-// tooltip format:
+// tooltip format:
// the_id will match an entry in tooltips.json
- .directive('mlInfoIcon', function () {
- return {
- scope: {
- id: '@mlInfoIcon'
- },
- restrict: 'AE',
- replace: true,
- template: `
-
- {{text}}
-
+// the original will be replaced with
+// ... to transform the DOM structure
+// into one which is suitable for use with EuiTooltip. Because of this replacement
+// span[ml-info-icon] has to be used instead of i[ml-info-icon] when using CSS.
+module.directive('mlInfoIcon', function () {
+ return {
+ scope: {
+ id: '@mlInfoIcon',
+ position: '@'
+ },
+ restrict: 'AE',
+ replace: true,
+ template: `
+
+
+ {{text}}
+
+
`,
- controller: function ($scope) {
- $scope.text = (tooltips[$scope.id]) ? tooltips[$scope.id].text : '';
- }
- };
+ controller: function ($scope) {
+ $scope.text = (tooltips[$scope.id]) ? tooltips[$scope.id].text : '';
+ }
+ };
- });
+});
diff --git a/x-pack/plugins/ml/public/components/json_tooltip/styles/main.less b/x-pack/plugins/ml/public/components/json_tooltip/styles/main.less
index 403faa2072e85e..d33956ce3b7991 100644
--- a/x-pack/plugins/ml/public/components/json_tooltip/styles/main.less
+++ b/x-pack/plugins/ml/public/components/json_tooltip/styles/main.less
@@ -1,4 +1,4 @@
-i[ml-info-icon] {
+span[ml-info-icon] {
color: #888;
margin: 3px 4px;
transition: color 0.15s;
@@ -8,7 +8,7 @@ i[ml-info-icon] {
}
}
-i[ml-info-icon]:hover {
+span[ml-info-icon]:hover {
color: #444;
transition: color 0.15s 0.15s;
}
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/index.js b/x-pack/plugins/ml/public/components/tooltip/index.js
similarity index 76%
rename from x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/index.js
rename to x-pack/plugins/ml/public/components/tooltip/index.js
index 31f94875772cc5..b789a3ec28bffe 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/index.js
+++ b/x-pack/plugins/ml/public/components/tooltip/index.js
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { ShowSytemIndicesCheckbox } from './show_system_indices_checkbox';
+import './tooltip_directive';
diff --git a/x-pack/plugins/ml/public/components/tooltip/tooltip_directive.js b/x-pack/plugins/ml/public/components/tooltip/tooltip_directive.js
new file mode 100644
index 00000000000000..bd5a7d43f7e6fd
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/tooltip/tooltip_directive.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import { uiModules } from 'ui/modules';
+const module = uiModules.get('apps/ml', ['react']);
+
+import { Tooltip } from './tooltip_view';
+
+module.directive('mlTooltip', function ($compile) {
+ const link = function (scope, element) {
+ const content = element.html();
+ element.html('');
+
+ const props = {
+ position: scope.position,
+ text: scope.text,
+ transclude: (el) => {
+ const transcludeScope = scope.$new();
+ const compiled = $compile(content)(transcludeScope);
+ el.append(compiled[0]);
+ }
+ };
+
+ ReactDOM.render(
+ React.createElement(Tooltip, props),
+ element[0]
+ );
+ };
+
+ return {
+ restrict: 'A',
+ replace: true,
+ scope: false,
+ transclude: false,
+ link
+ };
+});
diff --git a/x-pack/plugins/ml/public/components/tooltip/tooltip_view.js b/x-pack/plugins/ml/public/components/tooltip/tooltip_view.js
new file mode 100644
index 00000000000000..d2ebd4355a2557
--- /dev/null
+++ b/x-pack/plugins/ml/public/components/tooltip/tooltip_view.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import PropTypes from 'prop-types';
+
+import React from 'react';
+
+import {
+ EuiToolTip
+} from '@elastic/eui';
+
+export function Tooltip({ position = 'top', text, transclude }) {
+ return (
+
+
+
+ );
+}
+Tooltip.propTypes = {
+ position: PropTypes.string,
+ text: PropTypes.string,
+ transclude: PropTypes.func
+};
diff --git a/x-pack/plugins/ml/public/components/validate_job/validate_job_directive.js b/x-pack/plugins/ml/public/components/validate_job/validate_job_directive.js
index 9dff7938b9d77e..eb9184fb9db042 100644
--- a/x-pack/plugins/ml/public/components/validate_job/validate_job_directive.js
+++ b/x-pack/plugins/ml/public/components/validate_job/validate_job_directive.js
@@ -9,17 +9,13 @@
import 'ngreact';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml', ['react']);
import { ValidateJob } from './validate_job_view';
+import { mlJobService } from 'plugins/ml/services/job_service';
-module.directive('mlValidateJob', function ($injector) {
- const Private = $injector.get('Private');
- const mlJobService = Private(JobServiceProvider);
- const reactDirective = $injector.get('reactDirective');
-
+module.directive('mlValidateJob', function (reactDirective) {
return reactDirective(
ValidateJob,
undefined,
diff --git a/x-pack/plugins/ml/public/components/validate_job/validate_job_view.test.js b/x-pack/plugins/ml/public/components/validate_job/validate_job_view.test.js
index a82a79d4dd2bc1..024dbb3dadf8d5 100644
--- a/x-pack/plugins/ml/public/components/validate_job/validate_job_view.test.js
+++ b/x-pack/plugins/ml/public/components/validate_job/validate_job_view.test.js
@@ -9,8 +9,6 @@ import React from 'react';
import { ValidateJob } from './validate_job_view';
-jest.mock('ui/chrome', () => { }, { virtual: true });
-
const job = {
job_id: 'test-id'
};
diff --git a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js
index 305aabd8b7b0e8..7790d716a95ebf 100644
--- a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js
+++ b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js
@@ -30,9 +30,10 @@ import { IntervalHelperProvider } from 'plugins/ml/util/ml_time_buckets';
import { checkLicenseExpired } from 'plugins/ml/license/check_license';
import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege';
import { createSearchItems } from 'plugins/ml/jobs/new_job/utils/new_job_utils';
-import { getIndexPatternWithRoute, getSavedSearchWithRoute, timeBasedIndexCheck } from 'plugins/ml/util/index_utils';
+import { loadCurrentIndexPattern, loadCurrentSavedSearch, timeBasedIndexCheck } from 'plugins/ml/util/index_utils';
import { checkMlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
import { ml } from 'plugins/ml/services/ml_api_service';
+import { initPromise } from 'plugins/ml/util/promise';
import template from './datavisualizer.html';
uiRoutes
@@ -41,9 +42,10 @@ uiRoutes
resolve: {
CheckLicense: checkLicenseExpired,
privileges: checkGetJobsPrivilege,
- indexPattern: getIndexPatternWithRoute,
- savedSearch: getSavedSearchWithRoute,
- checkMlNodesAvailable
+ indexPattern: loadCurrentIndexPattern,
+ savedSearch: loadCurrentSavedSearch,
+ checkMlNodesAvailable,
+ initPromise: initPromise(true)
}
});
@@ -56,7 +58,6 @@ module
$route,
$timeout,
$window,
- $q,
Private,
timefilter,
AppState) {
@@ -461,7 +462,7 @@ module
buckets.setBarTarget(BAR_TARGET);
const aggInterval = buckets.getInterval();
- $q.when(ml.getVisualizerFieldStats({
+ ml.getVisualizerFieldStats({
indexPatternTitle: indexPattern.title,
query: $scope.searchQuery,
timeFieldName: indexPattern.timeFieldName,
@@ -470,7 +471,7 @@ module
samplerShardSize: $scope.samplerShardSize,
interval: aggInterval.expression,
fields: numberFields
- }))
+ })
.then((resp) => {
// Add the metric stats to the existing stats in the corresponding card.
_.each($scope.metricCards, (card) => {
@@ -520,7 +521,7 @@ module
if (fields.length > 0) {
- $q.when(ml.getVisualizerFieldStats({
+ ml.getVisualizerFieldStats({
indexPatternTitle: indexPattern.title,
query: $scope.searchQuery,
fields: fields,
@@ -529,7 +530,7 @@ module
latest: $scope.latest,
samplerShardSize: $scope.samplerShardSize,
maxExamples: 10
- }))
+ })
.then((resp) => {
// Add the metric stats to the existing stats in the corresponding card.
_.each($scope.fieldCards, (card) => {
@@ -575,7 +576,7 @@ module
// 2. List of aggregatable fields that do not exist in docs
// 3. List of non-aggregatable fields that do exist in docs.
// 4. List of non-aggregatable fields that do not exist in docs.
- $q.when(ml.getVisualizerOverallStats({
+ ml.getVisualizerOverallStats({
indexPatternTitle: indexPattern.title,
query: $scope.searchQuery,
timeFieldName: indexPattern.timeFieldName,
@@ -584,7 +585,7 @@ module
latest: $scope.latest,
aggregatableFields: aggregatableFields,
nonAggregatableFields: nonAggregatableFields
- }))
+ })
.then((resp) => {
$scope.overallStats = resp;
createMetricCards();
diff --git a/x-pack/plugins/ml/public/explorer/explorer.html b/x-pack/plugins/ml/public/explorer/explorer.html
index 9fcf3d90b9aac8..9c6d3cb41ac6d4 100644
--- a/x-pack/plugins/ml/public/explorer/explorer.html
+++ b/x-pack/plugins/ml/public/explorer/explorer.html
@@ -32,18 +32,21 @@
+ {(influencerFieldName !== 'mlcategory') ? (
+
+ {valueData.influencerFieldValue}
+ ) : (
+ mlcategory {valueData.influencerFieldValue}
+ )}
+
+
+ );
+}
+Influencer.propTypes = {
+ influencerFieldName: PropTypes.string.isRequired,
+ valueData: PropTypes.object.isRequired
+};
+
+function InfluencersByName({ influencerFieldName, fieldValues }) {
+ const influencerValues = fieldValues.map(valueData => (
+
+
+
+
+
+
+ {maxScoreLabel}
+
+
+
+
+ {(totalScore > 0) ? abbreviateWholeNumber(totalScore, 4) : totalScoreLabel}
+
+
+ {influencerFieldName}
+No influencers found
+
+ {influencersByName}
+
+ );
+}
+InfluencersList.propTypes = {
+ influencers: PropTypes.object
+};
diff --git a/x-pack/plugins/ml/public/components/influencers_list/influencers_list_directive.js b/x-pack/plugins/ml/public/components/influencers_list/influencers_list_directive.js
index 574c56be510ceb..114620b49ab336 100644
--- a/x-pack/plugins/ml/public/components/influencers_list/influencers_list_directive.js
+++ b/x-pack/plugins/ml/public/components/influencers_list/influencers_list_directive.js
@@ -5,113 +5,19 @@
*/
-
-/*
- * AngularJS directive for rendering a list of Machine Learning influencers.
- */
-
-import _ from 'lodash';
-
-import 'plugins/ml/lib/angular_bootstrap_patch';
-import 'plugins/ml/filters/abbreviate_whole_number';
-
-import template from './influencers_list.html';
-import { getSeverity } from 'plugins/ml/util/anomaly_utils';
-import { mlEscape } from 'plugins/ml/util/string_utils';
-
-import { FilterManagerProvider } from 'ui/filter_manager';
+import 'ngreact';
import { uiModules } from 'ui/modules';
-const module = uiModules.get('apps/ml');
-
-module.directive('mlInfluencersList', function (Private) {
-
- const filterManager = Private(FilterManagerProvider);
-
- function link(scope, element) {
-
- scope.$on('render', function () {
- render();
- });
-
- element.on('$destroy', function () {
- scope.$destroy();
- });
-
- scope.tooltipPlacement = scope.tooltipPlacement === undefined ? 'top' : scope.tooltipPlacement;
-
- function render() {
- if (scope.influencersData === undefined) {
- return;
- }
-
- const dataByViewBy = {};
-
- // TODO - position tooltip so it doesn't go off edge of window.
- const compiledTooltip = _.template(
- '<%= influencerFieldName %>: <%= influencerFieldValue %>' +
- '
Max anomaly score: <%= maxScoreLabel %>' + - '
Total anomaly score: <%= totalScoreLabel %>
');
-
- _.each(scope.influencersData, (fieldValues, influencerFieldName) => {
- const valuesForViewBy = [];
-
- _.each(fieldValues, function (valueData) {
- const influencerFieldValue = valueData.influencerFieldValue;
- const maxScorePrecise = valueData.maxAnomalyScore;
- const maxScore = parseInt(maxScorePrecise);
- const totalScore = parseInt(valueData.sumAnomalyScore);
- const barScore = maxScore !== 0 ? maxScore : 1;
- const maxScoreLabel = maxScore !== 0 ? maxScore : '< 1';
- const totalScoreLabel = totalScore !== 0 ? totalScore : '< 1';
- const severity = getSeverity(maxScore);
-
- // Store the data for each influencerfieldname in an array to ensure
- // reliable sorting by max score.
- // If it was sorted as an object, the order when rendered using the AngularJS
- // ngRepeat directive could not be relied upon to be the same as they were
- // returned in the ES aggregation e.g. for numeric keys from a mlcategory influencer.
- valuesForViewBy.push({
- influencerFieldValue,
- maxScorePrecise,
- barScore,
- maxScoreLabel,
- totalScore,
- severity,
- tooltip: compiledTooltip({
- influencerFieldName: mlEscape(influencerFieldName),
- influencerFieldValue: mlEscape(influencerFieldValue),
- maxScoreLabel,
- totalScoreLabel
- })
- });
- });
-
-
- dataByViewBy[influencerFieldName] = _.sortBy(valuesForViewBy, 'maxScorePrecise').reverse();
- });
-
- scope.influencers = dataByViewBy;
- }
-
- // Provide a filter function so filters can be added.
- scope.filter = function (field, value, operator) {
- filterManager.add(field, value, operator, scope.indexPatternId);
- };
+const module = uiModules.get('apps/ml', ['react']);
- scope.showNoResultsMessage = function () {
- return (scope.influencersData === undefined) || (_.keys(scope.influencersData).length === 0);
- };
+import { InfluencersList } from './influencers_list';
- }
+module.directive('mlInfluencersList', function ($injector) {
+ const reactDirective = $injector.get('reactDirective');
- return {
- scope: {
- influencersData: '=',
- indexPatternId: '=',
- tooltipPlacement: '@'
- },
- template,
- link: link
- };
+ return reactDirective(
+ InfluencersList,
+ undefined,
+ { restrict: 'E' }
+ );
});
diff --git a/x-pack/plugins/ml/public/components/influencers_list/styles/main.less b/x-pack/plugins/ml/public/components/influencers_list/styles/main.less
index ba36498b065b04..d1fd0f14ebb9ba 100644
--- a/x-pack/plugins/ml/public/components/influencers_list/styles/main.less
+++ b/x-pack/plugins/ml/public/components/influencers_list/styles/main.less
@@ -1,59 +1,26 @@
.ml-influencers-list {
- width: 100%;
- padding: 0px 0px;
line-height: 1.45;
- .visualize-error {
- display: inline;
-
- h4 {
- font-size: 16px;
- margin-top: 65px;
- }
- }
-
- .section-label {
- background-color: #9c9fa6;
- color: #ffffff;
- font-size:13px;
- /* eui h3 equivalent font-weight */
- font-weight: 500;
- margin-bottom: 5px;
- padding: 2px 5px;
- }
-
- .influencer-content {
- padding-right: 4px;
- padding-left: 4px;
- }
-
.field-label {
font-size: 12px;
- padding-left: 2px;
text-align: left;
- .influencerfieldvalue {
- max-width: calc(~"100% - 40px");
+ .field-value {
+ max-width: calc(~"100% - 34px");
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: inline-block;
vertical-align: bottom;
}
-
- .filter-buttons {
- padding-left: 5px;
- display: inline-block;
- vertical-align: bottom;
- }
}
.progress {
display:inline-block;
- width: calc(~"100% - 40px");
- height: 20px;
+ width: calc(~"100% - 34px");
+ height: 22px;
min-width: 70px;
- margin-bottom: 2px;
+ margin-bottom: 0px;
color: #555;
background-color : transparent;
@@ -62,63 +29,76 @@
}
.progress-bar {
- height: 6px;
- margin: 6px 0px;
+ height: 2px;
+ margin-top: 8px;
text-align: right;
line-height: 18px;
- border-radius: 5px;
display: inline-block;
-
+ transition: none;
}
+ }
- .progress-bar.critical {
+ .progress.critical {
+ .progress-bar {
background-color: #fe5050;
}
+ .score-label {
+ border-color: #fe5050;
+ }
+ }
- .progress-bar.major {
+ .progress.major {
+ .progress-bar {
background-color: #fba740;
}
+ .score-label {
+ border-color: #fba740;
+ }
+ }
- .progress-bar.minor {
+ .progress.minor {
+ .progress-bar {
background-color: #ffdd00;
}
+ .score-label {
+ border-color: #ffdd00;
+ }
+ }
- .progress-bar.warning {
+ .progress.warning {
+ .progress-bar {
background-color: #8bc8fb;
}
-
+ .score-label {
+ border-color: #8bc8fb;
+ }
}
.score-label {
- margin-left: 3px;
text-align: center;
- color: #444444;
- padding: 2px 2px 2px 2px;
- border-radius: 4px;
line-height: 14px;
white-space: nowrap;
font-size: 12px;
- display: inline-block;
+ display: inline;
+ margin-left: 4px;
}
- .score-label.total-score-label {
+ .total-score-label {
width: 32px;
vertical-align: top;
- background-color: #444444;
- color: white;
+ text-align: center;
+ color: #555;
font-size: 11px;
+ line-height: 14px;
+ border-radius: 4px;
+ padding: 2px;
+ margin-top: 1px;
+ display: inline-block;
+ border: 1px solid #bbbbbb;
}
}
.ml-influencers-list-tooltip {
- color: #ffffff;
- font-family: Roboto, Droid, Helvetica Neue, Helvetica, Arial, sans-serif;
- font-size: 12px;
- text-align: left;
-
- hr {
- margin-top: 3px;
- margin-bottom: 3px;
- border-color: #95a5a6;
- }
+ word-break: break-all;
}
+
diff --git a/x-pack/plugins/ml/public/components/job_group_select/job_group_select.js b/x-pack/plugins/ml/public/components/job_group_select/job_group_select.js
index 2b2a9055130653..1b413476e83abe 100644
--- a/x-pack/plugins/ml/public/components/job_group_select/job_group_select.js
+++ b/x-pack/plugins/ml/public/components/job_group_select/job_group_select.js
@@ -10,13 +10,13 @@ import _ from 'lodash';
import template from './job_group_select.html';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
-import { CalendarServiceProvider } from 'plugins/ml/services/calendar_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
+import { mlCalendarService } from 'plugins/ml/services/calendar_service';
import { InitAfterBindingsWorkaround } from 'ui/compat';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
-module.directive('mlJobGroupSelect', function (es, $timeout, Private) {
+module.directive('mlJobGroupSelect', function () {
return {
restrict: 'E',
template,
@@ -30,8 +30,6 @@ module.directive('mlJobGroupSelect', function (es, $timeout, Private) {
controller: class MlGroupSelectController extends InitAfterBindingsWorkaround {
initAfterBindings($scope) {
- const mlJobService = Private(JobServiceProvider);
- const mlCalendarService = Private(CalendarServiceProvider);
this.$scope = $scope;
this.selectedGroups = [];
this.groups = [];
diff --git a/x-pack/plugins/ml/public/components/job_select_list/job_select_list_directive.js b/x-pack/plugins/ml/public/components/job_select_list/job_select_list_directive.js
index edaf73b61eefe1..baf611b87e5d83 100644
--- a/x-pack/plugins/ml/public/components/job_select_list/job_select_list_directive.js
+++ b/x-pack/plugins/ml/public/components/job_select_list/job_select_list_directive.js
@@ -18,7 +18,7 @@ import d3 from 'd3';
import template from './job_select_list.html';
import { isTimeSeriesViewJob } from 'plugins/ml/../common/util/job_utils';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
import { JobSelectServiceProvider } from 'plugins/ml/components/job_select_list/job_select_service';
import { uiModules } from 'ui/modules';
@@ -31,7 +31,6 @@ module.directive('mlJobSelectList', function (Private, timefilter) {
transclude: true,
template,
controller: function ($scope) {
- const mlJobService = Private(JobServiceProvider);
const mlJobSelectService = Private(JobSelectServiceProvider);
$scope.jobs = [];
$scope.groups = [];
diff --git a/x-pack/plugins/ml/public/components/job_select_list/job_select_service.js b/x-pack/plugins/ml/public/components/job_select_list/job_select_service.js
index 4e1b0d99c12c2c..cda64fe84ed135 100644
--- a/x-pack/plugins/ml/public/components/job_select_list/job_select_service.js
+++ b/x-pack/plugins/ml/public/components/job_select_list/job_select_service.js
@@ -11,12 +11,11 @@
import _ from 'lodash';
import { notify } from 'ui/notify';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
let jobSelectService = undefined;
-export function JobSelectServiceProvider($rootScope, Private, globalState) {
- const mlJobService = Private(JobServiceProvider);
+export function JobSelectServiceProvider($rootScope, globalState) {
function checkGlobalState() {
if (globalState.ml === undefined) {
diff --git a/x-pack/plugins/ml/public/components/json_tooltip/__tests__/json_tooltip.js b/x-pack/plugins/ml/public/components/json_tooltip/__tests__/json_tooltip.js
index 20bb0568143366..49b1194616fbe7 100644
--- a/x-pack/plugins/ml/public/components/json_tooltip/__tests__/json_tooltip.js
+++ b/x-pack/plugins/ml/public/components/json_tooltip/__tests__/json_tooltip.js
@@ -4,8 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-
-
import ngMock from 'ng_mock';
import expect from 'expect.js';
@@ -46,6 +44,7 @@ describe('ML - Max anomaly score: <%= maxScoreLabel %>' + - '
Total anomaly score: <%= totalScoreLabel %>
-
+
+
+
+
+
Top Influencers
-
+ influencers="influencers"
+ />
-
+
diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_config_builder.js b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_config_builder.js
index abccb6c00788fb..07a9bc0885e605 100644
--- a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_config_builder.js
+++ b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_config_builder.js
@@ -16,10 +16,9 @@ import _ from 'lodash';
import { parseInterval } from 'ui/utils/parse_interval';
import { buildConfigFromDetector } from 'plugins/ml/util/chart_config_builder';
import { mlEscape } from 'plugins/ml/util/string_utils';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
-export function explorerChartConfigBuilder(Private) {
- const mlJobService = Private(JobServiceProvider);
+export function explorerChartConfigBuilder() {
const compiledTooltip = _.template(
'
Anomaly timeline
@@ -138,13 +141,10 @@
- No {{swimlaneViewByFieldName}} influencers
-
-
-
+
+ job ID: <%= jobId %>
' + diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js index 71bfef368e78bb..98fea34be0d034 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js @@ -18,25 +18,23 @@ import d3 from 'd3'; import angular from 'angular'; import moment from 'moment'; -import { getSeverityWithLow } from 'plugins/ml/util/anomaly_utils'; +import { formatValue } from 'plugins/ml/formatters/format_value'; +import { getSeverityWithLow } from 'plugins/ml/../common/util/anomaly_utils'; import { drawLineChartDots, numTicksForDateFormat } from 'plugins/ml/util/chart_utils'; import { TimeBuckets } from 'ui/time_buckets'; -import 'plugins/ml/filters/format_value'; import loadingIndicatorWrapperTemplate from 'plugins/ml/components/loading_indicator/loading_indicator_wrapper.html'; import { mlEscape } from 'plugins/ml/util/string_utils'; -import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service'; +import { mlFieldFormatService } from 'plugins/ml/services/field_format_service'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); module.directive('mlExplorerChart', function ( - formatValueFilter, mlChartTooltipService, Private, mlSelectSeverityService) { function link(scope, element) { - const mlFieldFormatService = Private(FieldFormatServiceProvider); console.log('ml-explorer-chart directive link series config:', scope.seriesConfig); if (typeof scope.seriesConfig === 'undefined') { // just return so the empty directive renders without an error later on @@ -287,10 +285,10 @@ module.directive('mlExplorerChart', function ( if (_.has(marker, 'actual')) { // Display the record actual in preference to the chart value, which may be // different depending on the aggregation interval of the chart. - contents += (`
actual: ${formatValueFilter(marker.actual, config.functionDescription, fieldFormat)}`); - contents += (`
typical: ${formatValueFilter(marker.typical, config.functionDescription, fieldFormat)}`); + contents += (`
actual: ${formatValue(marker.actual, config.functionDescription, fieldFormat)}`); + contents += (`
typical: ${formatValue(marker.typical, config.functionDescription, fieldFormat)}`); } else { - contents += (`
value: ${formatValueFilter(marker.value, config.functionDescription, fieldFormat)}`); + contents += (`
value: ${formatValue(marker.value, config.functionDescription, fieldFormat)}`); if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) { const numberOfCauses = marker.numberOfCauses; const byFieldName = mlEscape(marker.byFieldName); @@ -304,7 +302,7 @@ module.directive('mlExplorerChart', function ( } } } else { - contents += `value: ${formatValueFilter(marker.value, config.functionDescription, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, config.functionDescription, fieldFormat)}`; } if (_.has(marker, 'scheduledEvents')) { diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js index 442fb5e5238f59..87b61f8534cba7 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js @@ -21,16 +21,13 @@ const module = uiModules.get('apps/ml'); import { explorerChartConfigBuilder } from './explorer_chart_config_builder'; import { chartLimits } from 'plugins/ml/util/chart_utils'; import { isTimeSeriesViewDetector } from 'plugins/ml/../common/util/job_utils'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { mlResultsService } from 'plugins/ml/services/results_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; module.controller('MlExplorerChartsContainerController', function ($scope, $injector) { const Private = $injector.get('Private'); const mlExplorerDashboardService = $injector.get('mlExplorerDashboardService'); const mlSelectSeverityService = $injector.get('mlSelectSeverityService'); - const $q = $injector.get('$q'); - const mlResultsService = Private(ResultsServiceProvider); - const mlJobService = Private(JobServiceProvider); $scope.seriesToPlot = []; @@ -124,7 +121,7 @@ module.controller('MlExplorerChartsContainerController', function ($scope, $inje // only after that trigger data processing and page render. // TODO - if query returns no results e.g. source data has been deleted, // display a message saying 'No data between earliest/latest'. - const seriesPromises = seriesConfigs.map(seriesConfig => $q.all([ + const seriesPromises = seriesConfigs.map(seriesConfig => Promise.all([ getMetricData(seriesConfig, chartRange), getRecordsForCriteria(seriesConfig, chartRange), getScheduledEvents(seriesConfig, chartRange) @@ -243,7 +240,7 @@ module.controller('MlExplorerChartsContainerController', function ($scope, $inje return chartPoint; } - $q.all(seriesPromises) + Promise.all(seriesPromises) .then(response => { // calculate an overall min/max for all series const processedData = response.map(processChartData); diff --git a/x-pack/plugins/ml/public/explorer/explorer_controller.js b/x-pack/plugins/ml/public/explorer/explorer_controller.js index 6ef12e3c8a1ad7..e6636ce40a2724 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_controller.js +++ b/x-pack/plugins/ml/public/explorer/explorer_controller.js @@ -18,23 +18,27 @@ import DragSelect from 'dragselect'; import moment from 'moment'; import 'plugins/ml/components/anomalies_table'; +import 'plugins/ml/components/controls'; import 'plugins/ml/components/influencers_list'; import 'plugins/ml/components/job_select_list'; import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter'; import { parseInterval } from 'ui/utils/parse_interval'; +import { initPromise } from 'plugins/ml/util/promise'; import template from './explorer.html'; import uiRoutes from 'ui/routes'; import { checkLicense } from 'plugins/ml/license/check_license'; import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; -import { getIndexPatterns } from 'plugins/ml/util/index_utils'; +import { loadIndexPatterns, getIndexPatterns } from 'plugins/ml/util/index_utils'; import { refreshIntervalWatcher } from 'plugins/ml/util/refresh_interval_watcher'; import { IntervalHelperProvider, getBoundsRoundedToInterval } from 'plugins/ml/util/ml_time_buckets'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; -import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service'; +import { ml } from 'plugins/ml/services/ml_api_service'; +import { mlResultsService } from 'plugins/ml/services/results_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; +import { mlFieldFormatService } from 'plugins/ml/services/field_format_service'; import { JobSelectServiceProvider } from 'plugins/ml/components/job_select_list/job_select_service'; +import { isTimeSeriesViewDetector } from 'plugins/ml/../common/util/job_utils'; uiRoutes .when('/explorer/?', { @@ -42,7 +46,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - indexPatterns: getIndexPatterns + indexPatterns: loadIndexPatterns, + initPromise: initPromise(true) } }); @@ -51,7 +56,6 @@ const module = uiModules.get('apps/ml'); module.controller('MlExplorerController', function ( $scope, - $route, $timeout, AppState, Private, @@ -59,26 +63,23 @@ module.controller('MlExplorerController', function ( mlCheckboxShowChartsService, mlExplorerDashboardService, mlSelectLimitService, + mlSelectIntervalService, mlSelectSeverityService) { $scope.timeFieldName = 'timestamp'; $scope.loading = true; - $scope.loadCounter = 0; timefilter.enableTimeRangeSelector(); timefilter.enableAutoRefreshSelector(); const TimeBuckets = Private(IntervalHelperProvider); const queryFilter = Private(FilterBarQueryFilterProvider); - const mlResultsService = Private(ResultsServiceProvider); - const mlJobService = Private(JobServiceProvider); - const mlFieldFormatService = Private(FieldFormatServiceProvider); const mlJobSelectService = Private(JobSelectServiceProvider); let resizeTimeout = null; const $mlExplorer = $('.ml-explorer'); - const MAX_INFLUENCER_FIELD_NAMES = 10; const MAX_INFLUENCER_FIELD_VALUES = 10; + const MAX_CATEGORY_EXAMPLES = 10; const VIEW_BY_JOB_LABEL = 'job ID'; const ALLOW_CELL_RANGE_SELECTION = mlExplorerDashboardService.allowCellRangeSelection; @@ -167,35 +168,34 @@ module.controller('MlExplorerController', function ( }); } - $scope.loadAnomaliesTable = function (jobIds, influencers, earliestMs, latestMs) { - mlResultsService.getRecordsForInfluencer( - jobIds, influencers, 0, earliestMs, latestMs, 500 - ) - .then((resp) => { - // Sort in descending time order before storing in scope. - $scope.anomalyRecords = _.chain(resp.records).sortBy(record => record[$scope.timeFieldName]).reverse().value(); - console.log('Explorer anomalies table data set:', $scope.anomalyRecords); - - // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. - $timeout(() => { - $scope.$broadcast('renderTable'); - }, 0); - }); - }; - $scope.setSelectedJobs = function (selectedIds) { let previousSelected = 0; if ($scope.selectedJobs !== null) { previousSelected = $scope.selectedJobs.length; } - // Check for any new jobs created since the page was first loaded. - for (let i = 0; i < selectedIds.length; i++) { - if (_.find($scope.jobs, { 'id': selectedIds[i] }) === undefined) { - $scope.jobs = createJobs(mlJobService.jobs); - break; + // Check for any new jobs created since the page was first loaded, + // and whether any of the jobs have influencers configured (in which + // case the Top Influencers section will be hidden). + let recreateJobs = false; + let hasInfluencers = false; + selectedIds.forEach((id) => { + if (recreateJobs === false && _.find($scope.jobs, { id }) === undefined) { + recreateJobs = true; } + + const job = mlJobService.getJob(id); + let influencers = []; + if (job !== undefined) { + influencers = job.analysis_config.influencers || []; + } + hasInfluencers = hasInfluencers || influencers.length > 0; + }); + + if (recreateJobs === true) { + $scope.jobs = createJobs(mlJobService.jobs); } + $scope.noInfluencersConfigured = !hasInfluencers; // update the jobs' selected flag $scope.selectedJobs = []; @@ -215,7 +215,7 @@ module.controller('MlExplorerController', function ( $scope.appState.save(); // Populate the map of jobs / detectors / field formatters for the selected IDs. - mlFieldFormatService.populateFormats(selectedIds, $route.current.locals.indexPatterns) + mlFieldFormatService.populateFormats(selectedIds, getIndexPatterns()) .finally(() => { // Load the data - if the FieldFormats failed to populate // the default formatting will be used for metric values. @@ -308,16 +308,39 @@ module.controller('MlExplorerController', function ( return $scope.viewBySwimlaneData !== null && $scope.viewBySwimlaneData.laneLabels && $scope.viewBySwimlaneData.laneLabels.length > 0; }; - const getTimeRange = function (cellData) { - // Time range for charts should be maximum time span at job bucket span, centred on the selected cell. + function getSelectionTimeRange(cellData) { + // Returns the time range of the cell(s) currently selected in the swimlane. + // If no cell(s) are currently selected, returns the dashboard time range. const bounds = timefilter.getActiveBounds(); - const earliestMs = cellData.time[0] !== undefined ? ((cellData.time[0]) * 1000) : bounds.min.valueOf(); - let latestMs = cellData.time[1] !== undefined ? ((cellData.time[1]) * 1000) : bounds.max.valueOf(); - if (earliestMs === latestMs) { - latestMs = latestMs + (cellData.interval * 1000); + let earliestMs = bounds.min.valueOf(); + let latestMs = bounds.max.valueOf(); + + if (cellData !== undefined && cellData.time !== undefined) { + // time property of the cell data is an array, with the elements being + // the start times of the first and last cell selected. + earliestMs = (cellData.time[0] !== undefined) ? cellData.time[0] * 1000 : bounds.min.valueOf(); + latestMs = bounds.max.valueOf(); + if (cellData.time[1] !== undefined) { + // Subtract 1 ms so search does not include start of next bucket. + latestMs = ((cellData.time[1] + cellData.interval) * 1000) - 1; + } } + return { earliestMs, latestMs }; - }; + } + + function getSelectionInfluencers(cellData) { + const influencers = []; + + if (cellData !== undefined && cellData.fieldName !== undefined && + cellData.fieldName !== VIEW_BY_JOB_LABEL) { + cellData.laneLabels.forEach((laneLabel) =>{ + influencers.push({ fieldName: $scope.swimlaneViewByFieldName, fieldValue: laneLabel }); + }); + } + + return influencers; + } // Listener for click events in the swimlane and load corresponding anomaly data. // Empty cellData is passed on clicking outside a cell with score > 0. @@ -330,33 +353,43 @@ module.controller('MlExplorerController', function ( } clearSelectedAnomalies(); } else { - let jobIds = []; - const influencers = []; - const timerange = getTimeRange(cellData); - - if (cellData.fieldName === undefined) { - // Click is in one of the cells in the Overall swimlane - reload the 'view by' swimlane - // to show the top 'view by' values for the selected time. - loadViewBySwimlaneForSelectedTime(timerange.earliestMs, timerange.latestMs); - $scope.viewByLoadedForTimeFormatted = moment(timerange.earliestMs).format('MMMM Do YYYY, HH:mm'); - } + const timerange = getSelectionTimeRange(cellData); + $scope.cellData = cellData; + + if (cellData.score > 0) { + if (cellData.fieldName === undefined) { + // Click is in one of the cells in the Overall swimlane - reload the 'view by' swimlane + // to show the top 'view by' values for the selected time. + loadViewBySwimlaneForSelectedTime(timerange.earliestMs, timerange.latestMs); + $scope.viewByLoadedForTimeFormatted = moment(timerange.earliestMs).format('MMMM Do YYYY, HH:mm'); + } + + const jobIds = (cellData.fieldName === VIEW_BY_JOB_LABEL) ? + cellData.laneLabels : $scope.getSelectedJobIds(); + const influencers = getSelectionInfluencers(cellData); - if (cellData.fieldName === VIEW_BY_JOB_LABEL) { - jobIds = cellData.laneLabels; + loadAnomaliesTableData(); + loadDataForCharts(jobIds, influencers, timerange.earliestMs, timerange.latestMs); } else { - jobIds = $scope.getSelectedJobIds(); + // Multiple cells are selected, all with a score of 0 - clear all anomalies. + $scope.$evalAsync(() => { + $scope.influencers = {}; + $scope.anomalyChartRecords = []; + + $scope.tableData = { + anomalies: [], + interval: mlSelectIntervalService.state.get('interval').val, + examplesByJobId: {}, + showViewSeriesLink: true + }; + }); - if (cellData.fieldName !== undefined) { - cellData.laneLabels.forEach((laneLabel) =>{ - influencers.push({ fieldName: $scope.swimlaneViewByFieldName, fieldValue: laneLabel }); - }); - } + mlExplorerDashboardService.anomalyDataChange.changed( + [], + timerange.earliestMs, + timerange.latestMs + ); } - - $scope.cellData = cellData; - const args = [jobIds, influencers, timerange.earliestMs, timerange.latestMs]; - $scope.loadAnomaliesTable(...args); - $scope.loadAnomaliesForCharts(...args); } }; mlExplorerDashboardService.swimlaneCellClick.watch(swimlaneCellClickListener); @@ -366,7 +399,7 @@ module.controller('MlExplorerController', function ( if (showCharts && $scope.cellData !== undefined) { swimlaneCellClickListener($scope.cellData); } else { - const timerange = getTimeRange($scope.cellData); + const timerange = getSelectionTimeRange($scope.cellData); mlExplorerDashboardService.anomalyDataChange.changed( [], timerange.earliestMs, timerange.latestMs ); @@ -377,7 +410,7 @@ module.controller('MlExplorerController', function ( const anomalyChartsSeverityListener = function () { const showCharts = mlCheckboxShowChartsService.state.get('showCharts'); if (showCharts && $scope.cellData !== undefined) { - const timerange = getTimeRange($scope.cellData); + const timerange = getSelectionTimeRange($scope.cellData); mlExplorerDashboardService.anomalyDataChange.changed( $scope.anomalyChartRecords, timerange.earliestMs, timerange.latestMs ); @@ -385,6 +418,12 @@ module.controller('MlExplorerController', function ( }; mlSelectSeverityService.state.watch(anomalyChartsSeverityListener); + const tableControlsListener = function () { + loadAnomaliesTableData(); + }; + mlSelectIntervalService.state.watch(tableControlsListener); + mlSelectSeverityService.state.watch(tableControlsListener); + const swimlaneLimitListener = function () { loadViewBySwimlane([]); clearSelectedAnomalies(); @@ -403,29 +442,93 @@ module.controller('MlExplorerController', function ( mlExplorerDashboardService.swimlaneCellClick.unwatch(swimlaneCellClickListener); mlExplorerDashboardService.swimlaneRenderDone.unwatch(swimlaneRenderDoneListener); mlSelectSeverityService.state.unwatch(anomalyChartsSeverityListener); + mlSelectIntervalService.state.unwatch(tableControlsListener); + mlSelectSeverityService.state.unwatch(tableControlsListener); mlSelectLimitService.state.unwatch(swimlaneLimitListener); - $scope.cellData = undefined; + delete $scope.cellData; refreshWatcher.cancel(); // Cancel listening for updates to the global nav state. navListener(); }); - $scope.loadAnomaliesForCharts = function (jobIds, influencers, earliestMs, latestMs) { + function loadDataForCharts(jobIds, influencers, earliestMs, latestMs) { + // Loads the data used to populate the anomaly charts and the Top Influencers List. + if (influencers.length === 0) { + getTopInfluencers(jobIds, earliestMs, latestMs); + } + // Load the top anomalies (by record_score) which will be displayed in the charts. - // TODO - combine this with loadAnomaliesTable() if the table is being retained. mlResultsService.getRecordsForInfluencer( jobIds, influencers, 0, earliestMs, latestMs, 500 - ).then((resp) => { - $scope.anomalyChartRecords = resp.records; - console.log('Explorer anomaly charts data set:', $scope.anomalyChartRecords); + ) + .then((resp) => { + if ($scope.cellData !== undefined && _.keys($scope.cellData).length > 0) { + $scope.anomalyChartRecords = resp.records; + console.log('Explorer anomaly charts data set:', $scope.anomalyChartRecords); + + if (mlCheckboxShowChartsService.state.get('showCharts')) { + mlExplorerDashboardService.anomalyDataChange.changed( + $scope.anomalyChartRecords, earliestMs, latestMs + ); + } + } - if (mlCheckboxShowChartsService.state.get('showCharts')) { - mlExplorerDashboardService.anomalyDataChange.changed( - $scope.anomalyChartRecords, earliestMs, latestMs - ); - } - }); - }; + if (influencers.length > 0) { + // Filter the Top Influencers list to show just the influencers from + // the records in the selected time range. + const recordInfluencersByName = {}; + + // Add the specified influencer(s) to ensure they are used in the filter + // even if their influencer score for the selected time range is zero. + influencers.forEach((influencer) => { + const fieldName = influencer.fieldName; + if (recordInfluencersByName[influencer.fieldName] === undefined) { + recordInfluencersByName[influencer.fieldName] = []; + } + recordInfluencersByName[fieldName].push(influencer.fieldValue); + }); + + // Add the influencers from the top scoring anomalies. + resp.records.forEach((record) => { + const influencersByName = record.influencers || []; + influencersByName.forEach((influencer) => { + const fieldName = influencer.influencer_field_name; + const fieldValues = influencer.influencer_field_values; + if (recordInfluencersByName[fieldName] === undefined) { + recordInfluencersByName[fieldName] = []; + } + recordInfluencersByName[fieldName].push(...fieldValues); + }); + }); + + const uniqValuesByName = {}; + Object.keys(recordInfluencersByName).forEach((fieldName) => { + const fieldValues = recordInfluencersByName[fieldName]; + uniqValuesByName[fieldName] = _.uniq(fieldValues); + }); + + const filterInfluencers = []; + Object.keys(uniqValuesByName).forEach((fieldName) => { + // Find record influencers with the same field name as the clicked on cell(s). + const matchingFieldName = influencers.find((influencer) => { + return influencer.fieldName === fieldName; + }); + + if (matchingFieldName !== undefined) { + // Filter for the value(s) of the clicked on cell(s). + filterInfluencers.push(...influencers); + } else { + // For other field names, add values from all records. + uniqValuesByName[fieldName].forEach((fieldValue) => { + filterInfluencers.push({ fieldName, fieldValue }); + }); + } + }); + + getTopInfluencers(jobIds, earliestMs, latestMs, filterInfluencers); + } + }); + } function loadViewBySwimlaneOptions() { // Obtain the list of 'View by' fields per job. @@ -539,36 +642,6 @@ module.controller('MlExplorerController', function ( $scope.loading = true; $scope.hasResults = false; - // Counter to keep track of what data sets have been loaded. - $scope.loadCounter++; - let awaitingCount = 2; - - // finish() function, called after each data set has been loaded and processed. - // The last one to call it will trigger the page render. - function finish(counterVar) { - awaitingCount--; - if (awaitingCount === 0 && (counterVar === $scope.loadCounter)) { - - if ($scope.overallSwimlaneData.points && $scope.overallSwimlaneData.points.length > 0) { - $scope.hasResults = true; - - // Trigger loading of the 'view by' swimlane - - // only load once the overall swimlane so that we can match the time span. - loadViewBySwimlaneOptions(); - } else { - $scope.hasResults = false; - } - $scope.loading = false; - - // Tell the result components directives to render. - // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. - $timeout(() => { - $scope.$broadcast('render'); - mlExplorerDashboardService.swimlaneDataChange.changed('overall'); - }, 0); - } - } - $scope.swimlaneBucketInterval = calculateSwimlaneBucketInterval(); console.log('Explorer swimlane bucketInterval:', $scope.swimlaneBucketInterval); @@ -578,25 +651,7 @@ module.controller('MlExplorerController', function ( const searchBounds = getBoundsRoundedToInterval(bounds, $scope.swimlaneBucketInterval, false); const selectedJobIds = $scope.getSelectedJobIds(); - // Query 1 - load list of top influencers. - // Pass a counter flag into the finish() function to make sure we only process the results - // for the most recent call to the load the data in cases where the job selection and time filter - // have been altered in quick succession (such as from the job picker with 'Apply time range'). - const counter = $scope.loadCounter; - mlResultsService.getTopInfluencers( - selectedJobIds, - searchBounds.min.valueOf(), - searchBounds.max.valueOf(), - MAX_INFLUENCER_FIELD_NAMES, - MAX_INFLUENCER_FIELD_VALUES - ).then((resp) => { - // TODO - sort the influencers keys so that the partition field(s) are first. - $scope.influencersData = resp.influencers; - console.log('Explorer top influencers data set:', $scope.influencersData); - finish(counter); - }); - - // Query 2 - load overall bucket scores by time. + // Load the overall bucket scores by time. // Pass the interval in seconds as the swimlane relies on a fixed number of seconds between buckets // which wouldn't be the case if e.g. '1M' was used. // Pass 'true' when obtaining bucket bounds due to the way the overall_buckets endpoint works @@ -614,11 +669,46 @@ module.controller('MlExplorerController', function ( ).then((resp) => { processOverallResults(resp.results, searchBounds); console.log('Explorer overall swimlane data set:', $scope.overallSwimlaneData); - finish(counter); + + if ($scope.overallSwimlaneData.points && $scope.overallSwimlaneData.points.length > 0) { + $scope.hasResults = true; + + // Trigger loading of the 'view by' swimlane - + // only load once the overall swimlane so that we can match the time span. + loadViewBySwimlaneOptions(); + } else { + $scope.hasResults = false; + } + $scope.loading = false; + + // Tell the result components directives to render. + // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. + $timeout(() => { + $scope.$broadcast('render'); + mlExplorerDashboardService.swimlaneDataChange.changed('overall'); + }, 0); }); } + function getTopInfluencers(selectedJobIds, earliestMs, latestMs, influencers = []) { + if ($scope.noInfluencersConfigured !== true) { + mlResultsService.getTopInfluencers( + selectedJobIds, + earliestMs, + latestMs, + MAX_INFLUENCER_FIELD_VALUES, + influencers + ).then((resp) => { + // TODO - sort the influencers keys so that the partition field(s) are first. + $scope.influencers = resp.influencers; + console.log('Explorer top influencers data set:', $scope.influencers); + }); + } else { + $scope.influencers = {}; + } + } + function loadViewBySwimlane(fieldValues) { // finish() function, called after each data set has been loaded and processed. // The last one to call it will trigger the page render. @@ -658,7 +748,7 @@ module.controller('MlExplorerController', function ( interval, swimlaneLimit ).then((resp) => { - processViewByResults(resp.results); + processViewByResults(resp.results, fieldValues); finish(); }); } else { @@ -670,7 +760,7 @@ module.controller('MlExplorerController', function ( interval, swimlaneLimit ).then((resp) => { - processViewByResults(resp.results); + processViewByResults(resp.results, fieldValues); finish(); }); @@ -690,7 +780,6 @@ module.controller('MlExplorerController', function ( selectedJobIds, earliestMs, latestMs, - MAX_INFLUENCER_FIELD_NAMES, swimlaneLimit ).then((resp) => { const topFieldValues = []; @@ -715,10 +804,62 @@ module.controller('MlExplorerController', function ( } } + function loadAnomaliesTableData() { + const cellData = $scope.cellData; + const jobIds = ($scope.cellData !== undefined && cellData.fieldName === VIEW_BY_JOB_LABEL) ? + cellData.laneLabels : $scope.getSelectedJobIds(); + const influencers = getSelectionInfluencers(cellData); + const timeRange = getSelectionTimeRange(cellData); + + ml.results.getAnomaliesTableData( + jobIds, + [], + influencers, + mlSelectIntervalService.state.get('interval').val, + mlSelectSeverityService.state.get('threshold').val, + timeRange.earliestMs, + timeRange.latestMs, + 500, + MAX_CATEGORY_EXAMPLES + ).then((resp) => { + const anomalies = resp.anomalies; + const detectorsByJob = mlJobService.detectorsByJob; + anomalies.forEach((anomaly) => { + // Add a detector property to each anomaly. + // Default to functionDescription if no description available. + // TODO - when job_service is moved server_side, move this to server endpoint. + const jobId = anomaly.jobId; + anomaly.detector = _.get(detectorsByJob, + [jobId, anomaly.detectorIndex, 'detector_description'], + anomaly.source.function_description); + + // Add properties used for building the links menu. + // TODO - when job_service is moved server_side, move this to server endpoint. + anomaly.isTimeSeriesViewDetector = isTimeSeriesViewDetector( + mlJobService.getJob(jobId), anomaly.detectorIndex); + if (_.has(mlJobService.customUrlsByJob, jobId)) { + anomaly.customUrls = mlJobService.customUrlsByJob[jobId]; + } + }); + + $scope.$evalAsync(() => { + $scope.tableData = { + anomalies, + interval: resp.interval, + examplesByJobId: resp.examplesByJobId, + showViewSeriesLink: true + }; + }); + + }).catch((resp) => { + console.log('Explorer - error loading data for anomalies table:', resp); + }); + } + function clearSelectedAnomalies() { $scope.anomalyChartRecords = []; - $scope.anomalyRecords = []; $scope.viewByLoadedForTimeFormatted = null; + delete $scope.cellData; // With no swimlane selection, display anomalies over all time in the table. const jobIds = $scope.getSelectedJobIds(); @@ -726,7 +867,8 @@ module.controller('MlExplorerController', function ( const earliestMs = bounds.min.valueOf(); const latestMs = bounds.max.valueOf(); mlExplorerDashboardService.anomalyDataChange.changed($scope.anomalyChartRecords, earliestMs, latestMs); - $scope.loadAnomaliesTable(jobIds, [], earliestMs, latestMs); + loadDataForCharts(jobIds, [], earliestMs, latestMs); + loadAnomaliesTableData(); } function calculateSwimlaneBucketInterval() { @@ -764,8 +906,15 @@ module.controller('MlExplorerController', function ( } function getSwimlaneContainerWidth() { - // swimlane width is 5 sixths of the window, minus 170 for the lane labels, minus 50 padding - return(($mlExplorer.width() / 6) * 5) - 170 - 50; + if ($scope.noInfluencersConfigured === true) { + // swimlane is full width, minus 30 for the 'no influencers' info icon, + // minus 170 for the lane labels, minus 50 padding + return $mlExplorer.width() - 250; + } else { + // swimlane width is 5 sixths of the window, + // minus 170 for the lane labels, minus 50 padding + return (($mlExplorer.width() / 6) * 5) - 220; + } } function processOverallResults(scoresByTime, searchBounds) { @@ -796,7 +945,11 @@ module.controller('MlExplorerController', function ( $scope.overallSwimlaneData = dataset; } - function processViewByResults(scoresByInfluencerAndTime) { + function processViewByResults(scoresByInfluencerAndTime, sortedLaneValues) { + // Processes the scores for the 'view by' swimlane. + // Sorts the lanes according to the supplied array of lane + // values in the order in which they should be displayed, + // or pass an empty array to sort lanes according to max score over all time. const dataset = { fieldName: $scope.swimlaneViewByFieldName, points: [], @@ -825,13 +978,28 @@ module.controller('MlExplorerController', function ( }); }); - // Ensure lanes are sorted in descending order of max score. - // Note the keys in scoresByInfluencerAndTime received from the ES request - // are not guaranteed to be sorted by score if they can be parsed as numbers - // (e.g. if viewing by HTTP response code). - dataset.laneLabels = laneLabels.sort((a, b) => { - return maxScoreByLaneLabel[b] - maxScoreByLaneLabel[a]; - }); + const sortValuesLength = sortedLaneValues.length; + if (sortValuesLength === 0) { + // Sort lanes in descending order of max score. + // Note the keys in scoresByInfluencerAndTime received from the ES request + // are not guaranteed to be sorted by score if they can be parsed as numbers + // (e.g. if viewing by HTTP response code). + dataset.laneLabels = laneLabels.sort((a, b) => { + return maxScoreByLaneLabel[b] - maxScoreByLaneLabel[a]; + }); + } else { + // Sort lanes according to supplied order + // e.g. when a cell in the overall swimlane has been selected. + // Find the index of each lane label from the actual data set, + // rather than using sortedLaneValues as-is, just in case they differ. + dataset.laneLabels = laneLabels.sort((a, b) => { + let aIndex = sortedLaneValues.indexOf(a); + let bIndex = sortedLaneValues.indexOf(b); + aIndex = (aIndex > -1) ? aIndex : sortValuesLength; + bIndex = (bIndex > -1) ? bIndex : sortValuesLength; + return aIndex - bIndex; + }); + } $scope.viewBySwimlaneData = dataset; } diff --git a/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js b/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js index d18fb706f0d324..f2efd703a65c38 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js +++ b/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js @@ -17,7 +17,7 @@ const module = uiModules.get('apps/ml'); import { listenerFactoryProvider } from 'plugins/ml/factories/listener_factory'; module.service('mlExplorerDashboardService', function () { - this.allowCellRangeSelection = false; + this.allowCellRangeSelection = true; const listenerFactory = listenerFactoryProvider(); const dragSelect = this.dragSelect = listenerFactory(); diff --git a/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js b/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js index a7367266013dd0..3760c463e95638 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js +++ b/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js @@ -15,7 +15,7 @@ import $ from 'jquery'; import moment from 'moment'; import d3 from 'd3'; -import { getSeverityColor } from 'plugins/ml/util/anomaly_utils'; +import { getSeverityColor } from 'plugins/ml/../common/util/anomaly_utils'; import { numTicksForDateFormat } from 'plugins/ml/util/chart_utils'; import { IntervalHelperProvider } from 'plugins/ml/util/ml_time_buckets'; import { mlEscape } from 'plugins/ml/util/string_utils'; diff --git a/x-pack/plugins/ml/public/explorer/styles/main.less b/x-pack/plugins/ml/public/explorer/styles/main.less index e7c254460530f4..534b8cc73a6f9e 100644 --- a/x-pack/plugins/ml/public/explorer/styles/main.less +++ b/x-pack/plugins/ml/public/explorer/styles/main.less @@ -2,7 +2,6 @@ width: 100%; display: inline-block; color: #555; - font-size: 10px; .visualize-error { h4 { @@ -35,8 +34,22 @@ } .results-container { + + .col-xs-12 { + width: calc(~"100% - 30px"); + padding-left: 10px; + } + padding: 15px 0px 15px 0px; + .no-influencers-warning { + float: left; + padding-top: 2px; + padding-left: 15px; + color: #7b8a8b; + font-size: 14px; + } + .panel-title { color: #7b8a8b; display: inline-block; @@ -319,3 +332,5 @@ } } + + diff --git a/x-pack/plugins/ml/public/factories/__tests__/state_factory.js b/x-pack/plugins/ml/public/factories/__tests__/state_factory.js index 77b4ad21000fba..d8b177301e5c96 100644 --- a/x-pack/plugins/ml/public/factories/__tests__/state_factory.js +++ b/x-pack/plugins/ml/public/factories/__tests__/state_factory.js @@ -13,9 +13,11 @@ import { stateFactoryProvider } from '../state_factory'; describe('ML - mlStateFactory', () => { let stateFactory; + let AppState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(($injector) => { + AppState = $injector.get('AppState'); const Private = $injector.get('Private'); stateFactory = Private(stateFactoryProvider); })); @@ -53,4 +55,49 @@ describe('ML - mlStateFactory', () => { state.set('testValue', 10); state.changed(); }); + + it(`Malformed AppState, state falls back to undefined, doesn't throw an error`, () => { + const state = stateFactory('testName'); + + // First update the state without interfering with AppState + state.set('testValue', 1); + expect(state.get('testValue')).to.be(1); + + // Manipulate AppState first, then set and get the custom state. + const appState = new AppState(); + appState.fetch(); + appState.testName = undefined; + appState.save(); + state.set('testValue', 2); + expect(state.get('testValue')).to.be(2); + + // Now set the custom state, then manipulate AppState, then get the custom state. + // Because AppState was malformed between set and get, the custom state will fallback + // to the default state, in this case undefined + state.set('testValue', 3); + appState.fetch(); + appState.testName = undefined; + appState.save(); + expect(state.get('testValue')).to.be(undefined); + }); + + it(`Malformed AppState, state falls back to default, doesn't throw an error`, () => { + const state = stateFactory('testName', { + testValue: 1 + }); + + // First update the state without interfering with AppState + state.set('testValue', 2); + expect(state.get('testValue')).to.be(2); + + // Now set the custom state, then manipulate AppState, then get the custom state. + // Because AppState was malformed between set and get, the custom state will fallback + // to the default state, in this case 1 + state.set('testValue', 3); + const appState = new AppState(); + appState.fetch(); + appState.testName = undefined; + appState.save(); + expect(state.get('testValue')).to.be(1); + }); }); diff --git a/x-pack/plugins/ml/public/factories/state_factory.js b/x-pack/plugins/ml/public/factories/state_factory.js index 6248bd92ce9f31..f9db571e70f220 100644 --- a/x-pack/plugins/ml/public/factories/state_factory.js +++ b/x-pack/plugins/ml/public/factories/state_factory.js @@ -19,11 +19,7 @@ import { listenerFactoryProvider } from './listener_factory'; // Have a look at the unit tests which demonstrate basic usage. export function stateFactoryProvider(AppState) { - return function (stateName, defaultState) { - if (typeof stateName !== 'string') { - throw 'stateName needs to be of type `string`'; - } - + function initializeAppState(stateName, defaultState) { const appState = new AppState(); appState.fetch(); @@ -49,6 +45,16 @@ export function stateFactoryProvider(AppState) { } } + return appState; + } + + return function (stateName, defaultState) { + if (typeof stateName !== 'string') { + throw 'stateName needs to be of type `string`'; + } + + let appState = initializeAppState(stateName, defaultState); + // () two times here, because the Provider first returns // the Factory, which then returns the actual listener const listener = listenerFactoryProvider()(); @@ -60,11 +66,13 @@ export function stateFactoryProvider(AppState) { // on the state. const state = { get(name) { - return appState[stateName] && appState[stateName][name]; + updateAppState(); + return appState[stateName][name]; }, // only if value doesn't match the existing one, the state gets updated // and saved. set(name, value) { + updateAppState(); if (!_.isEqual(appState[stateName][name], value)) { appState[stateName][name] = value; appState.save(); @@ -73,6 +81,7 @@ export function stateFactoryProvider(AppState) { return state; }, reset() { + updateAppState(); if (!_.isEqual(appState[stateName], defaultState)) { appState[stateName] = _.cloneDeep(defaultState); appState.save(); @@ -92,6 +101,16 @@ export function stateFactoryProvider(AppState) { } }; + // gets the current state of AppState, if for whatever reason this custom + // state isn't part of AppState anymore, reinitialize it + function updateAppState() { + appState.fetch(); + if (typeof appState[stateName] === 'undefined') { + appState = initializeAppState(stateName, defaultState); + changed = true; + } + } + return state; }; } diff --git a/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js b/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js deleted file mode 100644 index 3015b6b59cdec7..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('abbreviateWholeNumber'); - }); -}; - -describe('ML - abbreviateWholeNumber filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have an abbreviateWholeNumber filter', () => { - expect(filter).to.not.be(null); - }); - - it('returns the correct format using default max digits', () => { - expect(filter(1)).to.be(1); - expect(filter(12)).to.be(12); - expect(filter(123)).to.be(123); - expect(filter(1234)).to.be('1k'); - expect(filter(12345)).to.be('12k'); - expect(filter(123456)).to.be('123k'); - expect(filter(1234567)).to.be('1m'); - expect(filter(12345678)).to.be('12m'); - expect(filter(123456789)).to.be('123m'); - expect(filter(1234567890)).to.be('1b'); - expect(filter(5555555555555.55)).to.be('6t'); - }); - - it('returns the correct format using custom max digits', () => { - expect(filter(1, 4)).to.be(1); - expect(filter(12, 4)).to.be(12); - expect(filter(123, 4)).to.be(123); - expect(filter(1234, 4)).to.be(1234); - expect(filter(12345, 4)).to.be('12k'); - expect(filter(123456, 6)).to.be(123456); - expect(filter(1234567, 4)).to.be('1m'); - expect(filter(12345678, 3)).to.be('12m'); - expect(filter(123456789, 9)).to.be(123456789); - expect(filter(1234567890, 3)).to.be('1b'); - expect(filter(5555555555555.55, 5)).to.be('6t'); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/__tests__/format_value.js b/x-pack/plugins/ml/public/filters/__tests__/format_value.js deleted file mode 100644 index 6ae77941685471..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/format_value.js +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; -import moment from 'moment'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('formatValue'); - }); -}; - -describe('ML - formatValue filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have a formatValue filter', () => { - expect(filter).to.not.be(null); - }); - - // Just check the return value is in the expected format, and - // not the exact value as this will be timezone specific. - it('correctly formats time_of_week value from numeric input', () => { - const formattedValue = filter(1483228800, 'time_of_week'); - const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats time_of_day value from numeric input', () => { - const formattedValue = filter(1483228800, 'time_of_day'); - const result = moment(formattedValue, 'hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats number values from numeric input', () => { - expect(filter(1483228800, 'mean')).to.be(1483228800); - expect(filter(1234.5678, 'mean')).to.be(1234.6); - expect(filter(0.00012345, 'mean')).to.be(0.000123); - expect(filter(0, 'mean')).to.be(0); - expect(filter(-0.12345, 'mean')).to.be(-0.123); - expect(filter(-1234.5678, 'mean')).to.be(-1234.6); - expect(filter(-100000.1, 'mean')).to.be(-100000); - }); - - it('correctly formats time_of_week value from array input', () => { - const formattedValue = filter([1483228800], 'time_of_week'); - const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats time_of_day value from array input', () => { - const formattedValue = filter([1483228800], 'time_of_day'); - const result = moment(formattedValue, 'hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats number values from array input', () => { - expect(filter([1483228800], 'mean')).to.be(1483228800); - expect(filter([1234.5678], 'mean')).to.be(1234.6); - expect(filter([0.00012345], 'mean')).to.be(0.000123); - expect(filter([0], 'mean')).to.be(0); - expect(filter([-0.12345], 'mean')).to.be(-0.123); - expect(filter([-1234.5678], 'mean')).to.be(-1234.6); - expect(filter([-100000.1], 'mean')).to.be(-100000); - }); - - it('correctly formats multi-valued array', () => { - const result = filter([500, 1000], 'mean'); - expect(result instanceof Array).to.be(true); - expect(result.length).to.be(2); - expect(result[0]).to.be(500); - expect(result[1]).to.be(1000); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js b/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js deleted file mode 100644 index e6045be4e09ec6..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('metricChangeDescription'); - }); -}; - -describe('ML - metricChangeDescription filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have a metricChangeDescription filter', () => { - expect(filter).to.not.be(null); - }); - - it('returns correct description if actual > typical', () => { - expect(filter(1.01, 1)).to.be(' Unusually high'); - expect(filter(1.123, 1)).to.be(' 1.1x higher'); - expect(filter(2, 1)).to.be(' 2x higher'); - expect(filter(9.5, 1)).to.be(' 10x higher'); - expect(filter(1000, 1)).to.be(' More than 100x higher'); - expect(filter(1, 0)).to.be(' Unexpected non-zero value'); - }); - - it('returns correct description if actual < typical', () => { - expect(filter(1, 1.01)).to.be(' Unusually low'); - expect(filter(1, 1.123)).to.be(' 1.1x lower'); - expect(filter(1, 2)).to.be(' 2x lower'); - expect(filter(1, 9.5)).to.be(' 10x lower'); - expect(filter(1, 1000)).to.be(' More than 100x lower'); - expect(filter(0, 1)).to.be(' Unexpected zero value'); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js b/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js deleted file mode 100644 index ab7d4553568136..00000000000000 --- a/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - -/* - * AngularJS filter to abbreviate large whole numbers with metric prefixes. - * Uses numeral.js to format numbers longer than the specified number of - * digits with metric abbreviations e.g. 12345 as 12k, or 98000000 as 98m. -*/ -import numeral from '@elastic/numeral'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('abbreviateWholeNumber', function () { - return function (value, maxDigits) { - const maxNumDigits = (maxDigits !== undefined ? maxDigits : 3); - if (Math.abs(value) < Math.pow(10, maxNumDigits)) { - return value; - } else { - return numeral(value).format('0a'); - } - }; -}); - diff --git a/x-pack/plugins/ml/public/filters/format_value.js b/x-pack/plugins/ml/public/filters/format_value.js deleted file mode 100644 index 7ba54cb2311e8f..00000000000000 --- a/x-pack/plugins/ml/public/filters/format_value.js +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -/* - * AngularJS filter generally used for formatting 'typical' and 'actual' values - * from machine learning results. For detectors which use the time_of_week or time_of_day - * functions, the filter converts the raw number, which is the number of seconds since - * midnight, into a human-readable date/time format. - */ - -import _ from 'lodash'; -import moment from 'moment'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('formatValue', function () { - - const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10 - - function formatValue(value, fx, fieldFormat) { - // If the analysis function is time_of_week/day, format as day/time. - if (fx === 'time_of_week') { - const d = new Date(); - const i = parseInt(value); - d.setTime(i * 1000); - return moment(d).format('ddd hh:mm'); - } else if (fx === 'time_of_day') { - const d = new Date(); - const i = parseInt(value); - d.setTime(i * 1000); - return moment(d).format('hh:mm'); - } else { - if (fieldFormat !== undefined) { - return fieldFormat.convert(value, 'text'); - } else { - // If no Kibana FieldFormat object provided, - // format the value depending on its magnitude. - const absValue = Math.abs(value); - if (absValue >= 10000 || absValue === Math.floor(absValue)) { - // Output 0 decimal places if whole numbers or >= 10000 - if (fieldFormat !== undefined) { - return fieldFormat.convert(value, 'text'); - } else { - return Number(value.toFixed(0)); - } - - } else if (absValue >= 10) { - // Output to 1 decimal place between 10 and 10000 - return Number(value.toFixed(1)); - } - else { - // For values < 10, output to 3 significant figures - let multiple; - if (value > 0) { - multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(value) / Math.LN10) - 1); - } else { - multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(-1 * value) / Math.LN10) - 1); - } - return (Math.round(value * multiple)) / multiple; - } - } - } - } - - return function (value, fx, fieldFormat) { - // actual and typical values in results will be arrays. - // Unless the array is multi-valued (as it will be for multi-variate analyses), - // simply return the formatted single value. - if (Array.isArray(value)) { - if (value.length === 1) { - return formatValue(value[0], fx, fieldFormat); - } else { - return _.map(value, function (val) { return formatValue(val, fx); }); - } - } else { - return formatValue(value, fx, fieldFormat); - } - }; -}); diff --git a/x-pack/plugins/ml/public/filters/metric_change_description.js b/x-pack/plugins/ml/public/filters/metric_change_description.js deleted file mode 100644 index 8eee882bbc7e9b..00000000000000 --- a/x-pack/plugins/ml/public/filters/metric_change_description.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -/* - * AngularJS filter for producing a concise textual description of how the - * actual value compares to the typical value for a time series anomaly. - */ - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('metricChangeDescription', function () { - return function (actual, typical) { - if (actual === typical) { - // Very unlikely, but just in case. - return 'actual same as typical'; - } - - // For actual / typical gives output of the form: - // 4 / 2 2x higher - // 2 / 10 5x lower - // 1000 / 1 More than 100x higher - // 999 / 1000 Unusually low - // 100 / -100 Unusually high - // 0 / 100 Unexpected zero value - // 1 / 0 Unexpected non-zero value - const isHigher = actual > typical; - const iconClass = isHigher ? 'fa-arrow-up' : 'fa-arrow-down'; - if (typical !== 0 && actual !== 0) { - const factor = isHigher ? actual / typical : typical / actual; - const direction = isHigher ? 'higher' : 'lower'; - if (factor > 1.5) { - if (factor <= 100) { - return ' ' + Math.round(factor) + 'x ' + direction; - } else { - return ' More than 100x ' + direction; - } - } - - if (factor >= 1.05) { - return ' ' + factor.toPrecision(2) + 'x ' + direction; - } else { - const dir = isHigher ? 'high' : 'low'; - return ' Unusually ' + dir; - } - - } else { - if (actual === 0) { - return ' Unexpected zero value'; - } else { - return ' Unexpected non-zero value'; - } - } - - }; -}); - diff --git a/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js b/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js new file mode 100644 index 00000000000000..582d9bac39d728 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import { abbreviateWholeNumber } from '../abbreviate_whole_number'; + +describe('ML - abbreviateWholeNumber formatter', () => { + + it('returns the correct format using default max digits', () => { + expect(abbreviateWholeNumber(1)).to.be(1); + expect(abbreviateWholeNumber(12)).to.be(12); + expect(abbreviateWholeNumber(123)).to.be(123); + expect(abbreviateWholeNumber(1234)).to.be('1k'); + expect(abbreviateWholeNumber(12345)).to.be('12k'); + expect(abbreviateWholeNumber(123456)).to.be('123k'); + expect(abbreviateWholeNumber(1234567)).to.be('1m'); + expect(abbreviateWholeNumber(12345678)).to.be('12m'); + expect(abbreviateWholeNumber(123456789)).to.be('123m'); + expect(abbreviateWholeNumber(1234567890)).to.be('1b'); + expect(abbreviateWholeNumber(5555555555555.55)).to.be('6t'); + }); + + it('returns the correct format using custom max digits', () => { + expect(abbreviateWholeNumber(1, 4)).to.be(1); + expect(abbreviateWholeNumber(12, 4)).to.be(12); + expect(abbreviateWholeNumber(123, 4)).to.be(123); + expect(abbreviateWholeNumber(1234, 4)).to.be(1234); + expect(abbreviateWholeNumber(12345, 4)).to.be('12k'); + expect(abbreviateWholeNumber(123456, 6)).to.be(123456); + expect(abbreviateWholeNumber(1234567, 4)).to.be('1m'); + expect(abbreviateWholeNumber(12345678, 3)).to.be('12m'); + expect(abbreviateWholeNumber(123456789, 9)).to.be(123456789); + expect(abbreviateWholeNumber(1234567890, 3)).to.be('1b'); + expect(abbreviateWholeNumber(5555555555555.55, 5)).to.be('6t'); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/__tests__/format_value.js b/x-pack/plugins/ml/public/formatters/__tests__/format_value.js new file mode 100644 index 00000000000000..ff5548b73551e5 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/format_value.js @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import moment from 'moment'; +import { formatValue } from '../format_value'; + +describe('ML - formatValue formatter', () => { + + // Just check the return value is in the expected format, and + // not the exact value as this will be timezone specific. + it('correctly formats time_of_week value from numeric input', () => { + const formattedValue = formatValue(1483228800, 'time_of_week'); + const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats time_of_day value from numeric input', () => { + const formattedValue = formatValue(1483228800, 'time_of_day'); + const result = moment(formattedValue, 'hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats number values from numeric input', () => { + expect(formatValue(1483228800, 'mean')).to.be(1483228800); + expect(formatValue(1234.5678, 'mean')).to.be(1234.6); + expect(formatValue(0.00012345, 'mean')).to.be(0.000123); + expect(formatValue(0, 'mean')).to.be(0); + expect(formatValue(-0.12345, 'mean')).to.be(-0.123); + expect(formatValue(-1234.5678, 'mean')).to.be(-1234.6); + expect(formatValue(-100000.1, 'mean')).to.be(-100000); + }); + + it('correctly formats time_of_week value from array input', () => { + const formattedValue = formatValue([1483228800], 'time_of_week'); + const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats time_of_day value from array input', () => { + const formattedValue = formatValue([1483228800], 'time_of_day'); + const result = moment(formattedValue, 'hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats number values from array input', () => { + expect(formatValue([1483228800], 'mean')).to.be(1483228800); + expect(formatValue([1234.5678], 'mean')).to.be(1234.6); + expect(formatValue([0.00012345], 'mean')).to.be(0.000123); + expect(formatValue([0], 'mean')).to.be(0); + expect(formatValue([-0.12345], 'mean')).to.be(-0.123); + expect(formatValue([-1234.5678], 'mean')).to.be(-1234.6); + expect(formatValue([-100000.1], 'mean')).to.be(-100000); + }); + + it('correctly formats multi-valued array', () => { + expect(formatValue([30.3, 26.2], 'lat_long')).to.be('[30.3,26.2]'); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js b/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js new file mode 100644 index 00000000000000..9c4b1516915aaf --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import { getMetricChangeDescription } from '../metric_change_description'; + + +describe('ML - metricChangeDescription formatter', () => { + + it('returns correct icon and message if actual > typical', () => { + expect(getMetricChangeDescription(1.01, 1)).to.eql({ iconType: 'sortUp', message: 'Unusually high' }); + expect(getMetricChangeDescription(1.123, 1)).to.eql({ iconType: 'sortUp', message: '1.1x higher' }); + expect(getMetricChangeDescription(2, 1)).to.eql({ iconType: 'sortUp', message: '2x higher' }); + expect(getMetricChangeDescription(9.5, 1)).to.eql({ iconType: 'sortUp', message: '10x higher' }); + expect(getMetricChangeDescription(1000, 1)).to.eql({ iconType: 'sortUp', message: 'More than 100x higher' }); + expect(getMetricChangeDescription(1, 0)).to.eql({ iconType: 'sortUp', message: 'Unexpected non-zero value' }); + }); + + it('returns correct icon and message if actual < typical', () => { + expect(getMetricChangeDescription(1, 1.01)).to.eql({ iconType: 'sortDown', message: 'Unusually low' }); + expect(getMetricChangeDescription(1, 1.123)).to.eql({ iconType: 'sortDown', message: '1.1x lower' }); + expect(getMetricChangeDescription(1, 2)).to.eql({ iconType: 'sortDown', message: '2x lower' }); + expect(getMetricChangeDescription(1, 9.5)).to.eql({ iconType: 'sortDown', message: '10x lower' }); + expect(getMetricChangeDescription(1, 1000)).to.eql({ iconType: 'sortDown', message: 'More than 100x lower' }); + expect(getMetricChangeDescription(0, 1)).to.eql({ iconType: 'sortDown', message: 'Unexpected zero value' }); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js b/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js new file mode 100644 index 00000000000000..802aeb3a5d19c3 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +/* + * Formatter to abbreviate large whole numbers with metric prefixes. + * Uses numeral.js to format numbers longer than the specified number of + * digits with metric abbreviations e.g. 12345 as 12k, or 98000000 as 98m. +*/ +import numeral from '@elastic/numeral'; + +export function abbreviateWholeNumber(value, maxDigits) { + const maxNumDigits = (maxDigits !== undefined ? maxDigits : 3); + if (Math.abs(value) < Math.pow(10, maxNumDigits)) { + return value; + } else { + return numeral(value).format('0a'); + } +} diff --git a/x-pack/plugins/ml/public/formatters/format_value.js b/x-pack/plugins/ml/public/formatters/format_value.js new file mode 100644 index 00000000000000..40eb8202782df8 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/format_value.js @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +/* + * Formatter for 'typical' and 'actual' values from machine learning results. + * For detectors which use the time_of_week or time_of_day + * functions, the filter converts the raw number, which is the number of seconds since + * midnight, into a human-readable date/time format. + */ + +import moment from 'moment'; + +import { uiModules } from 'ui/modules'; +const module = uiModules.get('apps/ml'); + + +const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10 + +// Formats the value of an actual or typical field from a machine learning anomaly record. +// mlFunction is the 'function' field from the ML record containing what the user entered e.g. 'high_count', +// (as opposed to the 'function_description' field which holds an ML-built display hint for the function e.g. 'count'. +export function formatValue(value, mlFunction, fieldFormat) { + // actual and typical values in anomaly record results will be arrays. + // Unless the array is multi-valued (as it will be for multi-variate analyses such as lat_long), + // simply return the formatted single value. + if (Array.isArray(value)) { + if (value.length === 1) { + return formatSingleValue(value[0], mlFunction, fieldFormat); + } else { + // Return with array style formatting. + const values = value.map(val => formatSingleValue(val, mlFunction, fieldFormat)); + return `[${values}]`; + } + } else { + return formatSingleValue(value, mlFunction, fieldFormat); + } +} + +// Formats a single value according to the specifield ML function. +// If a Kibana fieldFormat is not supplied, will fall back to default +// formatting depending on the magnitude of the value. +function formatSingleValue(value, mlFunction, fieldFormat) { + if (value === undefined || value === null) { + return ''; + } + + // If the analysis function is time_of_week/day, format as day/time. + if (mlFunction === 'time_of_week') { + const d = new Date(); + const i = parseInt(value); + d.setTime(i * 1000); + return moment(d).format('ddd hh:mm'); + } else if (mlFunction === 'time_of_day') { + const d = new Date(); + const i = parseInt(value); + d.setTime(i * 1000); + return moment(d).format('hh:mm'); + } else { + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + // If no Kibana FieldFormat object provided, + // format the value depending on its magnitude. + const absValue = Math.abs(value); + if (absValue >= 10000 || absValue === Math.floor(absValue)) { + // Output 0 decimal places if whole numbers or >= 10000 + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + return Number(value.toFixed(0)); + } + + } else if (absValue >= 10) { + // Output to 1 decimal place between 10 and 10000 + return Number(value.toFixed(1)); + } + else { + // For values < 10, output to 3 significant figures + let multiple; + if (value > 0) { + multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(value) / Math.LN10) - 1); + } else { + multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(-1 * value) / Math.LN10) - 1); + } + return (Math.round(value * multiple)) / multiple; + } + } + } +} + +// TODO - remove the filter once all uses of the formatValue Angular filter have been removed. +module.filter('formatValue', () => formatValue); + diff --git a/x-pack/plugins/ml/public/formatters/metric_change_description.js b/x-pack/plugins/ml/public/formatters/metric_change_description.js new file mode 100644 index 00000000000000..2edc89da376f94 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/metric_change_description.js @@ -0,0 +1,111 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +/* + * Produces a concise textual description of how the + * actual value compares to the typical value for an anomaly. + */ + +import { uiModules } from 'ui/modules'; +const module = uiModules.get('apps/ml'); + +// Returns an Object containing a text message and EuiIcon type to +// describe how the actual value compares to the typical. +export function getMetricChangeDescription(actualProp, typicalProp) { + if (actualProp === undefined || typicalProp === undefined) { + return { iconType: 'empty', message: '' }; + } + + let iconType; + let message; + + // For metric functions, actual and typical will be single value arrays. + let actual = actualProp; + let typical = typicalProp; + if (Array.isArray(actualProp)) { + if (actualProp.length === 1) { + actual = actualProp[0]; + } else { + // TODO - do we want to enhance the description depending on detector? + // e.g. 'Unusual location' if using a lat_long detector. + return { + iconType: 'alert', + message: 'Unusual values' + }; + } + } + + if (Array.isArray(typicalProp)) { + if (typicalProp.length === 1) { + typical = typicalProp[0]; + } + } + + if (actual === typical) { + // Very unlikely, but just in case. + message = 'actual same as typical'; + } else { + // For actual / typical gives output of the form: + // 4 / 2 2x higher + // 2 / 10 5x lower + // 1000 / 1 More than 100x higher + // 999 / 1000 Unusually low + // 100 / -100 Unusually high + // 0 / 100 Unexpected zero value + // 1 / 0 Unexpected non-zero value + const isHigher = actual > typical; + iconType = isHigher ? 'sortUp' : 'sortDown'; + if (typical !== 0 && actual !== 0) { + const factor = isHigher ? actual / typical : typical / actual; + const direction = isHigher ? 'higher' : 'lower'; + if (factor > 1.5) { + if (factor <= 100) { + message = `${Math.round(factor)}x ${direction}`; + } else { + message = `More than 100x ${direction}`; + } + } else if (factor >= 1.05) { + message = `${factor.toPrecision(2)}x ${direction}`; + } else { + message = `Unusually ${isHigher ? 'high' : 'low'}`; + } + + } else { + if (actual === 0) { + message = 'Unexpected zero value'; + } else { + message = 'Unexpected non-zero value'; + } + } + } + + return { iconType, message }; +} + +// TODO - remove the filter once all uses of the metricChangeDescription Angular filter have been removed. +module.filter('metricChangeDescription', function () { + return function (actual, typical) { + + const { + iconType, + message + } = getMetricChangeDescription(actual, typical); + + switch (iconType) { + case 'sortUp': + return ` ${message}`; + case 'sortDown': + return ` ${message}`; + case 'alert': + return ` ${message}`; + } + + return message; + }; +}); + diff --git a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js index 8a2ca71bcd34e9..8fdd222cf7d506 100644 --- a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js +++ b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js @@ -33,7 +33,7 @@ module.directive('mlCustomUrlEditor', function (Private) { replace: true, transclude: true, template, - controller: function ($scope, $q) { + controller: function ($scope) { const URL_TYPE = { KIBANA_DASHBOARD: 'KIBANA_DASHBOARD', KIBANA_DISCOVER: 'KIBANA_DISCOVER', @@ -88,7 +88,7 @@ module.directive('mlCustomUrlEditor', function (Private) { }); } - $q.all([ + Promise.all([ getSavedDashboards(), getSavedIndexPatterns() ]) diff --git a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js index 11f8fb4f8de4e2..f9bad4f31076d6 100644 --- a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js +++ b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js @@ -10,105 +10,104 @@ import { parseInterval } from 'ui/utils/parse_interval'; -import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/constants/index_patterns'; +import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/../common/constants/index_patterns'; import { replaceTokensInUrlValue } from 'plugins/ml/util/custom_url_utils'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; - -export function CustomUrlEditorServiceProvider(es, Private, $q) { - const mlJobService = Private(JobServiceProvider); - - // Builds the full URL for testing out a custom URL configuration, which - // may contain dollar delimited partition / influencer entity tokens and - // drilldown time range settings. - function getTestUrl(job, urlConfig) { - const urlValue = urlConfig.url_value; - const bucketSpanSecs = parseInterval(job.analysis_config.bucket_span).asSeconds(); - - // By default, return configured url_value. Look to substitute any dollar-delimited - // tokens with values from the highest scoring anomaly, or if no anomalies, with - // values from a document returned by the search in the job datafeed. - let testUrl = urlConfig.url_value; - - // Query to look for the highest scoring anomaly. - const body = { - query: { - bool: { - must: [ - { term: { job_id: job.job_id } }, - { term: { result_type: 'record' } } - ] - } - }, - size: 1, - _source: { - excludes: [] - }, - sort: [ - { record_score: { order: 'desc' } } - ] - }; - - return $q((resolve, reject) => { - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - body - }) - .then((resp) => { - if (resp.hits.total > 0) { - const record = resp.hits.hits[0]._source; - testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, record, 'timestamp'); - resolve(testUrl); - } else { - // No anomalies yet for this job, so do a preview of the search - // configured in the job datafeed to obtain sample docs. - mlJobService.searchPreview(job) - .then((response) => { - let testDoc; - const docTimeFieldName = job.data_description.time_field; - - // Handle datafeeds which use aggregations or documents. - if (response.aggregations) { - // Create a dummy object which contains the fields necessary to build the URL. - const firstBucket = response.aggregations.buckets.buckets[0]; - testDoc = { - [docTimeFieldName]: firstBucket.key - }; - - // Look for bucket aggregations which match the tokens in the URL. - urlValue.replace((/\$([^?&$\'"]{1,40})\$/g), (match, name) => { - if (name !== 'earliest' && name !== 'latest' && firstBucket[name] !== undefined) { - const tokenBuckets = firstBucket[name]; - if (tokenBuckets.buckets) { - testDoc[name] = tokenBuckets.buckets[0].key; - } - } - }); +import { mlJobService } from 'plugins/ml/services/job_service'; +import { ml } from 'plugins/ml/services/ml_api_service'; + + +// Builds the full URL for testing out a custom URL configuration, which +// may contain dollar delimited partition / influencer entity tokens and +// drilldown time range settings. +function getTestUrl(job, urlConfig) { + const urlValue = urlConfig.url_value; + const bucketSpanSecs = parseInterval(job.analysis_config.bucket_span).asSeconds(); + + // By default, return configured url_value. Look to substitute any dollar-delimited + // tokens with values from the highest scoring anomaly, or if no anomalies, with + // values from a document returned by the search in the job datafeed. + let testUrl = urlConfig.url_value; + + // Query to look for the highest scoring anomaly. + const body = { + query: { + bool: { + must: [ + { term: { job_id: job.job_id } }, + { term: { result_type: 'record' } } + ] + } + }, + size: 1, + _source: { + excludes: [] + }, + sort: [ + { record_score: { order: 'desc' } } + ] + }; - } else { - if (response.hits.total > 0) { - testDoc = response.hits.hits[0]._source; + return new Promise((resolve, reject) => { + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + body + }) + .then((resp) => { + if (resp.hits.total > 0) { + const record = resp.hits.hits[0]._source; + testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, record, 'timestamp'); + resolve(testUrl); + } else { + // No anomalies yet for this job, so do a preview of the search + // configured in the job datafeed to obtain sample docs. + mlJobService.searchPreview(job) + .then((response) => { + let testDoc; + const docTimeFieldName = job.data_description.time_field; + + // Handle datafeeds which use aggregations or documents. + if (response.aggregations) { + // Create a dummy object which contains the fields necessary to build the URL. + const firstBucket = response.aggregations.buckets.buckets[0]; + testDoc = { + [docTimeFieldName]: firstBucket.key + }; + + // Look for bucket aggregations which match the tokens in the URL. + urlValue.replace((/\$([^?&$\'"]{1,40})\$/g), (match, name) => { + if (name !== 'earliest' && name !== 'latest' && firstBucket[name] !== undefined) { + const tokenBuckets = firstBucket[name]; + if (tokenBuckets.buckets) { + testDoc[name] = tokenBuckets.buckets[0].key; + } } - } + }); - if (testDoc !== undefined) { - testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, testDoc, docTimeFieldName); + } else { + if (response.hits.total > 0) { + testDoc = response.hits.hits[0]._source; } + } - resolve(testUrl); - - }); - } + if (testDoc !== undefined) { + testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, testDoc, docTimeFieldName); + } - }) - .catch((resp) => { - reject(resp); - }); - }); + resolve(testUrl); - } + }); + } + }) + .catch((resp) => { + reject(resp); + }); + }); - return { - getTestUrl - }; } + + +export const customUrlEditorService = { + getTestUrl +}; + diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js index 1b61a8cb379ffd..d075af58445a98 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js +++ b/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js @@ -5,7 +5,8 @@ */ -import { CreateWatchServiceProvider } from 'plugins/ml/jobs/new_job/simple/components/watcher/create_watch_service'; +import { mlCreateWatchService } from 'plugins/ml/jobs/new_job/simple/components/watcher/create_watch_service'; +import { xpackFeatureProvider } from 'plugins/ml/license/check_license'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); @@ -13,14 +14,14 @@ const module = uiModules.get('apps/ml'); import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; module.controller('MlCreateWatchModal', function ($scope, $modalInstance, params, Private) { - const mlCreateWatchService = Private(CreateWatchServiceProvider); + const xpackFeature = Private(xpackFeatureProvider); const msgs = mlMessageBarService; // set a reference to the message bar service msgs.clear(); $scope.jobId = params.job.job_id; $scope.bucketSpan = params.job.analysis_config.bucket_span; - $scope.watcherEnabled = mlCreateWatchService.isWatcherEnabled(); + $scope.watcherEnabled = xpackFeature.isAvailable('watcher'); $scope.status = mlCreateWatchService.status; $scope.STATUS = mlCreateWatchService.STATUS; diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js index 70fe6eed0d7000..15ab9cbfc9c10d 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js +++ b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js @@ -14,10 +14,10 @@ import numeral from '@elastic/numeral'; import { calculateDatafeedFrequencyDefaultSeconds } from 'plugins/ml/../common/util/job_utils'; import { parseInterval } from 'plugins/ml/../common/util/parse_interval'; -import { CustomUrlEditorServiceProvider } from 'plugins/ml/jobs/components/custom_url_editor/custom_url_editor_service'; +import { customUrlEditorService } from 'plugins/ml/jobs/components/custom_url_editor/custom_url_editor_service'; import { isWebUrl } from 'plugins/ml/util/string_utils'; import { newJobLimits } from 'plugins/ml/jobs/new_job/utils/new_job_defaults'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; import { uiModules } from 'ui/modules'; @@ -28,11 +28,9 @@ module.controller('MlEditJobModal', function ( $modalInstance, $modal, $window, - params, - Private) { + params) { const msgs = mlMessageBarService; msgs.clear(); - const mlJobService = Private(JobServiceProvider); $scope.saveLock = false; const refreshJob = params.pscope.refreshJob; @@ -152,7 +150,6 @@ module.controller('MlEditJobModal', function ( }; $scope.testCustomUrl = function (index) { - const customUrlEditorService = Private(CustomUrlEditorServiceProvider); customUrlEditorService.getTestUrl( $scope.job, $scope.job.custom_settings.custom_urls[index]) diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less index df57114441c8d9..d52dcdc4cef88a 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less +++ b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less @@ -6,7 +6,7 @@ text-overflow: ellipsis; padding-bottom: 10px; - i[ml-info-icon] { + span[ml-info-icon] { font-size: 14px; } } diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html index 30b2dc30f45883..9fd22f848f31d4 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html +++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html @@ -41,7 +41,15 @@ -
@@ -115,7 +123,14 @@
is-loading="(datafeedPreview.json === '')"
/>
' + diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js index 71bfef368e78bb..98fea34be0d034 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_chart_directive.js @@ -18,25 +18,23 @@ import d3 from 'd3'; import angular from 'angular'; import moment from 'moment'; -import { getSeverityWithLow } from 'plugins/ml/util/anomaly_utils'; +import { formatValue } from 'plugins/ml/formatters/format_value'; +import { getSeverityWithLow } from 'plugins/ml/../common/util/anomaly_utils'; import { drawLineChartDots, numTicksForDateFormat } from 'plugins/ml/util/chart_utils'; import { TimeBuckets } from 'ui/time_buckets'; -import 'plugins/ml/filters/format_value'; import loadingIndicatorWrapperTemplate from 'plugins/ml/components/loading_indicator/loading_indicator_wrapper.html'; import { mlEscape } from 'plugins/ml/util/string_utils'; -import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service'; +import { mlFieldFormatService } from 'plugins/ml/services/field_format_service'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); module.directive('mlExplorerChart', function ( - formatValueFilter, mlChartTooltipService, Private, mlSelectSeverityService) { function link(scope, element) { - const mlFieldFormatService = Private(FieldFormatServiceProvider); console.log('ml-explorer-chart directive link series config:', scope.seriesConfig); if (typeof scope.seriesConfig === 'undefined') { // just return so the empty directive renders without an error later on @@ -287,10 +285,10 @@ module.directive('mlExplorerChart', function ( if (_.has(marker, 'actual')) { // Display the record actual in preference to the chart value, which may be // different depending on the aggregation interval of the chart. - contents += (`
actual: ${formatValueFilter(marker.actual, config.functionDescription, fieldFormat)}`); - contents += (`
typical: ${formatValueFilter(marker.typical, config.functionDescription, fieldFormat)}`); + contents += (`
actual: ${formatValue(marker.actual, config.functionDescription, fieldFormat)}`); + contents += (`
typical: ${formatValue(marker.typical, config.functionDescription, fieldFormat)}`); } else { - contents += (`
value: ${formatValueFilter(marker.value, config.functionDescription, fieldFormat)}`); + contents += (`
value: ${formatValue(marker.value, config.functionDescription, fieldFormat)}`); if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) { const numberOfCauses = marker.numberOfCauses; const byFieldName = mlEscape(marker.byFieldName); @@ -304,7 +302,7 @@ module.directive('mlExplorerChart', function ( } } } else { - contents += `value: ${formatValueFilter(marker.value, config.functionDescription, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, config.functionDescription, fieldFormat)}`; } if (_.has(marker, 'scheduledEvents')) { diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js index 442fb5e5238f59..87b61f8534cba7 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/explorer_charts_container_controller.js @@ -21,16 +21,13 @@ const module = uiModules.get('apps/ml'); import { explorerChartConfigBuilder } from './explorer_chart_config_builder'; import { chartLimits } from 'plugins/ml/util/chart_utils'; import { isTimeSeriesViewDetector } from 'plugins/ml/../common/util/job_utils'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { mlResultsService } from 'plugins/ml/services/results_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; module.controller('MlExplorerChartsContainerController', function ($scope, $injector) { const Private = $injector.get('Private'); const mlExplorerDashboardService = $injector.get('mlExplorerDashboardService'); const mlSelectSeverityService = $injector.get('mlSelectSeverityService'); - const $q = $injector.get('$q'); - const mlResultsService = Private(ResultsServiceProvider); - const mlJobService = Private(JobServiceProvider); $scope.seriesToPlot = []; @@ -124,7 +121,7 @@ module.controller('MlExplorerChartsContainerController', function ($scope, $inje // only after that trigger data processing and page render. // TODO - if query returns no results e.g. source data has been deleted, // display a message saying 'No data between earliest/latest'. - const seriesPromises = seriesConfigs.map(seriesConfig => $q.all([ + const seriesPromises = seriesConfigs.map(seriesConfig => Promise.all([ getMetricData(seriesConfig, chartRange), getRecordsForCriteria(seriesConfig, chartRange), getScheduledEvents(seriesConfig, chartRange) @@ -243,7 +240,7 @@ module.controller('MlExplorerChartsContainerController', function ($scope, $inje return chartPoint; } - $q.all(seriesPromises) + Promise.all(seriesPromises) .then(response => { // calculate an overall min/max for all series const processedData = response.map(processChartData); diff --git a/x-pack/plugins/ml/public/explorer/explorer_controller.js b/x-pack/plugins/ml/public/explorer/explorer_controller.js index 6ef12e3c8a1ad7..e6636ce40a2724 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_controller.js +++ b/x-pack/plugins/ml/public/explorer/explorer_controller.js @@ -18,23 +18,27 @@ import DragSelect from 'dragselect'; import moment from 'moment'; import 'plugins/ml/components/anomalies_table'; +import 'plugins/ml/components/controls'; import 'plugins/ml/components/influencers_list'; import 'plugins/ml/components/job_select_list'; import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter'; import { parseInterval } from 'ui/utils/parse_interval'; +import { initPromise } from 'plugins/ml/util/promise'; import template from './explorer.html'; import uiRoutes from 'ui/routes'; import { checkLicense } from 'plugins/ml/license/check_license'; import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; -import { getIndexPatterns } from 'plugins/ml/util/index_utils'; +import { loadIndexPatterns, getIndexPatterns } from 'plugins/ml/util/index_utils'; import { refreshIntervalWatcher } from 'plugins/ml/util/refresh_interval_watcher'; import { IntervalHelperProvider, getBoundsRoundedToInterval } from 'plugins/ml/util/ml_time_buckets'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; -import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service'; +import { ml } from 'plugins/ml/services/ml_api_service'; +import { mlResultsService } from 'plugins/ml/services/results_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; +import { mlFieldFormatService } from 'plugins/ml/services/field_format_service'; import { JobSelectServiceProvider } from 'plugins/ml/components/job_select_list/job_select_service'; +import { isTimeSeriesViewDetector } from 'plugins/ml/../common/util/job_utils'; uiRoutes .when('/explorer/?', { @@ -42,7 +46,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - indexPatterns: getIndexPatterns + indexPatterns: loadIndexPatterns, + initPromise: initPromise(true) } }); @@ -51,7 +56,6 @@ const module = uiModules.get('apps/ml'); module.controller('MlExplorerController', function ( $scope, - $route, $timeout, AppState, Private, @@ -59,26 +63,23 @@ module.controller('MlExplorerController', function ( mlCheckboxShowChartsService, mlExplorerDashboardService, mlSelectLimitService, + mlSelectIntervalService, mlSelectSeverityService) { $scope.timeFieldName = 'timestamp'; $scope.loading = true; - $scope.loadCounter = 0; timefilter.enableTimeRangeSelector(); timefilter.enableAutoRefreshSelector(); const TimeBuckets = Private(IntervalHelperProvider); const queryFilter = Private(FilterBarQueryFilterProvider); - const mlResultsService = Private(ResultsServiceProvider); - const mlJobService = Private(JobServiceProvider); - const mlFieldFormatService = Private(FieldFormatServiceProvider); const mlJobSelectService = Private(JobSelectServiceProvider); let resizeTimeout = null; const $mlExplorer = $('.ml-explorer'); - const MAX_INFLUENCER_FIELD_NAMES = 10; const MAX_INFLUENCER_FIELD_VALUES = 10; + const MAX_CATEGORY_EXAMPLES = 10; const VIEW_BY_JOB_LABEL = 'job ID'; const ALLOW_CELL_RANGE_SELECTION = mlExplorerDashboardService.allowCellRangeSelection; @@ -167,35 +168,34 @@ module.controller('MlExplorerController', function ( }); } - $scope.loadAnomaliesTable = function (jobIds, influencers, earliestMs, latestMs) { - mlResultsService.getRecordsForInfluencer( - jobIds, influencers, 0, earliestMs, latestMs, 500 - ) - .then((resp) => { - // Sort in descending time order before storing in scope. - $scope.anomalyRecords = _.chain(resp.records).sortBy(record => record[$scope.timeFieldName]).reverse().value(); - console.log('Explorer anomalies table data set:', $scope.anomalyRecords); - - // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. - $timeout(() => { - $scope.$broadcast('renderTable'); - }, 0); - }); - }; - $scope.setSelectedJobs = function (selectedIds) { let previousSelected = 0; if ($scope.selectedJobs !== null) { previousSelected = $scope.selectedJobs.length; } - // Check for any new jobs created since the page was first loaded. - for (let i = 0; i < selectedIds.length; i++) { - if (_.find($scope.jobs, { 'id': selectedIds[i] }) === undefined) { - $scope.jobs = createJobs(mlJobService.jobs); - break; + // Check for any new jobs created since the page was first loaded, + // and whether any of the jobs have influencers configured (in which + // case the Top Influencers section will be hidden). + let recreateJobs = false; + let hasInfluencers = false; + selectedIds.forEach((id) => { + if (recreateJobs === false && _.find($scope.jobs, { id }) === undefined) { + recreateJobs = true; } + + const job = mlJobService.getJob(id); + let influencers = []; + if (job !== undefined) { + influencers = job.analysis_config.influencers || []; + } + hasInfluencers = hasInfluencers || influencers.length > 0; + }); + + if (recreateJobs === true) { + $scope.jobs = createJobs(mlJobService.jobs); } + $scope.noInfluencersConfigured = !hasInfluencers; // update the jobs' selected flag $scope.selectedJobs = []; @@ -215,7 +215,7 @@ module.controller('MlExplorerController', function ( $scope.appState.save(); // Populate the map of jobs / detectors / field formatters for the selected IDs. - mlFieldFormatService.populateFormats(selectedIds, $route.current.locals.indexPatterns) + mlFieldFormatService.populateFormats(selectedIds, getIndexPatterns()) .finally(() => { // Load the data - if the FieldFormats failed to populate // the default formatting will be used for metric values. @@ -308,16 +308,39 @@ module.controller('MlExplorerController', function ( return $scope.viewBySwimlaneData !== null && $scope.viewBySwimlaneData.laneLabels && $scope.viewBySwimlaneData.laneLabels.length > 0; }; - const getTimeRange = function (cellData) { - // Time range for charts should be maximum time span at job bucket span, centred on the selected cell. + function getSelectionTimeRange(cellData) { + // Returns the time range of the cell(s) currently selected in the swimlane. + // If no cell(s) are currently selected, returns the dashboard time range. const bounds = timefilter.getActiveBounds(); - const earliestMs = cellData.time[0] !== undefined ? ((cellData.time[0]) * 1000) : bounds.min.valueOf(); - let latestMs = cellData.time[1] !== undefined ? ((cellData.time[1]) * 1000) : bounds.max.valueOf(); - if (earliestMs === latestMs) { - latestMs = latestMs + (cellData.interval * 1000); + let earliestMs = bounds.min.valueOf(); + let latestMs = bounds.max.valueOf(); + + if (cellData !== undefined && cellData.time !== undefined) { + // time property of the cell data is an array, with the elements being + // the start times of the first and last cell selected. + earliestMs = (cellData.time[0] !== undefined) ? cellData.time[0] * 1000 : bounds.min.valueOf(); + latestMs = bounds.max.valueOf(); + if (cellData.time[1] !== undefined) { + // Subtract 1 ms so search does not include start of next bucket. + latestMs = ((cellData.time[1] + cellData.interval) * 1000) - 1; + } } + return { earliestMs, latestMs }; - }; + } + + function getSelectionInfluencers(cellData) { + const influencers = []; + + if (cellData !== undefined && cellData.fieldName !== undefined && + cellData.fieldName !== VIEW_BY_JOB_LABEL) { + cellData.laneLabels.forEach((laneLabel) =>{ + influencers.push({ fieldName: $scope.swimlaneViewByFieldName, fieldValue: laneLabel }); + }); + } + + return influencers; + } // Listener for click events in the swimlane and load corresponding anomaly data. // Empty cellData is passed on clicking outside a cell with score > 0. @@ -330,33 +353,43 @@ module.controller('MlExplorerController', function ( } clearSelectedAnomalies(); } else { - let jobIds = []; - const influencers = []; - const timerange = getTimeRange(cellData); - - if (cellData.fieldName === undefined) { - // Click is in one of the cells in the Overall swimlane - reload the 'view by' swimlane - // to show the top 'view by' values for the selected time. - loadViewBySwimlaneForSelectedTime(timerange.earliestMs, timerange.latestMs); - $scope.viewByLoadedForTimeFormatted = moment(timerange.earliestMs).format('MMMM Do YYYY, HH:mm'); - } + const timerange = getSelectionTimeRange(cellData); + $scope.cellData = cellData; + + if (cellData.score > 0) { + if (cellData.fieldName === undefined) { + // Click is in one of the cells in the Overall swimlane - reload the 'view by' swimlane + // to show the top 'view by' values for the selected time. + loadViewBySwimlaneForSelectedTime(timerange.earliestMs, timerange.latestMs); + $scope.viewByLoadedForTimeFormatted = moment(timerange.earliestMs).format('MMMM Do YYYY, HH:mm'); + } + + const jobIds = (cellData.fieldName === VIEW_BY_JOB_LABEL) ? + cellData.laneLabels : $scope.getSelectedJobIds(); + const influencers = getSelectionInfluencers(cellData); - if (cellData.fieldName === VIEW_BY_JOB_LABEL) { - jobIds = cellData.laneLabels; + loadAnomaliesTableData(); + loadDataForCharts(jobIds, influencers, timerange.earliestMs, timerange.latestMs); } else { - jobIds = $scope.getSelectedJobIds(); + // Multiple cells are selected, all with a score of 0 - clear all anomalies. + $scope.$evalAsync(() => { + $scope.influencers = {}; + $scope.anomalyChartRecords = []; + + $scope.tableData = { + anomalies: [], + interval: mlSelectIntervalService.state.get('interval').val, + examplesByJobId: {}, + showViewSeriesLink: true + }; + }); - if (cellData.fieldName !== undefined) { - cellData.laneLabels.forEach((laneLabel) =>{ - influencers.push({ fieldName: $scope.swimlaneViewByFieldName, fieldValue: laneLabel }); - }); - } + mlExplorerDashboardService.anomalyDataChange.changed( + [], + timerange.earliestMs, + timerange.latestMs + ); } - - $scope.cellData = cellData; - const args = [jobIds, influencers, timerange.earliestMs, timerange.latestMs]; - $scope.loadAnomaliesTable(...args); - $scope.loadAnomaliesForCharts(...args); } }; mlExplorerDashboardService.swimlaneCellClick.watch(swimlaneCellClickListener); @@ -366,7 +399,7 @@ module.controller('MlExplorerController', function ( if (showCharts && $scope.cellData !== undefined) { swimlaneCellClickListener($scope.cellData); } else { - const timerange = getTimeRange($scope.cellData); + const timerange = getSelectionTimeRange($scope.cellData); mlExplorerDashboardService.anomalyDataChange.changed( [], timerange.earliestMs, timerange.latestMs ); @@ -377,7 +410,7 @@ module.controller('MlExplorerController', function ( const anomalyChartsSeverityListener = function () { const showCharts = mlCheckboxShowChartsService.state.get('showCharts'); if (showCharts && $scope.cellData !== undefined) { - const timerange = getTimeRange($scope.cellData); + const timerange = getSelectionTimeRange($scope.cellData); mlExplorerDashboardService.anomalyDataChange.changed( $scope.anomalyChartRecords, timerange.earliestMs, timerange.latestMs ); @@ -385,6 +418,12 @@ module.controller('MlExplorerController', function ( }; mlSelectSeverityService.state.watch(anomalyChartsSeverityListener); + const tableControlsListener = function () { + loadAnomaliesTableData(); + }; + mlSelectIntervalService.state.watch(tableControlsListener); + mlSelectSeverityService.state.watch(tableControlsListener); + const swimlaneLimitListener = function () { loadViewBySwimlane([]); clearSelectedAnomalies(); @@ -403,29 +442,93 @@ module.controller('MlExplorerController', function ( mlExplorerDashboardService.swimlaneCellClick.unwatch(swimlaneCellClickListener); mlExplorerDashboardService.swimlaneRenderDone.unwatch(swimlaneRenderDoneListener); mlSelectSeverityService.state.unwatch(anomalyChartsSeverityListener); + mlSelectIntervalService.state.unwatch(tableControlsListener); + mlSelectSeverityService.state.unwatch(tableControlsListener); mlSelectLimitService.state.unwatch(swimlaneLimitListener); - $scope.cellData = undefined; + delete $scope.cellData; refreshWatcher.cancel(); // Cancel listening for updates to the global nav state. navListener(); }); - $scope.loadAnomaliesForCharts = function (jobIds, influencers, earliestMs, latestMs) { + function loadDataForCharts(jobIds, influencers, earliestMs, latestMs) { + // Loads the data used to populate the anomaly charts and the Top Influencers List. + if (influencers.length === 0) { + getTopInfluencers(jobIds, earliestMs, latestMs); + } + // Load the top anomalies (by record_score) which will be displayed in the charts. - // TODO - combine this with loadAnomaliesTable() if the table is being retained. mlResultsService.getRecordsForInfluencer( jobIds, influencers, 0, earliestMs, latestMs, 500 - ).then((resp) => { - $scope.anomalyChartRecords = resp.records; - console.log('Explorer anomaly charts data set:', $scope.anomalyChartRecords); + ) + .then((resp) => { + if ($scope.cellData !== undefined && _.keys($scope.cellData).length > 0) { + $scope.anomalyChartRecords = resp.records; + console.log('Explorer anomaly charts data set:', $scope.anomalyChartRecords); + + if (mlCheckboxShowChartsService.state.get('showCharts')) { + mlExplorerDashboardService.anomalyDataChange.changed( + $scope.anomalyChartRecords, earliestMs, latestMs + ); + } + } - if (mlCheckboxShowChartsService.state.get('showCharts')) { - mlExplorerDashboardService.anomalyDataChange.changed( - $scope.anomalyChartRecords, earliestMs, latestMs - ); - } - }); - }; + if (influencers.length > 0) { + // Filter the Top Influencers list to show just the influencers from + // the records in the selected time range. + const recordInfluencersByName = {}; + + // Add the specified influencer(s) to ensure they are used in the filter + // even if their influencer score for the selected time range is zero. + influencers.forEach((influencer) => { + const fieldName = influencer.fieldName; + if (recordInfluencersByName[influencer.fieldName] === undefined) { + recordInfluencersByName[influencer.fieldName] = []; + } + recordInfluencersByName[fieldName].push(influencer.fieldValue); + }); + + // Add the influencers from the top scoring anomalies. + resp.records.forEach((record) => { + const influencersByName = record.influencers || []; + influencersByName.forEach((influencer) => { + const fieldName = influencer.influencer_field_name; + const fieldValues = influencer.influencer_field_values; + if (recordInfluencersByName[fieldName] === undefined) { + recordInfluencersByName[fieldName] = []; + } + recordInfluencersByName[fieldName].push(...fieldValues); + }); + }); + + const uniqValuesByName = {}; + Object.keys(recordInfluencersByName).forEach((fieldName) => { + const fieldValues = recordInfluencersByName[fieldName]; + uniqValuesByName[fieldName] = _.uniq(fieldValues); + }); + + const filterInfluencers = []; + Object.keys(uniqValuesByName).forEach((fieldName) => { + // Find record influencers with the same field name as the clicked on cell(s). + const matchingFieldName = influencers.find((influencer) => { + return influencer.fieldName === fieldName; + }); + + if (matchingFieldName !== undefined) { + // Filter for the value(s) of the clicked on cell(s). + filterInfluencers.push(...influencers); + } else { + // For other field names, add values from all records. + uniqValuesByName[fieldName].forEach((fieldValue) => { + filterInfluencers.push({ fieldName, fieldValue }); + }); + } + }); + + getTopInfluencers(jobIds, earliestMs, latestMs, filterInfluencers); + } + }); + } function loadViewBySwimlaneOptions() { // Obtain the list of 'View by' fields per job. @@ -539,36 +642,6 @@ module.controller('MlExplorerController', function ( $scope.loading = true; $scope.hasResults = false; - // Counter to keep track of what data sets have been loaded. - $scope.loadCounter++; - let awaitingCount = 2; - - // finish() function, called after each data set has been loaded and processed. - // The last one to call it will trigger the page render. - function finish(counterVar) { - awaitingCount--; - if (awaitingCount === 0 && (counterVar === $scope.loadCounter)) { - - if ($scope.overallSwimlaneData.points && $scope.overallSwimlaneData.points.length > 0) { - $scope.hasResults = true; - - // Trigger loading of the 'view by' swimlane - - // only load once the overall swimlane so that we can match the time span. - loadViewBySwimlaneOptions(); - } else { - $scope.hasResults = false; - } - $scope.loading = false; - - // Tell the result components directives to render. - // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. - $timeout(() => { - $scope.$broadcast('render'); - mlExplorerDashboardService.swimlaneDataChange.changed('overall'); - }, 0); - } - } - $scope.swimlaneBucketInterval = calculateSwimlaneBucketInterval(); console.log('Explorer swimlane bucketInterval:', $scope.swimlaneBucketInterval); @@ -578,25 +651,7 @@ module.controller('MlExplorerController', function ( const searchBounds = getBoundsRoundedToInterval(bounds, $scope.swimlaneBucketInterval, false); const selectedJobIds = $scope.getSelectedJobIds(); - // Query 1 - load list of top influencers. - // Pass a counter flag into the finish() function to make sure we only process the results - // for the most recent call to the load the data in cases where the job selection and time filter - // have been altered in quick succession (such as from the job picker with 'Apply time range'). - const counter = $scope.loadCounter; - mlResultsService.getTopInfluencers( - selectedJobIds, - searchBounds.min.valueOf(), - searchBounds.max.valueOf(), - MAX_INFLUENCER_FIELD_NAMES, - MAX_INFLUENCER_FIELD_VALUES - ).then((resp) => { - // TODO - sort the influencers keys so that the partition field(s) are first. - $scope.influencersData = resp.influencers; - console.log('Explorer top influencers data set:', $scope.influencersData); - finish(counter); - }); - - // Query 2 - load overall bucket scores by time. + // Load the overall bucket scores by time. // Pass the interval in seconds as the swimlane relies on a fixed number of seconds between buckets // which wouldn't be the case if e.g. '1M' was used. // Pass 'true' when obtaining bucket bounds due to the way the overall_buckets endpoint works @@ -614,11 +669,46 @@ module.controller('MlExplorerController', function ( ).then((resp) => { processOverallResults(resp.results, searchBounds); console.log('Explorer overall swimlane data set:', $scope.overallSwimlaneData); - finish(counter); + + if ($scope.overallSwimlaneData.points && $scope.overallSwimlaneData.points.length > 0) { + $scope.hasResults = true; + + // Trigger loading of the 'view by' swimlane - + // only load once the overall swimlane so that we can match the time span. + loadViewBySwimlaneOptions(); + } else { + $scope.hasResults = false; + } + $scope.loading = false; + + // Tell the result components directives to render. + // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data. + $timeout(() => { + $scope.$broadcast('render'); + mlExplorerDashboardService.swimlaneDataChange.changed('overall'); + }, 0); }); } + function getTopInfluencers(selectedJobIds, earliestMs, latestMs, influencers = []) { + if ($scope.noInfluencersConfigured !== true) { + mlResultsService.getTopInfluencers( + selectedJobIds, + earliestMs, + latestMs, + MAX_INFLUENCER_FIELD_VALUES, + influencers + ).then((resp) => { + // TODO - sort the influencers keys so that the partition field(s) are first. + $scope.influencers = resp.influencers; + console.log('Explorer top influencers data set:', $scope.influencers); + }); + } else { + $scope.influencers = {}; + } + } + function loadViewBySwimlane(fieldValues) { // finish() function, called after each data set has been loaded and processed. // The last one to call it will trigger the page render. @@ -658,7 +748,7 @@ module.controller('MlExplorerController', function ( interval, swimlaneLimit ).then((resp) => { - processViewByResults(resp.results); + processViewByResults(resp.results, fieldValues); finish(); }); } else { @@ -670,7 +760,7 @@ module.controller('MlExplorerController', function ( interval, swimlaneLimit ).then((resp) => { - processViewByResults(resp.results); + processViewByResults(resp.results, fieldValues); finish(); }); @@ -690,7 +780,6 @@ module.controller('MlExplorerController', function ( selectedJobIds, earliestMs, latestMs, - MAX_INFLUENCER_FIELD_NAMES, swimlaneLimit ).then((resp) => { const topFieldValues = []; @@ -715,10 +804,62 @@ module.controller('MlExplorerController', function ( } } + function loadAnomaliesTableData() { + const cellData = $scope.cellData; + const jobIds = ($scope.cellData !== undefined && cellData.fieldName === VIEW_BY_JOB_LABEL) ? + cellData.laneLabels : $scope.getSelectedJobIds(); + const influencers = getSelectionInfluencers(cellData); + const timeRange = getSelectionTimeRange(cellData); + + ml.results.getAnomaliesTableData( + jobIds, + [], + influencers, + mlSelectIntervalService.state.get('interval').val, + mlSelectSeverityService.state.get('threshold').val, + timeRange.earliestMs, + timeRange.latestMs, + 500, + MAX_CATEGORY_EXAMPLES + ).then((resp) => { + const anomalies = resp.anomalies; + const detectorsByJob = mlJobService.detectorsByJob; + anomalies.forEach((anomaly) => { + // Add a detector property to each anomaly. + // Default to functionDescription if no description available. + // TODO - when job_service is moved server_side, move this to server endpoint. + const jobId = anomaly.jobId; + anomaly.detector = _.get(detectorsByJob, + [jobId, anomaly.detectorIndex, 'detector_description'], + anomaly.source.function_description); + + // Add properties used for building the links menu. + // TODO - when job_service is moved server_side, move this to server endpoint. + anomaly.isTimeSeriesViewDetector = isTimeSeriesViewDetector( + mlJobService.getJob(jobId), anomaly.detectorIndex); + if (_.has(mlJobService.customUrlsByJob, jobId)) { + anomaly.customUrls = mlJobService.customUrlsByJob[jobId]; + } + }); + + $scope.$evalAsync(() => { + $scope.tableData = { + anomalies, + interval: resp.interval, + examplesByJobId: resp.examplesByJobId, + showViewSeriesLink: true + }; + }); + + }).catch((resp) => { + console.log('Explorer - error loading data for anomalies table:', resp); + }); + } + function clearSelectedAnomalies() { $scope.anomalyChartRecords = []; - $scope.anomalyRecords = []; $scope.viewByLoadedForTimeFormatted = null; + delete $scope.cellData; // With no swimlane selection, display anomalies over all time in the table. const jobIds = $scope.getSelectedJobIds(); @@ -726,7 +867,8 @@ module.controller('MlExplorerController', function ( const earliestMs = bounds.min.valueOf(); const latestMs = bounds.max.valueOf(); mlExplorerDashboardService.anomalyDataChange.changed($scope.anomalyChartRecords, earliestMs, latestMs); - $scope.loadAnomaliesTable(jobIds, [], earliestMs, latestMs); + loadDataForCharts(jobIds, [], earliestMs, latestMs); + loadAnomaliesTableData(); } function calculateSwimlaneBucketInterval() { @@ -764,8 +906,15 @@ module.controller('MlExplorerController', function ( } function getSwimlaneContainerWidth() { - // swimlane width is 5 sixths of the window, minus 170 for the lane labels, minus 50 padding - return(($mlExplorer.width() / 6) * 5) - 170 - 50; + if ($scope.noInfluencersConfigured === true) { + // swimlane is full width, minus 30 for the 'no influencers' info icon, + // minus 170 for the lane labels, minus 50 padding + return $mlExplorer.width() - 250; + } else { + // swimlane width is 5 sixths of the window, + // minus 170 for the lane labels, minus 50 padding + return (($mlExplorer.width() / 6) * 5) - 220; + } } function processOverallResults(scoresByTime, searchBounds) { @@ -796,7 +945,11 @@ module.controller('MlExplorerController', function ( $scope.overallSwimlaneData = dataset; } - function processViewByResults(scoresByInfluencerAndTime) { + function processViewByResults(scoresByInfluencerAndTime, sortedLaneValues) { + // Processes the scores for the 'view by' swimlane. + // Sorts the lanes according to the supplied array of lane + // values in the order in which they should be displayed, + // or pass an empty array to sort lanes according to max score over all time. const dataset = { fieldName: $scope.swimlaneViewByFieldName, points: [], @@ -825,13 +978,28 @@ module.controller('MlExplorerController', function ( }); }); - // Ensure lanes are sorted in descending order of max score. - // Note the keys in scoresByInfluencerAndTime received from the ES request - // are not guaranteed to be sorted by score if they can be parsed as numbers - // (e.g. if viewing by HTTP response code). - dataset.laneLabels = laneLabels.sort((a, b) => { - return maxScoreByLaneLabel[b] - maxScoreByLaneLabel[a]; - }); + const sortValuesLength = sortedLaneValues.length; + if (sortValuesLength === 0) { + // Sort lanes in descending order of max score. + // Note the keys in scoresByInfluencerAndTime received from the ES request + // are not guaranteed to be sorted by score if they can be parsed as numbers + // (e.g. if viewing by HTTP response code). + dataset.laneLabels = laneLabels.sort((a, b) => { + return maxScoreByLaneLabel[b] - maxScoreByLaneLabel[a]; + }); + } else { + // Sort lanes according to supplied order + // e.g. when a cell in the overall swimlane has been selected. + // Find the index of each lane label from the actual data set, + // rather than using sortedLaneValues as-is, just in case they differ. + dataset.laneLabels = laneLabels.sort((a, b) => { + let aIndex = sortedLaneValues.indexOf(a); + let bIndex = sortedLaneValues.indexOf(b); + aIndex = (aIndex > -1) ? aIndex : sortValuesLength; + bIndex = (bIndex > -1) ? bIndex : sortValuesLength; + return aIndex - bIndex; + }); + } $scope.viewBySwimlaneData = dataset; } diff --git a/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js b/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js index d18fb706f0d324..f2efd703a65c38 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js +++ b/x-pack/plugins/ml/public/explorer/explorer_dashboard_service.js @@ -17,7 +17,7 @@ const module = uiModules.get('apps/ml'); import { listenerFactoryProvider } from 'plugins/ml/factories/listener_factory'; module.service('mlExplorerDashboardService', function () { - this.allowCellRangeSelection = false; + this.allowCellRangeSelection = true; const listenerFactory = listenerFactoryProvider(); const dragSelect = this.dragSelect = listenerFactory(); diff --git a/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js b/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js index a7367266013dd0..3760c463e95638 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js +++ b/x-pack/plugins/ml/public/explorer/explorer_swimlane_directive.js @@ -15,7 +15,7 @@ import $ from 'jquery'; import moment from 'moment'; import d3 from 'd3'; -import { getSeverityColor } from 'plugins/ml/util/anomaly_utils'; +import { getSeverityColor } from 'plugins/ml/../common/util/anomaly_utils'; import { numTicksForDateFormat } from 'plugins/ml/util/chart_utils'; import { IntervalHelperProvider } from 'plugins/ml/util/ml_time_buckets'; import { mlEscape } from 'plugins/ml/util/string_utils'; diff --git a/x-pack/plugins/ml/public/explorer/styles/main.less b/x-pack/plugins/ml/public/explorer/styles/main.less index e7c254460530f4..534b8cc73a6f9e 100644 --- a/x-pack/plugins/ml/public/explorer/styles/main.less +++ b/x-pack/plugins/ml/public/explorer/styles/main.less @@ -2,7 +2,6 @@ width: 100%; display: inline-block; color: #555; - font-size: 10px; .visualize-error { h4 { @@ -35,8 +34,22 @@ } .results-container { + + .col-xs-12 { + width: calc(~"100% - 30px"); + padding-left: 10px; + } + padding: 15px 0px 15px 0px; + .no-influencers-warning { + float: left; + padding-top: 2px; + padding-left: 15px; + color: #7b8a8b; + font-size: 14px; + } + .panel-title { color: #7b8a8b; display: inline-block; @@ -319,3 +332,5 @@ } } + + diff --git a/x-pack/plugins/ml/public/factories/__tests__/state_factory.js b/x-pack/plugins/ml/public/factories/__tests__/state_factory.js index 77b4ad21000fba..d8b177301e5c96 100644 --- a/x-pack/plugins/ml/public/factories/__tests__/state_factory.js +++ b/x-pack/plugins/ml/public/factories/__tests__/state_factory.js @@ -13,9 +13,11 @@ import { stateFactoryProvider } from '../state_factory'; describe('ML - mlStateFactory', () => { let stateFactory; + let AppState; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(($injector) => { + AppState = $injector.get('AppState'); const Private = $injector.get('Private'); stateFactory = Private(stateFactoryProvider); })); @@ -53,4 +55,49 @@ describe('ML - mlStateFactory', () => { state.set('testValue', 10); state.changed(); }); + + it(`Malformed AppState, state falls back to undefined, doesn't throw an error`, () => { + const state = stateFactory('testName'); + + // First update the state without interfering with AppState + state.set('testValue', 1); + expect(state.get('testValue')).to.be(1); + + // Manipulate AppState first, then set and get the custom state. + const appState = new AppState(); + appState.fetch(); + appState.testName = undefined; + appState.save(); + state.set('testValue', 2); + expect(state.get('testValue')).to.be(2); + + // Now set the custom state, then manipulate AppState, then get the custom state. + // Because AppState was malformed between set and get, the custom state will fallback + // to the default state, in this case undefined + state.set('testValue', 3); + appState.fetch(); + appState.testName = undefined; + appState.save(); + expect(state.get('testValue')).to.be(undefined); + }); + + it(`Malformed AppState, state falls back to default, doesn't throw an error`, () => { + const state = stateFactory('testName', { + testValue: 1 + }); + + // First update the state without interfering with AppState + state.set('testValue', 2); + expect(state.get('testValue')).to.be(2); + + // Now set the custom state, then manipulate AppState, then get the custom state. + // Because AppState was malformed between set and get, the custom state will fallback + // to the default state, in this case 1 + state.set('testValue', 3); + const appState = new AppState(); + appState.fetch(); + appState.testName = undefined; + appState.save(); + expect(state.get('testValue')).to.be(1); + }); }); diff --git a/x-pack/plugins/ml/public/factories/state_factory.js b/x-pack/plugins/ml/public/factories/state_factory.js index 6248bd92ce9f31..f9db571e70f220 100644 --- a/x-pack/plugins/ml/public/factories/state_factory.js +++ b/x-pack/plugins/ml/public/factories/state_factory.js @@ -19,11 +19,7 @@ import { listenerFactoryProvider } from './listener_factory'; // Have a look at the unit tests which demonstrate basic usage. export function stateFactoryProvider(AppState) { - return function (stateName, defaultState) { - if (typeof stateName !== 'string') { - throw 'stateName needs to be of type `string`'; - } - + function initializeAppState(stateName, defaultState) { const appState = new AppState(); appState.fetch(); @@ -49,6 +45,16 @@ export function stateFactoryProvider(AppState) { } } + return appState; + } + + return function (stateName, defaultState) { + if (typeof stateName !== 'string') { + throw 'stateName needs to be of type `string`'; + } + + let appState = initializeAppState(stateName, defaultState); + // () two times here, because the Provider first returns // the Factory, which then returns the actual listener const listener = listenerFactoryProvider()(); @@ -60,11 +66,13 @@ export function stateFactoryProvider(AppState) { // on the state. const state = { get(name) { - return appState[stateName] && appState[stateName][name]; + updateAppState(); + return appState[stateName][name]; }, // only if value doesn't match the existing one, the state gets updated // and saved. set(name, value) { + updateAppState(); if (!_.isEqual(appState[stateName][name], value)) { appState[stateName][name] = value; appState.save(); @@ -73,6 +81,7 @@ export function stateFactoryProvider(AppState) { return state; }, reset() { + updateAppState(); if (!_.isEqual(appState[stateName], defaultState)) { appState[stateName] = _.cloneDeep(defaultState); appState.save(); @@ -92,6 +101,16 @@ export function stateFactoryProvider(AppState) { } }; + // gets the current state of AppState, if for whatever reason this custom + // state isn't part of AppState anymore, reinitialize it + function updateAppState() { + appState.fetch(); + if (typeof appState[stateName] === 'undefined') { + appState = initializeAppState(stateName, defaultState); + changed = true; + } + } + return state; }; } diff --git a/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js b/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js deleted file mode 100644 index 3015b6b59cdec7..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/abbreviate_whole_number.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('abbreviateWholeNumber'); - }); -}; - -describe('ML - abbreviateWholeNumber filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have an abbreviateWholeNumber filter', () => { - expect(filter).to.not.be(null); - }); - - it('returns the correct format using default max digits', () => { - expect(filter(1)).to.be(1); - expect(filter(12)).to.be(12); - expect(filter(123)).to.be(123); - expect(filter(1234)).to.be('1k'); - expect(filter(12345)).to.be('12k'); - expect(filter(123456)).to.be('123k'); - expect(filter(1234567)).to.be('1m'); - expect(filter(12345678)).to.be('12m'); - expect(filter(123456789)).to.be('123m'); - expect(filter(1234567890)).to.be('1b'); - expect(filter(5555555555555.55)).to.be('6t'); - }); - - it('returns the correct format using custom max digits', () => { - expect(filter(1, 4)).to.be(1); - expect(filter(12, 4)).to.be(12); - expect(filter(123, 4)).to.be(123); - expect(filter(1234, 4)).to.be(1234); - expect(filter(12345, 4)).to.be('12k'); - expect(filter(123456, 6)).to.be(123456); - expect(filter(1234567, 4)).to.be('1m'); - expect(filter(12345678, 3)).to.be('12m'); - expect(filter(123456789, 9)).to.be(123456789); - expect(filter(1234567890, 3)).to.be('1b'); - expect(filter(5555555555555.55, 5)).to.be('6t'); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/__tests__/format_value.js b/x-pack/plugins/ml/public/filters/__tests__/format_value.js deleted file mode 100644 index 6ae77941685471..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/format_value.js +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; -import moment from 'moment'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('formatValue'); - }); -}; - -describe('ML - formatValue filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have a formatValue filter', () => { - expect(filter).to.not.be(null); - }); - - // Just check the return value is in the expected format, and - // not the exact value as this will be timezone specific. - it('correctly formats time_of_week value from numeric input', () => { - const formattedValue = filter(1483228800, 'time_of_week'); - const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats time_of_day value from numeric input', () => { - const formattedValue = filter(1483228800, 'time_of_day'); - const result = moment(formattedValue, 'hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats number values from numeric input', () => { - expect(filter(1483228800, 'mean')).to.be(1483228800); - expect(filter(1234.5678, 'mean')).to.be(1234.6); - expect(filter(0.00012345, 'mean')).to.be(0.000123); - expect(filter(0, 'mean')).to.be(0); - expect(filter(-0.12345, 'mean')).to.be(-0.123); - expect(filter(-1234.5678, 'mean')).to.be(-1234.6); - expect(filter(-100000.1, 'mean')).to.be(-100000); - }); - - it('correctly formats time_of_week value from array input', () => { - const formattedValue = filter([1483228800], 'time_of_week'); - const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats time_of_day value from array input', () => { - const formattedValue = filter([1483228800], 'time_of_day'); - const result = moment(formattedValue, 'hh:mm', true).isValid(); - expect(result).to.be(true); - }); - - it('correctly formats number values from array input', () => { - expect(filter([1483228800], 'mean')).to.be(1483228800); - expect(filter([1234.5678], 'mean')).to.be(1234.6); - expect(filter([0.00012345], 'mean')).to.be(0.000123); - expect(filter([0], 'mean')).to.be(0); - expect(filter([-0.12345], 'mean')).to.be(-0.123); - expect(filter([-1234.5678], 'mean')).to.be(-1234.6); - expect(filter([-100000.1], 'mean')).to.be(-100000); - }); - - it('correctly formats multi-valued array', () => { - const result = filter([500, 1000], 'mean'); - expect(result instanceof Array).to.be(true); - expect(result.length).to.be(2); - expect(result[0]).to.be(500); - expect(result[1]).to.be(1000); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js b/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js deleted file mode 100644 index e6045be4e09ec6..00000000000000 --- a/x-pack/plugins/ml/public/filters/__tests__/metric_change_description.js +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -import ngMock from 'ng_mock'; -import expect from 'expect.js'; - -let filter; - -const init = function () { - // Load the application - ngMock.module('kibana'); - - // Create the scope - ngMock.inject(function ($filter) { - filter = $filter('metricChangeDescription'); - }); -}; - -describe('ML - metricChangeDescription filter', () => { - - beforeEach(function () { - init(); - }); - - it('should have a metricChangeDescription filter', () => { - expect(filter).to.not.be(null); - }); - - it('returns correct description if actual > typical', () => { - expect(filter(1.01, 1)).to.be(' Unusually high'); - expect(filter(1.123, 1)).to.be(' 1.1x higher'); - expect(filter(2, 1)).to.be(' 2x higher'); - expect(filter(9.5, 1)).to.be(' 10x higher'); - expect(filter(1000, 1)).to.be(' More than 100x higher'); - expect(filter(1, 0)).to.be(' Unexpected non-zero value'); - }); - - it('returns correct description if actual < typical', () => { - expect(filter(1, 1.01)).to.be(' Unusually low'); - expect(filter(1, 1.123)).to.be(' 1.1x lower'); - expect(filter(1, 2)).to.be(' 2x lower'); - expect(filter(1, 9.5)).to.be(' 10x lower'); - expect(filter(1, 1000)).to.be(' More than 100x lower'); - expect(filter(0, 1)).to.be(' Unexpected zero value'); - }); - -}); diff --git a/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js b/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js deleted file mode 100644 index ab7d4553568136..00000000000000 --- a/x-pack/plugins/ml/public/filters/abbreviate_whole_number.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - -/* - * AngularJS filter to abbreviate large whole numbers with metric prefixes. - * Uses numeral.js to format numbers longer than the specified number of - * digits with metric abbreviations e.g. 12345 as 12k, or 98000000 as 98m. -*/ -import numeral from '@elastic/numeral'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('abbreviateWholeNumber', function () { - return function (value, maxDigits) { - const maxNumDigits = (maxDigits !== undefined ? maxDigits : 3); - if (Math.abs(value) < Math.pow(10, maxNumDigits)) { - return value; - } else { - return numeral(value).format('0a'); - } - }; -}); - diff --git a/x-pack/plugins/ml/public/filters/format_value.js b/x-pack/plugins/ml/public/filters/format_value.js deleted file mode 100644 index 7ba54cb2311e8f..00000000000000 --- a/x-pack/plugins/ml/public/filters/format_value.js +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -/* - * AngularJS filter generally used for formatting 'typical' and 'actual' values - * from machine learning results. For detectors which use the time_of_week or time_of_day - * functions, the filter converts the raw number, which is the number of seconds since - * midnight, into a human-readable date/time format. - */ - -import _ from 'lodash'; -import moment from 'moment'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('formatValue', function () { - - const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10 - - function formatValue(value, fx, fieldFormat) { - // If the analysis function is time_of_week/day, format as day/time. - if (fx === 'time_of_week') { - const d = new Date(); - const i = parseInt(value); - d.setTime(i * 1000); - return moment(d).format('ddd hh:mm'); - } else if (fx === 'time_of_day') { - const d = new Date(); - const i = parseInt(value); - d.setTime(i * 1000); - return moment(d).format('hh:mm'); - } else { - if (fieldFormat !== undefined) { - return fieldFormat.convert(value, 'text'); - } else { - // If no Kibana FieldFormat object provided, - // format the value depending on its magnitude. - const absValue = Math.abs(value); - if (absValue >= 10000 || absValue === Math.floor(absValue)) { - // Output 0 decimal places if whole numbers or >= 10000 - if (fieldFormat !== undefined) { - return fieldFormat.convert(value, 'text'); - } else { - return Number(value.toFixed(0)); - } - - } else if (absValue >= 10) { - // Output to 1 decimal place between 10 and 10000 - return Number(value.toFixed(1)); - } - else { - // For values < 10, output to 3 significant figures - let multiple; - if (value > 0) { - multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(value) / Math.LN10) - 1); - } else { - multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(-1 * value) / Math.LN10) - 1); - } - return (Math.round(value * multiple)) / multiple; - } - } - } - } - - return function (value, fx, fieldFormat) { - // actual and typical values in results will be arrays. - // Unless the array is multi-valued (as it will be for multi-variate analyses), - // simply return the formatted single value. - if (Array.isArray(value)) { - if (value.length === 1) { - return formatValue(value[0], fx, fieldFormat); - } else { - return _.map(value, function (val) { return formatValue(val, fx); }); - } - } else { - return formatValue(value, fx, fieldFormat); - } - }; -}); diff --git a/x-pack/plugins/ml/public/filters/metric_change_description.js b/x-pack/plugins/ml/public/filters/metric_change_description.js deleted file mode 100644 index 8eee882bbc7e9b..00000000000000 --- a/x-pack/plugins/ml/public/filters/metric_change_description.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -/* - * AngularJS filter for producing a concise textual description of how the - * actual value compares to the typical value for a time series anomaly. - */ - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.filter('metricChangeDescription', function () { - return function (actual, typical) { - if (actual === typical) { - // Very unlikely, but just in case. - return 'actual same as typical'; - } - - // For actual / typical gives output of the form: - // 4 / 2 2x higher - // 2 / 10 5x lower - // 1000 / 1 More than 100x higher - // 999 / 1000 Unusually low - // 100 / -100 Unusually high - // 0 / 100 Unexpected zero value - // 1 / 0 Unexpected non-zero value - const isHigher = actual > typical; - const iconClass = isHigher ? 'fa-arrow-up' : 'fa-arrow-down'; - if (typical !== 0 && actual !== 0) { - const factor = isHigher ? actual / typical : typical / actual; - const direction = isHigher ? 'higher' : 'lower'; - if (factor > 1.5) { - if (factor <= 100) { - return ' ' + Math.round(factor) + 'x ' + direction; - } else { - return ' More than 100x ' + direction; - } - } - - if (factor >= 1.05) { - return ' ' + factor.toPrecision(2) + 'x ' + direction; - } else { - const dir = isHigher ? 'high' : 'low'; - return ' Unusually ' + dir; - } - - } else { - if (actual === 0) { - return ' Unexpected zero value'; - } else { - return ' Unexpected non-zero value'; - } - } - - }; -}); - diff --git a/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js b/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js new file mode 100644 index 00000000000000..582d9bac39d728 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/abbreviate_whole_number.js @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import { abbreviateWholeNumber } from '../abbreviate_whole_number'; + +describe('ML - abbreviateWholeNumber formatter', () => { + + it('returns the correct format using default max digits', () => { + expect(abbreviateWholeNumber(1)).to.be(1); + expect(abbreviateWholeNumber(12)).to.be(12); + expect(abbreviateWholeNumber(123)).to.be(123); + expect(abbreviateWholeNumber(1234)).to.be('1k'); + expect(abbreviateWholeNumber(12345)).to.be('12k'); + expect(abbreviateWholeNumber(123456)).to.be('123k'); + expect(abbreviateWholeNumber(1234567)).to.be('1m'); + expect(abbreviateWholeNumber(12345678)).to.be('12m'); + expect(abbreviateWholeNumber(123456789)).to.be('123m'); + expect(abbreviateWholeNumber(1234567890)).to.be('1b'); + expect(abbreviateWholeNumber(5555555555555.55)).to.be('6t'); + }); + + it('returns the correct format using custom max digits', () => { + expect(abbreviateWholeNumber(1, 4)).to.be(1); + expect(abbreviateWholeNumber(12, 4)).to.be(12); + expect(abbreviateWholeNumber(123, 4)).to.be(123); + expect(abbreviateWholeNumber(1234, 4)).to.be(1234); + expect(abbreviateWholeNumber(12345, 4)).to.be('12k'); + expect(abbreviateWholeNumber(123456, 6)).to.be(123456); + expect(abbreviateWholeNumber(1234567, 4)).to.be('1m'); + expect(abbreviateWholeNumber(12345678, 3)).to.be('12m'); + expect(abbreviateWholeNumber(123456789, 9)).to.be(123456789); + expect(abbreviateWholeNumber(1234567890, 3)).to.be('1b'); + expect(abbreviateWholeNumber(5555555555555.55, 5)).to.be('6t'); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/__tests__/format_value.js b/x-pack/plugins/ml/public/formatters/__tests__/format_value.js new file mode 100644 index 00000000000000..ff5548b73551e5 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/format_value.js @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import moment from 'moment'; +import { formatValue } from '../format_value'; + +describe('ML - formatValue formatter', () => { + + // Just check the return value is in the expected format, and + // not the exact value as this will be timezone specific. + it('correctly formats time_of_week value from numeric input', () => { + const formattedValue = formatValue(1483228800, 'time_of_week'); + const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats time_of_day value from numeric input', () => { + const formattedValue = formatValue(1483228800, 'time_of_day'); + const result = moment(formattedValue, 'hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats number values from numeric input', () => { + expect(formatValue(1483228800, 'mean')).to.be(1483228800); + expect(formatValue(1234.5678, 'mean')).to.be(1234.6); + expect(formatValue(0.00012345, 'mean')).to.be(0.000123); + expect(formatValue(0, 'mean')).to.be(0); + expect(formatValue(-0.12345, 'mean')).to.be(-0.123); + expect(formatValue(-1234.5678, 'mean')).to.be(-1234.6); + expect(formatValue(-100000.1, 'mean')).to.be(-100000); + }); + + it('correctly formats time_of_week value from array input', () => { + const formattedValue = formatValue([1483228800], 'time_of_week'); + const result = moment(formattedValue, 'ddd hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats time_of_day value from array input', () => { + const formattedValue = formatValue([1483228800], 'time_of_day'); + const result = moment(formattedValue, 'hh:mm', true).isValid(); + expect(result).to.be(true); + }); + + it('correctly formats number values from array input', () => { + expect(formatValue([1483228800], 'mean')).to.be(1483228800); + expect(formatValue([1234.5678], 'mean')).to.be(1234.6); + expect(formatValue([0.00012345], 'mean')).to.be(0.000123); + expect(formatValue([0], 'mean')).to.be(0); + expect(formatValue([-0.12345], 'mean')).to.be(-0.123); + expect(formatValue([-1234.5678], 'mean')).to.be(-1234.6); + expect(formatValue([-100000.1], 'mean')).to.be(-100000); + }); + + it('correctly formats multi-valued array', () => { + expect(formatValue([30.3, 26.2], 'lat_long')).to.be('[30.3,26.2]'); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js b/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js new file mode 100644 index 00000000000000..9c4b1516915aaf --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/__tests__/metric_change_description.js @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import expect from 'expect.js'; +import { getMetricChangeDescription } from '../metric_change_description'; + + +describe('ML - metricChangeDescription formatter', () => { + + it('returns correct icon and message if actual > typical', () => { + expect(getMetricChangeDescription(1.01, 1)).to.eql({ iconType: 'sortUp', message: 'Unusually high' }); + expect(getMetricChangeDescription(1.123, 1)).to.eql({ iconType: 'sortUp', message: '1.1x higher' }); + expect(getMetricChangeDescription(2, 1)).to.eql({ iconType: 'sortUp', message: '2x higher' }); + expect(getMetricChangeDescription(9.5, 1)).to.eql({ iconType: 'sortUp', message: '10x higher' }); + expect(getMetricChangeDescription(1000, 1)).to.eql({ iconType: 'sortUp', message: 'More than 100x higher' }); + expect(getMetricChangeDescription(1, 0)).to.eql({ iconType: 'sortUp', message: 'Unexpected non-zero value' }); + }); + + it('returns correct icon and message if actual < typical', () => { + expect(getMetricChangeDescription(1, 1.01)).to.eql({ iconType: 'sortDown', message: 'Unusually low' }); + expect(getMetricChangeDescription(1, 1.123)).to.eql({ iconType: 'sortDown', message: '1.1x lower' }); + expect(getMetricChangeDescription(1, 2)).to.eql({ iconType: 'sortDown', message: '2x lower' }); + expect(getMetricChangeDescription(1, 9.5)).to.eql({ iconType: 'sortDown', message: '10x lower' }); + expect(getMetricChangeDescription(1, 1000)).to.eql({ iconType: 'sortDown', message: 'More than 100x lower' }); + expect(getMetricChangeDescription(0, 1)).to.eql({ iconType: 'sortDown', message: 'Unexpected zero value' }); + }); + +}); diff --git a/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js b/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js new file mode 100644 index 00000000000000..802aeb3a5d19c3 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/abbreviate_whole_number.js @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +/* + * Formatter to abbreviate large whole numbers with metric prefixes. + * Uses numeral.js to format numbers longer than the specified number of + * digits with metric abbreviations e.g. 12345 as 12k, or 98000000 as 98m. +*/ +import numeral from '@elastic/numeral'; + +export function abbreviateWholeNumber(value, maxDigits) { + const maxNumDigits = (maxDigits !== undefined ? maxDigits : 3); + if (Math.abs(value) < Math.pow(10, maxNumDigits)) { + return value; + } else { + return numeral(value).format('0a'); + } +} diff --git a/x-pack/plugins/ml/public/formatters/format_value.js b/x-pack/plugins/ml/public/formatters/format_value.js new file mode 100644 index 00000000000000..40eb8202782df8 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/format_value.js @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +/* + * Formatter for 'typical' and 'actual' values from machine learning results. + * For detectors which use the time_of_week or time_of_day + * functions, the filter converts the raw number, which is the number of seconds since + * midnight, into a human-readable date/time format. + */ + +import moment from 'moment'; + +import { uiModules } from 'ui/modules'; +const module = uiModules.get('apps/ml'); + + +const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10 + +// Formats the value of an actual or typical field from a machine learning anomaly record. +// mlFunction is the 'function' field from the ML record containing what the user entered e.g. 'high_count', +// (as opposed to the 'function_description' field which holds an ML-built display hint for the function e.g. 'count'. +export function formatValue(value, mlFunction, fieldFormat) { + // actual and typical values in anomaly record results will be arrays. + // Unless the array is multi-valued (as it will be for multi-variate analyses such as lat_long), + // simply return the formatted single value. + if (Array.isArray(value)) { + if (value.length === 1) { + return formatSingleValue(value[0], mlFunction, fieldFormat); + } else { + // Return with array style formatting. + const values = value.map(val => formatSingleValue(val, mlFunction, fieldFormat)); + return `[${values}]`; + } + } else { + return formatSingleValue(value, mlFunction, fieldFormat); + } +} + +// Formats a single value according to the specifield ML function. +// If a Kibana fieldFormat is not supplied, will fall back to default +// formatting depending on the magnitude of the value. +function formatSingleValue(value, mlFunction, fieldFormat) { + if (value === undefined || value === null) { + return ''; + } + + // If the analysis function is time_of_week/day, format as day/time. + if (mlFunction === 'time_of_week') { + const d = new Date(); + const i = parseInt(value); + d.setTime(i * 1000); + return moment(d).format('ddd hh:mm'); + } else if (mlFunction === 'time_of_day') { + const d = new Date(); + const i = parseInt(value); + d.setTime(i * 1000); + return moment(d).format('hh:mm'); + } else { + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + // If no Kibana FieldFormat object provided, + // format the value depending on its magnitude. + const absValue = Math.abs(value); + if (absValue >= 10000 || absValue === Math.floor(absValue)) { + // Output 0 decimal places if whole numbers or >= 10000 + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + return Number(value.toFixed(0)); + } + + } else if (absValue >= 10) { + // Output to 1 decimal place between 10 and 10000 + return Number(value.toFixed(1)); + } + else { + // For values < 10, output to 3 significant figures + let multiple; + if (value > 0) { + multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(value) / Math.LN10) - 1); + } else { + multiple = Math.pow(10, SIGFIGS_IF_ROUNDING - Math.floor(Math.log(-1 * value) / Math.LN10) - 1); + } + return (Math.round(value * multiple)) / multiple; + } + } + } +} + +// TODO - remove the filter once all uses of the formatValue Angular filter have been removed. +module.filter('formatValue', () => formatValue); + diff --git a/x-pack/plugins/ml/public/formatters/metric_change_description.js b/x-pack/plugins/ml/public/formatters/metric_change_description.js new file mode 100644 index 00000000000000..2edc89da376f94 --- /dev/null +++ b/x-pack/plugins/ml/public/formatters/metric_change_description.js @@ -0,0 +1,111 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +/* + * Produces a concise textual description of how the + * actual value compares to the typical value for an anomaly. + */ + +import { uiModules } from 'ui/modules'; +const module = uiModules.get('apps/ml'); + +// Returns an Object containing a text message and EuiIcon type to +// describe how the actual value compares to the typical. +export function getMetricChangeDescription(actualProp, typicalProp) { + if (actualProp === undefined || typicalProp === undefined) { + return { iconType: 'empty', message: '' }; + } + + let iconType; + let message; + + // For metric functions, actual and typical will be single value arrays. + let actual = actualProp; + let typical = typicalProp; + if (Array.isArray(actualProp)) { + if (actualProp.length === 1) { + actual = actualProp[0]; + } else { + // TODO - do we want to enhance the description depending on detector? + // e.g. 'Unusual location' if using a lat_long detector. + return { + iconType: 'alert', + message: 'Unusual values' + }; + } + } + + if (Array.isArray(typicalProp)) { + if (typicalProp.length === 1) { + typical = typicalProp[0]; + } + } + + if (actual === typical) { + // Very unlikely, but just in case. + message = 'actual same as typical'; + } else { + // For actual / typical gives output of the form: + // 4 / 2 2x higher + // 2 / 10 5x lower + // 1000 / 1 More than 100x higher + // 999 / 1000 Unusually low + // 100 / -100 Unusually high + // 0 / 100 Unexpected zero value + // 1 / 0 Unexpected non-zero value + const isHigher = actual > typical; + iconType = isHigher ? 'sortUp' : 'sortDown'; + if (typical !== 0 && actual !== 0) { + const factor = isHigher ? actual / typical : typical / actual; + const direction = isHigher ? 'higher' : 'lower'; + if (factor > 1.5) { + if (factor <= 100) { + message = `${Math.round(factor)}x ${direction}`; + } else { + message = `More than 100x ${direction}`; + } + } else if (factor >= 1.05) { + message = `${factor.toPrecision(2)}x ${direction}`; + } else { + message = `Unusually ${isHigher ? 'high' : 'low'}`; + } + + } else { + if (actual === 0) { + message = 'Unexpected zero value'; + } else { + message = 'Unexpected non-zero value'; + } + } + } + + return { iconType, message }; +} + +// TODO - remove the filter once all uses of the metricChangeDescription Angular filter have been removed. +module.filter('metricChangeDescription', function () { + return function (actual, typical) { + + const { + iconType, + message + } = getMetricChangeDescription(actual, typical); + + switch (iconType) { + case 'sortUp': + return ` ${message}`; + case 'sortDown': + return ` ${message}`; + case 'alert': + return ` ${message}`; + } + + return message; + }; +}); + diff --git a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js index 8a2ca71bcd34e9..8fdd222cf7d506 100644 --- a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js +++ b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_directive.js @@ -33,7 +33,7 @@ module.directive('mlCustomUrlEditor', function (Private) { replace: true, transclude: true, template, - controller: function ($scope, $q) { + controller: function ($scope) { const URL_TYPE = { KIBANA_DASHBOARD: 'KIBANA_DASHBOARD', KIBANA_DISCOVER: 'KIBANA_DISCOVER', @@ -88,7 +88,7 @@ module.directive('mlCustomUrlEditor', function (Private) { }); } - $q.all([ + Promise.all([ getSavedDashboards(), getSavedIndexPatterns() ]) diff --git a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js index 11f8fb4f8de4e2..f9bad4f31076d6 100644 --- a/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js +++ b/x-pack/plugins/ml/public/jobs/components/custom_url_editor/custom_url_editor_service.js @@ -10,105 +10,104 @@ import { parseInterval } from 'ui/utils/parse_interval'; -import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/constants/index_patterns'; +import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/../common/constants/index_patterns'; import { replaceTokensInUrlValue } from 'plugins/ml/util/custom_url_utils'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; - -export function CustomUrlEditorServiceProvider(es, Private, $q) { - const mlJobService = Private(JobServiceProvider); - - // Builds the full URL for testing out a custom URL configuration, which - // may contain dollar delimited partition / influencer entity tokens and - // drilldown time range settings. - function getTestUrl(job, urlConfig) { - const urlValue = urlConfig.url_value; - const bucketSpanSecs = parseInterval(job.analysis_config.bucket_span).asSeconds(); - - // By default, return configured url_value. Look to substitute any dollar-delimited - // tokens with values from the highest scoring anomaly, or if no anomalies, with - // values from a document returned by the search in the job datafeed. - let testUrl = urlConfig.url_value; - - // Query to look for the highest scoring anomaly. - const body = { - query: { - bool: { - must: [ - { term: { job_id: job.job_id } }, - { term: { result_type: 'record' } } - ] - } - }, - size: 1, - _source: { - excludes: [] - }, - sort: [ - { record_score: { order: 'desc' } } - ] - }; - - return $q((resolve, reject) => { - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - body - }) - .then((resp) => { - if (resp.hits.total > 0) { - const record = resp.hits.hits[0]._source; - testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, record, 'timestamp'); - resolve(testUrl); - } else { - // No anomalies yet for this job, so do a preview of the search - // configured in the job datafeed to obtain sample docs. - mlJobService.searchPreview(job) - .then((response) => { - let testDoc; - const docTimeFieldName = job.data_description.time_field; - - // Handle datafeeds which use aggregations or documents. - if (response.aggregations) { - // Create a dummy object which contains the fields necessary to build the URL. - const firstBucket = response.aggregations.buckets.buckets[0]; - testDoc = { - [docTimeFieldName]: firstBucket.key - }; - - // Look for bucket aggregations which match the tokens in the URL. - urlValue.replace((/\$([^?&$\'"]{1,40})\$/g), (match, name) => { - if (name !== 'earliest' && name !== 'latest' && firstBucket[name] !== undefined) { - const tokenBuckets = firstBucket[name]; - if (tokenBuckets.buckets) { - testDoc[name] = tokenBuckets.buckets[0].key; - } - } - }); +import { mlJobService } from 'plugins/ml/services/job_service'; +import { ml } from 'plugins/ml/services/ml_api_service'; + + +// Builds the full URL for testing out a custom URL configuration, which +// may contain dollar delimited partition / influencer entity tokens and +// drilldown time range settings. +function getTestUrl(job, urlConfig) { + const urlValue = urlConfig.url_value; + const bucketSpanSecs = parseInterval(job.analysis_config.bucket_span).asSeconds(); + + // By default, return configured url_value. Look to substitute any dollar-delimited + // tokens with values from the highest scoring anomaly, or if no anomalies, with + // values from a document returned by the search in the job datafeed. + let testUrl = urlConfig.url_value; + + // Query to look for the highest scoring anomaly. + const body = { + query: { + bool: { + must: [ + { term: { job_id: job.job_id } }, + { term: { result_type: 'record' } } + ] + } + }, + size: 1, + _source: { + excludes: [] + }, + sort: [ + { record_score: { order: 'desc' } } + ] + }; - } else { - if (response.hits.total > 0) { - testDoc = response.hits.hits[0]._source; + return new Promise((resolve, reject) => { + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + body + }) + .then((resp) => { + if (resp.hits.total > 0) { + const record = resp.hits.hits[0]._source; + testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, record, 'timestamp'); + resolve(testUrl); + } else { + // No anomalies yet for this job, so do a preview of the search + // configured in the job datafeed to obtain sample docs. + mlJobService.searchPreview(job) + .then((response) => { + let testDoc; + const docTimeFieldName = job.data_description.time_field; + + // Handle datafeeds which use aggregations or documents. + if (response.aggregations) { + // Create a dummy object which contains the fields necessary to build the URL. + const firstBucket = response.aggregations.buckets.buckets[0]; + testDoc = { + [docTimeFieldName]: firstBucket.key + }; + + // Look for bucket aggregations which match the tokens in the URL. + urlValue.replace((/\$([^?&$\'"]{1,40})\$/g), (match, name) => { + if (name !== 'earliest' && name !== 'latest' && firstBucket[name] !== undefined) { + const tokenBuckets = firstBucket[name]; + if (tokenBuckets.buckets) { + testDoc[name] = tokenBuckets.buckets[0].key; + } } - } + }); - if (testDoc !== undefined) { - testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, testDoc, docTimeFieldName); + } else { + if (response.hits.total > 0) { + testDoc = response.hits.hits[0]._source; } + } - resolve(testUrl); - - }); - } + if (testDoc !== undefined) { + testUrl = replaceTokensInUrlValue(urlConfig, bucketSpanSecs, testDoc, docTimeFieldName); + } - }) - .catch((resp) => { - reject(resp); - }); - }); + resolve(testUrl); - } + }); + } + }) + .catch((resp) => { + reject(resp); + }); + }); - return { - getTestUrl - }; } + + +export const customUrlEditorService = { + getTestUrl +}; + diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js index 1b61a8cb379ffd..d075af58445a98 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js +++ b/x-pack/plugins/ml/public/jobs/jobs_list/create_watch_modal/create_watch_modal_controller.js @@ -5,7 +5,8 @@ */ -import { CreateWatchServiceProvider } from 'plugins/ml/jobs/new_job/simple/components/watcher/create_watch_service'; +import { mlCreateWatchService } from 'plugins/ml/jobs/new_job/simple/components/watcher/create_watch_service'; +import { xpackFeatureProvider } from 'plugins/ml/license/check_license'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); @@ -13,14 +14,14 @@ const module = uiModules.get('apps/ml'); import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; module.controller('MlCreateWatchModal', function ($scope, $modalInstance, params, Private) { - const mlCreateWatchService = Private(CreateWatchServiceProvider); + const xpackFeature = Private(xpackFeatureProvider); const msgs = mlMessageBarService; // set a reference to the message bar service msgs.clear(); $scope.jobId = params.job.job_id; $scope.bucketSpan = params.job.analysis_config.bucket_span; - $scope.watcherEnabled = mlCreateWatchService.isWatcherEnabled(); + $scope.watcherEnabled = xpackFeature.isAvailable('watcher'); $scope.status = mlCreateWatchService.status; $scope.STATUS = mlCreateWatchService.STATUS; diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js index 70fe6eed0d7000..15ab9cbfc9c10d 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js +++ b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/edit_job_modal_controller.js @@ -14,10 +14,10 @@ import numeral from '@elastic/numeral'; import { calculateDatafeedFrequencyDefaultSeconds } from 'plugins/ml/../common/util/job_utils'; import { parseInterval } from 'plugins/ml/../common/util/parse_interval'; -import { CustomUrlEditorServiceProvider } from 'plugins/ml/jobs/components/custom_url_editor/custom_url_editor_service'; +import { customUrlEditorService } from 'plugins/ml/jobs/components/custom_url_editor/custom_url_editor_service'; import { isWebUrl } from 'plugins/ml/util/string_utils'; import { newJobLimits } from 'plugins/ml/jobs/new_job/utils/new_job_defaults'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; import { uiModules } from 'ui/modules'; @@ -28,11 +28,9 @@ module.controller('MlEditJobModal', function ( $modalInstance, $modal, $window, - params, - Private) { + params) { const msgs = mlMessageBarService; msgs.clear(); - const mlJobService = Private(JobServiceProvider); $scope.saveLock = false; const refreshJob = params.pscope.refreshJob; @@ -152,7 +150,6 @@ module.controller('MlEditJobModal', function ( }; $scope.testCustomUrl = function (index) { - const customUrlEditorService = Private(CustomUrlEditorServiceProvider); customUrlEditorService.getTestUrl( $scope.job, $scope.job.custom_settings.custom_urls[index]) diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less index df57114441c8d9..d52dcdc4cef88a 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less +++ b/x-pack/plugins/ml/public/jobs/jobs_list/edit_job_modal/styles/main.less @@ -6,7 +6,7 @@ text-overflow: ellipsis; padding-bottom: 10px; - i[ml-info-icon] { + span[ml-info-icon] { font-size: 14px; } } diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html index 30b2dc30f45883..9fd22f848f31d4 100644 --- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html +++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row.html @@ -41,7 +41,15 @@ -
{{jobJson}}
+
-
{{datafeedPreview.json}}
+
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row_directive.js b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row_directive.js
index a76ef438007e66..c3a73fcef2cf2a 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row_directive.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/expanded_row_directive.js
@@ -8,12 +8,13 @@
import _ from 'lodash';
import moment from 'moment';
+import 'ace';
import { toLocaleString, detectorToString } from 'plugins/ml/util/string_utils';
import { copyTextToClipboard } from 'plugins/ml/util/clipboard_utils';
import { JOB_STATE, DATAFEED_STATE } from 'plugins/ml/../common/constants/states';
import { ML_DATA_PREVIEW_COUNT } from 'plugins/ml/../common/util/job_utils';
import { checkPermission } from 'plugins/ml/privilege/check_privilege';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
import numeral from '@elastic/numeral';
import chrome from 'ui/chrome';
@@ -23,7 +24,7 @@ import template from './expanded_row.html';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
-module.directive('mlJobListExpandedRow', function ($location, Private) {
+module.directive('mlJobListExpandedRow', function ($location) {
return {
restrict: 'AE',
replace: false,
@@ -39,7 +40,6 @@ module.directive('mlJobListExpandedRow', function ($location, Private) {
template,
link: function ($scope, $element) {
const msgs = mlMessageBarService; // set a reference to the message bar service
- const mlJobService = Private(JobServiceProvider);
const TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
const DATA_FORMAT = '0.0 b';
@@ -47,6 +47,7 @@ module.directive('mlJobListExpandedRow', function ($location, Private) {
$scope.permissions = {
canPreviewDatafeed: checkPermission('canPreviewDatafeed')
};
+ $scope.jobJson = '';
$scope.toLocaleString = toLocaleString; // add toLocaleString to the scope to display nicer numbers
@@ -239,6 +240,10 @@ module.directive('mlJobListExpandedRow', function ($location, Private) {
return url;
}
+ $scope.aceLoaded = function (editor) {
+ editor.setReadOnly(true);
+ $scope.$applyAsync();
+ };
},
};
})
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table.js b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table.js
index a46f37f8cd6392..293f89abaabe2e 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table.js
@@ -27,6 +27,7 @@ import chrome from 'ui/chrome';
import { FORECAST_REQUEST_STATE } from 'plugins/ml/../common/constants/states';
import { addItemToRecentlyAccessed } from 'plugins/ml/util/recently_accessed';
+import { mlForecastService } from 'plugins/ml/services/forecast_service';
const MAX_FORECASTS = 500;
const TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
@@ -47,7 +48,7 @@ class ForecastsTable extends Component {
const dataCounts = this.props.job.data_counts;
if (dataCounts.processed_record_count > 0) {
// Get the list of all the forecasts with results at or later than the specified 'from' time.
- this.props.mlForecastService.getForecastsSummary(
+ mlForecastService.getForecastsSummary(
this.props.job,
null,
dataCounts.earliest_record_timestamp,
@@ -247,7 +248,6 @@ class ForecastsTable extends Component {
}
ForecastsTable.propTypes = {
job: PropTypes.object.isRequired,
- mlForecastService: PropTypes.object.isRequired
};
export { ForecastsTable };
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table_directive.js b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table_directive.js
index f26059f24e42a4..9856c22af1737b 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table_directive.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/forecasts_table/forecasts_table_directive.js
@@ -9,22 +9,15 @@
import 'ngreact';
-import { ForecastServiceProvider } from 'plugins/ml/services/forecast_service';
-
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml', ['react']);
import { ForecastsTable } from './forecasts_table';
-module.directive('mlForecastsTable', function ($injector) {
- const Private = $injector.get('Private');
- const mlForecastService = Private(ForecastServiceProvider);
- const reactDirective = $injector.get('reactDirective');
-
+module.directive('mlForecastsTable', function (reactDirective) {
return reactDirective(
ForecastsTable,
undefined,
- { restrict: 'E' },
- { mlForecastService }
+ { restrict: 'E' }
);
});
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/styles/main.less b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/styles/main.less
index 7d72b377cdce55..814457a84406a1 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/styles/main.less
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/expanded_row/styles/main.less
@@ -16,6 +16,10 @@ ml-job-list-expanded-row {
padding: 10px;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
+
+ .json-textarea {
+ height: 500px;
+ }
}
.job-audit-list-container {
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/job_timepicker_modal/job_timepicker_modal_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/job_timepicker_modal/job_timepicker_modal_controller.js
index 5feeaeeebcf4e4..ab6351f9b92bdc 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/job_timepicker_modal/job_timepicker_modal_controller.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/job_timepicker_modal/job_timepicker_modal_controller.js
@@ -9,9 +9,9 @@
import moment from 'moment';
import angular from 'angular';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
-import { CreateWatchServiceProvider } from 'plugins/ml/jobs/new_job/simple/components/watcher/create_watch_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
+import { xpackFeatureProvider } from 'plugins/ml/license/check_license';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
@@ -23,10 +23,9 @@ module.controller('MlJobTimepickerModal', function (
params,
Private) {
const msgs = mlMessageBarService;
- const mlJobService = Private(JobServiceProvider);
- const mlCreateWatchService = Private(CreateWatchServiceProvider);
$scope.saveLock = false;
- $scope.watcherEnabled = mlCreateWatchService.isWatcherEnabled();
+ const xpackFeature = Private(xpackFeatureProvider);
+ $scope.watcherEnabled = xpackFeature.isAvailable('watcher');
const job = angular.copy(params.job);
$scope.jobId = job.job_id;
@@ -106,6 +105,7 @@ module.controller('MlJobTimepickerModal', function (
msgs.error(`Could not open ${$scope.jobId}`, resp);
}
} else {
+ // console.log(resp);
msgs.error(`Could not open ${$scope.jobId}`, resp);
}
$scope.saveLock = false;
diff --git a/x-pack/plugins/ml/public/jobs/jobs_list/jobs_list_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list/jobs_list_controller.js
index fb8e3e1a99f8da..89bee73416263d 100644
--- a/x-pack/plugins/ml/public/jobs/jobs_list/jobs_list_controller.js
+++ b/x-pack/plugins/ml/public/jobs/jobs_list/jobs_list_controller.js
@@ -32,10 +32,11 @@ import createWatchTemplate from 'plugins/ml/jobs/jobs_list/create_watch_modal/cr
import { buttonsEnabledChecks } from 'plugins/ml/jobs/jobs_list/buttons_enabled_checks';
import { cloudServiceProvider } from 'plugins/ml/services/cloud_service';
import { loadNewJobDefaults } from 'plugins/ml/jobs/new_job/utils/new_job_defaults';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
-import { CalendarServiceProvider } from 'plugins/ml/services/calendar_service';
-import { JobMessagesServiceProvider } from 'plugins/ml/services/job_messages_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
+import { mlCalendarService } from 'plugins/ml/services/calendar_service';
+import { jobMessagesService } from 'plugins/ml/services/job_messages_service';
import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
+import { initPromise } from 'plugins/ml/util/promise';
uiRoutes
.when('/jobs/?', {
@@ -44,7 +45,8 @@ uiRoutes
CheckLicense: checkLicense,
privileges: checkGetJobsPrivilege,
mlNodeCount: getMlNodeCount,
- loadNewJobDefaults
+ loadNewJobDefaults,
+ initPromise: initPromise(true)
}
});
@@ -54,13 +56,10 @@ const module = uiModules.get('apps/ml', ['ui.bootstrap']);
module.controller('MlJobsList',
function (
$scope,
- $route,
$location,
- $window,
$timeout,
$compile,
$modal,
- es,
timefilter,
kbnUrl,
Private,
@@ -85,9 +84,6 @@ module.controller('MlJobsList',
$scope.mlNodesAvailable = mlNodesAvailable();
$scope.permissionToViewMlNodeCount = permissionToViewMlNodeCount();
- const mlJobService = Private(JobServiceProvider);
- const mlCalendarService = Private(CalendarServiceProvider);
- const jobMessagesService = Private(JobMessagesServiceProvider);
const { isRunningOnCloud, getCloudId } = Private(cloudServiceProvider);
$scope.isCloud = isRunningOnCloud();
$scope.cloudId = getCloudId();
diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/detectors_list_directive.js b/x-pack/plugins/ml/public/jobs/new_job/advanced/detectors_list_directive.js
index b708ce325c0b01..0d1badddc5e164 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/advanced/detectors_list_directive.js
+++ b/x-pack/plugins/ml/public/jobs/new_job/advanced/detectors_list_directive.js
@@ -16,12 +16,12 @@ import { detectorToString } from 'plugins/ml/util/string_utils';
import template from './detectors_list.html';
import detectorModalTemplate from 'plugins/ml/jobs/new_job/advanced/detector_modal/detector_modal.html';
import detectorFilterModalTemplate from 'plugins/ml/jobs/new_job/advanced/detector_filter_modal/detector_filter_modal.html';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
-module.directive('mlJobDetectorsList', function ($modal, $q, Private) {
+module.directive('mlJobDetectorsList', function ($modal) {
return {
restrict: 'AE',
replace: true,
@@ -34,7 +34,6 @@ module.directive('mlJobDetectorsList', function ($modal, $q, Private) {
},
template,
controller: function ($scope) {
- const mlJobService = Private(JobServiceProvider);
$scope.addDetector = function (dtr, index) {
if (dtr !== undefined) {
diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job.html b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job.html
index 20725ca195d54a..ade274940949ba 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job.html
+++ b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job.html
@@ -464,12 +464,14 @@
@@ -482,11 +484,15 @@ {{ui.pageTitle}}
-
+ >
{{ui.pageTitle}}
is-loading="(ui.dataPreview === '')" />
-
+
} before forecast is complete.
// So wait for results and then refresh the dashboard to the end of the forecast.
@@ -180,7 +182,7 @@ class ForecastingModal extends Component {
let previousProgress = 0;
let noProgressMs = 0;
this.forecastChecker = setInterval(() => {
- this.props.mlForecastService.getForecastRequestStats(this.props.job, forecastId)
+ mlForecastService.getForecastRequestStats(this.props.job, forecastId)
.then((resp) => {
// Get the progress (stats value is between 0 and 1).
const progress = _.get(resp, ['stats', 'forecast_progress'], previousProgress);
@@ -198,7 +200,7 @@ class ForecastingModal extends Component {
if (closeJobAfterRunning === true) {
this.setState({ jobClosingState: PROGRESS_STATES.WAITING });
- this.props.mlJobService.closeJob(this.props.job.job_id)
+ mlJobService.closeJob(this.props.job.job_id)
.then(() => {
this.setState({
jobClosingState: PROGRESS_STATES.DONE
@@ -263,7 +265,7 @@ class ForecastingModal extends Component {
forecast_status: FORECAST_REQUEST_STATE.FINISHED
}
};
- this.props.mlForecastService.getForecastsSummary(
+ mlForecastService.getForecastsSummary(
job,
statusFinishedQuery,
bounds.min.valueOf(),
@@ -399,8 +401,6 @@ ForecastingModal.propTypes = {
job: PropTypes.object,
detectorIndex: PropTypes.number,
entities: PropTypes.array,
- mlForecastService: PropTypes.object.isRequired,
- mlJobService: PropTypes.object.isRequired,
loadForForecastId: PropTypes.func,
};
diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal_directive.js b/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal_directive.js
index 8b8f6c1356689a..9d5d1efe9b2403 100644
--- a/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal_directive.js
+++ b/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal_directive.js
@@ -10,24 +10,15 @@ import 'ngreact';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml', ['react']);
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
-import { ForecastServiceProvider } from 'plugins/ml/services/forecast_service';
import { ForecastingModal } from './forecasting_modal';
module.directive('mlForecastingModal', function ($injector) {
- const Private = $injector.get('Private');
- const mlJobService = Private(JobServiceProvider);
- const mlForecastService = Private(ForecastServiceProvider);
const timefilter = $injector.get('timefilter');
const reactDirective = $injector.get('reactDirective');
return reactDirective(
ForecastingModal,
undefined,
{ restrict: 'E' },
- {
- mlForecastService,
- mlJobService,
- timefilter
- }
+ { timefilter }
);
});
diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_chart_directive.js b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_chart_directive.js
index dee114edbbf11b..93f7797cfc9e6c 100644
--- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_chart_directive.js
+++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_chart_directive.js
@@ -20,18 +20,19 @@ import 'ui/timefilter';
import { ResizeChecker } from 'ui/resize_checker';
-import { getSeverityWithLow } from 'plugins/ml/util/anomaly_utils';
+import { getSeverityWithLow } from 'plugins/ml/../common/util/anomaly_utils';
+import { formatValue } from 'plugins/ml/formatters/format_value';
import {
drawLineChartDots,
filterAxisLabels,
numTicksForDateFormat
} from 'plugins/ml/util/chart_utils';
import { TimeBuckets } from 'ui/time_buckets';
+import { mlAnomaliesTableService } from 'plugins/ml/components/anomalies_table/anomalies_table_service';
import ContextChartMask from 'plugins/ml/timeseriesexplorer/context_chart_mask';
import { findNearestChartPointToTime } from 'plugins/ml/timeseriesexplorer/timeseriesexplorer_utils';
-import 'plugins/ml/filters/format_value';
import { mlEscape } from 'plugins/ml/util/string_utils';
-import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service';
+import { mlFieldFormatService } from 'plugins/ml/services/field_format_service';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
@@ -40,14 +41,11 @@ module.directive('mlTimeseriesChart', function (
$compile,
$timeout,
timefilter,
- mlAnomaliesTableService,
- formatValueFilter,
Private,
mlChartTooltipService) {
function link(scope, element) {
- const mlFieldFormatService = Private(FieldFormatServiceProvider);
// Key dimensions for the viz and constituent charts.
let svgWidth = angular.element('.results-container').width();
const focusZoomPanelHeight = 25;
@@ -114,9 +112,9 @@ module.directive('mlTimeseriesChart', function (
drawContextChartSelection();
});
- scope.$on('renderFocusChart', () => {
- renderFocusChart();
- });
+ scope.$watchCollection('focusForecastData', renderFocusChart);
+ scope.$watchCollection('focusChartData', renderFocusChart);
+ scope.$watchGroup(['showModelBounds', 'showForecast'], renderFocusChart);
// Redraw the charts when the container is resize.
const resizeChecker = new ResizeChecker(angular.element('.ml-timeseries-chart'));
@@ -969,10 +967,10 @@ module.directive('mlTimeseriesChart', function (
if (_.has(marker, 'actual')) {
// Display the record actual in preference to the chart value, which may be
// different depending on the aggregation interval of the chart.
- contents += `actual: ${formatValueFilter(marker.actual, marker.function, fieldFormat)}`;
- contents += `
typical: ${formatValueFilter(marker.typical, marker.function, fieldFormat)}`; + contents += `actual: ${formatValue(marker.actual, marker.function, fieldFormat)}`; + contents += `
typical: ${formatValue(marker.typical, marker.function, fieldFormat)}`; } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) { const numberOfCauses = marker.numberOfCauses; const byFieldName = mlEscape(marker.byFieldName); @@ -986,21 +984,21 @@ module.directive('mlTimeseriesChart', function ( } } } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; - contents += `
upper bounds: ${formatValueFilter(marker.upper, marker.function, fieldFormat)}`; - contents += `
lower bounds: ${formatValueFilter(marker.lower, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; + contents += `
upper bounds: ${formatValue(marker.upper, marker.function, fieldFormat)}`; + contents += `
lower bounds: ${formatValue(marker.lower, marker.function, fieldFormat)}`; } } else { // TODO - need better formatting for small decimals. if (_.get(marker, 'isForecast', false) === true) { - contents += `prediction: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `prediction: ${formatValue(marker.value, marker.function, fieldFormat)}`; } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; } if (scope.modelPlotEnabled === true) { - contents += `
upper bounds: ${formatValueFilter(marker.upper, marker.function, fieldFormat)}`; - contents += `
lower bounds: ${formatValueFilter(marker.lower, marker.function, fieldFormat)}`; + contents += `
upper bounds: ${formatValue(marker.upper, marker.function, fieldFormat)}`; + contents += `
lower bounds: ${formatValue(marker.lower, marker.function, fieldFormat)}`; } } diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js index f244e7060f2fb9..54485016b51b82 100644 --- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js +++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js @@ -11,149 +11,142 @@ import _ from 'lodash'; import { ml } from 'plugins/ml/services/ml_api_service'; import { isModelPlotEnabled } from 'plugins/ml/../common/util/job_utils'; import { buildConfigFromDetector } from 'plugins/ml/util/chart_config_builder'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.service('mlTimeSeriesSearchService', function ( - $q, - Private) { - - const mlResultsService = Private(ResultsServiceProvider); - - this.getMetricData = function (job, detectorIndex, entityFields, earliestMs, latestMs, interval) { - if (isModelPlotEnabled(job, detectorIndex, entityFields)) { - // Extract the partition, by, over fields on which to filter. - const criteriaFields = []; - const detector = job.analysis_config.detectors[detectorIndex]; - if (_.has(detector, 'partition_field_name')) { - const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); - if (partitionEntity !== undefined) { - criteriaFields.push( - { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, - { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); - } +import { mlResultsService } from 'plugins/ml/services/results_service'; + +function getMetricData(job, detectorIndex, entityFields, earliestMs, latestMs, interval) { + if (isModelPlotEnabled(job, detectorIndex, entityFields)) { + // Extract the partition, by, over fields on which to filter. + const criteriaFields = []; + const detector = job.analysis_config.detectors[detectorIndex]; + if (_.has(detector, 'partition_field_name')) { + const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); + if (partitionEntity !== undefined) { + criteriaFields.push( + { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, + { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); } + } - if (_.has(detector, 'over_field_name')) { - const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); - if (overEntity !== undefined) { - criteriaFields.push( - { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, - { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); - } + if (_.has(detector, 'over_field_name')) { + const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); + if (overEntity !== undefined) { + criteriaFields.push( + { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, + { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); } + } - if (_.has(detector, 'by_field_name')) { - const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); - if (byEntity !== undefined) { - criteriaFields.push( - { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, - { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); - } + if (_.has(detector, 'by_field_name')) { + const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); + if (byEntity !== undefined) { + criteriaFields.push( + { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, + { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); } + } + + return mlResultsService.getModelPlotOutput( + job.job_id, + detectorIndex, + criteriaFields, + earliestMs, + latestMs, + interval + ); + } else { + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; - return mlResultsService.getModelPlotOutput( - job.job_id, - detectorIndex, - criteriaFields, + const chartConfig = buildConfigFromDetector(job, detectorIndex); + + mlResultsService.getMetricData( + chartConfig.datafeedConfig.indices, + chartConfig.datafeedConfig.types, + entityFields, + chartConfig.datafeedConfig.query, + chartConfig.metricFunction, + chartConfig.metricFieldName, + chartConfig.timeField, earliestMs, latestMs, interval - ); - } else { - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; - - const chartConfig = buildConfigFromDetector(job, detectorIndex); - - mlResultsService.getMetricData( - chartConfig.datafeedConfig.indices, - chartConfig.datafeedConfig.types, - entityFields, - chartConfig.datafeedConfig.query, - chartConfig.metricFunction, - chartConfig.metricFieldName, - chartConfig.timeField, - earliestMs, - latestMs, - interval - ) - .then((resp) => { - _.each(resp.results, (value, time) => { - obj.results[time] = { - 'actual': value - }; - }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); + ) + .then((resp) => { + _.each(resp.results, (value, time) => { + obj.results[time] = { + 'actual': value + }; }); - }); - } + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); - }; + }); + } +} + +// Builds chart detail information (charting function description and entity counts) used +// in the title area of the time series chart. +// Queries Elasticsearch if necessary to obtain the distinct count of entities +// for which data is being plotted. +function getChartDetails(job, detectorIndex, entityFields, earliestMs, latestMs) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: { functionLabel: '', entityData: { entities: [] } } }; + + const chartConfig = buildConfigFromDetector(job, detectorIndex); + let functionLabel = chartConfig.metricFunction; + if (chartConfig.metricFieldName !== undefined) { + functionLabel += ' '; + functionLabel += chartConfig.metricFieldName; + } + obj.results.functionLabel = functionLabel; - // Builds chart detail information (charting function description and entity counts) used - // in the title area of the time series chart. - // Queries Elasticsearch if necessary to obtain the distinct count of entities - // for which data is being plotted. - this.getChartDetails = function (job, detectorIndex, entityFields, earliestMs, latestMs) { - return $q((resolve, reject) => { - const obj = { success: true, results: { functionLabel: '', entityData: { entities: [] } } }; + const blankEntityFields = _.filter(entityFields, (entity) => { + return entity.fieldValue.length === 0; + }); - const chartConfig = buildConfigFromDetector(job, detectorIndex); - let functionLabel = chartConfig.metricFunction; - if (chartConfig.metricFieldName !== undefined) { - functionLabel += ' '; - functionLabel += chartConfig.metricFieldName; - } - obj.results.functionLabel = functionLabel; - - const blankEntityFields = _.filter(entityFields, (entity) => { - return entity.fieldValue.length === 0; - }); - - // Look to see if any of the entity fields have defined values - // (i.e. blank input), and if so obtain the cardinality. - if (blankEntityFields.length === 0) { - obj.results.entityData.count = 1; - obj.results.entityData.entities = entityFields; - resolve(obj); - } else { - const entityFieldNames = _.map(blankEntityFields, 'fieldName'); - ml.getCardinalityOfFields({ - index: chartConfig.datafeedConfig.indices, - types: chartConfig.datafeedConfig.types, - fieldNames: entityFieldNames, - query: chartConfig.datafeedConfig.query, - timeFieldName: chartConfig.timeField, - earliestMs, - latestMs - }) - .then((results) => { - _.each(blankEntityFields, (field) => { - obj.results.entityData.entities.push({ - fieldName: field.fieldName, - cardinality: _.get(results, field.fieldName, 0) - }); + // Look to see if any of the entity fields have defined values + // (i.e. blank input), and if so obtain the cardinality. + if (blankEntityFields.length === 0) { + obj.results.entityData.count = 1; + obj.results.entityData.entities = entityFields; + resolve(obj); + } else { + const entityFieldNames = _.map(blankEntityFields, 'fieldName'); + ml.getCardinalityOfFields({ + index: chartConfig.datafeedConfig.indices, + types: chartConfig.datafeedConfig.types, + fieldNames: entityFieldNames, + query: chartConfig.datafeedConfig.query, + timeFieldName: chartConfig.timeField, + earliestMs, + latestMs + }) + .then((results) => { + _.each(blankEntityFields, (field) => { + obj.results.entityData.entities.push({ + fieldName: field.fieldName, + cardinality: _.get(results, field.fieldName, 0) }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); }); - } - }); - }; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + } + + }); +} -}); +export const mlTimeSeriesSearchService = { + getMetricData, + getChartDetails +}; diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html index 03b078b7535d80..a3549c52a0dfbe 100644 --- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html +++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html @@ -127,10 +127,9 @@
-
+ table-data="tableData"
+ filter="filter"
+ />
diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_controller.js b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_controller.js
index ea02ab2894be83..19b51da3d65ee6 100644
--- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_controller.js
+++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_controller.js
@@ -16,6 +16,7 @@ import _ from 'lodash';
import moment from 'moment';
import 'plugins/ml/components/anomalies_table';
+import 'plugins/ml/components/controls';
import { notify } from 'ui/notify';
import uiRoutes from 'ui/routes';
@@ -28,7 +29,7 @@ import {
isTimeSeriesViewDetector,
isModelPlotEnabled,
mlFunctionToESAggregation } from 'plugins/ml/../common/util/job_utils';
-import { getIndexPatterns } from 'plugins/ml/util/index_utils';
+import { loadIndexPatterns, getIndexPatterns } from 'plugins/ml/util/index_utils';
import {
createTimeSeriesJobData,
processForecastResults,
@@ -38,13 +39,16 @@ import {
processScheduledEventsForChart } from 'plugins/ml/timeseriesexplorer/timeseriesexplorer_utils';
import { refreshIntervalWatcher } from 'plugins/ml/util/refresh_interval_watcher';
import { IntervalHelperProvider, getBoundsRoundedToInterval } from 'plugins/ml/util/ml_time_buckets';
-import { ResultsServiceProvider } from 'plugins/ml/services/results_service';
+import { mlResultsService } from 'plugins/ml/services/results_service';
import template from './timeseriesexplorer.html';
import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
-import { FieldFormatServiceProvider } from 'plugins/ml/services/field_format_service';
-import { ForecastServiceProvider } from 'plugins/ml/services/forecast_service';
+import { ml } from 'plugins/ml/services/ml_api_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
+import { mlFieldFormatService } from 'plugins/ml/services/field_format_service';
import { JobSelectServiceProvider } from 'plugins/ml/components/job_select_list/job_select_service';
+import { mlForecastService } from 'plugins/ml/services/forecast_service';
+import { mlTimeSeriesSearchService } from 'plugins/ml/timeseriesexplorer/timeseries_search_service';
+import { initPromise } from 'plugins/ml/util/promise';
uiRoutes
.when('/timeseriesexplorer/?', {
@@ -52,8 +56,9 @@ uiRoutes
resolve: {
CheckLicense: checkLicense,
privileges: checkGetJobsPrivilege,
- indexPatterns: getIndexPatterns,
- mlNodeCount: getMlNodeCount
+ indexPatterns: loadIndexPatterns,
+ mlNodeCount: getMlNodeCount,
+ initPromise: initPromise(true)
}
});
@@ -67,8 +72,8 @@ module.controller('MlTimeSeriesExplorerController', function (
Private,
timefilter,
AppState,
- mlTimeSeriesSearchService,
- mlAnomaliesTableService) {
+ mlSelectIntervalService,
+ mlSelectSeverityService) {
$scope.timeFieldName = 'timestamp';
timefilter.enableTimeRangeSelector();
@@ -78,10 +83,6 @@ module.controller('MlTimeSeriesExplorerController', function (
const ANOMALIES_MAX_RESULTS = 500;
const MAX_SCHEDULED_EVENTS = 10; // Max number of scheduled events displayed per bucket.
const TimeBuckets = Private(IntervalHelperProvider);
- const mlResultsService = Private(ResultsServiceProvider);
- const mlJobService = Private(JobServiceProvider);
- const mlFieldFormatService = Private(FieldFormatServiceProvider);
- const mlForecastService = Private(ForecastServiceProvider);
const mlJobSelectService = Private(JobSelectServiceProvider);
$scope.jobPickerSelections = [];
@@ -90,6 +91,7 @@ module.controller('MlTimeSeriesExplorerController', function (
$scope.loading = true;
$scope.loadCounter = 0;
$scope.hasResults = false;
+ $scope.anomalyRecords = [];
$scope.modelPlotEnabled = false;
$scope.showModelBounds = true; // Toggles display of model bounds in the focus chart
@@ -342,33 +344,38 @@ module.controller('MlTimeSeriesExplorerController', function (
$scope.refreshFocusData = function (fromDate, toDate) {
- // Counter to keep track of what data sets have been loaded.
+ // Counter to keep track of the queries to populate the chart.
let awaitingCount = 3;
+ // This object is used to store the results of individual remote requests
+ // before we transform it into the final data and apply it to $scope. Otherwise
+ // we might trigger multiple $digest cycles and depending on how deep $watches
+ // listen for changes we could miss updates.
+ const refreshFocusData = {};
+
// finish() function, called after each data set has been loaded and processed.
// The last one to call it will trigger the page render.
function finish() {
awaitingCount--;
if (awaitingCount === 0) {
- processDataForFocusAnomalies(
- $scope.focusChartData,
- $scope.anomalyRecords,
+ // Tell the results container directives to render the focus chart.
+ refreshFocusData.focusChartData = processDataForFocusAnomalies(
+ refreshFocusData.focusChartData,
+ refreshFocusData.anomalyRecords,
$scope.timeFieldName);
- processScheduledEventsForChart(
- $scope.focusChartData,
- $scope.scheduledEvents);
+ refreshFocusData.focusChartData = processScheduledEventsForChart(
+ refreshFocusData.focusChartData,
+ refreshFocusData.scheduledEvents);
- console.log('Time series explorer focus chart data set:', $scope.focusChartData);
-
- // Tell the results container directives to render the focus chart.
- // Need to use $timeout to ensure the broadcast happens after the child scope is updated with the new data.
- $timeout(() => {
- $scope.$broadcast('renderFocusChart');
- $scope.$broadcast('renderTable');
+ // All the data is ready now for a scope update.
+ // Use $evalAsync to ensure the update happens after the child scope is updated with the new data.
+ $scope.$evalAsync(() => {
+ $scope = Object.assign($scope, refreshFocusData);
+ console.log('Time series explorer focus chart data set:', $scope.focusChartData);
$scope.loading = false;
- }, 0);
+ });
}
}
@@ -393,15 +400,15 @@ module.controller('MlTimeSeriesExplorerController', function (
searchBounds.max.valueOf(),
$scope.focusAggregationInterval.expression
).then((resp) => {
- $scope.focusChartData = processMetricPlotResults(resp.results, $scope.modelPlotEnabled);
+ refreshFocusData.focusChartData = processMetricPlotResults(resp.results, $scope.modelPlotEnabled);
$scope.showModelBoundsCheckbox = ($scope.modelPlotEnabled === true) &&
- ($scope.focusChartData.length > 0);
+ (refreshFocusData.focusChartData.length > 0);
finish();
}).catch((resp) => {
console.log('Time series explorer - error getting metric data from elasticsearch:', resp);
});
- // Query 2 - load records across selected time range.
+ // Query 2 - load all the records across selected time range for the chart anomaly markers.
mlResultsService.getRecordsForCriteria(
[$scope.selectedJob.job_id],
$scope.criteriaFields,
@@ -411,11 +418,11 @@ module.controller('MlTimeSeriesExplorerController', function (
ANOMALIES_MAX_RESULTS
).then((resp) => {
// Sort in descending time order before storing in scope.
- $scope.anomalyRecords = _.chain(resp.records)
+ refreshFocusData.anomalyRecords = _.chain(resp.records)
.sortBy(record => record[$scope.timeFieldName])
.reverse()
.value();
- console.log('Time series explorer anomalies:', $scope.anomalyRecords);
+ console.log('Time series explorer anomalies:', refreshFocusData.anomalyRecords);
finish();
});
@@ -428,7 +435,7 @@ module.controller('MlTimeSeriesExplorerController', function (
1,
MAX_SCHEDULED_EVENTS
).then((resp) => {
- $scope.scheduledEvents = resp.events[$scope.selectedJob.job_id];
+ refreshFocusData.scheduledEvents = resp.events[$scope.selectedJob.job_id];
finish();
}).catch((resp) => {
console.log('Time series explorer - error getting scheduled events from elasticsearch:', resp);
@@ -455,14 +462,17 @@ module.controller('MlTimeSeriesExplorerController', function (
$scope.focusAggregationInterval.expression,
aggType)
.then((resp) => {
- $scope.focusForecastData = processForecastResults(resp.results);
- $scope.showForecastCheckbox = ($scope.focusForecastData.length > 0);
+ refreshFocusData.focusForecastData = processForecastResults(resp.results);
+ refreshFocusData.showForecastCheckbox = (refreshFocusData.focusForecastData.length > 0);
finish();
}).catch((resp) => {
console.log(`Time series explorer - error loading data for forecast ID ${forecastId}`, resp);
});
}
+ // Load the data for the anomalies table.
+ loadAnomaliesTableData(searchBounds.min.valueOf(), searchBounds.max.valueOf());
+
};
$scope.saveSeriesPropertiesAndRefresh = function () {
@@ -476,6 +486,19 @@ module.controller('MlTimeSeriesExplorerController', function (
$scope.refresh();
};
+ $scope.filter = function (field, value, operator) {
+ const entity = _.find($scope.entities, { fieldName: field });
+ if (entity !== undefined) {
+ if (operator === '+' && entity.fieldValue !== value) {
+ entity.fieldValue = value;
+ $scope.saveSeriesPropertiesAndRefresh();
+ } else if (operator === '-' && entity.fieldValue === value) {
+ entity.fieldValue = '';
+ $scope.saveSeriesPropertiesAndRefresh();
+ }
+ }
+ };
+
$scope.loadForForecastId = function (forecastId) {
mlForecastService.getForecastDateRange(
$scope.selectedJob,
@@ -524,16 +547,14 @@ module.controller('MlTimeSeriesExplorerController', function (
};
$scope.toggleShowModelBounds = function () {
- $scope.showModelBounds = !$scope.showModelBounds;
$timeout(() => {
- $scope.$broadcast('renderFocusChart');
+ $scope.showModelBounds = !$scope.showModelBounds;
}, 0);
};
$scope.toggleShowForecast = function () {
- $scope.showForecast = !$scope.showForecast;
$timeout(() => {
- $scope.$broadcast('renderFocusChart');
+ $scope.showForecast = !$scope.showForecast;
}, 0);
};
@@ -546,28 +567,23 @@ module.controller('MlTimeSeriesExplorerController', function (
$scope.refresh();
});
- // Add a listener for filter changes triggered from the anomalies table.
- const filterChangeListener = function (field, value, operator) {
- const entity = _.find($scope.entities, { fieldName: field });
- if (entity !== undefined) {
- if (operator === '+' && entity.fieldValue !== value) {
- entity.fieldValue = value;
- $scope.saveSeriesPropertiesAndRefresh();
- } else if (operator === '-' && entity.fieldValue === value) {
- entity.fieldValue = '';
- $scope.saveSeriesPropertiesAndRefresh();
- }
+ // Reload the anomalies table if the Interval or Threshold controls are changed.
+ const tableControlsListener = function () {
+ if ($scope.zoomFrom !== undefined && $scope.zoomTo !== undefined) {
+ loadAnomaliesTableData($scope.zoomFrom.getTime(), $scope.zoomTo.getTime());
}
};
+ mlSelectIntervalService.state.watch(tableControlsListener);
+ mlSelectSeverityService.state.watch(tableControlsListener);
- mlAnomaliesTableService.filterChange.watch(filterChangeListener);
$scope.$on('$destroy', () => {
refreshWatcher.cancel();
- mlAnomaliesTableService.filterChange.unwatch(filterChangeListener);
+ mlSelectIntervalService.state.unwatch(tableControlsListener);
+ mlSelectSeverityService.state.unwatch(tableControlsListener);
});
- // When inside a dashboard in the ML plugin, listen for changes to job selection.
+ // Listen for changes to job selection.
mlJobSelectService.listenJobSelectionChange($scope, (event, selections) => {
// Clear the detectorIndex, entities and forecast info.
if (selections.length > 0) {
@@ -655,7 +671,7 @@ module.controller('MlTimeSeriesExplorerController', function (
updateControlsForDetector();
// Populate the map of jobs / detectors / field formatters for the selected IDs and refresh.
- mlFieldFormatService.populateFormats([jobId], $route.current.locals.indexPatterns)
+ mlFieldFormatService.populateFormats([jobId], getIndexPatterns())
.finally(() => {
// Load the data - if the FieldFormats failed to populate
// the default formatting will be used for metric values.
@@ -663,6 +679,49 @@ module.controller('MlTimeSeriesExplorerController', function (
});
}
+ function loadAnomaliesTableData(earliestMs, latestMs) {
+ ml.results.getAnomaliesTableData(
+ [$scope.selectedJob.job_id],
+ $scope.criteriaFields,
+ [],
+ mlSelectIntervalService.state.get('interval').val,
+ mlSelectSeverityService.state.get('threshold').val,
+ earliestMs,
+ latestMs,
+ ANOMALIES_MAX_RESULTS
+ ).then((resp) => {
+ const anomalies = resp.anomalies;
+ const detectorsByJob = mlJobService.detectorsByJob;
+ anomalies.forEach((anomaly) => {
+ // Add a detector property to each anomaly.
+ // Default to functionDescription if no description available.
+ // TODO - when job_service is moved server_side, move this to server endpoint.
+ const jobId = anomaly.jobId;
+ anomaly.detector = _.get(detectorsByJob,
+ [jobId, anomaly.detectorIndex, 'detector_description'],
+ anomaly.source.function_description);
+
+ // Add properties used for building the links menu.
+ // TODO - when job_service is moved server_side, move this to server endpoint.
+ if (_.has(mlJobService.customUrlsByJob, jobId)) {
+ anomaly.customUrls = mlJobService.customUrlsByJob[jobId];
+ }
+ });
+
+ $scope.$evalAsync(() => {
+ $scope.tableData = {
+ anomalies,
+ interval: resp.interval,
+ examplesByJobId: resp.examplesByJobId,
+ showViewSeriesLink: false
+ };
+ });
+
+ }).catch((resp) => {
+ console.log('Time series explorer - error loading data for anomalies table:', resp);
+ });
+ }
+
function updateControlsForDetector() {
// Update the entity dropdown control(s) according to the partitioning fields for the selected detector.
const detectorIndex = +$scope.detectorId;
diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_utils.js b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_utils.js
index a4761d172ac0e9..c59d5e1c86041a 100644
--- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_utils.js
+++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer_utils.js
@@ -107,9 +107,9 @@ export function processDataForFocusAnomalies(
const recordTime = record[timeFieldName];
let chartPoint = findNearestChartPointToTime(chartData, recordTime);
- // TODO - handle case where there is an anomaly due to the absense of data
+ // TODO - handle case where there is an anomaly due to the absence of data
// and there is no model plot.
- if (chartPoint === undefined && chartData.length) {
+ if (chartPoint === undefined && chartData !== undefined && chartData.length) {
// In case there is a record with a time after that of the last chart point, set the score
// for the last chart point to that of the last record, if that record has a higher score.
const lastChartPoint = chartData[chartData.length - 1];
@@ -167,6 +167,10 @@ export function processScheduledEventsForChart(chartData, scheduledEvents) {
export function findNearestChartPointToTime(chartData, time) {
let chartPoint;
+ if(chartData === undefined) {
+ return chartPoint;
+ }
+
for (let i = 0; i < chartData.length; i++) {
if (chartData[i].date.getTime() === time) {
chartPoint = chartData[i];
diff --git a/x-pack/plugins/ml/public/util/index_utils.js b/x-pack/plugins/ml/public/util/index_utils.js
index 8b0c755fcf3fbb..e0a669dfab4c1a 100644
--- a/x-pack/plugins/ml/public/util/index_utils.js
+++ b/x-pack/plugins/ml/public/util/index_utils.js
@@ -9,31 +9,58 @@
import { notify } from 'ui/notify';
import { SavedObjectsClientProvider } from 'ui/saved_objects';
-export function getIndexPatterns(Private) {
+let indexPatterns = [];
+let fullIndexPatterns = [];
+let currentIndexPattern = null;
+let currentSavedSearch = null;
+
+export function loadIndexPatterns(Private, courier) {
+ fullIndexPatterns = courier.indexPatterns;
const savedObjectsClient = Private(SavedObjectsClientProvider);
return savedObjectsClient.find({
type: 'index-pattern',
fields: ['title'],
perPage: 10000
- }).then(response => response.savedObjects);
+ }).then((response) => {
+ indexPatterns = response.savedObjects;
+ return indexPatterns;
+ });
+}
+
+export function getIndexPatterns() {
+ return indexPatterns;
+}
+
+export function getIndexPatternIdFromName(name) {
+ for (let j = 0; j < indexPatterns.length; j++) {
+ if (indexPatterns[j].get('title') === name) {
+ return indexPatterns[j].id;
+ }
+ }
+ return name;
+}
+
+export function loadCurrentIndexPattern(courier, $route) {
+ fullIndexPatterns = courier.indexPatterns;
+ currentIndexPattern = fullIndexPatterns.get($route.current.params.index);
+ return currentIndexPattern;
}
-export function getIndexPattern(courier, indexPatternId) {
- return courier.indexPatterns.get(indexPatternId);
+export function getIndexPatternById(id) {
+ return fullIndexPatterns.get(id);
}
-export function getIndexPatternWithRoute(courier, $route) {
- return getIndexPattern(courier, $route.current.params.index);
+export function loadCurrentSavedSearch(courier, $route, savedSearches) {
+ currentSavedSearch = savedSearches.get($route.current.params.savedSearchId);
+ return currentSavedSearch;
}
-export function getIndexPatternProvider(courier) {
- return function (indexPatternId) {
- return getIndexPattern(courier, indexPatternId);
- };
+export function getCurrentIndexPattern() {
+ return currentIndexPattern;
}
-export function getSavedSearchWithRoute(courier, $route, savedSearches) {
- return savedSearches.get($route.current.params.savedSearchId);
+export function getCurrentSavedSearch() {
+ return currentSavedSearch;
}
// returns true if the index passed in is time based
diff --git a/x-pack/plugins/ml/public/util/promise.js b/x-pack/plugins/ml/public/util/promise.js
new file mode 100644
index 00000000000000..3d59d300079da5
--- /dev/null
+++ b/x-pack/plugins/ml/public/util/promise.js
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// to work around the need for wrapping all of our promises in $q for our angular code
+// we replace the native Promise with $q.
+// For pages which are mainly react, initPromise should be called with false
+// and any calls to promises in angular code wrapped in $q.when
+// once we're free of angular this file can be removed.
+
+const promise = window.Promise;
+
+export function initPromise(replacePromise) {
+ return function ($q) {
+ window.Promise = replacePromise ? $q : promise;
+ return Promise.resolve();
+ };
+}
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.js b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.js
index a298b032c52407..2415a391da5338 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.js
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.js
@@ -75,11 +75,11 @@ export function calculateModelMemoryLimitProvider(callWithRequest) {
let mmlKB = 0;
if (i === 0) {
// first in the list is the basic calculation.
- // a base of 10MB plus 32KB per series per detector
- // i.e. 10000KB + (32KB * cardinality of split field * number or detectors)
+ // a base of 10MB plus 64KB per series per detector
+ // i.e. 10000KB + (64KB * cardinality of split field * number or detectors)
const cardinality = resp[splitFieldName];
mmlKB = 10000;
- const SERIES_MULTIPLIER = 32;
+ const SERIES_MULTIPLIER = 64;
const numberOfFields = fieldNames.length;
if (cardinality !== undefined) {
@@ -110,7 +110,7 @@ export function calculateModelMemoryLimitProvider(callWithRequest) {
mmlMB = (maxBytes / numeral('1MB').value());
}
}
- response(`${mmlMB}MB`);
+ response({ modelMemoryLimit: `${mmlMB}MB` });
})
.catch((error) => {
reject(error);
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js
index 7ceada4264287c..0c3d9988d76b8f 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js
@@ -105,6 +105,10 @@ export class DataRecognizer {
}
async searchForFields(moduleConfig, indexPattern) {
+ if (moduleConfig.query === undefined) {
+ return false;
+ }
+
const index = indexPattern;
const size = 0;
const body = {
@@ -158,21 +162,23 @@ export class DataRecognizer {
}));
// load all of the kibana saved objects
- const kKeys = Object.keys(manifestJSON.kibana);
- await Promise.all(kKeys.map(async (key) => {
- kibana[key] = [];
- await Promise.all(manifestJSON.kibana[key].map(async (obj) => {
- const kConfig = await this.readFile(`${this.modulesDir}/${dirName}/${KIBANA_DIR}/${key}/${obj.file}`);
- // use the file name for the id
- const kId = obj.file.replace('.json', '');
- const config = JSON.parse(kConfig);
- kibana[key].push({
- id: kId,
- title: config.title,
- config
- });
+ if (manifestJSON.kibana !== undefined) {
+ const kKeys = Object.keys(manifestJSON.kibana);
+ await Promise.all(kKeys.map(async (key) => {
+ kibana[key] = [];
+ await Promise.all(manifestJSON.kibana[key].map(async (obj) => {
+ const kConfig = await this.readFile(`${this.modulesDir}/${dirName}/${KIBANA_DIR}/${key}/${obj.file}`);
+ // use the file name for the id
+ const kId = obj.file.replace('.json', '');
+ const config = JSON.parse(kConfig);
+ kibana[key].push({
+ id: kId,
+ title: config.title,
+ config
+ });
+ }));
}));
- }));
+ }
return {
jobs,
@@ -185,7 +191,17 @@ export class DataRecognizer {
// takes a module config id, an optional jobPrefix and the request object
// creates all of the jobs, datafeeds and savedObjects listed in the module config.
// if any of the savedObjects already exist, they will not be overwritten.
- async setupModuleItems(moduleId, jobPrefix, groups, indexPatternName, query, request) {
+ async setupModuleItems(
+ moduleId,
+ jobPrefix,
+ groups,
+ indexPatternName,
+ query,
+ startDatafeed,
+ start,
+ end,
+ request
+ ) {
this.savedObjectsClient = request.getSavedObjectsClient();
this.indexPatterns = await this.loadIndexPatterns();
@@ -229,6 +245,24 @@ export class DataRecognizer {
});
}
saveResults.datafeeds = await this.saveDatafeeds(moduleConfig.datafeeds);
+
+ if (startDatafeed) {
+ const savedDatafeeds = moduleConfig.datafeeds.filter((df) => {
+ const datafeedResult = saveResults.datafeeds.find(d => d.id === df.id);
+ return (datafeedResult !== undefined && datafeedResult.success === true);
+ });
+
+ const startResults = await this.startDatafeeds(savedDatafeeds, start, end);
+ saveResults.datafeeds.forEach((df) => {
+ const startedDatafeed = startResults[df.id];
+ if (startedDatafeed !== undefined) {
+ df.started = startedDatafeed.started;
+ if (startedDatafeed.error !== undefined) {
+ df.error = startedDatafeed.error;
+ }
+ }
+ });
+ }
}
// create the savedObjects
@@ -361,14 +395,11 @@ export class DataRecognizer {
// as success: false
async saveDatafeeds(datafeeds) {
return await Promise.all(datafeeds.map(async (datafeed) => {
- const datafeedId = datafeed.id;
-
try {
- datafeed.id = datafeedId;
await this.saveDatafeed(datafeed);
- return { id: datafeedId, success: true };
+ return { id: datafeed.id, success: true, started: false };
} catch (error) {
- return { id: datafeedId, success: false, error };
+ return { id: datafeed.id, success: false, started: false, error };
}
}));
}
@@ -378,6 +409,51 @@ export class DataRecognizer {
return this.callWithRequest('ml.addDatafeed', { datafeedId, body });
}
+ async startDatafeeds(datafeeds, start, end) {
+ const results = {};
+ for (const datafeed of datafeeds) {
+ results[datafeed.id] = await this.startDatafeed(datafeed, start, end);
+ }
+ return results;
+ }
+
+ async startDatafeed(datafeed, start, end) {
+ const result = { started: false };
+ let opened = false;
+ try {
+ const openResult = await this.callWithRequest('ml.openJob', { jobId: datafeed.config.job_id });
+ opened = openResult.opened;
+ } catch (error) {
+ // if the job is already open, a 409 will be returned.
+ if (error.statusCode === 409) {
+ opened = true;
+ } else {
+ opened = false;
+ result.started = false;
+ result.error = error;
+ }
+ }
+ if (opened) {
+ try {
+ const duration = { start: 0 };
+ if (start !== undefined) {
+ duration.start = start;
+ }
+ if (end !== undefined) {
+ duration.end = end;
+ }
+
+ await this.callWithRequest('ml.startDatafeed', { datafeedId: datafeed.id, ...duration });
+ result.started = true;
+ } catch (error) {
+ result.started = false;
+ result.error = error;
+ }
+ }
+ return result;
+ }
+
+
// merge all of the save results into one result object
// which is returned from the endpoint
async updateResults(results, saveResults) {
@@ -398,6 +474,7 @@ export class DataRecognizer {
saveResults.datafeeds.forEach((d2) => {
if (d.id === d2.id) {
d.success = d2.success;
+ d.started = d2.started;
if (d2.error !== undefined) {
d.error = d2.error;
}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json
new file mode 100644
index 00000000000000..88cff79a5b5805
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/logo.json
@@ -0,0 +1,5 @@
+{
+ "src": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAlCAYAAAAjt+tHAAADMUlEQVRYhe2XTWhUVxSAv/Nm3jSVRB3SJtCMZhhpky4LguCiug2FbnRRBFeKGxFEEBSXCl2VLMSdhS7qJuhCC9JVIQUXrloItLbUxPyaxJ9kUIOTO/NOF/fe9zMThHQGp4vczZt77rnvfPeen3dGVFXp4gi6afx/AZAHuLn4hDurixTzhS2VIrKka/VNjg0McXqo3D7At9OPuDL/D6EKRsSZA1VBJAkPu57Mf6mu86xW43JlpC0A2T15X19pI2VE3FIUGw1V4g2bfqMoRXK8ODLWFkBwIXWNRhRVJXSJYecSGzWiFABxkOdLZdodoqp6fe4xt1cXKeZDVEHEO8JRuqePhWrdcHywxNl9lc4AtP2WNkbX07DrAPlmwWsTcW/2DYJgfaOAuCeA4BPFOk8REbwjRcB6NdHzul8P76I3zJ45EwN/Vw0nJleZ36jTUCUnYNxaoGTmIeJ07DOSRMeDAhiUELvvwId5bh0d4LM9ScHL4Hw3tcb0holf7F8SpnQCTYy7sxGJlUViDRtnuKFKoNBwe2Y26oxPVTM3kAEY7rOmcoIzYI00lAyQ1ZEmmTemMWTkliKxQDkR9vdmvd6ShhcePueHmdfxyY07dZTyp5+nb8Y0yf085wKhocrJSi/jhz56NwDAWi0iEUscgzbA0oGWVEWwsvQ8lrt7Kn7QmnQ7hailDgC8MJsE2Nqf+gKjYolV7W9xz/5w6z7iPwGc+/N3bqwuZGTNvQExnh0jhR6+//wLDu/t3zZAJgauTT/i6txjgLgP8E1Ic29gJBs6oQi1L7/aNkAmBp683QBs0xG6PkBTBtVBpKFwOkaVpc237QFcHP6UkUIPItaQiL16D5G4IYihvHy8PMonhZ5tA7Sk4atGnbsrS2Ra0eZIhGRdlNFduzm4p7ht41sCvO/R9TrQdYAtC1E7Y2J5kR+XZxGfIdLa1K4bw7HBEuf2VzoLMLEyzzd/TbmPUrZwhZqkr6rw68wfvDS1zgbh2G8P+Lm6Hhv3tcSncoFsgeuTXGdj4MxQGWmqln4uqdP7calU6Xwa/vRsiVtPFwhSfYH3faQQiP1ze/zjIU6Vyjt1YAeAfwEhypX7ku7g2QAAAABJRU5ErkJggg==",
+ "height": 25,
+ "width": 120
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json
new file mode 100644
index 00000000000000..b505d54fdd414c
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/manifest.json
@@ -0,0 +1,37 @@
+{
+ "id": "apm_transaction",
+ "title": "APM",
+ "description": "Detect anomalies in high mean of transaction duration",
+ "type": "Transaction data",
+ "logoFile": "logo.json",
+ "defaultIndexPattern": "apm-*",
+ "query": {
+ "bool": {
+ "filter": [
+ {
+ "term": {
+ "processor.name": "transaction"
+ }
+ },
+ {
+ "term": {
+ "processor.event": "transaction"
+ }
+ }
+ ]
+ }
+ },
+ "jobs": [
+ {
+ "id": "high_mean_response_time",
+ "file": "high_mean_response_time.json"
+ }
+ ],
+ "datafeeds": [
+ {
+ "id": "datafeed-high_mean_response_time",
+ "file": "datafeed_high_mean_response_time.json",
+ "job_id": "high_mean_response_time"
+ }
+ ]
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_response_time.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_response_time.json
new file mode 100644
index 00000000000000..69d5a8651a8fe3
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/datafeed_high_mean_response_time.json
@@ -0,0 +1,25 @@
+{
+ "job_id": "JOB_ID",
+ "indexes": [
+ "INDEX_PATTERN_NAME"
+ ],
+ "types": [],
+ "query": {
+ "match": {
+ "processor.event": {
+ "query": "transaction",
+ "operator": "OR",
+ "prefix_length": 0,
+ "max_expansions": 50,
+ "fuzzy_transpositions": true,
+ "lenient": false,
+ "zero_terms_query": "NONE",
+ "auto_generate_synonyms_phrase_query": true,
+ "boost": 1
+ }
+ }
+ },
+ "chunking_config": {
+ "mode": "auto"
+ }
+}
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_response_time.json b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_response_time.json
new file mode 100644
index 00000000000000..98aebd32d31af1
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/data_recognizer/modules/apm_transaction/ml/high_mean_response_time.json
@@ -0,0 +1,29 @@
+{
+ "job_type": "anomaly_detector",
+ "groups": [
+ "apm"
+ ],
+ "description": "Detect anomalies in high mean of transaction duration",
+ "analysis_config": {
+ "bucket_span": "15m",
+ "detectors": [
+ {
+ "detector_description": "high_mean(\"transaction.duration.us\")",
+ "function": "high_mean",
+ "field_name": "transaction.duration.us",
+ "rules": []
+ }
+ ],
+ "influencers": []
+ },
+ "analysis_limits": {
+ "model_memory_limit": "10mb"
+ },
+ "data_description": {
+ "time_field": "@timestamp"
+ },
+ "model_plot_config": {
+ "enabled": true
+ },
+ "model_snapshot_retention_days": 1
+}
diff --git a/x-pack/plugins/ml/server/models/job_validation/__tests__/job_validation.js b/x-pack/plugins/ml/server/models/job_validation/__tests__/job_validation.js
index b85f4f76c5c143..94c43fb1054a77 100644
--- a/x-pack/plugins/ml/server/models/job_validation/__tests__/job_validation.js
+++ b/x-pack/plugins/ml/server/models/job_validation/__tests__/job_validation.js
@@ -285,8 +285,7 @@ describe('ML - validateJob', () => {
'job_id_valid',
'detectors_function_not_empty',
'index_fields_valid',
- 'time_field_invalid',
- 'success_mml'
+ 'time_field_invalid'
]);
}
);
diff --git a/x-pack/plugins/ml/server/models/job_validation/__tests__/validate_model_memory_limit.js b/x-pack/plugins/ml/server/models/job_validation/__tests__/validate_model_memory_limit.js
index 782d7d34027ad9..c069618bcd9415 100644
--- a/x-pack/plugins/ml/server/models/job_validation/__tests__/validate_model_memory_limit.js
+++ b/x-pack/plugins/ml/server/models/job_validation/__tests__/validate_model_memory_limit.js
@@ -25,7 +25,7 @@ describe('ML - validateModelMemoryLimit', () => {
}
},
limits: {
- max_model_memory_limit: '20mb'
+ max_model_memory_limit: '30mb'
}
};
@@ -103,7 +103,7 @@ describe('ML - validateModelMemoryLimit', () => {
return validateModelMemoryLimit(callWithRequest, job, duration).then(
(messages) => {
const ids = messages.map(m => m.id);
- expect(ids).to.eql(['success_mml']);
+ expect(ids).to.eql([]);
}
);
});
@@ -111,7 +111,7 @@ describe('ML - validateModelMemoryLimit', () => {
it('Called with no duration or split and mml above limit', () => {
const job = getJobConfig();
const duration = undefined;
- job.analysis_limits.model_memory_limit = '21mb';
+ job.analysis_limits.model_memory_limit = '31mb';
return validateModelMemoryLimit(callWithRequest, job, duration).then(
(messages) => {
@@ -139,7 +139,7 @@ describe('ML - validateModelMemoryLimit', () => {
const dtrs = createDetectors(2);
const job = getJobConfig(['instance'], dtrs);
const duration = { start: 0, end: 1 };
- job.analysis_limits.model_memory_limit = '20mb';
+ job.analysis_limits.model_memory_limit = '30mb';
return validateModelMemoryLimit(callWithRequest, job, duration).then(
(messages) => {
@@ -192,4 +192,32 @@ describe('ML - validateModelMemoryLimit', () => {
);
});
+ it('Called with specified invalid mml of "0mb"', () => {
+ const dtrs = createDetectors(1);
+ const job = getJobConfig(['instance'], dtrs);
+ const duration = { start: 0, end: 1 };
+ job.analysis_limits.model_memory_limit = '0mb';
+
+ return validateModelMemoryLimit(callWithRequest, job, duration).then(
+ (messages) => {
+ const ids = messages.map(m => m.id);
+ expect(ids).to.eql(['mml_value_invalid']);
+ }
+ );
+ });
+
+ it('Called with specified invalid mml of "asdf"', () => {
+ const dtrs = createDetectors(1);
+ const job = getJobConfig(['instance'], dtrs);
+ const duration = { start: 0, end: 1 };
+ job.analysis_limits.model_memory_limit = 'asdf';
+
+ return validateModelMemoryLimit(callWithRequest, job, duration).then(
+ (messages) => {
+ const ids = messages.map(m => m.id);
+ expect(ids).to.eql(['mml_value_invalid']);
+ }
+ );
+ });
+
});
diff --git a/x-pack/plugins/ml/server/models/job_validation/messages.json b/x-pack/plugins/ml/server/models/job_validation/messages.json
index 8ff6f363ee8ba8..7f3fec66ffcc08 100644
--- a/x-pack/plugins/ml/server/models/job_validation/messages.json
+++ b/x-pack/plugins/ml/server/models/job_validation/messages.json
@@ -151,6 +151,10 @@
"status": "ERROR",
"text": "The model memory limit is greater than the max model memory limit configured for this cluster."
},
+ "mml_value_invalid": {
+ "status": "ERROR",
+ "text": "{{mml}} is not a valid value for model memory limit. The value should be specified in bytes e.g. 10MB"
+ },
"estimated_mml_greater_than_mml": {
"status": "INFO",
"text": "The estimated model memory limit is greater than the model memory limit you have configured."
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.js b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.js
index 748f0dc970b27d..90896bed5c9700 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.js
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.js
@@ -73,7 +73,7 @@ export async function validateModelMemoryLimit(callWithRequest, job, duration) {
duration.start,
duration.end,
true);
- const mmlEstimateBytes = numeral(mmlEstimate).value();
+ const mmlEstimateBytes = numeral(mmlEstimate.modelMemoryLimit).value();
let runEstimateGreaterThenMml = true;
// if max_model_memory_limit has been set,
@@ -96,7 +96,12 @@ export async function validateModelMemoryLimit(callWithRequest, job, duration) {
// the max mml
if (runEstimateGreaterThenMml && mml !== null) {
const mmlBytes = numeral(mml).value();
- if (mmlEstimateBytes > mmlBytes) {
+ if (mmlBytes === 0) {
+ messages.push({
+ id: 'mml_value_invalid',
+ mml
+ });
+ } else if (mmlEstimateBytes > mmlBytes) {
messages.push({
id: 'estimated_mml_greater_than_mml',
maxModelMemoryLimit,
@@ -120,7 +125,7 @@ export async function validateModelMemoryLimit(callWithRequest, job, duration) {
}
}
- if (messages.length === 0) {
+ if (messages.length === 0 && runCalcModelMemoryTest === true) {
messages.push({ id: 'success_mml' });
}
diff --git a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js
new file mode 100644
index 00000000000000..e1755f136dec60
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js
@@ -0,0 +1,192 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+import _ from 'lodash';
+import moment from 'moment';
+
+import {
+ getEntityFieldName,
+ getEntityFieldValue,
+ showActualForFunction,
+ showTypicalForFunction
+} from '../../../common/util/anomaly_utils';
+
+
+// Builds the items for display in the anomalies table from the supplied list of anomaly records.
+export function buildAnomalyTableItems(anomalyRecords, aggregationInterval) {
+
+ // Aggregate the anomaly records if necessary, and create skeleton display records with
+ // time, detector (description) and source record properties set.
+ let displayRecords = [];
+ if (aggregationInterval !== 'second') {
+ displayRecords = aggregateAnomalies(anomalyRecords, aggregationInterval);
+ } else {
+ // Show all anomaly records.
+ displayRecords = anomalyRecords.map((record) => {
+ return {
+ time: record.timestamp,
+ source: record,
+ };
+ });
+ }
+
+ // Fill out the remaining properties in each display record
+ // for the columns to be displayed in the table.
+ const time = (new Date()).getTime();
+ return displayRecords.map((record, index) => {
+ const source = record.source;
+ const jobId = source.job_id;
+
+ // Identify each row with a unique ID which is used by the table for row expansion.
+ record.rowId = `${time}_${index}`;
+
+ record.jobId = jobId;
+ record.detectorIndex = source.detector_index;
+ record.severity = source.record_score;
+
+ const entityName = getEntityFieldName(source);
+ if (entityName !== undefined) {
+ record.entityName = entityName;
+ record.entityValue = getEntityFieldValue(source);
+ }
+
+ if (source.influencers !== undefined) {
+ const influencers = [];
+ const sourceInfluencers = _.sortBy(source.influencers, 'influencer_field_name');
+ sourceInfluencers.forEach((influencer) => {
+ const influencerFieldName = influencer.influencer_field_name;
+ influencer.influencer_field_values.forEach((influencerFieldValue) => {
+ influencers.push({
+ [influencerFieldName]: influencerFieldValue
+ });
+ });
+ });
+ record.influencers = influencers;
+ }
+
+ // Add fields to the display records for the actual and typical values.
+ // To ensure sorting in the EuiTable works correctly, add extra 'sort'
+ // properties which are single numeric values rather than the underlying arrays.
+ // These properties can be removed if EuiTable sorting logic can be customized
+ // - see https://github.com/elastic/eui/issues/425
+ const functionDescription = source.function_description || '';
+ const causes = source.causes || [];
+ if (showActualForFunction(functionDescription) === true) {
+ if (source.actual !== undefined) {
+ record.actual = source.actual;
+ record.actualSort = getMetricSortValue(source.actual);
+ } else {
+ // If only a single cause, copy values to the top level.
+ if (causes.length === 1) {
+ record.actual = causes[0].actual;
+ record.actualSort = getMetricSortValue(causes[0].actual);
+ }
+ }
+ }
+ if (showTypicalForFunction(functionDescription) === true) {
+ if (source.typical !== undefined) {
+ record.typical = source.typical;
+ record.typicalSort = getMetricSortValue(source.typical);
+ } else {
+ // If only a single cause, copy values to the top level.
+ if (causes.length === 1) {
+ record.typical = causes[0].typical;
+ record.typicalSort = getMetricSortValue(causes[0].typical);
+ }
+ }
+ }
+
+ // Add a sortable property for the magnitude of the factor by
+ // which the actual value is different from the typical.
+ if (Array.isArray(record.actual) && record.actual.length === 1 &&
+ Array.isArray(record.typical) && record.typical.length === 1) {
+ const actualVal = Number(record.actual[0]);
+ const typicalVal = Number(record.typical[0]);
+ record.metricDescriptionSort = (actualVal > typicalVal) ?
+ actualVal / typicalVal : typicalVal / actualVal;
+ }
+
+ return record;
+
+ });
+}
+
+function aggregateAnomalies(anomalyRecords, interval) {
+ // Aggregate the anomaly records by time, jobId, detectorIndex, and entity (by/over/partition).
+ // anomalyRecords assumed to be supplied in ascending time order.
+ if (anomalyRecords.length === 0) {
+ return [];
+ }
+
+ const aggregatedData = {};
+ anomalyRecords.forEach((record) => {
+ // Use moment.js to get start of interval.
+ const roundedTime = moment(record.timestamp).startOf(interval).valueOf();
+ if (aggregatedData[roundedTime] === undefined) {
+ aggregatedData[roundedTime] = {};
+ }
+
+ // Aggregate by job, then detectorIndex.
+ const jobId = record.job_id;
+ const jobsAtTime = aggregatedData[roundedTime];
+ if (jobsAtTime[jobId] === undefined) {
+ jobsAtTime[jobId] = {};
+ }
+
+ // Aggregate by detector - default to function_description if no description available.
+ const detectorIndex = record.detector_index;
+ const detectorsForJob = jobsAtTime[jobId];
+ if (detectorsForJob[detectorIndex] === undefined) {
+ detectorsForJob[detectorIndex] = {};
+ }
+
+ // Now add an object for the anomaly with the highest anomaly score per entity.
+ // For the choice of entity, look in order for byField, overField, partitionField.
+ // If no by/over/partition, default to an empty String.
+ const entitiesForDetector = detectorsForJob[detectorIndex];
+
+ // TODO - are we worried about different byFields having the same
+ // value e.g. host=server1 and machine=server1?
+ let entity = getEntityFieldValue(record);
+ if (entity === undefined) {
+ entity = '';
+ }
+ if (entitiesForDetector[entity] === undefined) {
+ entitiesForDetector[entity] = record;
+ } else {
+ if (record.record_score > entitiesForDetector[entity].record_score) {
+ entitiesForDetector[entity] = record;
+ }
+ }
+ });
+
+ // Flatten the aggregatedData to give a list of records with
+ // the highest score per bucketed time / jobId / detectorIndex.
+ const summaryRecords = [];
+ _.each(aggregatedData, (times, roundedTime) => {
+ _.each(times, (jobIds) => {
+ _.each(jobIds, (entityDetectors) => {
+ _.each(entityDetectors, (record) => {
+ summaryRecords.push({
+ time: +roundedTime,
+ source: record
+ });
+ });
+ });
+ });
+ });
+
+ return summaryRecords;
+
+}
+
+function getMetricSortValue(value) {
+ // Returns a sortable value for a metric field (actual and typical values)
+ // from the supplied value, which for metric functions will be a single
+ // valued array.
+ return (Array.isArray(value) && value.length > 0) ? value[0] : value;
+}
diff --git a/x-pack/dev-tools/functional_tests/index.js b/x-pack/plugins/ml/server/models/results_service/index.js
similarity index 72%
rename from x-pack/dev-tools/functional_tests/index.js
rename to x-pack/plugins/ml/server/models/results_service/index.js
index 6eba9bc3361bf6..995e9a06f63265 100644
--- a/x-pack/dev-tools/functional_tests/index.js
+++ b/x-pack/plugins/ml/server/models/results_service/index.js
@@ -4,8 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export {
- runFunctionTests,
- runApiTests,
- runFunctionalTestsServer,
-} from './tasks';
+
+
+export { resultsServiceProvider } from './results_service';
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.js b/x-pack/plugins/ml/server/models/results_service/results_service.js
new file mode 100644
index 00000000000000..7b569c26009a5e
--- /dev/null
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.js
@@ -0,0 +1,268 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+
+import _ from 'lodash';
+import moment from 'moment';
+
+import { buildAnomalyTableItems } from './build_anomaly_table_items';
+import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
+
+
+// Service for carrying out Elasticsearch queries to obtain data for the
+// ML Results dashboards.
+
+const DEFAULT_QUERY_SIZE = 500;
+const DEFAULT_MAX_EXAMPLES = 500;
+
+export function resultsServiceProvider(callWithRequest) {
+
+ // Obtains data for the anomalies table, aggregating anomalies by day or hour as requested.
+ // Return an Object with properties 'anomalies' and 'interval' (interval used to aggregate anomalies,
+ // one of day, hour or second. Note 'auto' can be provided as the aggregationInterval in the request,
+ // in which case the interval is determined according to the time span between the first and
+ // last anomalies), plus an examplesByJobId property if any of the
+ // anomalies are categorization anomalies in mlcategory.
+ async function getAnomaliesTableData(
+ jobIds,
+ criteriaFields,
+ influencers,
+ aggregationInterval,
+ threshold,
+ earliestMs,
+ latestMs,
+ maxRecords = DEFAULT_QUERY_SIZE,
+ maxExamples = DEFAULT_MAX_EXAMPLES) {
+
+ // Build the query to return the matching anomaly record results.
+ // Add criteria for the time range, record score, plus any specified job IDs.
+ const boolCriteria = [
+ {
+ range: {
+ timestamp: {
+ gte: earliestMs,
+ lte: latestMs,
+ format: 'epoch_millis'
+ }
+ }
+ },
+ {
+ range: {
+ record_score: {
+ gte: threshold,
+ }
+ }
+ }
+ ];
+
+ if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) {
+ let jobIdFilterStr = '';
+ jobIds.forEach((jobId, i) => {
+ if (i > 0) {
+ jobIdFilterStr += ' OR ';
+ }
+ jobIdFilterStr += 'job_id:';
+ jobIdFilterStr += jobId;
+ });
+ boolCriteria.push({
+ query_string: {
+ analyze_wildcard: false,
+ query: jobIdFilterStr
+ }
+ });
+ }
+
+ // Add in term queries for each of the specified criteria.
+ criteriaFields.forEach((criteria) => {
+ boolCriteria.push({
+ term: {
+ [criteria.fieldName]: criteria.fieldValue
+ }
+ });
+ });
+
+ // Add a nested query to filter for each of the specified influencers.
+ if (influencers.length > 0) {
+ boolCriteria.push({
+ bool: {
+ should: influencers.map((influencer) => {
+ return {
+ nested: {
+ path: 'influencers',
+ query: {
+ bool: {
+ must: [
+ {
+ match: {
+ 'influencers.influencer_field_name': influencer.fieldName
+ }
+ },
+ {
+ match: {
+ 'influencers.influencer_field_values': influencer.fieldValue
+ }
+ }
+ ]
+ }
+ }
+ }
+ };
+ }),
+ minimum_should_match: 1,
+ }
+ });
+ }
+
+ const resp = await callWithRequest('search', {
+ index: ML_RESULTS_INDEX_PATTERN,
+ size: maxRecords,
+ body: {
+ query: {
+ bool: {
+ filter: [
+ {
+ query_string: {
+ query: 'result_type:record',
+ analyze_wildcard: false
+ }
+ },
+ {
+ bool: {
+ must: boolCriteria
+ }
+ }
+ ]
+ }
+ },
+ sort: [
+ { record_score: { order: 'desc' } }
+ ]
+ }
+ });
+
+ const tableData = { anomalies: [], interval: 'second' };
+ if (resp.hits.total !== 0) {
+ let records = [];
+ resp.hits.hits.forEach((hit) => {
+ records.push(hit._source);
+ });
+
+ // Sort anomalies in ascending time order.
+ records = _.sortBy(records, 'timestamp');
+ tableData.interval = aggregationInterval;
+ if (aggregationInterval === 'auto') {
+ // Determine the actual interval to use if aggregating.
+ const earliest = moment(records[0].timestamp);
+ const latest = moment(records[records.length - 1].timestamp);
+
+ const daysDiff = latest.diff(earliest, 'days');
+ tableData.interval = (daysDiff < 2 ? 'hour' : 'day');
+ }
+
+ tableData.anomalies = buildAnomalyTableItems(records, tableData.interval);
+
+ // Load examples for any categorization anomalies.
+ const categoryAnomalies = tableData.anomalies.filter(item => item.entityName === 'mlcategory');
+ if (categoryAnomalies.length > 0) {
+ tableData.examplesByJobId = {};
+
+ const categoryIdsByJobId = {};
+ categoryAnomalies.forEach((anomaly) => {
+ if (!_.has(categoryIdsByJobId, anomaly.jobId)) {
+ categoryIdsByJobId[anomaly.jobId] = [];
+ }
+ if (categoryIdsByJobId[anomaly.jobId].indexOf(anomaly.entityValue) === -1) {
+ categoryIdsByJobId[anomaly.jobId].push(anomaly.entityValue);
+ }
+ });
+
+ const categoryJobIds = Object.keys(categoryIdsByJobId);
+ await Promise.all(categoryJobIds.map(async (jobId) => {
+ const examplesByCategoryId = await getCategoryExamples(jobId, categoryIdsByJobId[jobId], maxExamples);
+ tableData.examplesByJobId[jobId] = examplesByCategoryId;
+ }));
+ }
+
+ }
+
+ return tableData;
+
+ }
+
+
+ // Obtains the categorization examples for the categories with the specified IDs
+ // from the given index and job ID.
+ // Returned response consists of a list of examples against category ID.
+ async function getCategoryExamples(jobId, categoryIds, maxExamples) {
+ const resp = await callWithRequest('search', {
+ index: ML_RESULTS_INDEX_PATTERN,
+ size: DEFAULT_QUERY_SIZE, // Matches size of records in anomaly summary table.
+ body: {
+ query: {
+ bool: {
+ filter: [
+ { term: { job_id: jobId } },
+ { terms: { category_id: categoryIds } }
+ ]
+ }
+ }
+ }
+ });
+
+ const examplesByCategoryId = {};
+ if (resp.hits.total !== 0) {
+ resp.hits.hits.forEach((hit) => {
+ if (maxExamples) {
+ examplesByCategoryId[hit._source.category_id] =
+ _.slice(hit._source.examples, 0, Math.min(hit._source.examples.length, maxExamples));
+ } else {
+ examplesByCategoryId[hit._source.category_id] = hit._source.examples;
+ }
+ });
+ }
+
+ return examplesByCategoryId;
+ }
+
+ // Obtains the definition of the category with the specified ID and job ID.
+ // Returned response contains four properties - categoryId, regex, examples
+ // and terms (space delimited String of the common tokens matched in values of the category).
+ async function getCategoryDefinition(jobId, categoryId) {
+ const resp = await callWithRequest('search', {
+ index: ML_RESULTS_INDEX_PATTERN,
+ size: 1,
+ body: {
+ query: {
+ bool: {
+ filter: [
+ { term: { job_id: jobId } },
+ { term: { category_id: categoryId } }
+ ]
+ }
+ }
+ }
+ });
+
+ const definition = { categoryId, terms: null, regex: null, examples: [] };
+ if (resp.hits.total !== 0) {
+ const source = resp.hits.hits[0]._source;
+ definition.categoryId = source.category_id;
+ definition.regex = source.regex;
+ definition.terms = source.terms;
+ definition.examples = source.examples;
+ }
+
+ return definition;
+ }
+
+ return {
+ getAnomaliesTableData,
+ getCategoryDefinition,
+ getCategoryExamples
+ };
+
+}
diff --git a/x-pack/plugins/ml/server/routes/modules.js b/x-pack/plugins/ml/server/routes/modules.js
index 3eb883a8dd9f1b..bae0e4b6fcbcbe 100644
--- a/x-pack/plugins/ml/server/routes/modules.js
+++ b/x-pack/plugins/ml/server/routes/modules.js
@@ -21,9 +21,29 @@ function getModule(callWithRequest, moduleId) {
return dr.getModule(moduleId);
}
-function saveModuleItems(callWithRequest, moduleId, prefix, groups, indexPatternName, query, request) {
+function saveModuleItems(
+ callWithRequest,
+ moduleId,
+ prefix,
+ groups,
+ indexPatternName,
+ query,
+ startDatafeed,
+ start,
+ end,
+ request
+) {
const dr = new DataRecognizer(callWithRequest);
- return dr.setupModuleItems(moduleId, prefix, groups, indexPatternName, query, request);
+ return dr.setupModuleItems(
+ moduleId,
+ prefix,
+ groups,
+ indexPatternName,
+ query,
+ startDatafeed,
+ start,
+ end,
+ request);
}
export function dataRecognizer(server, commonRouteConfig) {
@@ -69,10 +89,24 @@ export function dataRecognizer(server, commonRouteConfig) {
prefix,
groups,
indexPatternName,
- query
+ query,
+ startDatafeed,
+ start,
+ end
} = request.payload;
- return saveModuleItems(callWithRequest, moduleId, prefix, groups, indexPatternName, query, request)
+ return saveModuleItems(
+ callWithRequest,
+ moduleId,
+ prefix,
+ groups,
+ indexPatternName,
+ query,
+ startDatafeed,
+ start,
+ end,
+ request
+ )
.then(resp => reply(resp))
.catch(resp => reply(wrapError(resp)));
},
diff --git a/x-pack/plugins/ml/server/routes/results_service.js b/x-pack/plugins/ml/server/routes/results_service.js
new file mode 100644
index 00000000000000..07f261a07e0f1e
--- /dev/null
+++ b/x-pack/plugins/ml/server/routes/results_service.js
@@ -0,0 +1,101 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
+
+import { callWithRequestFactory } from '../client/call_with_request_factory';
+import { wrapError } from '../client/errors';
+import { resultsServiceProvider } from '../models/results_service';
+
+
+function getAnomaliesTableData(callWithRequest, payload) {
+ const rs = resultsServiceProvider(callWithRequest);
+ const {
+ jobIds,
+ criteriaFields,
+ influencers,
+ aggregationInterval,
+ threshold,
+ earliestMs,
+ latestMs,
+ maxRecords,
+ maxExamples } = payload;
+ return rs.getAnomaliesTableData(
+ jobIds,
+ criteriaFields,
+ influencers,
+ aggregationInterval,
+ threshold,
+ earliestMs,
+ latestMs,
+ maxRecords,
+ maxExamples);
+}
+
+function getCategoryDefinition(callWithRequest, payload) {
+ const rs = resultsServiceProvider(callWithRequest);
+ return rs.getCategoryDefinition(
+ payload.jobId,
+ payload.categoryId);
+}
+
+function getCategoryExamples(callWithRequest, payload) {
+ const rs = resultsServiceProvider(callWithRequest);
+ const {
+ jobId,
+ categoryIds,
+ maxExamples } = payload;
+ return rs.getCategoryExamples(
+ jobId,
+ categoryIds,
+ maxExamples);
+}
+
+export function resultsServiceRoutes(server, commonRouteConfig) {
+
+ server.route({
+ method: 'POST',
+ path: '/api/ml/results/anomalies_table_data',
+ handler(request, reply) {
+ const callWithRequest = callWithRequestFactory(server, request);
+ return getAnomaliesTableData(callWithRequest, request.payload)
+ .then(resp => reply(resp))
+ .catch(resp => reply(wrapError(resp)));
+ },
+ config: {
+ ...commonRouteConfig
+ }
+ });
+
+ server.route({
+ method: 'POST',
+ path: '/api/ml/results/category_definition',
+ handler(request, reply) {
+ const callWithRequest = callWithRequestFactory(server, request);
+ return getCategoryDefinition(callWithRequest, request.payload)
+ .then(resp => reply(resp))
+ .catch(resp => reply(wrapError(resp)));
+ },
+ config: {
+ ...commonRouteConfig
+ }
+ });
+
+ server.route({
+ method: 'POST',
+ path: '/api/ml/results/category_examples',
+ handler(request, reply) {
+ const callWithRequest = callWithRequestFactory(server, request);
+ return getCategoryExamples(callWithRequest, request.payload)
+ .then(resp => reply(resp))
+ .catch(resp => reply(wrapError(resp)));
+ },
+ config: {
+ ...commonRouteConfig
+ }
+ });
+
+}
diff --git a/x-pack/plugins/ml/server/routes/system.js b/x-pack/plugins/ml/server/routes/system.js
index 615358dbdeb3e1..6889fa80b172ae 100644
--- a/x-pack/plugins/ml/server/routes/system.js
+++ b/x-pack/plugins/ml/server/routes/system.js
@@ -125,4 +125,18 @@ export function systemRoutes(server, commonRouteConfig) {
...commonRouteConfig
}
});
+
+ server.route({
+ method: 'POST',
+ path: '/api/ml/es_search',
+ handler(request, reply) {
+ const callWithRequest = callWithRequestFactory(server, request);
+ return callWithRequest('search', request.payload)
+ .then(resp => reply(resp))
+ .catch(resp => reply(wrapError(resp)));
+ },
+ config: {
+ ...commonRouteConfig
+ }
+ });
}
diff --git a/x-pack/plugins/monitoring/common/constants.js b/x-pack/plugins/monitoring/common/constants.js
index 6b015234ce63cc..e1f1806026b1a2 100644
--- a/x-pack/plugins/monitoring/common/constants.js
+++ b/x-pack/plugins/monitoring/common/constants.js
@@ -33,11 +33,6 @@ export const KIBANA_SETTINGS_TYPE = 'kibana_settings';
* @type {string}
*/
export const KIBANA_USAGE_TYPE = 'kibana';
-/**
- * The type name used within the Monitoring index to publish reporting stats.
- * @type {string}
- */
-export const KIBANA_REPORTING_TYPE = 'reporting_stats';
/*
* Key for the localStorage service
diff --git a/x-pack/plugins/monitoring/init.js b/x-pack/plugins/monitoring/init.js
index 55d4b9bf72fcce..c948a537dd8c67 100644
--- a/x-pack/plugins/monitoring/init.js
+++ b/x-pack/plugins/monitoring/init.js
@@ -7,49 +7,39 @@
import { requireUIRoutes } from './server/routes';
import { instantiateClient } from './server/es_client/instantiate_client';
import { initMonitoringXpackInfo } from './server/init_monitoring_xpack_info';
-import { initKibanaMonitoring } from './server/kibana_monitoring';
+import { createCollectorSet } from './server/kibana_monitoring';
/**
- * Initialize the Kibana Monitoring plugin by starting up asynchronous server
- * tasks, based on user-defined configuration
- * - webserver route handling
- * - monitoring cluster health checker
- * - instantiation of an elasticsearch-js client exposed as a server plugin object
- * - start kibana ops monitoring loop
- * - start monitoring cluster x-pack license and features check loop
+ * Initialize the Kibana Monitoring plugin by starting up asynchronous server tasks
+ * - [1] instantiation of an elasticsearch-js client exposed as a server plugin object
+ * - [2] start monitoring cluster x-pack license and features check
+ * - [3] webserver route handling
+ * - [4] start the internal monitoring collectors
+ * - [5] expose the monitoring collector object for other plugins to register with
+ * - [6] set monitoring plugin status to green
* @param monitoringPlugin {Object} Monitoring UI plugin
* @param server {Object} HapiJS server instance
*/
export const init = (monitoringPlugin, server) => {
+ monitoringPlugin.status.yellow('Initializing');
const xpackMainPlugin = server.plugins.xpack_main;
xpackMainPlugin.status.once('green', async () => {
const config = server.config();
const uiEnabled = config.get('xpack.monitoring.ui.enabled');
- const features = [];
- const onceMonitoringGreen = callbackFn => monitoringPlugin.status.once('green', () => callbackFn()); // avoid race condition in things that require ES client
if (uiEnabled) {
- // Instantiate the dedicated ES client
- features.push(instantiateClient(server));
-
- // route handlers depend on xpackInfo (exposed as server.plugins.monitoring.info)
- onceMonitoringGreen(async () => {
- await initMonitoringXpackInfo(server);
- });
-
- // Require only routes needed for ui app
- features.push(requireUIRoutes(server));
+ await instantiateClient(server); // Instantiate the dedicated ES client
+ await initMonitoringXpackInfo(server); // Route handlers depend on this for xpackInfo
+ await requireUIRoutes(server);
}
- // Send Kibana usage / server ops to the monitoring bulk api
if (config.get('xpack.monitoring.kibana.collection.enabled')) {
- onceMonitoringGreen(() => {
- features.push(initKibanaMonitoring(monitoringPlugin.kbnServer, server));
- });
+ const collectorSet = createCollectorSet(monitoringPlugin.kbnServer, server); // instantiate an object for collecting/sending metrics and usage stats
+ server.expose('collectorSet', collectorSet); // expose the collector set object on the server. other plugins will call statsCollectors.register(collector) to define their own collection
}
- Promise.all(features);
+ monitoringPlugin.status.green('Ready');
});
server.injectUiAppVars('monitoring', (server) => {
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
index 7401a5c6364977..f3c6f6e8d31735 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
@@ -89,7 +89,7 @@ export function ElasticsearchPanel(props) {
Version
- { get(nodes, 'versions[0]') || 'N/A' }
+ { props.version || 'N/A' }
Uptime
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js b/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js
index ff8ddec368197a..c0e3a6a6b28e4c 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js
@@ -49,7 +49,7 @@ const PanelExtras = ({ extras }) => {
export function ClusterItemContainer(props) {
const iconMap = {
- elasticsearch: 'logoElasticSearch',
+ elasticsearch: 'logoElasticsearch',
kibana: 'logoKibana',
logstash: 'logoLogstash',
beats: 'logoBeats',
@@ -64,7 +64,7 @@ export function ClusterItemContainer(props) {
-
+
{ props.title }
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
index cb76698555ad4b..747407bf650c73 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
@@ -20,6 +20,7 @@ export function Overview(props) {
Preview returns the content of the _source field only.
diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js
index f8356faef62346..0b4188cad8c530 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js
+++ b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js
@@ -8,18 +8,17 @@
import _ from 'lodash';
import angular from 'angular';
+import 'ace';
import { parseInterval } from 'ui/utils/parse_interval';
-import 'ui/courier';
-
import uiRoutes from 'ui/routes';
import { checkLicense } from 'plugins/ml/license/check_license';
import { checkCreateJobsPrivilege } from 'plugins/ml/privilege/check_privilege';
import template from './new_job.html';
import saveStatusTemplate from 'plugins/ml/jobs/new_job/advanced/save_status_modal/save_status_modal.html';
import { createSearchItems, createJobForSaving } from 'plugins/ml/jobs/new_job/utils/new_job_utils';
-import { getIndexPatterns, getIndexPatternWithRoute, getSavedSearchWithRoute, timeBasedIndexCheck } from 'plugins/ml/util/index_utils';
+import { loadIndexPatterns, loadCurrentIndexPattern, loadCurrentSavedSearch, timeBasedIndexCheck } from 'plugins/ml/util/index_utils';
import { ML_JOB_FIELD_TYPES, ES_FIELD_TYPES } from 'plugins/ml/../common/constants/field_types';
import { checkMlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes';
import { loadNewJobDefaults, newJobLimits, newJobDefaults } from 'plugins/ml/jobs/new_job/utils/new_job_defaults';
@@ -28,9 +27,10 @@ import {
ML_DATA_PREVIEW_COUNT,
basicJobValidation
} from 'plugins/ml/../common/util/job_utils';
-import { JobServiceProvider } from 'plugins/ml/services/job_service';
+import { mlJobService } from 'plugins/ml/services/job_service';
import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
import { ml } from 'plugins/ml/services/ml_api_service';
+import { initPromise } from 'plugins/ml/util/promise';
uiRoutes
.when('/jobs/new_job/advanced', {
@@ -38,11 +38,12 @@ uiRoutes
resolve: {
CheckLicense: checkLicense,
privileges: checkCreateJobsPrivilege,
- indexPattern: getIndexPatternWithRoute,
- indexPatterns: getIndexPatterns,
- savedSearch: getSavedSearchWithRoute,
+ indexPattern: loadCurrentIndexPattern,
+ indexPatterns: loadIndexPatterns,
+ savedSearch: loadCurrentSavedSearch,
checkMlNodesAvailable,
- loadNewJobDefaults
+ loadNewJobDefaults,
+ initPromise: initPromise(true)
}
})
.when('/jobs/new_job/advanced/:jobId', {
@@ -50,11 +51,12 @@ uiRoutes
resolve: {
CheckLicense: checkLicense,
privileges: checkCreateJobsPrivilege,
- indexPattern: getIndexPatternWithRoute,
- indexPatterns: getIndexPatterns,
- savedSearch: getSavedSearchWithRoute,
+ indexPattern: loadCurrentIndexPattern,
+ indexPatterns: loadIndexPatterns,
+ savedSearch: loadCurrentSavedSearch,
checkMlNodesAvailable,
- loadNewJobDefaults
+ loadNewJobDefaults,
+ initPromise: initPromise(true)
}
});
@@ -67,15 +69,10 @@ module.controller('MlNewJob',
$route,
$location,
$modal,
- $q,
- courier,
- es,
- Private,
timefilter,
mlDatafeedService,
mlConfirmModalService) {
- const mlJobService = Private(JobServiceProvider);
timefilter.disableTimeRangeSelector(); // remove time picker from top of page
timefilter.disableAutoRefreshSelector(); // remove time picker from top of page
const MODE = {
@@ -219,13 +216,28 @@ module.controller('MlNewJob',
console.log('Editing job', mlJobService.currentJob);
$scope.ui.pageTitle = 'Editing Job ' + $scope.job.job_id;
} else {
+ // if the job_version is undefined, assume we have transferred to this page from
+ // a new job wizard.
+ // Alternatively, we are cloning a job and so the job already has a job_version
if (mlJobService.currentJob.job_version === undefined) {
$scope.mode = MODE.NEW;
+
+ // if results_index_name exists, the dedicated index checkbox has been checked
+ if ($scope.job.results_index_name !== undefined) {
+ $scope.ui.useDedicatedIndex = true;
+ }
} else {
$scope.mode = MODE.CLONE;
console.log('Cloning job', mlJobService.currentJob);
$scope.ui.pageTitle = 'Clone Job from ' + $scope.job.job_id;
$scope.job.job_id = '';
+
+ if ($scope.job.results_index_name === 'shared') {
+ delete $scope.job.results_index_name;
+ } else {
+ $scope.ui.useDedicatedIndex = true;
+ $scope.job.results_index_name = '';
+ }
}
setDatafeedUIText();
setFieldDelimiterControlsFromText();
@@ -240,13 +252,6 @@ module.controller('MlNewJob',
if ($scope.job.analysis_limits && $scope.job.analysis_limits.model_memory_limit) {
$scope.ui.modelMemoryLimitText = $scope.job.analysis_limits.model_memory_limit;
}
-
- if ($scope.job.results_index_name === 'shared') {
- delete $scope.job.results_index_name;
- } else {
- $scope.ui.useDedicatedIndex = true;
- $scope.job.results_index_name = '';
- }
}
// clear the current job
@@ -296,7 +301,7 @@ module.controller('MlNewJob',
};
function loadFields() {
- return $q((resolve, reject) => {
+ return new Promise((resolve, reject) => {
clear($scope.fields);
clear($scope.dateFields);
clear($scope.catFields);
@@ -1155,6 +1160,13 @@ module.controller('MlNewJob',
return _.sortBy(influencers, (inf) => inf);
}
+ $scope.aceLoaded = function (editor) {
+ $scope.$applyAsync();
+ if (editor.container.id === 'datafeed-preview') {
+ editor.setReadOnly(true);
+ }
+ };
+
init();
});
diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
new file mode 100644
index 00000000000000..e437da4d697667
--- /dev/null
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/__snapshots__/bucket_span_estimator_view.test.js.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BucketSpanEstimator renders the button 1`] = `
+
+
+
+ Estimate bucket span
+
+
+
+`;
+
+exports[`BucketSpanEstimator renders the loading button 1`] = `
+
+
+
+ Estimating bucket span
+
+
+
+`;
diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator.html b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator.html
deleted file mode 100644
index 8e8118c9c0aca4..00000000000000
--- a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js
index aaf3e1772334cb..dbdb857238dae6 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_directive.js
@@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import React from 'react';
+import ReactDOM from 'react-dom';
-
-import template from './bucket_span_estimator.html';
+import { BucketSpanEstimator } from './bucket_span_estimator_view';
import { getQueryFromSavedSearch } from 'plugins/ml/jobs/new_job/utils/new_job_utils';
import { EVENT_RATE_COUNT_FIELD } from 'plugins/ml/jobs/new_job/simple/components/constants/general';
import { ml } from 'plugins/ml/services/ml_api_service';
@@ -14,7 +15,7 @@ import { ml } from 'plugins/ml/services/ml_api_service';
import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml');
-module.directive('mlBucketSpanEstimator', function ($q) {
+module.directive('mlBucketSpanEstimator', function () {
return {
restrict: 'AE',
replace: false,
@@ -26,15 +27,13 @@ module.directive('mlBucketSpanEstimator', function ($q) {
ui: '=ui',
exportedFunctions: '='
},
- template,
- link: function ($scope) {
+ link: function ($scope, $element) {
const STATUS = {
FAILED: -1,
NOT_RUNNING: 0,
RUNNING: 1,
FINISHED: 2
};
- $scope.STATUS = STATUS;
const errorHandler = (error) => {
console.log('Bucket span could not be estimated', error);
@@ -78,7 +77,7 @@ module.directive('mlBucketSpanEstimator', function ($q) {
});
}
- $q.when(ml.estimateBucketSpan(data))
+ ml.estimateBucketSpan(data)
.then((interval) => {
if (interval.error) {
errorHandler(interval.message);
@@ -101,6 +100,38 @@ module.directive('mlBucketSpanEstimator', function ($q) {
$scope.exportedFunctions.guessBucketSpan = $scope.guessBucketSpan;
}
+ // watch for these changes
+ $scope.$watch('formConfig.agg.type', updateButton, true);
+ $scope.$watch('jobStateWrapper.jobState', updateButton, true);
+ $scope.$watch('[ui.showJobInput,ui.formValid,ui.bucketSpanEstimator.status]', updateButton, true);
+
+ function updateButton() {
+ const buttonDisabled = (
+ $scope.ui.showJobInput === false ||
+ $scope.ui.formValid === false ||
+ $scope.formConfig.agg.type === undefined ||
+ $scope.jobStateWrapper.jobState === $scope.JOB_STATE.RUNNING ||
+ $scope.jobStateWrapper.jobState === $scope.JOB_STATE.STOPPING ||
+ $scope.jobStateWrapper.jobState === $scope.JOB_STATE.FINISHED ||
+ $scope.ui.bucketSpanEstimator.status === STATUS.RUNNING
+ );
+ const estimatorRunning = ($scope.ui.bucketSpanEstimator.status === STATUS.RUNNING);
+ const buttonText = (estimatorRunning) ? 'Estimating bucket span' : 'Estimate bucket span';
+
+ const props = {
+ buttonDisabled,
+ estimatorRunning,
+ guessBucketSpan: $scope.guessBucketSpan,
+ buttonText
+ };
+
+ ReactDOM.render(
+ React.createElement(BucketSpanEstimator, props),
+ $element[0]
+ );
+ }
+
+ updateButton();
}
};
});
diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.js b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.js
new file mode 100644
index 00000000000000..6bc668ce16b832
--- /dev/null
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import {
+ EuiButton,
+ EuiToolTip
+} from '@elastic/eui';
+
+export function BucketSpanEstimator({ buttonDisabled, buttonText, estimatorRunning, guessBucketSpan }) {
+ return (
+
+
+
+ {buttonText}
+
+
+
+ );
+}
+BucketSpanEstimator.propTypes = {
+ buttonDisabled: PropTypes.bool.isRequired,
+ buttonText: PropTypes.string.isRequired,
+ estimatorRunning: PropTypes.bool.isRequired,
+ guessBucketSpan: PropTypes.func.isRequired
+};
+
diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.test.js b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.test.js
new file mode 100644
index 00000000000000..4ed4227977cb40
--- /dev/null
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/components/bucket_span_estimator/bucket_span_estimator_view.test.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+
+import { BucketSpanEstimator } from './bucket_span_estimator_view';
+
+describe('BucketSpanEstimator', () => {
+
+ test('renders the button', () => {
+ const props = {
+ buttonDisabled: false,
+ estimatorRunning: false,
+ guessBucketSpan: () => { },
+ buttonText: 'Estimate bucket span'
+ };
+ const wrapper = shallow(Use a wizard
- 
+ ![Single metric job]()
+ Single metric
@@ -85,7 +85,7 @@Single metric
- 
+ ![Multi metric job]()
+ Multi metric
@@ -106,7 +106,7 @@Multi metric
- 
+ ![Population job]()
+ Population
@@ -127,7 +127,7 @@Population
- 
+ ![Advanced job]()
+ Advanced
@@ -165,7 +165,7 @@Learn more about your data
- 
+ ![Single metric job]()
+ Data Visualizer
diff --git a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js index e7890493e987af..02badffdaf2db9 100644 --- a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js +++ b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/job_type/job_type_controller.js @@ -16,9 +16,10 @@ import uiRoutes from 'ui/routes'; import { checkLicenseExpired } from 'plugins/ml/license/check_license'; import { checkCreateJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; import { createSearchItems } from 'plugins/ml/jobs/new_job/utils/new_job_utils'; -import { getIndexPatternWithRoute, getSavedSearchWithRoute, timeBasedIndexCheck } from 'plugins/ml/util/index_utils'; +import { loadCurrentIndexPattern, loadCurrentSavedSearch, timeBasedIndexCheck } from 'plugins/ml/util/index_utils'; import { addItemToRecentlyAccessed } from 'plugins/ml/util/recently_accessed'; import { checkMlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes'; +import { initPromise } from 'plugins/ml/util/promise'; import template from './job_type.html'; uiRoutes @@ -27,9 +28,10 @@ uiRoutes resolve: { CheckLicense: checkLicenseExpired, privileges: checkCreateJobsPrivilege, - indexPattern: getIndexPatternWithRoute, - savedSearch: getSavedSearchWithRoute, - checkMlNodesAvailable + indexPattern: loadCurrentIndexPattern, + savedSearch: loadCurrentSavedSearch, + checkMlNodesAvailable, + initPromise: initPromise(true) } }); diff --git a/x-pack/plugins/ml/public/license/check_license.js b/x-pack/plugins/ml/public/license/check_license.js index 9d78fa22025275..59d18e71485933 100644 --- a/x-pack/plugins/ml/public/license/check_license.js +++ b/x-pack/plugins/ml/public/license/check_license.js @@ -14,7 +14,7 @@ import chrome from 'ui/chrome'; let licenseHasExpired = true; -export function checkLicense(Private, Promise, kbnBaseUrl) { +export function checkLicense(Private, kbnBaseUrl) { const xpackInfo = Private(XPackInfoProvider); const features = xpackInfo.get('features.ml'); @@ -67,3 +67,14 @@ export function checkLicenseExpired(Private, Promise, kbnBaseUrl, kbnUrl) { export function getLicenseHasExpired() { return licenseHasExpired; } + +export function xpackFeatureProvider(Private) { + const xpackInfo = Private(XPackInfoProvider); + function isAvailable(feature) { + return xpackInfo.get(`features.${feature}.isAvailable`, false); + } + + return { + isAvailable + }; +} diff --git a/x-pack/plugins/ml/public/register_feature.js b/x-pack/plugins/ml/public/register_feature.js index d1a618c5a17dcb..131d392bd35a87 100644 --- a/x-pack/plugins/ml/public/register_feature.js +++ b/x-pack/plugins/ml/public/register_feature.js @@ -13,7 +13,7 @@ FeatureCatalogueRegistryProvider.register(() => { id: 'ml', title: 'Machine Learning', description: 'Automatically model the normal behavior of your time series data to detect anomalies.', - icon: '/plugins/ml/assets/app_ml.svg', + icon: 'machineLearningApp', path: '/app/ml', showOnHomePage: true, category: FeatureCatalogueCategory.DATA diff --git a/x-pack/plugins/ml/public/services/calendar_service.js b/x-pack/plugins/ml/public/services/calendar_service.js index ba7e9926e1f791..11e0e39527b2df 100644 --- a/x-pack/plugins/ml/public/services/calendar_service.js +++ b/x-pack/plugins/ml/public/services/calendar_service.js @@ -9,92 +9,86 @@ import _ from 'lodash'; import { ml } from 'plugins/ml/services/ml_api_service'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; -let calendarService = undefined; -export function CalendarServiceProvider($q, Private) { - const msgs = mlMessageBarService; - const mlJobService = Private(JobServiceProvider); - class CalendarService { - constructor() { - this.calendars = []; - // list of calendar ids per job id - this.jobCalendars = {}; - // list of calendar ids per group id - this.groupCalendars = {}; - } +const msgs = mlMessageBarService; - loadCalendars(jobs) { - return $q((resolve, reject) => { - let calendars = []; - jobs.forEach((j) => { - this.jobCalendars[j.job_id] = []; - }); - const groups = {}; - mlJobService.getJobGroups().forEach((g) => { - groups[g.id] = g; - }); +class CalendarService { + constructor() { + this.calendars = []; + // list of calendar ids per job id + this.jobCalendars = {}; + // list of calendar ids per group id + this.groupCalendars = {}; + } - ml.calendars() - .then((resp) => { - calendars = resp; - // loop through calendars and their job_ids and create jobCalendars - // if a group is found, expand it out to its member jobs - calendars.forEach((cal) => { - cal.job_ids.forEach((id) => { - let isGroup = false; - // the job_id could be either a job id or a group id - if (this.jobCalendars[id] !== undefined) { - this.jobCalendars[id].push(cal.calendar_id); - } else if (groups[id] !== undefined) { - isGroup = true; - // expand out the group into its jobs and add each job - groups[id].jobs.forEach((j) => { - this.jobCalendars[j.job_id].push(cal.calendar_id); - }); - } else { - // not a known job or a known group. assume it's a unused group - isGroup = true; - } + loadCalendars(jobs) { + return new Promise((resolve, reject) => { + let calendars = []; + jobs.forEach((j) => { + this.jobCalendars[j.job_id] = []; + }); + const groups = {}; + mlJobService.getJobGroups().forEach((g) => { + groups[g.id] = g; + }); - if (isGroup) { - // keep track of calendars per group - if (this.groupCalendars[id] === undefined) { - this.groupCalendars[id] = [cal.calendar_id]; - } else { - this.groupCalendars[id].push(cal.calendar_id); - } - } - }); - }); + ml.calendars() + .then((resp) => { + calendars = resp; + // loop through calendars and their job_ids and create jobCalendars + // if a group is found, expand it out to its member jobs + calendars.forEach((cal) => { + cal.job_ids.forEach((id) => { + let isGroup = false; + // the job_id could be either a job id or a group id + if (this.jobCalendars[id] !== undefined) { + this.jobCalendars[id].push(cal.calendar_id); + } else if (groups[id] !== undefined) { + isGroup = true; + // expand out the group into its jobs and add each job + groups[id].jobs.forEach((j) => { + this.jobCalendars[j.job_id].push(cal.calendar_id); + }); + } else { + // not a known job or a known group. assume it's a unused group + isGroup = true; + } - // deduplicate as group expansion may have added dupes. - _.each(this.jobCalendars, (cal, id) => { - this.jobCalendars[id] = _.uniq(cal); + if (isGroup) { + // keep track of calendars per group + if (this.groupCalendars[id] === undefined) { + this.groupCalendars[id] = [cal.calendar_id]; + } else { + this.groupCalendars[id].push(cal.calendar_id); + } + } }); + }); - this.calendars = calendars; - resolve({ calendars }); - }) - .catch((err) => { - msgs.error('Calendars list could not be retrieved'); - msgs.error('', err); - reject({ calendars, err }); + // deduplicate as group expansion may have added dupes. + _.each(this.jobCalendars, (cal, id) => { + this.jobCalendars[id] = _.uniq(cal); }); - }); - } - // get the list of calendar groups - getCalendarGroups() { - return Object.keys(this.groupCalendars).map(id => ({ id })); - } + this.calendars = calendars; + resolve({ calendars }); + }) + .catch((err) => { + msgs.error('Calendars list could not be retrieved'); + msgs.error('', err); + reject({ calendars, err }); + }); + }); } - if (calendarService === undefined) { - calendarService = new CalendarService(); + // get the list of calendar groups + getCalendarGroups() { + return Object.keys(this.groupCalendars).map(id => ({ id })); } - return calendarService; } + +export const mlCalendarService = new CalendarService(); diff --git a/x-pack/plugins/ml/public/services/field_format_service.js b/x-pack/plugins/ml/public/services/field_format_service.js index b70b8f200037ed..c02160c15a9fd7 100644 --- a/x-pack/plugins/ml/public/services/field_format_service.js +++ b/x-pack/plugins/ml/public/services/field_format_service.js @@ -8,125 +8,117 @@ import _ from 'lodash'; -import 'ui/courier'; import { mlFunctionToESAggregation } from 'plugins/ml/../common/util/job_utils'; -import { getIndexPatternProvider } from 'plugins/ml/util/index_utils'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; +import { getIndexPatternById } from 'plugins/ml/util/index_utils'; +import { mlJobService } from 'plugins/ml/services/job_service'; // Service for accessing FieldFormat objects configured for a Kibana index pattern // for use in formatting the actual and typical values from anomalies. -export function FieldFormatServiceProvider( - $q, - courier, - Private) { - const mlJobService = Private(JobServiceProvider); - const getIndexPattern = Private(getIndexPatternProvider); - - class FieldFormatService { - constructor() { - this.indexPatternIdsByJob = {}; - this.formatsByJob = {}; - } +class FieldFormatService { + constructor() { + this.indexPatternIdsByJob = {}; + this.formatsByJob = {}; + } - // Populate the service with the FieldFormats for the list of jobs with the - // specified IDs. List of Kibana index patterns is passed, with a title - // attribute set in each pattern which will be compared to the index pattern - // configured in the datafeed of each job. - // Builds a map of Kibana FieldFormats (ui/field_formats/field_format.js) - // against detector index by job ID. - populateFormats(jobIds, indexPatterns) { - return $q((resolve, reject) => { - // Populate a map of index pattern IDs against job ID, by finding the ID of the index - // pattern with a title attribute which matches the index configured in the datafeed. - // If a Kibana index pattern has not been created - // for this index, then no custom field formatting will occur. - _.each(jobIds, (jobId) => { - const jobObj = mlJobService.getJob(jobId); - const datafeedIndices = jobObj.datafeed_config.indices; - const indexPattern = _.find(indexPatterns, (index) => { - return _.find(datafeedIndices, (datafeedIndex) => { - return index.get('title') === datafeedIndex; - }); + // Populate the service with the FieldFormats for the list of jobs with the + // specified IDs. List of Kibana index patterns is passed, with a title + // attribute set in each pattern which will be compared to the index pattern + // configured in the datafeed of each job. + // Builds a map of Kibana FieldFormats (ui/field_formats/field_format.js) + // against detector index by job ID. + populateFormats(jobIds, indexPatterns) { + return new Promise((resolve, reject) => { + // Populate a map of index pattern IDs against job ID, by finding the ID of the index + // pattern with a title attribute which matches the index configured in the datafeed. + // If a Kibana index pattern has not been created + // for this index, then no custom field formatting will occur. + _.each(jobIds, (jobId) => { + const jobObj = mlJobService.getJob(jobId); + const datafeedIndices = jobObj.datafeed_config.indices; + const indexPattern = _.find(indexPatterns, (index) => { + return _.find(datafeedIndices, (datafeedIndex) => { + return index.get('title') === datafeedIndex; }); - - // Check if index pattern has been configured to match the index in datafeed. - if (indexPattern !== undefined) { - this.indexPatternIdsByJob[jobId] = indexPattern.id; - } }); - const promises = jobIds.map(jobId => $q.all([ - this.getFormatsForJob(jobId) - ])); + // Check if index pattern has been configured to match the index in datafeed. + if (indexPattern !== undefined) { + this.indexPatternIdsByJob[jobId] = indexPattern.id; + } + }); - $q.all(promises).then((fmtsByJobByDetector) => { - _.each(fmtsByJobByDetector, (formatsByDetector, index) => { - this.formatsByJob[jobIds[index]] = formatsByDetector[0]; - }); + const promises = jobIds.map(jobId => Promise.all([ + this.getFormatsForJob(jobId) + ])); - resolve(this.formatsByJob); - }).catch(err => { - console.log('fieldFormatService error populating formats:', err); - reject({ formats: {}, err }); + Promise.all(promises).then((fmtsByJobByDetector) => { + _.each(fmtsByJobByDetector, (formatsByDetector, index) => { + this.formatsByJob[jobIds[index]] = formatsByDetector[0]; }); + resolve(this.formatsByJob); + }).catch(err => { + console.log('fieldFormatService error populating formats:', err); + reject({ formats: {}, err }); }); - } - // Return the FieldFormat to use for formatting values from - // the detector from the job with the specified ID. - getFieldFormat(jobId, detectorIndex) { - return _.get(this.formatsByJob, [jobId, detectorIndex]); - } + }); + } + // Return the FieldFormat to use for formatting values from + // the detector from the job with the specified ID. + getFieldFormat(jobId, detectorIndex) { + return _.get(this.formatsByJob, [jobId, detectorIndex]); + } - // Utility for returning the FieldFormat from a full populated Kibana index pattern object - // containing the list of fields by name with their formats. - getFieldFormatFromIndexPattern(fullIndexPattern, fieldName, esAggName) { - // Don't use the field formatter for distinct count detectors as - // e.g. distinct_count(clientip) should be formatted as a count, not as an IP address. - let fieldFormat = undefined; - if (esAggName !== 'cardinality') { - const indexPatternFields = _.get(fullIndexPattern, 'fields.byName', []); - fieldFormat = _.get(indexPatternFields, [fieldName, 'format']); - } - return fieldFormat; + // Utility for returning the FieldFormat from a full populated Kibana index pattern object + // containing the list of fields by name with their formats. + getFieldFormatFromIndexPattern(fullIndexPattern, fieldName, esAggName) { + // Don't use the field formatter for distinct count detectors as + // e.g. distinct_count(clientip) should be formatted as a count, not as an IP address. + let fieldFormat = undefined; + if (esAggName !== 'cardinality') { + const indexPatternFields = _.get(fullIndexPattern, 'fields.byName', []); + fieldFormat = _.get(indexPatternFields, [fieldName, 'format']); } - getFormatsForJob(jobId) { - return $q((resolve, reject) => { + return fieldFormat; + } - const jobObj = mlJobService.getJob(jobId); - const detectors = jobObj.analysis_config.detectors || []; - const formatsByDetector = {}; - - const indexPatternId = this.indexPatternIdsByJob[jobId]; - if (indexPatternId !== undefined) { - // Load the full index pattern configuration to obtain the formats of each field. - getIndexPattern(indexPatternId) - .then((indexPatternData) => { - // Store the FieldFormat for each job by detector_index. - const fieldsByName = _.get(indexPatternData, 'fields.byName', []); - _.each(detectors, (dtr) => { - const esAgg = mlFunctionToESAggregation(dtr.function); - // distinct_count detectors should fall back to the default - // formatter as the values are just counts. - if (dtr.field_name !== undefined && esAgg !== 'cardinality') { - formatsByDetector[dtr.detector_index] = _.get(fieldsByName, [dtr.field_name, 'format']); - } - }); - - resolve(formatsByDetector); - }).catch(err => { - reject(err); + getFormatsForJob(jobId) { + return new Promise((resolve, reject) => { + + const jobObj = mlJobService.getJob(jobId); + const detectors = jobObj.analysis_config.detectors || []; + const formatsByDetector = {}; + + const indexPatternId = this.indexPatternIdsByJob[jobId]; + if (indexPatternId !== undefined) { + // Load the full index pattern configuration to obtain the formats of each field. + getIndexPatternById(indexPatternId) + .then((indexPatternData) => { + // Store the FieldFormat for each job by detector_index. + const fieldsByName = _.get(indexPatternData, 'fields.byName', []); + _.each(detectors, (dtr) => { + const esAgg = mlFunctionToESAggregation(dtr.function); + // distinct_count detectors should fall back to the default + // formatter as the values are just counts. + if (dtr.field_name !== undefined && esAgg !== 'cardinality') { + formatsByDetector[dtr.detector_index] = _.get(fieldsByName, [dtr.field_name, 'format']); + } }); - } else { - resolve(formatsByDetector); - } - }); - } - } - return new FieldFormatService(); + resolve(formatsByDetector); + }).catch(err => { + reject(err); + }); + } else { + resolve(formatsByDetector); + } + }); + } } + +export const mlFieldFormatService = new FieldFormatService(); + diff --git a/x-pack/plugins/ml/public/services/forecast_service.js b/x-pack/plugins/ml/public/services/forecast_service.js index d07de1911f754e..09a6b03f4658a0 100644 --- a/x-pack/plugins/ml/public/services/forecast_service.js +++ b/x-pack/plugins/ml/public/services/forecast_service.js @@ -10,375 +10,374 @@ // data on forecasts that have been performed. import _ from 'lodash'; -import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/constants/index_patterns'; +import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/../common/constants/index_patterns'; import { ml } from 'plugins/ml/services/ml_api_service'; -export function ForecastServiceProvider(es, $q) { - - // Gets a basic summary of the most recently run forecasts for the specified - // job, with results at or later than the supplied timestamp. - // Extra query object can be supplied, or pass null if no additional query. - // Returned response contains a forecasts property, which is an array of objects - // containing id, earliest and latest keys. - function getForecastsSummary( - job, - query, - earliestMs, - maxResults - ) { - return $q((resolve, reject) => { - const obj = { - success: true, - forecasts: [] - }; - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the job ID, result type and earliest time, plus - // the additional query if supplied. - const filterCriteria = [ - { - term: { result_type: 'model_forecast_request_stats' } - }, - { - term: { job_id: job.job_id } - }, - { - range: { - timestamp: { - gte: earliestMs, - format: 'epoch_millis' - } + +// Gets a basic summary of the most recently run forecasts for the specified +// job, with results at or later than the supplied timestamp. +// Extra query object can be supplied, or pass null if no additional query. +// Returned response contains a forecasts property, which is an array of objects +// containing id, earliest and latest keys. +function getForecastsSummary( + job, + query, + earliestMs, + maxResults +) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + forecasts: [] + }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the job ID, result type and earliest time, plus + // the additional query if supplied. + const filterCriteria = [ + { + term: { result_type: 'model_forecast_request_stats' } + }, + { + term: { job_id: job.job_id } + }, + { + range: { + timestamp: { + gte: earliestMs, + format: 'epoch_millis' } } - ]; - - if (query) { - filterCriteria.push(query); } + ]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: maxResults, - body: { - query: { - bool: { - filter: filterCriteria - } - }, - sort: [ - { forecast_create_timestamp: { 'order': 'desc' } } - ] - } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - obj.forecasts = resp.hits.hits.map(hit => hit._source); - } + if (query) { + filterCriteria.push(query); + } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: maxResults, + body: { + query: { + bool: { + filter: filterCriteria + } + }, + sort: [ + { forecast_create_timestamp: { 'order': 'desc' } } + ] + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + obj.forecasts = resp.hits.hits.map(hit => hit._source); + } - // Obtains the earliest and latest timestamps for the forecast data from - // the forecast with the specified ID. - // Returned response contains earliest and latest properties which are the - // timestamps of the first and last model_forecast results. - function getForecastDateRange(job, forecastId) { - - return $q((resolve, reject) => { - const obj = { - success: true, - earliest: null, - latest: null - }; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the job ID, forecast ID, result type and time range. - const filterCriteria = [{ - query_string: { - query: 'result_type:model_forecast', - analyze_wildcard: true - } - }, - { - term: { job_id: job.job_id } - }, - { - term: { forecast_id: forecastId } - }]; - - // TODO - add in criteria for detector index and entity fields (by, over, partition) - // once forecasting with these parameters is supported. - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: filterCriteria +// Obtains the earliest and latest timestamps for the forecast data from +// the forecast with the specified ID. +// Returned response contains earliest and latest properties which are the +// timestamps of the first and last model_forecast results. +function getForecastDateRange(job, forecastId) { + + return new Promise((resolve, reject) => { + const obj = { + success: true, + earliest: null, + latest: null + }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the job ID, forecast ID, result type and time range. + const filterCriteria = [{ + query_string: { + query: 'result_type:model_forecast', + analyze_wildcard: true + } + }, + { + term: { job_id: job.job_id } + }, + { + term: { forecast_id: forecastId } + }]; + + // TODO - add in criteria for detector index and entity fields (by, over, partition) + // once forecasting with these parameters is supported. + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: filterCriteria + } + }, + aggs: { + earliest: { + min: { + field: 'timestamp' } }, - aggs: { - earliest: { - min: { - field: 'timestamp' - } - }, - latest: { - max: { - field: 'timestamp' - } + latest: { + max: { + field: 'timestamp' } } } - }) - .then((resp) => { - obj.earliest = _.get(resp, 'aggregations.earliest.value', null); - obj.latest = _.get(resp, 'aggregations.latest.value', null); - if (obj.earliest === null || obj.latest === null) { - reject(resp); - } else { - resolve(obj); - } - }) - .catch((resp) => { + } + }) + .then((resp) => { + obj.earliest = _.get(resp, 'aggregations.earliest.value', null); + obj.latest = _.get(resp, 'aggregations.latest.value', null); + if (obj.earliest === null || obj.latest === null) { reject(resp); - }); + } else { + resolve(obj); + } + }) + .catch((resp) => { + reject(resp); + }); - }); - } + }); +} - // Obtains the requested forecast model data for the forecast with the specified ID. - function getForecastData( - job, - detectorIndex, - forecastId, - entityFields, - earliestMs, - latestMs, - interval, - aggType) { - // Extract the partition, by, over fields on which to filter. - const criteriaFields = []; - const detector = job.analysis_config.detectors[detectorIndex]; - if (_.has(detector, 'partition_field_name')) { - const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); - if (partitionEntity !== undefined) { - criteriaFields.push( - { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, - { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); - } +// Obtains the requested forecast model data for the forecast with the specified ID. +function getForecastData( + job, + detectorIndex, + forecastId, + entityFields, + earliestMs, + latestMs, + interval, + aggType) { + // Extract the partition, by, over fields on which to filter. + const criteriaFields = []; + const detector = job.analysis_config.detectors[detectorIndex]; + if (_.has(detector, 'partition_field_name')) { + const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); + if (partitionEntity !== undefined) { + criteriaFields.push( + { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, + { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); } + } - if (_.has(detector, 'over_field_name')) { - const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); - if (overEntity !== undefined) { - criteriaFields.push( - { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, - { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); - } + if (_.has(detector, 'over_field_name')) { + const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); + if (overEntity !== undefined) { + criteriaFields.push( + { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, + { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); } + } - if (_.has(detector, 'by_field_name')) { - const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); - if (byEntity !== undefined) { - criteriaFields.push( - { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, - { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); - } + if (_.has(detector, 'by_field_name')) { + const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); + if (byEntity !== undefined) { + criteriaFields.push( + { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, + { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); } + } - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the job ID, forecast ID, detector index, result type and time range. - const filterCriteria = [{ - query_string: { - query: 'result_type:model_forecast', - analyze_wildcard: true - } - }, - { - term: { job_id: job.job_id } - }, - { - term: { forecast_id: forecastId } - }, - { - term: { detector_index: detectorIndex } - }, - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the job ID, forecast ID, detector index, result type and time range. + const filterCriteria = [{ + query_string: { + query: 'result_type:model_forecast', + analyze_wildcard: true + } + }, + { + term: { job_id: job.job_id } + }, + { + term: { forecast_id: forecastId } + }, + { + term: { detector_index: detectorIndex } + }, + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' } - }]; + } + }]; - // Add in term queries for each of the specified criteria. - _.each(criteriaFields, (criteria) => { - filterCriteria.push({ - term: { - [criteria.fieldName]: criteria.fieldValue - } - }); + // Add in term queries for each of the specified criteria. + _.each(criteriaFields, (criteria) => { + filterCriteria.push({ + term: { + [criteria.fieldName]: criteria.fieldValue + } }); + }); - // If an aggType object has been passed in, use it. - // Otherwise default to avg, min and max aggs for the - // forecast prediction, upper and lower - const forecastAggs = (aggType === undefined) ? - { avg: 'avg', max: 'max', min: 'min' } : - { - avg: aggType.avg, - max: aggType.max, - min: aggType.min - }; - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: filterCriteria - } - }, - aggs: { - times: { - date_histogram: { - field: 'timestamp', - interval: interval, - min_doc_count: 1 + // If an aggType object has been passed in, use it. + // Otherwise default to avg, min and max aggs for the + // forecast prediction, upper and lower + const forecastAggs = (aggType === undefined) ? + { avg: 'avg', max: 'max', min: 'min' } : + { + avg: aggType.avg, + max: aggType.max, + min: aggType.min + }; + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: filterCriteria + } + }, + aggs: { + times: { + date_histogram: { + field: 'timestamp', + interval: interval, + min_doc_count: 1 + }, + aggs: { + prediction: { + [forecastAggs.avg]: { + field: 'forecast_prediction' + } + }, + forecastUpper: { + [forecastAggs.max]: { + field: 'forecast_upper' + } }, - aggs: { - prediction: { - [forecastAggs.avg]: { - field: 'forecast_prediction' - } - }, - forecastUpper: { - [forecastAggs.max]: { - field: 'forecast_upper' - } - }, - forecastLower: { - [forecastAggs.min]: { - field: 'forecast_lower' - } + forecastLower: { + [forecastAggs.min]: { + field: 'forecast_lower' } } } } } - }) - .then((resp) => { - const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); - _.each(aggregationsByTime, (dataForTime) => { - const time = dataForTime.key; - obj.results[time] = { - prediction: _.get(dataForTime, ['prediction', 'value']), - forecastUpper: _.get(dataForTime, ['forecastUpper', 'value']), - forecastLower: _.get(dataForTime, ['forecastLower', 'value']) - }; - }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); + } + }) + .then((resp) => { + const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); + _.each(aggregationsByTime, (dataForTime) => { + const time = dataForTime.key; + obj.results[time] = { + prediction: _.get(dataForTime, ['prediction', 'value']), + forecastUpper: _.get(dataForTime, ['forecastUpper', 'value']), + forecastLower: _.get(dataForTime, ['forecastLower', 'value']) + }; }); - }); - } - - // Runs a forecast - function runForecast(jobId, duration) { - console.log('ML forecast service run forecast with duration:', duration); - return $q((resolve, reject) => { - - ml.forecast({ - jobId, - duration + resolve(obj); }) - .then((resp) => { - resolve(resp); - }).catch((err) => { - reject(err); - }); - }); - } + .catch((resp) => { + reject(resp); + }); - // Gets stats for a forecast that has been run on the specified job. - // Returned response contains a stats property, including - // forecast_progress (a value from 0 to 1), - // and forecast_status ('finished' when complete) properties. - function getForecastRequestStats(job, forecastId) { - return $q((resolve, reject) => { - const obj = { - success: true, - stats: {} - }; + }); +} - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the job ID, result type and earliest time. - const filterCriteria = [{ - query_string: { - query: 'result_type:model_forecast_request_stats', - analyze_wildcard: true - } - }, - { - term: { job_id: job.job_id } - }, - { - term: { forecast_id: forecastId } - }]; - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 1, - body: { - query: { - bool: { - filter: filterCriteria - } +// Runs a forecast +function runForecast(jobId, duration) { + console.log('ML forecast service run forecast with duration:', duration); + return new Promise((resolve, reject) => { + + ml.forecast({ + jobId, + duration + }) + .then((resp) => { + resolve(resp); + }).catch((err) => { + reject(err); + }); + }); +} + +// Gets stats for a forecast that has been run on the specified job. +// Returned response contains a stats property, including +// forecast_progress (a value from 0 to 1), +// and forecast_status ('finished' when complete) properties. +function getForecastRequestStats(job, forecastId) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + stats: {} + }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the job ID, result type and earliest time. + const filterCriteria = [{ + query_string: { + query: 'result_type:model_forecast_request_stats', + analyze_wildcard: true + } + }, + { + term: { job_id: job.job_id } + }, + { + term: { forecast_id: forecastId } + }]; + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 1, + body: { + query: { + bool: { + filter: filterCriteria } } + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + obj.stats = _.first(resp.hits.hits)._source; + } + resolve(obj); }) - .then((resp) => { - if (resp.hits.total !== 0) { - obj.stats = _.first(resp.hits.hits)._source; - } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); + .catch((resp) => { + reject(resp); + }); - }); - } + }); +} - return { - getForecastsSummary, - getForecastDateRange, - getForecastData, - runForecast, - getForecastRequestStats - }; +export const mlForecastService = { + getForecastsSummary, + getForecastDateRange, + getForecastData, + runForecast, + getForecastRequestStats +}; -} diff --git a/x-pack/plugins/ml/public/services/http_service.js b/x-pack/plugins/ml/public/services/http_service.js index e368ad5a768b10..5a7e4d9c1d70f2 100644 --- a/x-pack/plugins/ml/public/services/http_service.js +++ b/x-pack/plugins/ml/public/services/http_service.js @@ -27,14 +27,19 @@ export function http(options) { const allHeaders = (options.headers === undefined) ? headers : { ...options.headers, ...headers }; const body = (options.data === undefined) ? null : JSON.stringify(options.data); - fetch(url, { + const payload = { method: (options.method || 'GET'), - headers: (allHeaders), - credentials: 'same-origin', - body, - }) + headers: allHeaders, + credentials: 'same-origin' + }; + + if (body !== null) { + payload.body = body; + } + + fetch(url, payload) .then((resp) => { - resolve(resp.json()); + resp.json().then((resp.ok === true) ? resolve : reject); }) .catch((resp) => { reject(resp); diff --git a/x-pack/plugins/ml/public/services/job_messages_service.js b/x-pack/plugins/ml/public/services/job_messages_service.js index ab34faeb0d4d05..dd2481886d4fd4 100644 --- a/x-pack/plugins/ml/public/services/job_messages_service.js +++ b/x-pack/plugins/ml/public/services/job_messages_service.js @@ -10,132 +10,131 @@ // Service for carrying out Elasticsearch queries to obtain data for the // Ml Results dashboards. -import { ML_NOTIFICATION_INDEX_PATTERN } from 'plugins/ml/constants/index_patterns'; +import { ML_NOTIFICATION_INDEX_PATTERN } from 'plugins/ml/../common/constants/index_patterns'; +import { ml } from 'plugins/ml/services/ml_api_service'; -export function JobMessagesServiceProvider(es, $q) { - // search for audit messages, jobId is optional. - // without it, all jobs will be listed. - // fromRange should be a string formatted in ES time units. e.g. 12h, 1d, 7d - function getJobAuditMessages(fromRange, jobId) { - return $q((resolve, reject) => { - let jobFilter = {}; - // if no jobId specified, load all of the messages - if (jobId !== undefined) { - jobFilter = { - bool: { - should: [ - { - term: { - job_id: '' // catch system messages - } - }, - { - term: { - job_id: jobId // messages for specified jobId - } +// search for audit messages, jobId is optional. +// without it, all jobs will be listed. +// fromRange should be a string formatted in ES time units. e.g. 12h, 1d, 7d +function getJobAuditMessages(fromRange, jobId) { + return new Promise((resolve, reject) => { + let jobFilter = {}; + // if no jobId specified, load all of the messages + if (jobId !== undefined) { + jobFilter = { + bool: { + should: [ + { + term: { + job_id: '' // catch system messages + } + }, + { + term: { + job_id: jobId // messages for specified jobId } - ] - } - }; - } - - let timeFilter = {}; - if (fromRange !== undefined && fromRange !== '') { - timeFilter = { - range: { - timestamp: { - gte: `now-${fromRange}`, - lte: 'now' } + ] + } + }; + } + + let timeFilter = {}; + if (fromRange !== undefined && fromRange !== '') { + timeFilter = { + range: { + timestamp: { + gte: `now-${fromRange}`, + lte: 'now' } - }; - } + } + }; + } - es.search({ - index: ML_NOTIFICATION_INDEX_PATTERN, - ignore_unavailable: true, - size: 1000, - body: - { - sort: [ - { timestamp: { order: 'asc' } }, - { job_id: { order: 'asc' } } - ], - query: { - bool: { - filter: [ - { - bool: { - must_not: { - term: { - level: 'activity' - } + ml.esSearch({ + index: ML_NOTIFICATION_INDEX_PATTERN, + ignore_unavailable: true, + size: 1000, + body: + { + sort: [ + { timestamp: { order: 'asc' } }, + { job_id: { order: 'asc' } } + ], + query: { + bool: { + filter: [ + { + bool: { + must_not: { + term: { + level: 'activity' } } - }, - jobFilter, - timeFilter - ] - } + } + }, + jobFilter, + timeFilter + ] } } + } + }) + .then((resp) => { + let messages = []; + if (resp.hits.total !== 0) { + messages = resp.hits.hits.map(hit => hit._source); + } + resolve({ messages }); }) - .then((resp) => { - let messages = []; - if (resp.hits.total !== 0) { - messages = resp.hits.hits.map(hit => hit._source); - } - resolve({ messages }); - }) - .catch((resp) => { - reject(resp); - }); - }); - } + .catch((resp) => { + reject(resp); + }); + }); +} - // search highest, most recent audit messages for all jobs for the last 24hrs. - function getAuditMessagesSummary() { - return $q((resolve, reject) => { - es.search({ - index: ML_NOTIFICATION_INDEX_PATTERN, - ignore_unavailable: true, - size: 0, - body: { - query: { - bool: { - filter: { - range: { - timestamp: { - gte: 'now-1d' - } +// search highest, most recent audit messages for all jobs for the last 24hrs. +function getAuditMessagesSummary() { + return new Promise((resolve, reject) => { + ml.esSearch({ + index: ML_NOTIFICATION_INDEX_PATTERN, + ignore_unavailable: true, + size: 0, + body: { + query: { + bool: { + filter: { + range: { + timestamp: { + gte: 'now-1d' } } } - }, - aggs: { - levelsPerJob: { - terms: { - field: 'job_id', - }, - aggs: { - levels: { - terms: { - field: 'level', - }, - aggs: { - latestMessage: { - terms: { - field: 'message.raw', - size: 1, - order: { - latestMessage: 'desc' - } - }, - aggs: { - latestMessage: { - max: { - field: 'timestamp' - } + } + }, + aggs: { + levelsPerJob: { + terms: { + field: 'job_id', + }, + aggs: { + levels: { + terms: { + field: 'level', + }, + aggs: { + latestMessage: { + terms: { + field: 'message.raw', + size: 1, + order: { + latestMessage: 'desc' + } + }, + aggs: { + latestMessage: { + max: { + field: 'timestamp' } } } @@ -145,26 +144,27 @@ export function JobMessagesServiceProvider(es, $q) { } } } + } + }) + .then((resp) => { + let messagesPerJob = []; + if (resp.hits.total !== 0 && + resp.aggregations && + resp.aggregations.levelsPerJob && + resp.aggregations.levelsPerJob.buckets && + resp.aggregations.levelsPerJob.buckets.length) { + messagesPerJob = resp.aggregations.levelsPerJob.buckets; + } + resolve({ messagesPerJob }); }) - .then((resp) => { - let messagesPerJob = []; - if (resp.hits.total !== 0 && - resp.aggregations && - resp.aggregations.levelsPerJob && - resp.aggregations.levelsPerJob.buckets && - resp.aggregations.levelsPerJob.buckets.length) { - messagesPerJob = resp.aggregations.levelsPerJob.buckets; - } - resolve({ messagesPerJob }); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - return { - getJobAuditMessages, - getAuditMessagesSummary - }; + .catch((resp) => { + reject(resp); + }); + }); } + +export const jobMessagesService = { + getJobAuditMessages, + getAuditMessagesSummary +}; + diff --git a/x-pack/plugins/ml/public/services/job_service.js b/x-pack/plugins/ml/public/services/job_service.js index 6776bbe7648367..53055094560091 100644 --- a/x-pack/plugins/ml/public/services/job_service.js +++ b/x-pack/plugins/ml/public/services/job_service.js @@ -13,98 +13,169 @@ import moment from 'moment'; import { parseInterval } from 'ui/utils/parse_interval'; import { ml } from 'plugins/ml/services/ml_api_service'; -import { labelDuplicateDetectorDescriptions } from 'plugins/ml/util/anomaly_utils'; +import { labelDuplicateDetectorDescriptions } from 'plugins/ml/../common/util/anomaly_utils'; import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; import { isWebUrl } from 'plugins/ml/util/string_utils'; import { ML_DATA_PREVIEW_COUNT } from 'plugins/ml/../common/util/job_utils'; -let jobService = undefined; - -export function JobServiceProvider($q, es) { - const msgs = mlMessageBarService; - let jobs = []; - let datafeedIds = {}; - - class JobService { - constructor() { - this.currentJob = undefined; - this.jobs = []; - - // Provide ready access to widely used basic job properties. - // Note these get populated on a call to either loadJobs or getBasicJobInfo. - this.basicJobs = {}; - this.jobDescriptions = {}; - this.detectorsByJob = {}; - this.customUrlsByJob = {}; - this.jobStats = { - activeNodes: { label: 'Active ML Nodes', value: 0, show: true }, - total: { label: 'Total jobs', value: 0, show: true }, - open: { label: 'Open jobs', value: 0, show: true }, - closed: { label: 'Closed jobs', value: 0, show: true }, - failed: { label: 'Failed jobs', value: 0, show: false }, - activeDatafeeds: { label: 'Active datafeeds', value: 0, show: true } - }; - this.jobUrls = {}; - } +const msgs = mlMessageBarService; +let jobs = []; +let datafeedIds = {}; + +class JobService { + constructor() { + this.currentJob = undefined; + this.jobs = []; + + // Provide ready access to widely used basic job properties. + // Note these get populated on a call to either loadJobs or getBasicJobInfo. + this.basicJobs = {}; + this.jobDescriptions = {}; + this.detectorsByJob = {}; + this.customUrlsByJob = {}; + this.jobStats = { + activeNodes: { label: 'Active ML Nodes', value: 0, show: true }, + total: { label: 'Total jobs', value: 0, show: true }, + open: { label: 'Open jobs', value: 0, show: true }, + closed: { label: 'Closed jobs', value: 0, show: true }, + failed: { label: 'Failed jobs', value: 0, show: false }, + activeDatafeeds: { label: 'Active datafeeds', value: 0, show: true } + }; + this.jobUrls = {}; + } - getBlankJob() { - return { - job_id: '', - description: '', - groups: [], - analysis_config: { - bucket_span: '15m', - influencers: [], - detectors: [] - }, - data_description: { - time_field: '', - time_format: '', // 'epoch', - field_delimiter: '', - quote_character: '"', - format: 'delimited' - } - }; - } + getBlankJob() { + return { + job_id: '', + description: '', + groups: [], + analysis_config: { + bucket_span: '15m', + influencers: [], + detectors: [] + }, + data_description: { + time_field: '', + time_format: '', // 'epoch', + field_delimiter: '', + quote_character: '"', + format: 'delimited' + } + }; + } - loadJobs() { - return $q((resolve, reject) => { - jobs = []; - datafeedIds = {}; + loadJobs() { + return new Promise((resolve, reject) => { + jobs = []; + datafeedIds = {}; - ml.jobs() - .then((resp) => { - // make deep copy of jobs - angular.copy(resp.jobs, jobs); + ml.jobs() + .then((resp) => { + // make deep copy of jobs + angular.copy(resp.jobs, jobs); + + // load jobs stats + ml.jobStats() + .then((statsResp) => { + // merge jobs stats into jobs + for (let i = 0; i < jobs.length; i++) { + const job = jobs[i]; + // create empty placeholders for stats and datafeed objects + job.data_counts = {}; + job.model_size_stats = {}; + job.datafeed_config = {}; + + for (let j = 0; j < statsResp.jobs.length; j++) { + if (job.job_id === statsResp.jobs[j].job_id) { + const jobStats = angular.copy(statsResp.jobs[j]); + + job.state = jobStats.state; + job.data_counts = jobStats.data_counts; + job.model_size_stats = jobStats.model_size_stats; + if (jobStats.node) { + job.node = jobStats.node; + } + if (jobStats.open_time) { + job.open_time = jobStats.open_time; + } + } + } + } + this.loadDatafeeds() + .then((datafeedsResp) => { + for (let i = 0; i < jobs.length; i++) { + for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { + if (jobs[i].job_id === datafeedsResp.datafeeds[j].job_id) { + jobs[i].datafeed_config = datafeedsResp.datafeeds[j]; + + datafeedIds[jobs[i].job_id] = datafeedsResp.datafeeds[j].datafeed_id; + } + } + } + processBasicJobInfo(this, jobs); + this.jobs = jobs; + createJobStats(this.jobs, this.jobStats); + createJobUrls(this.jobs, this.jobUrls); + resolve({ jobs: this.jobs }); + }); + }) + .catch((err) => { + error(err); + }); + }).catch((err) => { + error(err); + }); + + function error(err) { + console.log('jobService error getting list of jobs:', err); + msgs.error('Jobs list could not be retrieved'); + msgs.error('', err); + reject({ jobs, err }); + } + }); + } + + refreshJob(jobId) { + return new Promise((resolve, reject) => { + ml.jobs({ jobId }) + .then((resp) => { + console.log('refreshJob query response:', resp); + const newJob = {}; + if (resp.jobs && resp.jobs.length) { + angular.copy(resp.jobs[0], newJob); // load jobs stats - ml.jobStats() + ml.jobStats({ jobId }) .then((statsResp) => { // merge jobs stats into jobs - for (let i = 0; i < jobs.length; i++) { - const job = jobs[i]; - // create empty placeholders for stats and datafeed objects - job.data_counts = {}; - job.model_size_stats = {}; - job.datafeed_config = {}; - - for (let j = 0; j < statsResp.jobs.length; j++) { - if (job.job_id === statsResp.jobs[j].job_id) { - const jobStats = angular.copy(statsResp.jobs[j]); - - job.state = jobStats.state; - job.data_counts = jobStats.data_counts; - job.model_size_stats = jobStats.model_size_stats; - if (jobStats.node) { - job.node = jobStats.node; - } - if (jobStats.open_time) { - job.open_time = jobStats.open_time; - } + for (let j = 0; j < statsResp.jobs.length; j++) { + if (newJob.job_id === statsResp.jobs[j].job_id) { + const statsJob = statsResp.jobs[j]; + newJob.state = statsJob.state; + newJob.data_counts = {}; + newJob.model_size_stats = {}; + angular.copy(statsJob.data_counts, newJob.data_counts); + angular.copy(statsJob.model_size_stats, newJob.model_size_stats); + if (newJob.node) { + angular.copy(statsJob.node, newJob.node); + } + + if (statsJob.open_time) { + newJob.open_time = statsJob.open_time; } } } - this.loadDatafeeds() + + // replace the job in the jobs array + for (let i = 0; i < jobs.length; i++) { + if (jobs[i].job_id === newJob.job_id) { + jobs[i] = newJob; + } + } + + const datafeedId = this.getDatafeedId(jobId); + + this.loadDatafeeds(datafeedId) .then((datafeedsResp) => { for (let i = 0; i < jobs.length; i++) { for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { @@ -115,7 +186,6 @@ export function JobServiceProvider($q, es) { } } } - processBasicJobInfo(this, jobs); this.jobs = jobs; createJobStats(this.jobs, this.jobStats); createJobUrls(this.jobs, this.jobUrls); @@ -125,1039 +195,935 @@ export function JobServiceProvider($q, es) { .catch((err) => { error(err); }); - }).catch((err) => { - error(err); - }); + } + }).catch((err) => { + error(err); + }); - function error(err) { - console.log('jobService error getting list of jobs:', err); - msgs.error('Jobs list could not be retrieved'); - msgs.error('', err); - reject({ jobs, err }); - } - }); - } + function error(err) { + console.log('JobService error getting list of jobs:', err); + msgs.error('Jobs list could not be retrieved'); + msgs.error('', err); + reject({ jobs, err }); + } + }); + } - refreshJob(jobId) { - return $q((resolve, reject) => { - ml.jobs({ jobId }) - .then((resp) => { - console.log('refreshJob query response:', resp); - const newJob = {}; - if (resp.jobs && resp.jobs.length) { - angular.copy(resp.jobs[0], newJob); - - // load jobs stats - ml.jobStats({ jobId }) - .then((statsResp) => { - // merge jobs stats into jobs - for (let j = 0; j < statsResp.jobs.length; j++) { - if (newJob.job_id === statsResp.jobs[j].job_id) { - const statsJob = statsResp.jobs[j]; - newJob.state = statsJob.state; - newJob.data_counts = {}; - newJob.model_size_stats = {}; - angular.copy(statsJob.data_counts, newJob.data_counts); - angular.copy(statsJob.model_size_stats, newJob.model_size_stats); - if (newJob.node) { - angular.copy(statsJob.node, newJob.node); - } + loadDatafeeds(datafeedId) { + return new Promise((resolve, reject) => { + const datafeeds = []; + const sId = (datafeedId !== undefined) ? { datafeed_id: datafeedId } : undefined; - if (statsJob.open_time) { - newJob.open_time = statsJob.open_time; - } - } - } + ml.datafeeds(sId) + .then((resp) => { + // console.log('loadDatafeeds query response:', resp); - // replace the job in the jobs array - for (let i = 0; i < jobs.length; i++) { - if (jobs[i].job_id === newJob.job_id) { - jobs[i] = newJob; - } + // make deep copy of datafeeds + angular.copy(resp.datafeeds, datafeeds); + + // load datafeeds stats + ml.datafeedStats() + .then((statsResp) => { + // merge datafeeds stats into datafeeds + for (let i = 0; i < datafeeds.length; i++) { + const datafeed = datafeeds[i]; + for (let j = 0; j < statsResp.datafeeds.length; j++) { + if (datafeed.datafeed_id === statsResp.datafeeds[j].datafeed_id) { + datafeed.state = statsResp.datafeeds[j].state; } + } + } + resolve({ datafeeds }); + }) + .catch((err) => { + error(err); + }); + }).catch((err) => { + error(err); + }); - const datafeedId = this.getDatafeedId(jobId); + function error(err) { + console.log('loadDatafeeds error getting list of datafeeds:', err); + msgs.error('datafeeds list could not be retrieved'); + msgs.error('', err); + reject({ jobs, err }); + } + }); + } - this.loadDatafeeds(datafeedId) - .then((datafeedsResp) => { - for (let i = 0; i < jobs.length; i++) { - for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { - if (jobs[i].job_id === datafeedsResp.datafeeds[j].job_id) { - jobs[i].datafeed_config = datafeedsResp.datafeeds[j]; + updateSingleJobCounts(jobId) { + return new Promise((resolve, reject) => { + console.log('jobService: update job counts and state for ' + jobId); + ml.jobStats({ jobId }) + .then((resp) => { + console.log('updateSingleJobCounts controller query response:', resp); + if (resp.jobs && resp.jobs.length) { + const newJob = {}; + angular.copy(resp.jobs[0], newJob); - datafeedIds[jobs[i].job_id] = datafeedsResp.datafeeds[j].datafeed_id; - } - } - } - this.jobs = jobs; - createJobStats(this.jobs, this.jobStats); - createJobUrls(this.jobs, this.jobUrls); - resolve({ jobs: this.jobs }); - }); - }) - .catch((err) => { - error(err); - }); + // replace the job in the jobs array + for (let i = 0; i < jobs.length; i++) { + if (jobs[i].job_id === jobId) { + const job = jobs[i]; + job.state = newJob.state; + job.data_counts = newJob.data_counts; + if (newJob.model_size_stats) { + job.model_size_stats = newJob.model_size_stats; + } + if (newJob.node) { + job.node = newJob.node; + } + if (newJob.open_time) { + job.open_time = newJob.open_time; + } + } } - }).catch((err) => { - error(err); - }); - - function error(err) { - console.log('JobService error getting list of jobs:', err); - msgs.error('Jobs list could not be retrieved'); - msgs.error('', err); - reject({ jobs, err }); - } - }); - } - loadDatafeeds(datafeedId) { - return $q((resolve, reject) => { - const datafeeds = []; - const sId = (datafeedId !== undefined) ? { datafeed_id: datafeedId } : undefined; + const datafeedId = this.getDatafeedId(jobId); - ml.datafeeds(sId) - .then((resp) => { - // console.log('loadDatafeeds query response:', resp); - - // make deep copy of datafeeds - angular.copy(resp.datafeeds, datafeeds); + this.loadDatafeeds(datafeedId) + .then((datafeedsResp) => { + for (let i = 0; i < jobs.length; i++) { + for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { + if (jobs[i].job_id === datafeedsResp.datafeeds[j].job_id) { + jobs[i].datafeed_config = datafeedsResp.datafeeds[j]; - // load datafeeds stats - ml.datafeedStats() - .then((statsResp) => { - // merge datafeeds stats into datafeeds - for (let i = 0; i < datafeeds.length; i++) { - const datafeed = datafeeds[i]; - for (let j = 0; j < statsResp.datafeeds.length; j++) { - if (datafeed.datafeed_id === statsResp.datafeeds[j].datafeed_id) { - datafeed.state = statsResp.datafeeds[j].state; + datafeedIds[jobs[i].job_id] = datafeedsResp.datafeeds[j].datafeed_id; } } } - resolve({ datafeeds }); + createJobStats(this.jobs, this.jobStats); + createJobUrls(this.jobs, this.jobUrls); + resolve({ jobs: this.jobs }); }) .catch((err) => { error(err); }); - }).catch((err) => { - error(err); - }); + } else { + resolve({ jobs: this.jobs }); + } - function error(err) { - console.log('loadDatafeeds error getting list of datafeeds:', err); - msgs.error('datafeeds list could not be retrieved'); - msgs.error('', err); - reject({ jobs, err }); - } - }); - } + }).catch((err) => { + error(err); + }); - updateSingleJobCounts(jobId) { - return $q((resolve, reject) => { - console.log('jobService: update job counts and state for ' + jobId); - ml.jobStats({ jobId }) - .then((resp) => { - console.log('updateSingleJobCounts controller query response:', resp); - if (resp.jobs && resp.jobs.length) { - const newJob = {}; - angular.copy(resp.jobs[0], newJob); + function error(err) { + console.log('updateSingleJobCounts error getting job details:', err); + msgs.error('Job details could not be retrieved for ' + jobId); + msgs.error('', err); + reject({ jobs, err }); + } - // replace the job in the jobs array - for (let i = 0; i < jobs.length; i++) { - if (jobs[i].job_id === jobId) { - const job = jobs[i]; - job.state = newJob.state; - job.data_counts = newJob.data_counts; - if (newJob.model_size_stats) { - job.model_size_stats = newJob.model_size_stats; - } - if (newJob.node) { - job.node = newJob.node; - } - if (newJob.open_time) { - job.open_time = newJob.open_time; - } - } - } + }); + } - const datafeedId = this.getDatafeedId(jobId); + updateAllJobStats() { + return new Promise((resolve, reject) => { + console.log('jobService: update all jobs counts and state'); + ml.jobStats().then((resp) => { + console.log('updateAllJobStats controller query response:', resp); + let newJobsAdded = false; + for (let d = 0; d < resp.jobs.length; d++) { + const newJobStats = {}; + let jobExists = false; + angular.copy(resp.jobs[d], newJobStats); + + // update parts of the job + for (let i = 0; i < jobs.length; i++) { + const job = jobs[i]; + if (job.job_id === newJobStats.job_id) { + jobExists = true; + job.state = newJobStats.state; + job.data_counts = newJobStats.data_counts; + if (newJobStats.model_size_stats) { + job.model_size_stats = newJobStats.model_size_stats; + } + if (newJobStats.node) { + job.node = newJobStats.node; + } + if (newJobStats.open_time) { + job.open_time = newJobStats.open_time; + } + } + } - this.loadDatafeeds(datafeedId) - .then((datafeedsResp) => { - for (let i = 0; i < jobs.length; i++) { - for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { - if (jobs[i].job_id === datafeedsResp.datafeeds[j].job_id) { - jobs[i].datafeed_config = datafeedsResp.datafeeds[j]; + // a new job has been added, add it to the list + if (!jobExists) { + // add it to the same index position as it's found in jobs. + jobs.splice(d, 0, newJobStats); + newJobsAdded = true; + } + } - datafeedIds[jobs[i].job_id] = datafeedsResp.datafeeds[j].datafeed_id; - } + // load datafeeds stats + ml.datafeedStats() + .then((datafeedsResp) => { + for (let i = 0; i < jobs.length; i++) { + const datafeed = jobs[i].datafeed_config; + if (datafeed) { + for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { + const newDatafeedStats = {}; + angular.copy(datafeedsResp.datafeeds[j], newDatafeedStats); + + if (datafeed.datafeed_id === newDatafeedStats.datafeed_id) { + datafeed.state = newDatafeedStats.state; + if (newDatafeedStats.node) { + datafeed.node = newDatafeedStats.node; } } - createJobStats(this.jobs, this.jobStats); - createJobUrls(this.jobs, this.jobUrls); - resolve({ jobs: this.jobs }); - }) + } + } + } + this.jobs = jobs; + + // if after adding missing jobs, the retrieved number of jobs still differs from + // the local copy, reload the whole list from scratch. some non-running jobs may have + // been deleted by a different user. + if (newJobsAdded || resp.jobs.length !== jobs.length) { + console.log('updateAllJobStats: number of jobs differs. reloading all jobs'); + this.loadJobs().then(() => { + resolve({ jobs: this.jobs, listChanged: true }); + }) .catch((err) => { error(err); }); } else { - resolve({ jobs: this.jobs }); + createJobStats(this.jobs, this.jobStats); + createJobUrls(this.jobs, this.jobUrls); + resolve({ jobs: this.jobs, listChanged: false }); } - - }).catch((err) => { + }) + .catch((err) => { error(err); }); + }) + .catch((err) => { + error(err); + }); - function error(err) { - console.log('updateSingleJobCounts error getting job details:', err); - msgs.error('Job details could not be retrieved for ' + jobId); - msgs.error('', err); - reject({ jobs, err }); - } + function error(err) { + console.log('updateAllJobStats error getting list job details:', err); + msgs.error('Job details could not be retrieved'); + msgs.error('', err); + reject({ jobs, err }); + } - }); - } + }); + } - updateAllJobStats() { - return $q((resolve, reject) => { - console.log('jobService: update all jobs counts and state'); - ml.jobStats().then((resp) => { - console.log('updateAllJobStats controller query response:', resp); - let newJobsAdded = false; - for (let d = 0; d < resp.jobs.length; d++) { - const newJobStats = {}; - let jobExists = false; - angular.copy(resp.jobs[d], newJobStats); - - // update parts of the job - for (let i = 0; i < jobs.length; i++) { - const job = jobs[i]; - if (job.job_id === newJobStats.job_id) { - jobExists = true; - job.state = newJobStats.state; - job.data_counts = newJobStats.data_counts; - if (newJobStats.model_size_stats) { - job.model_size_stats = newJobStats.model_size_stats; - } - if (newJobStats.node) { - job.node = newJobStats.node; - } - if (newJobStats.open_time) { - job.open_time = newJobStats.open_time; - } - } - } + getRunningJobs() { + const runningJobs = []; + _.each(jobs, (job) => { + if (job.datafeed_config && job.datafeed_config.state === 'started') { + runningJobs.push(job); + } + }); + return runningJobs; + } - // a new job has been added, add it to the list - if (!jobExists) { - // add it to the same index position as it's found in jobs. - jobs.splice(d, 0, newJobStats); - newJobsAdded = true; - } - } + updateSingleJobDatafeedState(jobId) { + return new Promise((resolve, reject) => { - // load datafeeds stats - ml.datafeedStats() - .then((datafeedsResp) => { - for (let i = 0; i < jobs.length; i++) { - const datafeed = jobs[i].datafeed_config; - if (datafeed) { - for (let j = 0; j < datafeedsResp.datafeeds.length; j++) { - const newDatafeedStats = {}; - angular.copy(datafeedsResp.datafeeds[j], newDatafeedStats); + const datafeedId = this.getDatafeedId(jobId); - if (datafeed.datafeed_id === newDatafeedStats.datafeed_id) { - datafeed.state = newDatafeedStats.state; - if (newDatafeedStats.node) { - datafeed.node = newDatafeedStats.node; - } - } - } - } - } - this.jobs = jobs; - - // if after adding missing jobs, the retrieved number of jobs still differs from - // the local copy, reload the whole list from scratch. some non-running jobs may have - // been deleted by a different user. - if (newJobsAdded || resp.jobs.length !== jobs.length) { - console.log('updateAllJobStats: number of jobs differs. reloading all jobs'); - this.loadJobs().then(() => { - resolve({ jobs: this.jobs, listChanged: true }); - }) - .catch((err) => { - error(err); - }); - } else { - createJobStats(this.jobs, this.jobStats); - createJobUrls(this.jobs, this.jobUrls); - resolve({ jobs: this.jobs, listChanged: false }); - } - }) - .catch((err) => { - error(err); - }); + ml.datafeedStats({ datafeedId }) + .then((resp) => { + // console.log('updateSingleJobCounts controller query response:', resp); + const datafeeds = resp.datafeeds; + let state = 'UNKNOWN'; + if (datafeeds && datafeeds.length) { + state = datafeeds[0].state; + } + resolve(state); }) - .catch((err) => { - error(err); - }); - - function error(err) { - console.log('updateAllJobStats error getting list job details:', err); - msgs.error('Job details could not be retrieved'); - msgs.error('', err); - reject({ jobs, err }); - } + .catch((resp) => { + reject(resp); + }); - }); - } + }); + } - getRunningJobs() { - const runningJobs = []; - _.each(jobs, (job) => { - if (job.datafeed_config && job.datafeed_config.state === 'started') { - runningJobs.push(job); - } - }); - return runningJobs; + saveNewJob(job) { + // run then and catch through the same check + function func(resp) { + console.log('Response for job query:', resp); + const success = checkSaveResponse(resp, job); + return { success, job, resp }; } - updateSingleJobDatafeedState(jobId) { - return $q((resolve, reject) => { - - const datafeedId = this.getDatafeedId(jobId); + // return the promise chain + return ml.addJob({ jobId: job.job_id, job }) + .then(func).catch(func); + } - ml.datafeedStats({ datafeedId }) - .then((resp) => { - // console.log('updateSingleJobCounts controller query response:', resp); - const datafeeds = resp.datafeeds; - let state = 'UNKNOWN'; - if (datafeeds && datafeeds.length) { - state = datafeeds[0].state; - } - resolve(state); + deleteJob(job, statusIn) { + return new Promise((resolve, reject) => { + const status = statusIn || { deleteDatafeed: 0, deleteJob: 0, errorMessage: '' }; + + // chain of endpoint calls to delete a job. + // if job is datafeed, stop and delete datafeed first + if (job.datafeed_config && Object.keys(job.datafeed_config).length) { + const datafeedId = this.getDatafeedId(job.job_id); + // stop datafeed + ml.forceDeleteDatafeed({ datafeedId: datafeedId }) + .then(() => { + status.deleteDatafeed = 1; + deleteJob(); }) .catch((resp) => { - reject(resp); + status.deleteDatafeed = -1; + status.deleteJob = -1; + deleteFailed(resp, 'Delete datafeed'); }); - - }); - } - - saveNewJob(job) { - // run then and catch through the same check - function func(resp) { - console.log('Response for job query:', resp); - const success = checkSaveResponse(resp, job); - return { success, job, resp }; + } else { + deleteJob(); } - // return the promise chain - return $q.when(ml.addJob({ jobId: job.job_id, job })) - .then(func).catch(func); - } + function deleteJob() { + ml.forceDeleteJob({ jobId: job.job_id }) + .then(() => { + status.deleteJob = 1; + resolve({ success: true }); + }) + .catch((resp) => { + status.deleteJob = -1; + deleteFailed(resp, 'Delete job'); + }); + } - deleteJob(job, statusIn) { - return $q((resolve, reject) => { - const status = statusIn || { deleteDatafeed: 0, deleteJob: 0, errorMessage: '' }; - - // chain of endpoint calls to delete a job. - // if job is datafeed, stop and delete datafeed first - if (job.datafeed_config && Object.keys(job.datafeed_config).length) { - const datafeedId = this.getDatafeedId(job.job_id); - // stop datafeed - ml.forceDeleteDatafeed({ datafeedId: datafeedId }) - .then(() => { - status.deleteDatafeed = 1; - deleteJob(); - }) - .catch((resp) => { - status.deleteDatafeed = -1; - status.deleteJob = -1; - deleteFailed(resp, 'Delete datafeed'); - }); - } else { - deleteJob(); + function deleteFailed(resp, txt) { + if (resp.statusCode === 500) { + status.errorMessage = txt; } + reject({ success: false }); + } - function deleteJob() { - ml.forceDeleteJob({ jobId: job.job_id }) - .then(() => { - status.deleteJob = 1; - resolve({ success: true }); - }) - .catch((resp) => { - status.deleteJob = -1; - deleteFailed(resp, 'Delete job'); - }); - } + }); + } + + cloneJob(job) { + // create a deep copy of a job object + // also remove items from the job which are set by the server and not needed + // in the future this formatting could be optional + const tempJob = angular.copy(job); + + // remove all of the items which should not be copied + // such as counts, state and times + delete tempJob.state; + delete tempJob.job_version; + delete tempJob.data_counts; + delete tempJob.create_time; + delete tempJob.finished_time; + delete tempJob.last_data_time; + delete tempJob.model_size_stats; + delete tempJob.node; + delete tempJob.average_bucket_processing_time_ms; + delete tempJob.model_snapshot_id; + delete tempJob.open_time; + delete tempJob.established_model_memory; + + delete tempJob.analysis_config.use_per_partition_normalization; + + _.each(tempJob.analysis_config.detectors, (d) => { + delete d.detector_index; + }); - function deleteFailed(resp, txt) { - if (resp.statusCode === 500) { - status.errorMessage = txt; + // remove parts of the datafeed config which should not be copied + if (tempJob.datafeed_config) { + delete tempJob.datafeed_config.datafeed_id; + delete tempJob.datafeed_config.job_id; + delete tempJob.datafeed_config.state; + delete tempJob.datafeed_config.node; + + // remove query_delay if it's between 60s and 120s + // the back-end produces a random value between 60 and 120 and so + // by deleting it, the back-end will produce a new random value + if (tempJob.datafeed_config.query_delay) { + const interval = parseInterval(tempJob.datafeed_config.query_delay); + if (interval !== null) { + const queryDelay = interval.asSeconds(); + if (queryDelay > 60 && queryDelay < 120) { + delete tempJob.datafeed_config.query_delay; } - reject({ success: false }); } + } + } + + return tempJob; + } + updateJob(jobId, job) { + // return the promise chain + return ml.updateJob({ jobId, job }) + .then((resp) => { + console.log('update job', resp); + return { success: true }; + }).catch((err) => { + msgs.error('Could not update job: ' + jobId); + console.log('update job', err); + return { success: false, message: err.message }; }); - } + } - cloneJob(job) { - // create a deep copy of a job object - // also remove items from the job which are set by the server and not needed - // in the future this formatting could be optional - const tempJob = angular.copy(job); - - // remove all of the items which should not be copied - // such as counts, state and times - delete tempJob.state; - delete tempJob.job_version; - delete tempJob.data_counts; - delete tempJob.create_time; - delete tempJob.finished_time; - delete tempJob.last_data_time; - delete tempJob.model_size_stats; - delete tempJob.node; - delete tempJob.average_bucket_processing_time_ms; - delete tempJob.model_snapshot_id; - delete tempJob.open_time; - delete tempJob.established_model_memory; - - delete tempJob.analysis_config.use_per_partition_normalization; - - _.each(tempJob.analysis_config.detectors, (d) => { - delete d.detector_index; + validateJob(obj) { + // return the promise chain + return ml.validateJob(obj) + .then((messages) => { + console.log('validate job', messages); + return { success: true, messages }; + }).catch((err) => { + msgs.error('Job Validation Error: ' + err.message); + console.log('validate job', err); + return { + success: false, + messages: [{ + status: 'error', + text: err.message + }] + }; }); + } - // remove parts of the datafeed config which should not be copied - if (tempJob.datafeed_config) { - delete tempJob.datafeed_config.datafeed_id; - delete tempJob.datafeed_config.job_id; - delete tempJob.datafeed_config.state; - delete tempJob.datafeed_config.node; - - // remove query_delay if it's between 60s and 120s - // the back-end produces a random value between 60 and 120 and so - // by deleting it, the back-end will produce a new random value - if (tempJob.datafeed_config.query_delay) { - const interval = parseInterval(tempJob.datafeed_config.query_delay); - if (interval !== null) { - const queryDelay = interval.asSeconds(); - if (queryDelay > 60 && queryDelay < 120) { - delete tempJob.datafeed_config.query_delay; - } - } - } - } + // find a job based on the id + getJob(jobId) { + const job = _.find(jobs, (j) => { + return j.job_id === jobId; + }); - return tempJob; - } + return job; + } - updateJob(jobId, job) { - // return the promise chain - return $q.when(ml.updateJob({ jobId, job })) + // use elasticsearch to load basic information on jobs, as used by various result + // dashboards in the Ml plugin. Returned response contains a jobs property, + // which is an array of objects containing id, description, bucketSpanSeconds, detectors + // and detectorDescriptions properties, plus a customUrls key if custom URLs + // have been configured for the job. + getBasicJobInfo() { + return new Promise((resolve, reject) => { + const obj = { success: true, jobs: [] }; + + ml.jobs() .then((resp) => { - console.log('update job', resp); - return { success: true }; - }).catch((err) => { - msgs.error('Could not update job: ' + jobId); - console.log('update job', err); - return { success: false, message: err.message }; + if (resp.jobs && resp.jobs.length > 0) { + obj.jobs = processBasicJobInfo(this, resp.jobs); + } + resolve(obj); + }) + .catch((resp) => { + console.log('getBasicJobInfo error getting list of jobs:', resp); + reject(resp); }); - } - validateJob(obj) { - // return the promise chain - return $q.when(ml.validateJob(obj)) - .then((messages) => { - console.log('validate job', messages); - return { success: true, messages }; - }).catch((err) => { - msgs.error('Job Validation Error: ' + err.message); - console.log('validate job', err); - return { - success: false, - messages: [{ - status: 'error', - text: err.message - }] - }; + }); + } + + // Obtains the list of fields by which record level results may be viewed for all + // the jobs that have been created. Essentially this is the list of unique 'by', + // 'over' and 'partition' fields that have been defined across all the detectors for + // a job, although for detectors with both 'by' and 'over' fields, the 'by' field name + // is not returned since this field is not added to the top-level record fields. + // Returned response contains a fieldsByJob property, with job ID keys + // against an array of the field names by which record type results may be viewed + // for that job. + // Contains an addition '*' key which holds an array of the + // unique fields across all jobs. + getJobViewByFields() { + return new Promise((resolve, reject) => { + const obj = { success: true, fieldsByJob: { '*': [] } }; + + ml.jobs() + .then(function (resp) { + if (resp.jobs && resp.jobs.length > 0) { + _.each(resp.jobs, (jobObj) => { + // Add the list of distinct by, over and partition fields for each job. + const fieldsForJob = []; + + const analysisConfig = jobObj.analysis_config; + const detectors = analysisConfig.detectors || []; + _.each(detectors, (detector) => { + if (_.has(detector, 'partition_field_name')) { + fieldsForJob.push(detector.partition_field_name); + } + if (_.has(detector, 'over_field_name')) { + fieldsForJob.push(detector.over_field_name); + } + // For jobs with by and over fields, don't add the 'by' field as this + // field will only be added to the top-level fields for record type results + // if it also an influencer over the bucket. + if (_.has(detector, 'by_field_name') && !(_.has(detector, 'over_field_name'))) { + fieldsForJob.push(detector.by_field_name); + } + }); + + obj.fieldsByJob[jobObj.job_id] = _.uniq(fieldsForJob); + obj.fieldsByJob['*'] = _.union(obj.fieldsByJob['*'], obj.fieldsByJob[jobObj.job_id]); + }); + + // Sort fields alphabetically. + _.each(obj.fieldsByJob, (fields, jobId)=> { + obj.fieldsByJob[jobId] = _.sortBy(fields, (field) => { + return field.toLowerCase(); + }); + }); + } + + resolve(obj); + + }) + .catch((resp) => { + console.log('getJobViewByFields error getting list of viewBy fields:', resp); + reject(resp); }); - } - // find a job based on the id - getJob(jobId) { - const job = _.find(jobs, (j) => { - return j.job_id === jobId; - }); + }); + } - return job; - } + searchPreview(job) { + return new Promise((resolve, reject) => { - // use elasticsearch to load basic information on jobs, as used by various result - // dashboards in the Ml plugin. Returned response contains a jobs property, - // which is an array of objects containing id, description, bucketSpanSeconds, detectors - // and detectorDescriptions properties, plus a customUrls key if custom URLs - // have been configured for the job. - getBasicJobInfo() { - return $q((resolve, reject) => { - const obj = { success: true, jobs: [] }; + if (job.datafeed_config) { - ml.jobs() - .then((resp) => { - if (resp.jobs && resp.jobs.length > 0) { - obj.jobs = processBasicJobInfo(this, resp.jobs); - } - resolve(obj); - }) - .catch((resp) => { - console.log('getBasicJobInfo error getting list of jobs:', resp); - reject(resp); - }); + // if query is set, add it to the search, otherwise use match_all + let query = { 'match_all': {} }; + if (job.datafeed_config.query) { + query = job.datafeed_config.query; + } - }); - } - // Obtains the list of fields by which record level results may be viewed for all - // the jobs that have been created. Essentially this is the list of unique 'by', - // 'over' and 'partition' fields that have been defined across all the detectors for - // a job, although for detectors with both 'by' and 'over' fields, the 'by' field name - // is not returned since this field is not added to the top-level record fields. - // Returned response contains a fieldsByJob property, with job ID keys - // against an array of the field names by which record type results may be viewed - // for that job. - // Contains an addition '*' key which holds an array of the - // unique fields across all jobs. - getJobViewByFields() { - return $q((resolve, reject) => { - const obj = { success: true, fieldsByJob: { '*': [] } }; - - ml.jobs() - .then(function (resp) { - if (resp.jobs && resp.jobs.length > 0) { - _.each(resp.jobs, (jobObj) => { - // Add the list of distinct by, over and partition fields for each job. - const fieldsForJob = []; - - const analysisConfig = jobObj.analysis_config; - const detectors = analysisConfig.detectors || []; - _.each(detectors, (detector) => { - if (_.has(detector, 'partition_field_name')) { - fieldsForJob.push(detector.partition_field_name); + // Get bucket span + // Get first doc time for datafeed + // Create a new query - must user query and must range query. + // Time range 'to' first doc time plus < 10 buckets + + // Do a preliminary search to get the date of the earliest doc matching the + // query in the datafeed. This will be used to apply a time range criteria + // on the datafeed search preview. + // This time filter is required for datafeed searches using aggregations to ensure + // the search does not create too many buckets (default 10000 max_bucket limit), + // but apply it to searches without aggregations too for consistency. + ml.getTimeFieldRange({ + index: job.datafeed_config.indices, + timeFieldName: job.data_description.time_field, + query + }) + .then((timeRange) => { + const bucketSpan = parseInterval(job.analysis_config.bucket_span); + const earliestMs = timeRange.start.epoch; + const latestMs = +timeRange.start.epoch + (10 * bucketSpan.asMilliseconds()); + + const body = { + query: { + bool: { + must: [ + { + range: { + [job.data_description.time_field]: { + gte: earliestMs, + lt: latestMs, + format: 'epoch_millis' + } + } + }, + query + ] + } + } + }; + + // if aggs or aggregations is set, add it to the search + const aggregations = job.datafeed_config.aggs || job.datafeed_config.aggregations; + if (aggregations && Object.keys(aggregations).length) { + body.size = 0; + body.aggregations = aggregations; + + // add script_fields if present + const scriptFields = job.datafeed_config.script_fields; + if (scriptFields && Object.keys(scriptFields).length) { + body.script_fields = scriptFields; + } + + } else { + // if aggregations is not set and retrieveWholeSource is not set, add all of the fields from the job + body.size = ML_DATA_PREVIEW_COUNT; + + // add script_fields if present + const scriptFields = job.datafeed_config.script_fields; + if (scriptFields && Object.keys(scriptFields).length) { + body.script_fields = scriptFields; + } + + const fields = {}; + + // get fields from detectors + if (job.analysis_config.detectors) { + _.each(job.analysis_config.detectors, (dtr) => { + if (dtr.by_field_name) { + fields[dtr.by_field_name] = {}; + } + if (dtr.field_name) { + fields[dtr.field_name] = {}; } - if (_.has(detector, 'over_field_name')) { - fieldsForJob.push(detector.over_field_name); + if (dtr.over_field_name) { + fields[dtr.over_field_name] = {}; } - // For jobs with by and over fields, don't add the 'by' field as this - // field will only be added to the top-level fields for record type results - // if it also an influencer over the bucket. - if (_.has(detector, 'by_field_name') && !(_.has(detector, 'over_field_name'))) { - fieldsForJob.push(detector.by_field_name); + if (dtr.partition_field_name) { + fields[dtr.partition_field_name] = {}; } }); + } - obj.fieldsByJob[jobObj.job_id] = _.uniq(fieldsForJob); - obj.fieldsByJob['*'] = _.union(obj.fieldsByJob['*'], obj.fieldsByJob[jobObj.job_id]); - }); - - // Sort fields alphabetically. - _.each(obj.fieldsByJob, (fields, jobId)=> { - obj.fieldsByJob[jobId] = _.sortBy(fields, (field) => { - return field.toLowerCase(); + // get fields from influencers + if (job.analysis_config.influencers) { + _.each(job.analysis_config.influencers, (inf) => { + fields[inf] = {}; }); - }); - } + } - resolve(obj); + // get fields from categorizationFieldName + if (job.analysis_config.categorization_field_name) { + fields[job.analysis_config.categorization_field_name] = {}; + } - }) - .catch((resp) => { - console.log('getJobViewByFields error getting list of viewBy fields:', resp); - reject(resp); - }); + // get fields from summary_count_field_name + if (job.analysis_config.summary_count_field_name) { + fields[job.analysis_config.summary_count_field_name] = {}; + } - }); - } + // get fields from time_field + if (job.data_description.time_field) { + fields[job.data_description.time_field] = {}; + } - // search to load a few records to extract the time field - searchTimeFields(index, type, field) { - return $q((resolve, reject) => { - const obj = { time: '' }; - - es.search({ - method: 'GET', - index: index, - type: type, - size: 1, - _source: field, - }) - .then((resp) => { - if (resp.hits.total !== 0 && resp.hits.hits.length) { - const hit = resp.hits.hits[0]; - if (hit._source && hit._source[field]) { - obj.time = hit._source[field]; + // console.log('fields: ', fields); + const fieldsList = Object.keys(fields); + if (fieldsList.length) { + body._source = fieldsList; } } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - searchPreview(job) { - return $q((resolve, reject) => { + const data = { + index: job.datafeed_config.indices, + body + }; - if (job.datafeed_config) { - - // if query is set, add it to the search, otherwise use match_all - let query = { 'match_all': {} }; - if (job.datafeed_config.query) { - query = job.datafeed_config.query; - } + ml.esSearch(data) + .then((resp) => { + resolve(resp); + }) + .catch((resp) => { + reject(resp); + }); - // Get bucket span - // Get first doc time for datafeed - // Create a new query - must user query and must range query. - // Time range 'to' first doc time plus < 10 buckets - - // Do a preliminary search to get the date of the earliest doc matching the - // query in the datafeed. This will be used to apply a time range criteria - // on the datafeed search preview. - // This time filter is required for datafeed searches using aggregations to ensure - // the search does not create too many buckets (default 10000 max_bucket limit), - // but apply it to searches without aggregations too for consistency. - ml.getTimeFieldRange({ - index: job.datafeed_config.indices, - timeFieldName: job.data_description.time_field, - query }) - .then((timeRange) => { - const bucketSpan = parseInterval(job.analysis_config.bucket_span); - const earliestMs = timeRange.start.epoch; - const latestMs = +timeRange.start.epoch + (10 * bucketSpan.asMilliseconds()); - - const body = { - query: { - bool: { - must: [ - { - range: { - [job.data_description.time_field]: { - gte: earliestMs, - lt: latestMs, - format: 'epoch_millis' - } - } - }, - query - ] - } - } - }; - - // if aggs or aggregations is set, add it to the search - const aggregations = job.datafeed_config.aggs || job.datafeed_config.aggregations; - if (aggregations && Object.keys(aggregations).length) { - body.size = 0; - body.aggregations = aggregations; - - // add script_fields if present - const scriptFields = job.datafeed_config.script_fields; - if (scriptFields && Object.keys(scriptFields).length) { - body.script_fields = scriptFields; - } - - } else { - // if aggregations is not set and retrieveWholeSource is not set, add all of the fields from the job - body.size = ML_DATA_PREVIEW_COUNT; - - // add script_fields if present - const scriptFields = job.datafeed_config.script_fields; - if (scriptFields && Object.keys(scriptFields).length) { - body.script_fields = scriptFields; - } - - const fields = {}; - - // get fields from detectors - if (job.analysis_config.detectors) { - _.each(job.analysis_config.detectors, (dtr) => { - if (dtr.by_field_name) { - fields[dtr.by_field_name] = {}; - } - if (dtr.field_name) { - fields[dtr.field_name] = {}; - } - if (dtr.over_field_name) { - fields[dtr.over_field_name] = {}; - } - if (dtr.partition_field_name) { - fields[dtr.partition_field_name] = {}; - } - }); - } - - // get fields from influencers - if (job.analysis_config.influencers) { - _.each(job.analysis_config.influencers, (inf) => { - fields[inf] = {}; - }); - } + .catch((resp) => { + reject(resp); + }); - // get fields from categorizationFieldName - if (job.analysis_config.categorization_field_name) { - fields[job.analysis_config.categorization_field_name] = {}; - } - // get fields from summary_count_field_name - if (job.analysis_config.summary_count_field_name) { - fields[job.analysis_config.summary_count_field_name] = {}; - } + } - // get fields from time_field - if (job.data_description.time_field) { - fields[job.data_description.time_field] = {}; - } + }); + } - // console.log('fields: ', fields); - const fieldsList = Object.keys(fields); - if (fieldsList.length) { - body._source = fieldsList; - } - } + openJob(jobId) { + return ml.openJob({ jobId }); + } - const data = { - index: job.datafeed_config.indices, - body - }; - - es.search(data) - .then((resp) => { - resolve(resp); - }) - .catch((resp) => { - reject(resp); - }); + closeJob(jobId) { + return ml.closeJob({ jobId }); + } + forceCloseJob(jobId) { + return ml.forceCloseJob({ jobId }); + } - }) - .catch((resp) => { - reject(resp); - }); + saveNewDatafeed(datafeedConfig, jobId) { + const datafeedId = `datafeed-${jobId}`; + datafeedConfig.job_id = jobId; - } + return ml.addDatafeed({ + datafeedId, + datafeedConfig + }); + } + updateDatafeed(datafeedId, datafeedConfig) { + return ml.updateDatafeed({ datafeedId, datafeedConfig }) + .then((resp) => { + console.log('update datafeed', resp); + return { success: true }; + }) + .catch((err) => { + msgs.error('Could not update datafeed: ' + datafeedId); + console.log('update datafeed', err); + return { success: false, message: err.message }; }); - } - - openJob(jobId) { - return $q.when(ml.openJob({ jobId })); - } + } - closeJob(jobId) { - return $q.when(ml.closeJob({ jobId })); - } + deleteDatafeed() { - forceCloseJob(jobId) { - return $q.when(ml.forceCloseJob({ jobId })); - } + } + // start the datafeed for a given job + // refresh the job state on start success + startDatafeed(datafeedId, jobId, start, end) { + return new Promise((resolve, reject) => { - saveNewDatafeed(datafeedConfig, jobId) { - const datafeedId = `datafeed-${jobId}`; - datafeedConfig.job_id = jobId; + // if the end timestamp is a number, add one ms to it to make it + // inclusive of the end of the data + if (_.isNumber(end)) { + end++; + } - return $q.when(ml.addDatafeed({ + ml.startDatafeed({ datafeedId, - datafeedConfig - })); - } - - updateDatafeed(datafeedId, datafeedConfig) { - return $q.when(ml.updateDatafeed({ datafeedId, datafeedConfig })) + start, + end + }) .then((resp) => { - console.log('update datafeed', resp); - return { success: true }; + resolve(resp); }) .catch((err) => { - msgs.error('Could not update datafeed: ' + datafeedId); - console.log('update datafeed', err); - return { success: false, message: err.message }; + console.log('jobService error starting datafeed:', err); + msgs.error('Could not start datafeed for ' + jobId, err); + reject(err); }); - } - - deleteDatafeed() { - - } - - // start the datafeed for a given job - // refresh the job state on start success - startDatafeed(datafeedId, jobId, start, end) { - return $q((resolve, reject) => { - - // if the end timestamp is a number, add one ms to it to make it - // inclusive of the end of the data - if (_.isNumber(end)) { - end++; - } + }); + } - ml.startDatafeed({ - datafeedId, - start, - end + // stop the datafeed for a given job + // refresh the job state on stop success + stopDatafeed(datafeedId, jobId) { + return new Promise((resolve, reject) => { + ml.stopDatafeed({ + datafeedId + }) + .then((resp) => { + resolve(resp); }) - .then((resp) => { - resolve(resp); - }) - .catch((err) => { - console.log('jobService error starting datafeed:', err); - msgs.error('Could not start datafeed for ' + jobId, err); - reject(err); - }); - }); - } + .catch((err) => { + console.log('jobService error stopping datafeed:', err); + if (err.statusCode === 500) { + msgs.error('Could not stop datafeed for ' + jobId); + msgs.error('Request may have timed out and may still be running in the background.'); + } else { + msgs.error('Could not stop datafeed for ' + jobId, err); + } + reject(err); + }); + }); + } - // stop the datafeed for a given job - // refresh the job state on stop success - stopDatafeed(datafeedId, jobId) { - return $q((resolve, reject) => { - ml.stopDatafeed({ - datafeedId - }) + validateDetector(detector) { + return new Promise((resolve, reject) => { + if (detector) { + ml.validateDetector({ detector }) .then((resp) => { resolve(resp); }) - .catch((err) => { - console.log('jobService error stopping datafeed:', err); - if (err.statusCode === 500) { - msgs.error('Could not stop datafeed for ' + jobId); - msgs.error('Request may have timed out and may still be running in the background.'); - } else { - msgs.error('Could not stop datafeed for ' + jobId, err); - } - reject(err); + .catch((resp) => { + reject(resp); }); - }); - } - - validateDetector(detector) { - return $q((resolve, reject) => { - if (detector) { - ml.validateDetector({ detector }) - .then((resp) => { - resolve(resp); - }) - .catch((resp) => { - reject(resp); - }); - } else { - reject({}); - } - }); - } - - getDatafeedId(jobId) { - let datafeedId = datafeedIds[jobId]; - if (datafeedId === undefined) { - datafeedId = `datafeed-${jobId}`; + } else { + reject({}); } - return datafeedId; - } - - getDatafeedPreview(jobId) { - const datafeedId = this.getDatafeedId(jobId); - return $q.when(ml.datafeedPreview({ datafeedId })); - } - - // get the list of job group ids as well as how many jobs are in each group - getJobGroups() { - const groups = []; - const tempGroups = {}; - this.jobs.forEach(job => { - if (Array.isArray(job.groups)) { - job.groups.forEach(group => { - if (tempGroups[group] === undefined) { - tempGroups[group] = [job]; - } else { - tempGroups[group].push(job); - } - }); - } - }); - _.each(tempGroups, (js, id) => { - groups.push({ id, jobs: js }); - }); - return groups; - } + }); } - // private function used to check the job saving response - function checkSaveResponse(resp, origJob) { - if (resp) { - if (resp.job_id) { - if (resp.job_id === origJob.job_id) { - console.log('checkSaveResponse(): save successful'); - return true; - } - } else { - if (resp.errorCode) { - console.log('checkSaveResponse(): save failed', resp); - return false; - } - } - } else { - console.log('checkSaveResponse(): response is empty'); - return false; + getDatafeedId(jobId) { + let datafeedId = datafeedIds[jobId]; + if (datafeedId === undefined) { + datafeedId = `datafeed-${jobId}`; } + return datafeedId; } - function processBasicJobInfo(localJobService, jobsList) { - // Process the list of job data obtained from the jobs endpoint to return - // an array of objects containing the basic information (id, description, bucketSpan, detectors - // and detectorDescriptions properties, plus a customUrls key if custom URLs - // have been configured for the job) used by various result dashboards in the ml plugin. - // The key information is stored in the jobService object for quick access. - const processedJobsList = []; - let detectorDescriptionsByJob = {}; - const detectorsByJob = {}; - const customUrlsByJob = {}; - - // use cloned copy of jobs list so not to alter the original - const jobsListCopy = _.cloneDeep(jobsList); - - _.each(jobsListCopy, (jobObj) => { - const analysisConfig = jobObj.analysis_config; - const bucketSpan = parseInterval(analysisConfig.bucket_span); - - const job = { - id: jobObj.job_id, - bucketSpanSeconds: bucketSpan.asSeconds() - }; - - if (_.has(jobObj, 'description') && /^\s*$/.test(jobObj.description) === false) { - job.description = jobObj.description; - } else { - // Just use the id as the description. - job.description = jobObj.job_id; - } - - job.detectorDescriptions = []; - job.detectors = []; - const detectors = _.get(analysisConfig, 'detectors', []); - _.each(detectors, (detector)=> { - if (_.has(detector, 'detector_description')) { - job.detectorDescriptions.push(detector.detector_description); - job.detectors.push(detector); - } - }); - + getDatafeedPreview(jobId) { + const datafeedId = this.getDatafeedId(jobId); + return ml.datafeedPreview({ datafeedId }); + } - if (_.has(jobObj, 'custom_settings.custom_urls')) { - job.customUrls = []; - _.each(jobObj.custom_settings.custom_urls, (url) => { - if (_.has(url, 'url_name') && _.has(url, 'url_value') && isWebUrl(url.url_value)) { - // Only make web URLs (i.e. http or https) available in dashboard drilldowns. - job.customUrls.push(url); + // get the list of job group ids as well as how many jobs are in each group + getJobGroups() { + const groups = []; + const tempGroups = {}; + this.jobs.forEach(job => { + if (Array.isArray(job.groups)) { + job.groups.forEach(group => { + if (tempGroups[group] === undefined) { + tempGroups[group] = [job]; + } else { + tempGroups[group].push(job); } }); - // Only add an entry for a job if customUrls have been defined. - if (job.customUrls.length > 0) { - customUrlsByJob[job.id] = job.customUrls; - } } - - localJobService.jobDescriptions[job.id] = job.description; - detectorDescriptionsByJob[job.id] = job.detectorDescriptions; - detectorsByJob[job.id] = job.detectors; - localJobService.basicJobs[job.id] = job; - processedJobsList.push(job); }); - - detectorDescriptionsByJob = labelDuplicateDetectorDescriptions(detectorDescriptionsByJob); - _.each(detectorsByJob, (dtrs, jobId) => { - _.each(dtrs, (dtr, i) => { - dtr.detector_description = detectorDescriptionsByJob[jobId][i]; - }); + _.each(tempGroups, (js, id) => { + groups.push({ id, jobs: js }); }); - localJobService.detectorsByJob = detectorsByJob; - localJobService.customUrlsByJob = customUrlsByJob; - - return processedJobsList; + return groups; } +} - // Loop through the jobs list and create basic stats - // stats are displayed along the top of the Jobs Management page - function createJobStats(jobsList, jobStats) { - - jobStats.activeNodes.value = 0; - jobStats.total.value = 0; - jobStats.open.value = 0; - jobStats.closed.value = 0; - jobStats.failed.value = 0; - jobStats.activeDatafeeds.value = 0; - - // object to keep track of nodes being used by jobs - const mlNodes = {}; - let failedJobs = 0; - - _.each(jobsList, (job) => { - if (job.state === 'opened') { - jobStats.open.value++; - } else if (job.state === 'closed') { - jobStats.closed.value++; - } else if (job.state === 'failed') { - failedJobs++; +// private function used to check the job saving response +function checkSaveResponse(resp, origJob) { + if (resp) { + if (resp.job_id) { + if (resp.job_id === origJob.job_id) { + console.log('checkSaveResponse(): save successful'); + return true; } + } else { + if (resp.errorCode) { + console.log('checkSaveResponse(): save failed', resp); + return false; + } + } + } else { + console.log('checkSaveResponse(): response is empty'); + return false; + } +} - if (job.datafeed_config && job.datafeed_config.state === 'started') { - jobStats.activeDatafeeds.value++; +function processBasicJobInfo(localJobService, jobsList) { + // Process the list of job data obtained from the jobs endpoint to return + // an array of objects containing the basic information (id, description, bucketSpan, detectors + // and detectorDescriptions properties, plus a customUrls key if custom URLs + // have been configured for the job) used by various result dashboards in the ml plugin. + // The key information is stored in the jobService object for quick access. + const processedJobsList = []; + let detectorDescriptionsByJob = {}; + const detectorsByJob = {}; + const customUrlsByJob = {}; + + // use cloned copy of jobs list so not to alter the original + const jobsListCopy = _.cloneDeep(jobsList); + + _.each(jobsListCopy, (jobObj) => { + const analysisConfig = jobObj.analysis_config; + const bucketSpan = parseInterval(analysisConfig.bucket_span); + + const job = { + id: jobObj.job_id, + bucketSpanSeconds: bucketSpan.asSeconds() + }; + + if (_.has(jobObj, 'description') && /^\s*$/.test(jobObj.description) === false) { + job.description = jobObj.description; + } else { + // Just use the id as the description. + job.description = jobObj.job_id; + } + + job.detectorDescriptions = []; + job.detectors = []; + const detectors = _.get(analysisConfig, 'detectors', []); + _.each(detectors, (detector)=> { + if (_.has(detector, 'detector_description')) { + job.detectorDescriptions.push(detector.detector_description); + job.detectors.push(detector); } + }); + - if (job.node && job.node.name) { - mlNodes[job.node.name] = {}; + if (_.has(jobObj, 'custom_settings.custom_urls')) { + job.customUrls = []; + _.each(jobObj.custom_settings.custom_urls, (url) => { + if (_.has(url, 'url_name') && _.has(url, 'url_value') && isWebUrl(url.url_value)) { + // Only make web URLs (i.e. http or https) available in dashboard drilldowns. + job.customUrls.push(url); + } + }); + // Only add an entry for a job if customUrls have been defined. + if (job.customUrls.length > 0) { + customUrlsByJob[job.id] = job.customUrls; } + } + + localJobService.jobDescriptions[job.id] = job.description; + detectorDescriptionsByJob[job.id] = job.detectorDescriptions; + detectorsByJob[job.id] = job.detectors; + localJobService.basicJobs[job.id] = job; + processedJobsList.push(job); + }); + + detectorDescriptionsByJob = labelDuplicateDetectorDescriptions(detectorDescriptionsByJob); + _.each(detectorsByJob, (dtrs, jobId) => { + _.each(dtrs, (dtr, i) => { + dtr.detector_description = detectorDescriptionsByJob[jobId][i]; }); + }); + localJobService.detectorsByJob = detectorsByJob; + localJobService.customUrlsByJob = customUrlsByJob; - jobStats.total.value = jobsList.length; + return processedJobsList; +} - // // Only show failed jobs if it is non-zero - if (failedJobs) { - jobStats.failed.value = failedJobs; - jobStats.failed.show = true; - } else { - jobStats.failed.show = false; +// Loop through the jobs list and create basic stats +// stats are displayed along the top of the Jobs Management page +function createJobStats(jobsList, jobStats) { + + jobStats.activeNodes.value = 0; + jobStats.total.value = 0; + jobStats.open.value = 0; + jobStats.closed.value = 0; + jobStats.failed.value = 0; + jobStats.activeDatafeeds.value = 0; + + // object to keep track of nodes being used by jobs + const mlNodes = {}; + let failedJobs = 0; + + _.each(jobsList, (job) => { + if (job.state === 'opened') { + jobStats.open.value++; + } else if (job.state === 'closed') { + jobStats.closed.value++; + } else if (job.state === 'failed') { + failedJobs++; } - jobStats.activeNodes.value = Object.keys(mlNodes).length; - } + if (job.datafeed_config && job.datafeed_config.state === 'started') { + jobStats.activeDatafeeds.value++; + } - function createJobUrls(jobsList, jobUrls) { - _.each(jobsList, (job) => { - if (job.data_counts) { - const from = moment(job.data_counts.earliest_record_timestamp).toISOString(); - const to = moment(job.data_counts.latest_record_timestamp).toISOString(); - let path = `?_g=(ml:(jobIds:!('${job.job_id}'))`; - path += `,refreshInterval:(display:Off,pause:!f,value:0),time:(from:'${from}'`; - path += `,mode:absolute,to:'${to}'`; - path += '))&_a=(filters:!(),query:(query_string:(analyze_wildcard:!t,query:\'*\')))'; - - if (jobUrls[job.job_id]) { - jobUrls[job.job_id].url = path; - } else { - jobUrls[job.job_id] = { url: path }; - } - } - }); - } + if (job.node && job.node.name) { + mlNodes[job.node.name] = {}; + } + }); + + jobStats.total.value = jobsList.length; - if (jobService === undefined) { - jobService = new JobService(); + // // Only show failed jobs if it is non-zero + if (failedJobs) { + jobStats.failed.value = failedJobs; + jobStats.failed.show = true; + } else { + jobStats.failed.show = false; } - return jobService; + + jobStats.activeNodes.value = Object.keys(mlNodes).length; } + +function createJobUrls(jobsList, jobUrls) { + _.each(jobsList, (job) => { + if (job.data_counts) { + const from = moment(job.data_counts.earliest_record_timestamp).toISOString(); + const to = moment(job.data_counts.latest_record_timestamp).toISOString(); + let path = `?_g=(ml:(jobIds:!('${job.job_id}'))`; + path += `,refreshInterval:(display:Off,pause:!f,value:0),time:(from:'${from}'`; + path += `,mode:absolute,to:'${to}'`; + path += '))&_a=(filters:!(),query:(query_string:(analyze_wildcard:!t,query:\'*\')))'; + + if (jobUrls[job.job_id]) { + jobUrls[job.job_id].url = path; + } else { + jobUrls[job.job_id] = { url: path }; + } + } + }); +} + +export const mlJobService = new JobService(); diff --git a/x-pack/plugins/ml/public/services/ml_api_service.js b/x-pack/plugins/ml/public/services/ml_api_service/index.js similarity index 97% rename from x-pack/plugins/ml/public/services/ml_api_service.js rename to x-pack/plugins/ml/public/services/ml_api_service/index.js index 6eb3e357883255..a91cdf258d2d53 100644 --- a/x-pack/plugins/ml/public/services/ml_api_service.js +++ b/x-pack/plugins/ml/public/services/ml_api_service/index.js @@ -9,7 +9,9 @@ import { pick } from 'lodash'; import chrome from 'ui/chrome'; -import { http } from './http_service'; +import { http } from 'plugins/ml/services/http_service'; + +import { results } from './results'; const basePath = chrome.addBasePath('/api/ml'); @@ -394,5 +396,15 @@ export const ml = { method: 'POST', data }); - } + }, + + esSearch(obj) { + return http({ + url: `${basePath}/es_search`, + method: 'POST', + data: obj + }); + }, + + results }; diff --git a/x-pack/plugins/ml/public/services/ml_api_service/results.js b/x-pack/plugins/ml/public/services/ml_api_service/results.js new file mode 100644 index 00000000000000..5f7b76ce268655 --- /dev/null +++ b/x-pack/plugins/ml/public/services/ml_api_service/results.js @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// Service for obtaining data for the ML Results dashboards. + +import chrome from 'ui/chrome'; + +import { http } from 'plugins/ml/services/http_service'; + +const basePath = chrome.addBasePath('/api/ml'); + +export const results = { + getAnomaliesTableData( + jobIds, + criteriaFields, + influencers, + aggregationInterval, + threshold, + earliestMs, + latestMs, + maxRecords, + maxExamples) { + + return http({ + url: `${basePath}/results/anomalies_table_data`, + method: 'POST', + data: { + jobIds, + criteriaFields, + influencers, + aggregationInterval, + threshold, + earliestMs, + latestMs, + maxRecords, + maxExamples + } + }); + }, + + getCategoryDefinition(jobId, categoryId) { + return http({ + url: `${basePath}/results/category_definition`, + method: 'POST', + data: { jobId, categoryId } + }); + }, + + getCategoryExamples( + jobId, + categoryIds, + maxExamples + ) { + + return http({ + url: `${basePath}/results/category_examples`, + method: 'POST', + data: { + jobId, + categoryIds, + maxExamples + } + }); + } +}; diff --git a/x-pack/plugins/ml/public/services/results_service.js b/x-pack/plugins/ml/public/services/results_service.js index 0d64220bfbbaa5..fb13ed381ab301 100644 --- a/x-pack/plugins/ml/public/services/results_service.js +++ b/x-pack/plugins/ml/public/services/results_service.js @@ -12,101 +12,376 @@ import _ from 'lodash'; import { ML_MEDIAN_PERCENTS } from 'plugins/ml/../common/util/job_utils'; import { escapeForElasticsearchQuery } from 'plugins/ml/util/string_utils'; -import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/constants/index_patterns'; +import { ML_RESULTS_INDEX_PATTERN } from 'plugins/ml/../common/constants/index_patterns'; import { ml } from 'plugins/ml/services/ml_api_service'; -export function ResultsServiceProvider($q, es) { + // Obtains the maximum bucket anomaly scores by job ID and time. // Pass an empty array or ['*'] to search over all job IDs. // Returned response contains a results property, with a key for job // which has results for the specified time range. - function getScoresByBucket(jobIds, earliestMs, latestMs, interval, maxResults) { - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; +function getScoresByBucket(jobIds, earliestMs, latestMs, interval, maxResults) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the time range plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } + } + } + ]; + + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the time range plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [{ + query_string: { + query: 'result_type:bucket', + analyze_wildcard: false + } + }, { + bool: { + must: boolCriteria + } + }] + } + }, + aggs: { + jobId: { + terms: { + field: 'job_id', + size: maxResults !== undefined ? maxResults : 5, + order: { + anomalyScore: 'desc' + } + }, + aggs: { + anomalyScore: { + max: { + field: 'anomaly_score' + } + }, + byTime: { + date_histogram: { + field: 'timestamp', + interval: interval, + min_doc_count: 1, + extended_bounds: { + min: earliestMs, + max: latestMs + } + }, + aggs: { + anomalyScore: { + max: { + field: 'anomaly_score' + } + } + } + } } } } - ]; + } + }) + .then((resp) => { + const dataByJobId = _.get(resp, ['aggregations', 'jobId', 'buckets'], []); + _.each(dataByJobId, (dataForJob) => { + const jobId = dataForJob.key; - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; - } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; + const resultsForTime = {}; + + const dataByTime = _.get(dataForJob, ['byTime', 'buckets'], []); + _.each(dataByTime, (dataForTime) => { + const value = _.get(dataForTime, ['anomalyScore', 'value']); + if (value !== undefined) { + const time = dataForTime.key; + resultsForTime[time] = _.get(dataForTime, ['anomalyScore', 'value']); + } + }); + obj.results[jobId] = resultsForTime; }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr + + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} + +// Obtains a list of scheduled events by job ID and time. +// Pass an empty array or ['*'] to search over all job IDs. +// Returned response contains a events property, which will only +// contains keys for jobs which have scheduled events for the specified time range. +function getScheduledEventsByBucket( + jobIds, + earliestMs, + latestMs, + interval, + maxJobs, + maxEvents) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + events: {} + }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the time range plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } + } + }, + { + exists: { field: 'scheduled_events' } + } + ]; + + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + jobIdFilterStr += `${i > 0 ? ' OR ' : ''}job_id:${jobId}`; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [{ + query_string: { + query: 'result_type:bucket', + analyze_wildcard: false + } + }, { + bool: { + must: boolCriteria + } + }] + } + }, + aggs: { + jobs: { + terms: { + field: 'job_id', + min_doc_count: 1, + size: maxJobs + }, + aggs: { + times: { + date_histogram: { + field: 'timestamp', + interval: interval, + min_doc_count: 1 + }, + aggs: { + events: { + terms: { + field: 'scheduled_events', + size: maxEvents + } + } + } + } + } } + } + } + }) + .then((resp) => { + const dataByJobId = _.get(resp, ['aggregations', 'jobs', 'buckets'], []); + _.each(dataByJobId, (dataForJob) => { + const jobId = dataForJob.key; + const resultsForTime = {}; + const dataByTime = _.get(dataForJob, ['times', 'buckets'], []); + _.each(dataByTime, (dataForTime) => { + const time = dataForTime.key; + const events = _.get(dataForTime, ['events', 'buckets']); + resultsForTime[time] = _.map(events, 'key'); + }); + obj.events[jobId] = resultsForTime; }); + + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} + + +// Obtains the top influencers, by maximum influencer score, for the specified index, time range and job ID(s). +// Pass an empty array or ['*'] to search over all job IDs. +// An optional array of influencers may be supplied, with each object in the array having 'fieldName' +// and 'fieldValue' properties, to limit data to the supplied list of influencers. +// Returned response contains an influencers property, with a key for each of the influencer field names, +// whose value is an array of objects containing influencerFieldValue, maxAnomalyScore and sumAnomalyScore keys. +function getTopInfluencers( + jobIds, + earliestMs, + latestMs, + maxFieldValues = 10, + influencers = []) { + return new Promise((resolve, reject) => { + const obj = { success: true, influencers: {} }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the time range plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } + } + }, + { + range: { + influencer_score: { + gt: 0 + } + } } + ]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [{ + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + // Add a should query to filter for each of the specified influencers. + if (influencers.length > 0) { + boolCriteria.push({ + bool: { + should: influencers.map((influencer) => { + return { + bool: { + must: [ + { term: { influencer_field_name: influencer.fieldName } }, + { term: { influencer_field_value: influencer.fieldValue } } + ] + } + }; + }), + minimum_should_match: 1, + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [ + { query_string: { - query: 'result_type:bucket', + query: 'result_type:influencer', analyze_wildcard: false } - }, { + }, + { bool: { must: boolCriteria } - }] - } - }, - aggs: { - jobId: { - terms: { - field: 'job_id', - size: maxResults !== undefined ? maxResults : 5, - order: { - anomalyScore: 'desc' + } + ] + } + }, + aggs: { + influencerFieldNames: { + terms: { + field: 'influencer_field_name', + size: 5, + order: { + maxAnomalyScore: 'desc' + } + }, + aggs: { + maxAnomalyScore: { + max: { + field: 'influencer_score' } }, - aggs: { - anomalyScore: { - max: { - field: 'anomaly_score' + influencerFieldValues: { + terms: { + field: 'influencer_field_value', + size: maxFieldValues, + order: { + maxAnomalyScore: 'desc' } }, - byTime: { - date_histogram: { - field: 'timestamp', - interval: interval, - min_doc_count: 1, - extended_bounds: { - min: earliestMs, - max: latestMs + aggs: { + maxAnomalyScore: { + max: { + field: 'influencer_score' } }, - aggs: { - anomalyScore: { - max: { - field: 'anomaly_score' - } + sumAnomalyScore: { + sum: { + field: 'influencer_score' } } } @@ -114,242 +389,283 @@ export function ResultsServiceProvider($q, es) { } } } - }) - .then((resp) => { - const dataByJobId = _.get(resp, ['aggregations', 'jobId', 'buckets'], []); - _.each(dataByJobId, (dataForJob) => { - const jobId = dataForJob.key; - - const resultsForTime = {}; - - const dataByTime = _.get(dataForJob, ['byTime', 'buckets'], []); - _.each(dataByTime, (dataForTime) => { - const value = _.get(dataForTime, ['anomalyScore', 'value']); - if (value !== undefined) { - const time = dataForTime.key; - resultsForTime[time] = _.get(dataForTime, ['anomalyScore', 'value']); - } - }); - obj.results[jobId] = resultsForTime; + } + }) + .then((resp) => { + const fieldNameBuckets = _.get(resp, ['aggregations', 'influencerFieldNames', 'buckets'], []); + _.each(fieldNameBuckets, (nameBucket) => { + const fieldName = nameBucket.key; + const fieldValues = []; + + const fieldValueBuckets = _.get(nameBucket, ['influencerFieldValues', 'buckets'], []); + _.each(fieldValueBuckets, (valueBucket) => { + const fieldValueResult = { + influencerFieldValue: valueBucket.key, + maxAnomalyScore: valueBucket.maxAnomalyScore.value, + sumAnomalyScore: valueBucket.sumAnomalyScore.value + }; + fieldValues.push(fieldValueResult); }); - resolve(obj); - }) - .catch((resp) => { - reject(resp); + obj.influencers[fieldName] = fieldValues; }); - }); - } - - // Obtains a list of scheduled events by job ID and time. - // Pass an empty array or ['*'] to search over all job IDs. - // Returned response contains a events property, which will only - // contains keys for jobs which have scheduled events for the specified time range. - function getScheduledEventsByBucket( - jobIds, - earliestMs, - latestMs, - interval, - maxJobs, - maxEvents) { - return $q((resolve, reject) => { - const obj = { - success: true, - events: {} - }; - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the time range plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } - } - }, - { - exists: { field: 'scheduled_events' } - } - ]; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - jobIdFilterStr += `${i > 0 ? ' OR ' : ''}job_id:${jobId}`; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr - } - }); +// Obtains the top influencer field values, by maximum anomaly score, for a +// particular index, field name and job ID(s). +// Pass an empty array or ['*'] to search over all job IDs. +// Returned response contains a results property, which is an array of objects +// containing influencerFieldValue, maxAnomalyScore and sumAnomalyScore keys. +function getTopInfluencerValues(jobIds, influencerFieldName, earliestMs, latestMs, maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: [] }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the time range plus any specified job IDs. + const boolCriteria = [{ + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } } + }]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [{ + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [ + { query_string: { - query: 'result_type:bucket', + query: `result_type:influencer AND influencer_field_name: ${escapeForElasticsearchQuery(influencerFieldName)}`, analyze_wildcard: false } - }, { + }, + { bool: { must: boolCriteria } - }] - } - }, - aggs: { - jobs: { - terms: { - field: 'job_id', - min_doc_count: 1, - size: maxJobs + } + ] + } + }, + aggs: { + influencerFieldValues: { + terms: { + field: 'influencer_field_value', + size: maxResults !== undefined ? maxResults : 2, + order: { + maxAnomalyScore: 'desc' + } + }, + aggs: { + maxAnomalyScore: { + max: { + field: 'influencer_score' + } }, - aggs: { - times: { - date_histogram: { - field: 'timestamp', - interval: interval, - min_doc_count: 1 - }, - aggs: { - events: { - terms: { - field: 'scheduled_events', - size: maxEvents - } - } - } + sumAnomalyScore: { + sum: { + field: 'influencer_score' } } } } } + } + }) + .then((resp) => { + const buckets = _.get(resp, ['aggregations', 'influencerFieldValues', 'buckets'], []); + _.each(buckets, (bucket) => { + const result = { + influencerFieldValue: bucket.key, + maxAnomalyScore: bucket.maxAnomalyScore.value, + sumAnomalyScore: bucket.sumAnomalyScore.value }; + obj.results.push(result); + }); + + resolve(obj); }) - .then((resp) => { - const dataByJobId = _.get(resp, ['aggregations', 'jobs', 'buckets'], []); - _.each(dataByJobId, (dataForJob) => { - const jobId = dataForJob.key; - const resultsForTime = {}; - const dataByTime = _.get(dataForJob, ['times', 'buckets'], []); - _.each(dataByTime, (dataForTime) => { - const time = dataForTime.key; - const events = _.get(dataForTime, ['events', 'buckets']); - resultsForTime[time] = _.map(events, 'key'); - }); - obj.events[jobId] = resultsForTime; - }); + .catch((resp) => { + reject(resp); + }); + }); +} - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Obtains the top influencers, by maximum influencer score, for the specified index, time range and job ID(s). - // Pass an empty array or ['*'] to search over all job IDs. - // Returned response contains an influencers property, with a key for each of the influencer field names, - // whose value is an array of objects containing influencerFieldValue, maxAnomalyScore and sumAnomalyScore keys. - function getTopInfluencers(jobIds, earliestMs, latestMs, maxFieldNames, maxFieldValues) { - return $q((resolve, reject) => { - const obj = { success: true, influencers: {} }; - - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the time range plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } +// Obtains the overall bucket scores for the specified job ID(s). +// Pass ['*'] to search over all job IDs. +// Returned response contains a results property as an object of max score by time. +function getOverallBucketScores(jobIds, topN, earliestMs, latestMs, interval) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: {} }; + + ml.overallBuckets({ + jobId: jobIds, + topN: topN, + bucketSpan: interval, + start: earliestMs, + end: latestMs + }) + .then(resp => { + const dataByTime = _.get(resp, ['overall_buckets'], []); + _.each(dataByTime, (dataForTime) => { + const value = _.get(dataForTime, ['overall_score']); + if (value !== undefined) { + obj.results[dataForTime.timestamp] = value; } - } - ]; + }); + + resolve(obj); + }) + .catch(resp => { + reject(resp); + }); + }); +} - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; +// Obtains the maximum score by influencer_field_value and by time for the specified job ID(s) +// (pass an empty array or ['*'] to search over all job IDs), and specified influencer field +// values (pass an empty array to search over all field values). +// Returned response contains a results property with influencer field values keyed +// against max score by time. +function getInfluencerValueMaxScoreByTime( + jobIds, + influencerFieldName, + influencerFieldValues, + earliestMs, + latestMs, + interval, + maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: {} }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the time range plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr + } + }, + { + range: { + influencer_score: { + gt: 0 } - }); + } } + ]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [ - { - query_string: { - query: 'result_type:influencer', - analyze_wildcard: false - } - }, - { - bool: { - must: boolCriteria - } + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += `job_id:${jobId}`; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + if (influencerFieldValues && influencerFieldValues.length > 0) { + let influencerFilterStr = ''; + _.each(influencerFieldValues, (value, i) => { + if (i > 0) { + influencerFilterStr += ' OR '; + } + influencerFilterStr += `influencer_field_value:${escapeForElasticsearchQuery(value)}`; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: influencerFilterStr + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [ + { + query_string: { + query: `result_type:influencer AND influencer_field_name: ${escapeForElasticsearchQuery(influencerFieldName)}`, + analyze_wildcard: false } - ] - } - }, - aggs: { - influencerFieldNames: { - terms: { - field: 'influencer_field_name', - size: 5, - order: { - maxAnomalyScore: 'desc' + }, + { + bool: { + must: boolCriteria + } + } + ] + } + }, + aggs: { + influencerFieldValues: { + terms: { + field: 'influencer_field_value', + size: maxResults !== undefined ? maxResults : 10, + order: { + maxAnomalyScore: 'desc' + } + }, + aggs: { + maxAnomalyScore: { + max: { + field: 'influencer_score' } }, - aggs: { - maxAnomalyScore: { - max: { - field: 'influencer_score' - } + byTime: { + date_histogram: { + field: 'timestamp', + interval, + min_doc_count: 1 }, - influencerFieldValues: { - terms: { - field: 'influencer_field_value', - size: maxFieldValues !== undefined ? maxFieldValues : 10, - order: { - maxAnomalyScore: 'desc' - } - }, - aggs: { - maxAnomalyScore: { - max: { - field: 'influencer_score' - } - }, - sumAnomalyScore: { - sum: { - field: 'influencer_score' - } + aggs: { + maxAnomalyScore: { + max: { + field: 'influencer_score' } } } @@ -357,46 +673,60 @@ export function ResultsServiceProvider($q, es) { } } } - }) - .then((resp) => { - const fieldNameBuckets = _.get(resp, ['aggregations', 'influencerFieldNames', 'buckets'], []); - _.each(fieldNameBuckets, (nameBucket) => { - const fieldName = nameBucket.key; - const fieldValues = []; - - const fieldValueBuckets = _.get(nameBucket, ['influencerFieldValues', 'buckets'], []); - _.each(fieldValueBuckets, (valueBucket) => { - const fieldValueResult = { - influencerFieldValue: valueBucket.key, - maxAnomalyScore: valueBucket.maxAnomalyScore.value, - sumAnomalyScore: valueBucket.sumAnomalyScore.value - }; - fieldValues.push(fieldValueResult); - }); - - obj.influencers[fieldName] = fieldValues; + } + }) + .then((resp) => { + const fieldValueBuckets = _.get(resp, ['aggregations', 'influencerFieldValues', 'buckets'], []); + _.each(fieldValueBuckets, (valueBucket) => { + const fieldValue = valueBucket.key; + const fieldValues = {}; + + const timeBuckets = _.get(valueBucket, ['byTime', 'buckets'], []); + _.each(timeBuckets, (timeBucket) => { + const time = timeBucket.key; + const score = timeBucket.maxAnomalyScore.value; + fieldValues[time] = score; }); - resolve(obj); - }) - .catch((resp) => { - reject(resp); + obj.results[fieldValue] = fieldValues; }); - }); - } - - // Obtains the top influencer field values, by maximum anomaly score, for a - // particular index, field name and job ID(s). - // Pass an empty array or ['*'] to search over all job IDs. - // Returned response contains a results property, which is an array of objects - // containing influencerFieldValue, maxAnomalyScore and sumAnomalyScore keys. - function getTopInfluencerValues(jobIds, influencerFieldName, earliestMs, latestMs, maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, results: [] }; - - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the time range plus any specified job IDs. - const boolCriteria = [{ + + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} + +// Queries Elasticsearch to obtain record level results containing the influencers +// for the specified job(s), record score threshold, and time range. +// Pass an empty array or ['*'] to search over all job IDs. +// Returned response contains a records property, with each record containing +// only the fields job_id, detector_index, record_score and influencers. +function getRecordInfluencers(jobIds, threshold, earliestMs, latestMs, maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, records: [] }; + + // Build the criteria to use in the bool filter part of the request. + // Adds criteria for the existence of the nested influencers field, time range, + // record score, plus any specified job IDs. + const boolCriteria = [ + { + nested: { + path: 'influencers', + query: { + bool: { + must: [ + { + exists: { field: 'influencers' } + } + ] + } + } + } + }, + { range: { timestamp: { gte: earliestMs, @@ -404,620 +734,264 @@ export function ResultsServiceProvider($q, es) { format: 'epoch_millis' } } - }]; - - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; + }, + { + range: { + record_score: { + gte: threshold, } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr - } - }); + } } + ]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [ - { - query_string: { - query: `result_type:influencer AND influencer_field_name: ${escapeForElasticsearchQuery(influencerFieldName)}`, - analyze_wildcard: false - } - }, - { - bool: { - must: boolCriteria - } - } - ] - } - }, - aggs: { - influencerFieldValues: { - terms: { - field: 'influencer_field_value', - size: maxResults !== undefined ? maxResults : 2, - order: { - maxAnomalyScore: 'desc' + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: maxResults !== undefined ? maxResults : 100, + body: { + _source: ['job_id', 'detector_index', 'influencers', 'record_score'], + query: { + bool: { + filter: [ + { + query_string: { + query: 'result_type:record', + analyze_wildcard: false } }, - aggs: { - maxAnomalyScore: { - max: { - field: 'influencer_score' - } - }, - sumAnomalyScore: { - sum: { - field: 'influencer_score' - } + { + bool: { + must: boolCriteria } } - } + ] } + }, + sort: [ + { record_score: { order: 'desc' } } + ], + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + _.each(resp.hits.hits, (hit) => { + obj.records.push(hit._source); + }); } + resolve(obj); }) - .then((resp) => { - const buckets = _.get(resp, ['aggregations', 'influencerFieldValues', 'buckets'], []); - _.each(buckets, (bucket) => { - const result = { - influencerFieldValue: bucket.key, - maxAnomalyScore: bucket.maxAnomalyScore.value, - sumAnomalyScore: bucket.sumAnomalyScore.value }; - obj.results.push(result); - }); + .catch((resp) => { + reject(resp); + }); + }); +} - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - // Obtains the overall bucket scores for the specified job ID(s). - // Pass ['*'] to search over all job IDs. - // Returned response contains a results property as an object of max score by time. - function getOverallBucketScores(jobIds, topN, earliestMs, latestMs, interval) { - return $q((resolve, reject) => { - const obj = { success: true, results: {} }; - - ml.overallBuckets({ - jobId: jobIds, - topN: topN, - bucketSpan: interval, - start: earliestMs, - end: latestMs - }) - .then(resp => { - const dataByTime = _.get(resp, ['overall_buckets'], []); - _.each(dataByTime, (dataForTime) => { - const value = _.get(dataForTime, ['overall_score']); - if (value !== undefined) { - obj.results[dataForTime.timestamp] = value; - } - }); - resolve(obj); - }) - .catch(resp => { - reject(resp); - }); - }); - } - - // Obtains the maximum score by influencer_field_value and by time for the specified job ID(s) - // (pass an empty array or ['*'] to search over all job IDs), and specified influencer field - // values (pass an empty array to search over all field values). - // Returned response contains a results property with influencer field values keyed - // against max score by time. - function getInfluencerValueMaxScoreByTime( - jobIds, - influencerFieldName, - influencerFieldValues, - earliestMs, - latestMs, - interval, - maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, results: {} }; - - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the time range plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } - } - }, - { - range: { - influencer_score: { - gt: 0 - } +// Queries Elasticsearch to obtain the record level results containing the specified influencer(s), +// for the specified job(s), time range, and record score threshold. +// influencers parameter must be an array, with each object in the array having 'fieldName' +// 'fieldValue' properties. The influencer array uses 'should' for the nested bool query, +// so this returns record level results which have at least one of the influencers. +// Pass an empty array or ['*'] to search over all job IDs. +function getRecordsForInfluencer(jobIds, influencers, threshold, earliestMs, latestMs, maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, records: [] }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the time range, record score, plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' } } - ]; - - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; - } - jobIdFilterStr += `job_id:${jobId}`; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr - } - }); - } - - if (influencerFieldValues && influencerFieldValues.length > 0) { - let influencerFilterStr = ''; - _.each(influencerFieldValues, (value, i) => { - if (i > 0) { - influencerFilterStr += ' OR '; - } - influencerFilterStr += `influencer_field_value:${escapeForElasticsearchQuery(value)}`; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: influencerFilterStr + }, + { + range: { + record_score: { + gte: threshold, } - }); + } } + ]; - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [ - { - query_string: { - query: `result_type:influencer AND influencer_field_name: ${escapeForElasticsearchQuery(influencerFieldName)}`, - analyze_wildcard: false - } - }, - { + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + // Add a nested query to filter for each of the specified influencers. + if (influencers.length > 0) { + boolCriteria.push({ + bool: { + should: influencers.map((influencer) => { + return { + nested: { + path: 'influencers', + query: { bool: { - must: boolCriteria + must: [ + { + match: { + 'influencers.influencer_field_name': influencer.fieldName + } + }, + { + match: { + 'influencers.influencer_field_values': influencer.fieldValue + } + } + ] } } - ] - } - }, - aggs: { - influencerFieldValues: { - terms: { - field: 'influencer_field_value', - size: maxResults !== undefined ? maxResults : 10, - order: { - maxAnomalyScore: 'desc' + } + }; + }), + minimum_should_match: 1, + } + }); + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: maxResults !== undefined ? maxResults : 100, + body: { + query: { + bool: { + filter: [ + { + query_string: { + query: 'result_type:record', + analyze_wildcard: false } }, - aggs: { - maxAnomalyScore: { - max: { - field: 'influencer_score' - } - }, - byTime: { - date_histogram: { - field: 'timestamp', - interval, - min_doc_count: 1 - }, - aggs: { - maxAnomalyScore: { - max: { - field: 'influencer_score' - } - } - } + { + bool: { + must: boolCriteria } } - } + ] } - } - }) - .then((resp) => { - const fieldValueBuckets = _.get(resp, ['aggregations', 'influencerFieldValues', 'buckets'], []); - _.each(fieldValueBuckets, (valueBucket) => { - const fieldValue = valueBucket.key; - const fieldValues = {}; - - const timeBuckets = _.get(valueBucket, ['byTime', 'buckets'], []); - _.each(timeBuckets, (timeBucket) => { - const time = timeBucket.key; - const score = timeBucket.maxAnomalyScore.value; - fieldValues[time] = score; - }); - - obj.results[fieldValue] = fieldValues; + }, + sort: [ + { record_score: { order: 'desc' } } + ] + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + _.each(resp.hits.hits, (hit) => { + obj.records.push(hit._source); }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Obtains the definition of the category with the specified ID and job ID. - // Returned response contains four properties - categoryId, regex, examples - // and terms (space delimited String of the common tokens matched in values of the category). - function getCategoryDefinition(jobId, categoryId) { - return $q((resolve, reject) => { - const obj = { success: true, categoryId: categoryId, terms: null, regex: null, examples: [] }; - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 1, - body: { - query: { - bool: { - filter: [ - { term: { job_id: jobId } }, - { term: { category_id: categoryId } } - ] - } - } } + resolve(obj); }) - .then((resp) => { - if (resp.hits.total !== 0) { - const source = _.first(resp.hits.hits)._source; - obj.categoryId = source.category_id; - obj.regex = source.regex; - obj.terms = source.terms; - obj.examples = source.examples; - } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Obtains the categorization examples for the categories with the specified IDs - // from the given index and job ID. - // Returned response contains two properties - jobId and - // examplesByCategoryId (list of examples against categoryId). - function getCategoryExamples(jobId, categoryIds, maxExamples) { - return $q((resolve, reject) => { - const obj = { success: true, jobId: jobId, examplesByCategoryId: {} }; - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 500, // Matches size of records in anomaly summary table. - body: { - query: { - bool: { - filter: [ - { term: { job_id: jobId } }, - { terms: { category_id: categoryIds } } - ] - } - } - } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - _.each(resp.hits.hits, (hit) => { - if (maxExamples) { - obj.examplesByCategoryId[hit._source.category_id] = - _.slice(hit._source.examples, 0, Math.min(hit._source.examples.length, maxExamples)); - } else { - obj.examplesByCategoryId[hit._source.category_id] = hit._source.examples; - } + .catch((resp) => { + reject(resp); + }); + }); +} - }); - } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Queries Elasticsearch to obtain record level results containing the influencers - // for the specified job(s), record score threshold, and time range. - // Pass an empty array or ['*'] to search over all job IDs. - // Returned response contains a records property, with each record containing - // only the fields job_id, detector_index, record_score and influencers. - function getRecordInfluencers(jobIds, threshold, earliestMs, latestMs, maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, records: [] }; - - // Build the criteria to use in the bool filter part of the request. - // Adds criteria for the existence of the nested influencers field, time range, - // record score, plus any specified job IDs. - const boolCriteria = [ - { - nested: { - path: 'influencers', - query: { - bool: { - must: [ - { - exists: { field: 'influencers' } - } - ] - } - } - } - }, - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } - } - }, - { - range: { - record_score: { - gte: threshold, - } - } - } - ]; - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; - } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr +// Queries Elasticsearch to obtain the record level results for the specified job and detector, +// time range, record score threshold, and whether to only return results containing influencers. +// An additional, optional influencer field name and value may also be provided. +function getRecordsForDetector( + jobId, + detectorIndex, + checkForInfluencers, + influencerFieldName, + influencerFieldValue, + threshold, + earliestMs, + latestMs, + maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, records: [] }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the time range, record score, plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' } - }); - } - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: maxResults !== undefined ? maxResults : 100, - body: { - _source: ['job_id', 'detector_index', 'influencers', 'record_score'], - query: { - bool: { - filter: [ - { - query_string: { - query: 'result_type:record', - analyze_wildcard: false - } - }, - { - bool: { - must: boolCriteria - } - } - ] - } - }, - sort: [ - { record_score: { order: 'desc' } } - ], } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - _.each(resp.hits.hits, (hit) => { - obj.records.push(hit._source); - }); - } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Queries Elasticsearch to obtain the record level results containing the specified influencer(s), - // for the specified job(s), time range, and record score threshold. - // influencers parameter must be an array, with each object in the array having 'fieldName' - // 'fieldValue' properties. The influencer array uses 'should' for the nested bool query, - // so this returns record level results which have at least one of the influencers. - // Pass an empty array or ['*'] to search over all job IDs. - function getRecordsForInfluencer(jobIds, influencers, threshold, earliestMs, latestMs, maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, records: [] }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the time range, record score, plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } - } - }, - { - range: { - record_score: { - gte: threshold, - } + }, + { + term: { job_id: jobId } + }, + { + term: { detector_index: detectorIndex } + }, + { + range: { + record_score: { + gte: threshold, } } - ]; - - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; - } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr - } - }); } + ]; - // Add a nested query to filter for each of the specified influencers. - if (influencers.length > 0) { - boolCriteria.push({ - bool: { - should: influencers.map((influencer) => { - return { - nested: { - path: 'influencers', - query: { - bool: { - must: [ - { - match: { - 'influencers.influencer_field_name': influencer.fieldName - } - }, - { - match: { - 'influencers.influencer_field_values': influencer.fieldValue - } - } - ] - } - } - } - }; - }), - minimum_should_match: 1, - } - }); - } - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: maxResults !== undefined ? maxResults : 100, - body: { + // Add a nested query to filter for the specified influencer field name and value. + if (influencerFieldName && influencerFieldValue) { + boolCriteria.push({ + nested: { + path: 'influencers', query: { bool: { - filter: [ + must: [ { - query_string: { - query: 'result_type:record', - analyze_wildcard: false + match: { + 'influencers.influencer_field_name': influencerFieldName } }, { - bool: { - must: boolCriteria + match: { + 'influencers.influencer_field_values': influencerFieldValue } } ] } - }, - sort: [ - { record_score: { order: 'desc' } } - ] - } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - _.each(resp.hits.hits, (hit) => { - obj.records.push(hit._source); - }); - } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - - // Queries Elasticsearch to obtain the record level results for the specified job and detector, - // time range, record score threshold, and whether to only return results containing influencers. - // An additional, optional influencer field name and value may also be provided. - function getRecordsForDetector( - jobId, - detectorIndex, - checkForInfluencers, - influencerFieldName, - influencerFieldValue, - threshold, - earliestMs, - latestMs, - maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, records: [] }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the time range, record score, plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } - } - }, - { - term: { job_id: jobId } - }, - { - term: { detector_index: detectorIndex } - }, - { - range: { - record_score: { - gte: threshold, - } } } - ]; - - // Add a nested query to filter for the specified influencer field name and value. - if (influencerFieldName && influencerFieldValue) { + }); + } else { + if (checkForInfluencers === true) { boolCriteria.push({ nested: { path: 'influencers', @@ -1025,697 +999,670 @@ export function ResultsServiceProvider($q, es) { bool: { must: [ { - match: { - 'influencers.influencer_field_name': influencerFieldName - } - }, - { - match: { - 'influencers.influencer_field_values': influencerFieldValue - } + exists: { field: 'influencers' } } ] } } } }); - } else { - if (checkForInfluencers === true) { - boolCriteria.push({ - nested: { - path: 'influencers', - query: { + } + } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: maxResults !== undefined ? maxResults : 100, + body: { + query: { + bool: { + filter: [ + { + query_string: { + query: 'result_type:record', + analyze_wildcard: false + } + }, + { bool: { - must: [ - { - exists: { field: 'influencers' } - } - ] + must: boolCriteria } } - } + ] + } + }, + sort: [ + { record_score: { order: 'desc' } } + ], + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + _.each(resp.hits.hits, (hit) => { + obj.records.push(hit._source); }); } - } + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: maxResults !== undefined ? maxResults : 100, - body: { - query: { - bool: { - filter: [ - { - query_string: { - query: 'result_type:record', - analyze_wildcard: false - } - }, - { - bool: { - must: boolCriteria - } - } - ] - } - }, - sort: [ - { record_score: { order: 'desc' } } - ], +// Queries Elasticsearch to obtain all the record level results for the specified job(s), time range, +// and record score threshold. +// Pass an empty array or ['*'] to search over all job IDs. +// Returned response contains a records property, which is an array of the matching results. +function getRecords(jobIds, threshold, earliestMs, latestMs, maxResults) { + return this.getRecordsForInfluencer(jobIds, [], threshold, earliestMs, latestMs, maxResults); +} + +// Queries Elasticsearch to obtain the record level results matching the given criteria, +// for the specified job(s), time range, and record score threshold. +// criteriaFields parameter must be an array, with each object in the array having 'fieldName' +// 'fieldValue' properties. +// Pass an empty array or ['*'] to search over all job IDs. +function getRecordsForCriteria(jobIds, criteriaFields, threshold, earliestMs, latestMs, maxResults) { + return new Promise((resolve, reject) => { + const obj = { success: true, records: [] }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the time range, record score, plus any specified job IDs. + const boolCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - _.each(resp.hits.hits, (hit) => { - obj.records.push(hit._source); - }); + }, + { + range: { + record_score: { + gte: threshold, } - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); + } + } + ]; + + if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { + let jobIdFilterStr = ''; + _.each(jobIds, (jobId, i) => { + if (i > 0) { + jobIdFilterStr += ' OR '; + } + jobIdFilterStr += 'job_id:'; + jobIdFilterStr += jobId; + }); + boolCriteria.push({ + query_string: { + analyze_wildcard: false, + query: jobIdFilterStr + } + }); + } + + // Add in term queries for each of the specified criteria. + _.each(criteriaFields, (criteria) => { + boolCriteria.push({ + term: { + [criteria.fieldName]: criteria.fieldValue + } + }); }); - } - - // Queries Elasticsearch to obtain all the record level results for the specified job(s), time range, - // and record score threshold. - // Pass an empty array or ['*'] to search over all job IDs. - // Returned response contains a records property, which is an array of the matching results. - function getRecords(jobIds, threshold, earliestMs, latestMs, maxResults) { - return this.getRecordsForInfluencer(jobIds, [], threshold, earliestMs, latestMs, maxResults); - } - - // Queries Elasticsearch to obtain the record level results matching the given criteria, - // for the specified job(s), time range, and record score threshold. - // criteriaFields parameter must be an array, with each object in the array having 'fieldName' - // 'fieldValue' properties. - // Pass an empty array or ['*'] to search over all job IDs. - function getRecordsForCriteria(jobIds, criteriaFields, threshold, earliestMs, latestMs, maxResults) { - return $q((resolve, reject) => { - const obj = { success: true, records: [] }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the time range, record score, plus any specified job IDs. - const boolCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: maxResults !== undefined ? maxResults : 100, + body: { + query: { + bool: { + filter: [ + { + query_string: { + query: 'result_type:record', + analyze_wildcard: false + } + }, + { + bool: { + must: boolCriteria + } + } + ] } }, - { - range: { - record_score: { - gte: threshold, - } - } + sort: [ + { record_score: { order: 'desc' } } + ], + } + }) + .then((resp) => { + if (resp.hits.total !== 0) { + _.each(resp.hits.hits, (hit) => { + obj.records.push(hit._source); + }); } - ]; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} - if (jobIds && jobIds.length > 0 && !(jobIds.length === 1 && jobIds[0] === '*')) { - let jobIdFilterStr = ''; - _.each(jobIds, (jobId, i) => { - if (i > 0) { - jobIdFilterStr += ' OR '; - } - jobIdFilterStr += 'job_id:'; - jobIdFilterStr += jobId; - }); - boolCriteria.push({ - query_string: { - analyze_wildcard: false, - query: jobIdFilterStr - } - }); + +// Queries Elasticsearch to obtain metric aggregation results. +// index can be a String, or String[], of index names to search. +// types must be a String[] of types to search. +// entityFields parameter must be an array, with each object in the array having 'fieldName' +// and 'fieldValue' properties. +// Extra query object can be supplied, or pass null if no additional query +// to that built from the supplied entity fields. +// Returned response contains a results property containing the requested aggregation. +function getMetricData( + index, + types, + entityFields, + query, + metricFunction, + metricFieldName, + timeFieldName, + earliestMs, + latestMs, + interval) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: {} }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the types, time range, entity fields, + // plus any additional supplied query. + const mustCriteria = []; + const shouldCriteria = []; + + if (types && types.length) { + mustCriteria.push({ terms: { _type: types } }); + } + + mustCriteria.push({ + range: { + [timeFieldName]: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } } + }); - // Add in term queries for each of the specified criteria. - _.each(criteriaFields, (criteria) => { - boolCriteria.push({ + if (query) { + mustCriteria.push(query); + } + + _.each(entityFields, (entity) => { + if (entity.fieldValue.length !== 0) { + mustCriteria.push({ term: { - [criteria.fieldName]: criteria.fieldValue + [entity.fieldName]: entity.fieldValue } }); - }); - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: maxResults !== undefined ? maxResults : 100, - body: { - query: { - bool: { - filter: [ - { - query_string: { - query: 'result_type:record', - analyze_wildcard: false - } - }, - { - bool: { - must: boolCriteria - } + } else { + // Add special handling for blank entity field values, checking for either + // an empty string or the field not existing. + shouldCriteria.push({ + bool: { + must: [ + { + term: { + [entity.fieldName]: '' } - ] - } - }, - sort: [ - { record_score: { order: 'desc' } } - ], - } - }) - .then((resp) => { - if (resp.hits.total !== 0) { - _.each(resp.hits.hits, (hit) => { - obj.records.push(hit._source); - }); + } + ] + } + }); + shouldCriteria.push({ + bool: { + must_not: [ + { + exists: { field: entity.fieldName } + } + ] } - resolve(obj); - }) - .catch((resp) => { - reject(resp); }); - }); - } - - - // Queries Elasticsearch to obtain metric aggregation results. - // index can be a String, or String[], of index names to search. - // types must be a String[] of types to search. - // entityFields parameter must be an array, with each object in the array having 'fieldName' - // and 'fieldValue' properties. - // Extra query object can be supplied, or pass null if no additional query - // to that built from the supplied entity fields. - // Returned response contains a results property containing the requested aggregation. - function getMetricData( - index, - types, - entityFields, - query, - metricFunction, - metricFieldName, - timeFieldName, - earliestMs, - latestMs, - interval) { - return $q((resolve, reject) => { - const obj = { success: true, results: {} }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the types, time range, entity fields, - // plus any additional supplied query. - const mustCriteria = []; - const shouldCriteria = []; - - if (types && types.length) { - mustCriteria.push({ terms: { _type: types } }); } - mustCriteria.push({ - range: { - [timeFieldName]: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } + }); + + const body = { + query: { + bool: { + must: mustCriteria } - }); + }, + size: 0, + _source: { + excludes: [] + }, + aggs: { + byTime: { + date_histogram: { + field: timeFieldName, + interval: interval, + min_doc_count: 0 + } - if (query) { - mustCriteria.push(query); + } } + }; - _.each(entityFields, (entity) => { - if (entity.fieldValue.length !== 0) { - mustCriteria.push({ - term: { - [entity.fieldName]: entity.fieldValue - } - }); + if (shouldCriteria.length > 0) { + body.query.bool.should = shouldCriteria; + body.query.bool.minimum_should_match = shouldCriteria.length / 2; + } - } else { - // Add special handling for blank entity field values, checking for either - // an empty string or the field not existing. - shouldCriteria.push({ - bool: { - must: [ - { - term: { - [entity.fieldName]: '' - } - } - ] - } - }); - shouldCriteria.push({ - bool: { - must_not: [ - { - exists: { field: entity.fieldName } - } - ] - } - }); + if (metricFieldName !== undefined && metricFieldName !== '') { + body.aggs.byTime.aggs = {}; + + const metricAgg = { + [metricFunction]: { + field: metricFieldName } + }; + + if (metricFunction === 'percentiles') { + metricAgg[metricFunction].percents = [ML_MEDIAN_PERCENTS]; + } + body.aggs.byTime.aggs.metric = metricAgg; + } + + ml.esSearch({ + index, + body + }) + .then((resp) => { + const dataByTime = _.get(resp, ['aggregations', 'byTime', 'buckets'], []); + _.each(dataByTime, (dataForTime) => { + if (metricFunction === 'count') { + obj.results[dataForTime.key] = dataForTime.doc_count; + } else { + const value = _.get(dataForTime, ['metric', 'value']); + const values = _.get(dataForTime, ['metric', 'values']); + if (dataForTime.doc_count === 0) { + obj.results[dataForTime.key] = null; + } else if (value !== undefined) { + obj.results[dataForTime.key] = value; + } else if (values !== undefined) { + // Percentiles agg currently returns NaN rather than null when none of the docs in the + // bucket contain the field used in the aggregation + // (see elasticsearch issue https://github.com/elastic/elasticsearch/issues/29066). + // Store as null, so values can be handled in the same manner downstream as other aggs + // (min, mean, max) which return null. + const medianValues = values[ML_MEDIAN_PERCENTS]; + obj.results[dataForTime.key] = !isNaN(medianValues) ? medianValues : null; + } else { + obj.results[dataForTime.key] = null; + } + } + }); + resolve(obj); + }) + .catch((resp) => { + reject(resp); }); + }); +} + +// Queries Elasticsearch to obtain event rate data i.e. the count +// of documents over time. +// index can be a String, or String[], of index names to search. +// Extra query object can be supplied, or pass null if no additional query. +// Returned response contains a results property, which is an object +// of document counts against time (epoch millis). +function getEventRateData( + index, + query, + timeFieldName, + earliestMs, + latestMs, + interval) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: {} }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the types, time range, entity fields, + // plus any additional supplied query. + const mustCriteria = [{ + range: { + [timeFieldName]: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' + } + } + }]; - const body = { + if (query) { + mustCriteria.push(query); + } + + ml.esSearch({ + index, + size: 0, + body: { query: { bool: { must: mustCriteria } }, - size: 0, _source: { excludes: [] }, aggs: { - byTime: { + eventRate: { date_histogram: { field: timeFieldName, interval: interval, - min_doc_count: 0 + min_doc_count: 0, + extended_bounds: { + min: earliestMs, + max: latestMs, + } } - } } - }; - - if (shouldCriteria.length > 0) { - body.query.bool.should = shouldCriteria; - body.query.bool.minimum_should_match = shouldCriteria.length / 2; - } - - if (metricFieldName !== undefined && metricFieldName !== '') { - body.aggs.byTime.aggs = {}; - - const metricAgg = { - [metricFunction]: { - field: metricFieldName - } - }; - - if (metricFunction === 'percentiles') { - metricAgg[metricFunction].percents = [ML_MEDIAN_PERCENTS]; - } - body.aggs.byTime.aggs.metric = metricAgg; } + }) + .then((resp) => { + const dataByTimeBucket = _.get(resp, ['aggregations', 'eventRate', 'buckets'], []); + _.each(dataByTimeBucket, (dataForTime) => { + const time = dataForTime.key; + obj.results[time] = dataForTime.doc_count; + }); + obj.total = resp.hits.total; - es.search({ - index, - body + resolve(obj); }) - .then((resp) => { - const dataByTime = _.get(resp, ['aggregations', 'byTime', 'buckets'], []); - _.each(dataByTime, (dataForTime) => { - if (metricFunction === 'count') { - obj.results[dataForTime.key] = dataForTime.doc_count; - } else { - const value = _.get(dataForTime, ['metric', 'value']); - const values = _.get(dataForTime, ['metric', 'values']); - if (dataForTime.doc_count === 0) { - obj.results[dataForTime.key] = null; - } else if (value !== undefined) { - obj.results[dataForTime.key] = value; - } else if (values !== undefined) { - // Percentiles agg currently returns NaN rather than null when none of the docs in the - // bucket contain the field used in the aggregation - // (see elasticsearch issue https://github.com/elastic/elasticsearch/issues/29066). - // Store as null, so values can be handled in the same manner downstream as other aggs - // (min, mean, max) which return null. - const medianValues = values[ML_MEDIAN_PERCENTS]; - obj.results[dataForTime.key] = !isNaN(medianValues) ? medianValues : null; - } else { - obj.results[dataForTime.key] = null; - } - } - }); + .catch((resp) => { + reject(resp); + }); + }); +} - resolve(obj); - }) - .catch((resp) => { - reject(resp); - }); - }); - } - - // Queries Elasticsearch to obtain event rate data i.e. the count - // of documents over time. - // index can be a String, or String[], of index names to search. - // Extra query object can be supplied, or pass null if no additional query. - // Returned response contains a results property, which is an object - // of document counts against time (epoch millis). - function getEventRateData( - index, - query, - timeFieldName, - earliestMs, - latestMs, - interval) { - return $q((resolve, reject) => { - const obj = { success: true, results: {} }; - - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the types, time range, entity fields, - // plus any additional supplied query. - const mustCriteria = [{ +function getModelPlotOutput( + jobId, + detectorIndex, + criteriaFields, + earliestMs, + latestMs, + interval, + aggType) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; + + // if an aggType object has been passed in, use it. + // otherwise default to min and max aggs for the upper and lower bounds + const modelAggs = (aggType === undefined) ? + { max: 'max', min: 'min' } : + { + max: aggType.max, + min: aggType.min + }; + + // Build the criteria to use in the bool filter part of the request. + // Add criteria for the job ID and time range. + const mustCriteria = [ + { + term: { job_id: jobId } + }, + { range: { - [timeFieldName]: { + timestamp: { gte: earliestMs, lte: latestMs, format: 'epoch_millis' } } - }]; - - if (query) { - mustCriteria.push(query); } + ]; - es.search({ - index, - size: 0, - body: { - query: { - bool: { - must: mustCriteria + // Add in term queries for each of the specified criteria. + _.each(criteriaFields, (criteria) => { + mustCriteria.push({ + term: { + [criteria.fieldName]: criteria.fieldValue + } + }); + }); + + // Add criteria for the detector index. Results from jobs created before 6.1 will not + // contain a detector_index field, so use a should criteria with a 'not exists' check. + const shouldCriteria = [ + { + term: { detector_index: detectorIndex } + }, + { + bool: { + must_not: [ + { + exists: { field: 'detector_index' } } - }, - _source: { - excludes: [] - }, - aggs: { - eventRate: { - date_histogram: { - field: timeFieldName, - interval: interval, - min_doc_count: 0, - extended_bounds: { - min: earliestMs, - max: latestMs, + ] + } + } + ]; + + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [{ + query_string: { + query: 'result_type:model_plot', + analyze_wildcard: true + } + }, { + bool: { + must: mustCriteria, + should: shouldCriteria, + minimum_should_match: 1 + } + }] + } + }, + aggs: { + times: { + date_histogram: { + field: 'timestamp', + interval: interval, + min_doc_count: 0 + }, + aggs: { + actual: { + avg: { + field: 'actual' + } + }, + modelUpper: { + [modelAggs.max]: { + field: 'model_upper' + } + }, + modelLower: { + [modelAggs.min]: { + field: 'model_lower' } } } } } - }) - .then((resp) => { - const dataByTimeBucket = _.get(resp, ['aggregations', 'eventRate', 'buckets'], []); - _.each(dataByTimeBucket, (dataForTime) => { - const time = dataForTime.key; - obj.results[time] = dataForTime.doc_count; - }); - obj.total = resp.hits.total; + } + }) + .then((resp) => { + const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); + _.each(aggregationsByTime, (dataForTime) => { + const time = dataForTime.key; + let modelUpper = _.get(dataForTime, ['modelUpper', 'value']); + let modelLower = _.get(dataForTime, ['modelLower', 'value']); + const actual = _.get(dataForTime, ['actual', 'value']); + + if (modelUpper === undefined || isFinite(modelUpper) === false) { + modelUpper = null; + } + if (modelLower === undefined || isFinite(modelLower) === false) { + modelLower = null; + } - resolve(obj); - }) - .catch((resp) => { - reject(resp); + obj.results[time] = { + actual, + modelUpper, + modelLower + }; }); - }); - } - - function getModelPlotOutput( - jobId, - detectorIndex, - criteriaFields, - earliestMs, - latestMs, - interval, - aggType) { - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; - // if an aggType object has been passed in, use it. - // otherwise default to min and max aggs for the upper and lower bounds - const modelAggs = (aggType === undefined) ? - { max: 'max', min: 'min' } : - { - max: aggType.max, - min: aggType.min - }; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); +} - // Build the criteria to use in the bool filter part of the request. - // Add criteria for the job ID and time range. - const mustCriteria = [ - { - term: { job_id: jobId } - }, - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } +// Queries Elasticsearch to obtain the max record score over time for the specified job, +// criteria, time range, and aggregation interval. +// criteriaFields parameter must be an array, with each object in the array having 'fieldName' +// 'fieldValue' properties. +function getRecordMaxScoreByTime(jobId, criteriaFields, earliestMs, latestMs, interval) { + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; + + // Build the criteria to use in the bool filter part of the request. + const mustCriteria = [ + { + range: { + timestamp: { + gte: earliestMs, + lte: latestMs, + format: 'epoch_millis' } } - ]; + }, + { term: { job_id: jobId } } + ]; + const shouldCriteria = []; - // Add in term queries for each of the specified criteria. - _.each(criteriaFields, (criteria) => { + _.each(criteriaFields, (criteria) => { + if (criteria.fieldValue.length !== 0) { mustCriteria.push({ term: { [criteria.fieldName]: criteria.fieldValue } }); - }); - - // Add criteria for the detector index. Results from jobs created before 6.1 will not - // contain a detector_index field, so use a should criteria with a 'not exists' check. - const shouldCriteria = [ - { - term: { detector_index: detectorIndex } - }, - { + } else { + // Add special handling for blank entity field values, checking for either + // an empty string or the field not existing. + const emptyFieldCondition = { bool: { - must_not: [ + must: [ { - exists: { field: 'detector_index' } + term: { + } } ] } - } - ]; - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [{ - query_string: { - query: 'result_type:model_plot', - analyze_wildcard: true - } - }, { - bool: { - must: mustCriteria, - should: shouldCriteria, - minimum_should_match: 1 - } - }] - } - }, - aggs: { - times: { - date_histogram: { - field: 'timestamp', - interval: interval, - min_doc_count: 0 - }, - aggs: { - actual: { - avg: { - field: 'actual' - } - }, - modelUpper: { - [modelAggs.max]: { - field: 'model_upper' - } - }, - modelLower: { - [modelAggs.min]: { - field: 'model_lower' - } - } + }; + emptyFieldCondition.bool.must[0].term[criteria.fieldName] = ''; + shouldCriteria.push(emptyFieldCondition); + shouldCriteria.push({ + bool: { + must_not: [ + { + exists: { field: criteria.fieldName } } - } + ] } - } - }) - .then((resp) => { - const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); - _.each(aggregationsByTime, (dataForTime) => { - const time = dataForTime.key; - let modelUpper = _.get(dataForTime, ['modelUpper', 'value']); - let modelLower = _.get(dataForTime, ['modelLower', 'value']); - const actual = _.get(dataForTime, ['actual', 'value']); - - if (modelUpper === undefined || isFinite(modelUpper) === false) { - modelUpper = null; - } - if (modelLower === undefined || isFinite(modelLower) === false) { - modelLower = null; - } - - obj.results[time] = { - actual, - modelUpper, - modelLower - }; - }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); }); + } + }); - } - - // Queries Elasticsearch to obtain the max record score over time for the specified job, - // criteria, time range, and aggregation interval. - // criteriaFields parameter must be an array, with each object in the array having 'fieldName' - // 'fieldValue' properties. - function getRecordMaxScoreByTime(jobId, criteriaFields, earliestMs, latestMs, interval) { - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; - // Build the criteria to use in the bool filter part of the request. - const mustCriteria = [ - { - range: { - timestamp: { - gte: earliestMs, - lte: latestMs, - format: 'epoch_millis' - } + ml.esSearch({ + index: ML_RESULTS_INDEX_PATTERN, + size: 0, + body: { + query: { + bool: { + filter: [{ + query_string: { + query: 'result_type:record', + analyze_wildcard: true + } + }, { + bool: { + must: mustCriteria + } + }] } }, - { term: { job_id: jobId } } - ]; - const shouldCriteria = []; - - _.each(criteriaFields, (criteria) => { - if (criteria.fieldValue.length !== 0) { - mustCriteria.push({ - term: { - [criteria.fieldName]: criteria.fieldValue - } - }); - } else { - // Add special handling for blank entity field values, checking for either - // an empty string or the field not existing. - const emptyFieldCondition = { - bool: { - must: [ - { - term: { - } - } - ] - } - }; - emptyFieldCondition.bool.must[0].term[criteria.fieldName] = ''; - shouldCriteria.push(emptyFieldCondition); - shouldCriteria.push({ - bool: { - must_not: [ - { - exists: { field: criteria.fieldName } - } - ] - } - }); - } - - }); - - es.search({ - index: ML_RESULTS_INDEX_PATTERN, - size: 0, - body: { - query: { - bool: { - filter: [{ - query_string: { - query: 'result_type:record', - analyze_wildcard: true - } - }, { - bool: { - must: mustCriteria - } - }] - } - }, - aggs: { - times: { - date_histogram: { - field: 'timestamp', - interval: interval, - min_doc_count: 1 - }, - aggs: { - recordScore: { - max: { - field: 'record_score' - } + aggs: { + times: { + date_histogram: { + field: 'timestamp', + interval: interval, + min_doc_count: 1 + }, + aggs: { + recordScore: { + max: { + field: 'record_score' } } } } } - }) - .then((resp) => { - const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); - _.each(aggregationsByTime, (dataForTime) => { - const time = dataForTime.key; - obj.results[time] = { - score: _.get(dataForTime, ['recordScore', 'value']), - }; - }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); + } + }) + .then((resp) => { + const aggregationsByTime = _.get(resp, ['aggregations', 'times', 'buckets'], []); + _.each(aggregationsByTime, (dataForTime) => { + const time = dataForTime.key; + obj.results[time] = { + score: _.get(dataForTime, ['recordScore', 'value']), + }; }); - }); - } - - return { - getScoresByBucket, - getScheduledEventsByBucket, - getTopInfluencers, - getTopInfluencerValues, - getOverallBucketScores, - getInfluencerValueMaxScoreByTime, - getCategoryDefinition, - getCategoryExamples, - getRecordInfluencers, - getRecordsForInfluencer, - getRecordsForDetector, - getRecords, - getRecordsForCriteria, - getMetricData, - getEventRateData, - getModelPlotOutput, - getRecordMaxScoreByTime - }; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + }); } + +export const mlResultsService = { + getScoresByBucket, + getScheduledEventsByBucket, + getTopInfluencers, + getTopInfluencerValues, + getOverallBucketScores, + getInfluencerValueMaxScoreByTime, + getRecordInfluencers, + getRecordsForInfluencer, + getRecordsForDetector, + getRecords, + getRecordsForCriteria, + getMetricData, + getEventRateData, + getModelPlotOutput, + getRecordMaxScoreByTime +}; diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/calendars_list/calendars_list_controller.js b/x-pack/plugins/ml/public/settings/scheduled_events/calendars_list/calendars_list_controller.js index 15279e6100ffcd..85d6242b20b529 100644 --- a/x-pack/plugins/ml/public/settings/scheduled_events/calendars_list/calendars_list_controller.js +++ b/x-pack/plugins/ml/public/settings/scheduled_events/calendars_list/calendars_list_controller.js @@ -18,6 +18,7 @@ import { checkGetJobsPrivilege, checkPermission } from 'plugins/ml/privilege/che import { getMlNodeCount, mlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes'; import { buttonsEnabledChecks } from 'plugins/ml/settings/scheduled_events/calendars_list/buttons_enabled_checks'; import { ml } from 'plugins/ml/services/ml_api_service'; +import { initPromise } from 'plugins/ml/util/promise'; import template from './calendars_list.html'; @@ -27,7 +28,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - mlNodeCount: getMlNodeCount + mlNodeCount: getMlNodeCount, + initPromise: initPromise(true) } }); @@ -40,9 +42,7 @@ module.controller('MlCalendarsList', $filter, $route, $location, - $q, pagerFactory, - Private, timefilter, mlConfirmModalService) { @@ -117,7 +117,7 @@ module.controller('MlCalendarsList', title: `Delete calendar` }) .then(() => { - $q.when(ml.deleteCalendar({ calendarId })) + ml.deleteCalendar({ calendarId }) .then(loadCalendars) .catch((error) => { console.log(error); @@ -127,7 +127,7 @@ module.controller('MlCalendarsList', }; function loadCalendars() { - $q.when(ml.calendars()) + ml.calendars() .then((resp) => { calendars = resp; $scope.pager = pagerFactory.create(calendars.length, PAGE_SIZE, 1); diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_modal_controller.js b/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_modal_controller.js index 1215014f4a6279..c4c63149a4c65f 100644 --- a/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_modal_controller.js +++ b/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_modal_controller.js @@ -17,7 +17,6 @@ const module = uiModules.get('apps/ml'); module.controller('MlImportEventsModal', function ( $scope, - $q, $timeout, $modalInstance) { @@ -67,7 +66,7 @@ module.controller('MlImportEventsModal', function ( }; function readFile(file) { - return $q((resolve, reject) => { + return new Promise((resolve, reject) => { $scope.loadingLock = true; if (file && file.size) { diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_service.js b/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_service.js index 8a848f713c290f..58c49c66ce1606 100644 --- a/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_service.js +++ b/x-pack/plugins/ml/public/settings/scheduled_events/components/import_events_modal/import_events_service.js @@ -11,10 +11,10 @@ import template from './import_events_modal.html'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); -module.service('mlImportEventsService', function ($q, $modal) { +module.service('mlImportEventsService', function ($modal) { this.openImportEventsWindow = function () { - return $q((resolve, reject) => { + return new Promise((resolve, reject) => { const modal = $modal.open({ template, controller: 'MlImportEventsModal', diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_service.js b/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_service.js index c63b20155f4e98..3101fe2314a7dd 100644 --- a/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_service.js +++ b/x-pack/plugins/ml/public/settings/scheduled_events/components/new_event_modal/new_event_service.js @@ -11,10 +11,10 @@ import template from './new_event_modal.html'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); -module.service('mlNewEventService', function ($q, $modal) { +module.service('mlNewEventService', function ($modal) { this.openNewEventWindow = function () { - return $q((resolve, reject) => { + return new Promise((resolve, reject) => { const modal = $modal.open({ template, controller: 'MlNewEventModal', diff --git a/x-pack/plugins/ml/public/settings/scheduled_events/new_calendar/create_calendar_controller.js b/x-pack/plugins/ml/public/settings/scheduled_events/new_calendar/create_calendar_controller.js index e5b9c81bd24c64..eaa0a471d711e6 100644 --- a/x-pack/plugins/ml/public/settings/scheduled_events/new_calendar/create_calendar_controller.js +++ b/x-pack/plugins/ml/public/settings/scheduled_events/new_calendar/create_calendar_controller.js @@ -18,9 +18,10 @@ import uiRoutes from 'ui/routes'; import { checkLicense } from 'plugins/ml/license/check_license'; import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; import { checkMlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes'; -import { JobServiceProvider } from 'plugins/ml/services/job_service'; -import { CalendarServiceProvider } from 'plugins/ml/services/calendar_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; +import { mlCalendarService } from 'plugins/ml/services/calendar_service'; import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service'; +import { initPromise } from 'plugins/ml/util/promise'; import { ml } from 'plugins/ml/services/ml_api_service'; import template from './create_calendar.html'; @@ -31,7 +32,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - checkMlNodesAvailable + checkMlNodesAvailable, + initPromise: initPromise(true) } }) .when('/settings/calendars_list/edit_calendar/:calendarId', { @@ -39,7 +41,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - checkMlNodesAvailable + checkMlNodesAvailable, + initPromise: initPromise(true) } }); @@ -50,14 +53,9 @@ module.controller('MlCreateCalendar', function ( $scope, $route, - $location, - $q, - timefilter, - Private) { + $location) { const msgs = mlMessageBarService; msgs.clear(); - const mlJobService = Private(JobServiceProvider); - const mlCalendarService = Private(CalendarServiceProvider); const calendarId = $route.current.params.calendarId; $scope.isNewCalendar = (calendarId === undefined); @@ -142,7 +140,7 @@ module.controller('MlCreateCalendar', if (validateCalendarId(calendar.calendarId, $scope.validation.checks)) { $scope.saveLock = true; const saveFunc = $scope.isNewCalendar ? (c => ml.addCalendar(c)) : (c => ml.updateCalendar(c)); - $q.when(saveFunc(calendar)) + saveFunc(calendar) .then(() => { $location.path('settings/calendars_list'); $scope.saveLock = false; diff --git a/x-pack/plugins/ml/public/settings/settings_controller.js b/x-pack/plugins/ml/public/settings/settings_controller.js index 3ae63c6143052f..6d815542a2ab82 100644 --- a/x-pack/plugins/ml/public/settings/settings_controller.js +++ b/x-pack/plugins/ml/public/settings/settings_controller.js @@ -10,6 +10,7 @@ import uiRoutes from 'ui/routes'; import { checkLicense } from 'plugins/ml/license/check_license'; import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; import { getMlNodeCount } from 'plugins/ml/ml_nodes_check/check_ml_nodes'; +import { initPromise } from 'plugins/ml/util/promise'; import template from './settings.html'; @@ -19,7 +20,8 @@ uiRoutes resolve: { CheckLicense: checkLicense, privileges: checkGetJobsPrivilege, - mlNodeCount: getMlNodeCount + mlNodeCount: getMlNodeCount, + initPromise: initPromise(true) } }); diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal.js b/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal.js index 1bf8e455568ff2..bd7abd674a64e9 100644 --- a/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal.js +++ b/x-pack/plugins/ml/public/timeseriesexplorer/forecasting_modal/forecasting_modal.js @@ -33,6 +33,8 @@ import { parseInterval } from '../../../common/util/parse_interval'; import { Modal } from './modal'; import { PROGRESS_STATES } from './progress_states'; import { ml } from 'plugins/ml/services/ml_api_service'; +import { mlJobService } from 'plugins/ml/services/job_service'; +import { mlForecastService } from 'plugins/ml/services/forecast_service'; const FORECAST_JOB_MIN_VERSION = '6.1.0'; // Forecasting only allowed for jobs created >= 6.1.0. const FORECASTS_VIEW_MAX = 5; // Display links to a maximum of 5 forecasts. @@ -123,7 +125,7 @@ class ForecastingModal extends Component { jobOpeningState: PROGRESS_STATES.WAITING }); - this.props.mlJobService.openJob(this.props.job.job_id) + mlJobService.openJob(this.props.job.job_id) .then(() => { // If open was successful run the forecast, then close the job again. this.setState({ @@ -160,7 +162,7 @@ class ForecastingModal extends Component { // formats accepted by Kibana (w, M, y) are not valid formats in Elasticsearch. const durationInSeconds = parseInterval(this.state.newForecastDuration).asSeconds(); - this.props.mlForecastService.runForecast(this.props.job.job_id, `${durationInSeconds}s`) + mlForecastService.runForecast(this.props.job.job_id, `${durationInSeconds}s`) .then((resp) => { // Endpoint will return { acknowledged:true, id:typical: ${formatValueFilter(marker.typical, marker.function, fieldFormat)}`; + contents += `actual: ${formatValue(marker.actual, marker.function, fieldFormat)}`; + contents += `
typical: ${formatValue(marker.typical, marker.function, fieldFormat)}`; } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) { const numberOfCauses = marker.numberOfCauses; const byFieldName = mlEscape(marker.byFieldName); @@ -986,21 +984,21 @@ module.directive('mlTimeseriesChart', function ( } } } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; - contents += `
upper bounds: ${formatValueFilter(marker.upper, marker.function, fieldFormat)}`; - contents += `
lower bounds: ${formatValueFilter(marker.lower, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; + contents += `
upper bounds: ${formatValue(marker.upper, marker.function, fieldFormat)}`; + contents += `
lower bounds: ${formatValue(marker.lower, marker.function, fieldFormat)}`; } } else { // TODO - need better formatting for small decimals. if (_.get(marker, 'isForecast', false) === true) { - contents += `prediction: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `prediction: ${formatValue(marker.value, marker.function, fieldFormat)}`; } else { - contents += `value: ${formatValueFilter(marker.value, marker.function, fieldFormat)}`; + contents += `value: ${formatValue(marker.value, marker.function, fieldFormat)}`; } if (scope.modelPlotEnabled === true) { - contents += `
upper bounds: ${formatValueFilter(marker.upper, marker.function, fieldFormat)}`; - contents += `
lower bounds: ${formatValueFilter(marker.lower, marker.function, fieldFormat)}`; + contents += `
upper bounds: ${formatValue(marker.upper, marker.function, fieldFormat)}`; + contents += `
lower bounds: ${formatValue(marker.lower, marker.function, fieldFormat)}`; } } diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js index f244e7060f2fb9..54485016b51b82 100644 --- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js +++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseries_search_service.js @@ -11,149 +11,142 @@ import _ from 'lodash'; import { ml } from 'plugins/ml/services/ml_api_service'; import { isModelPlotEnabled } from 'plugins/ml/../common/util/job_utils'; import { buildConfigFromDetector } from 'plugins/ml/util/chart_config_builder'; -import { ResultsServiceProvider } from 'plugins/ml/services/results_service'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.service('mlTimeSeriesSearchService', function ( - $q, - Private) { - - const mlResultsService = Private(ResultsServiceProvider); - - this.getMetricData = function (job, detectorIndex, entityFields, earliestMs, latestMs, interval) { - if (isModelPlotEnabled(job, detectorIndex, entityFields)) { - // Extract the partition, by, over fields on which to filter. - const criteriaFields = []; - const detector = job.analysis_config.detectors[detectorIndex]; - if (_.has(detector, 'partition_field_name')) { - const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); - if (partitionEntity !== undefined) { - criteriaFields.push( - { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, - { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); - } +import { mlResultsService } from 'plugins/ml/services/results_service'; + +function getMetricData(job, detectorIndex, entityFields, earliestMs, latestMs, interval) { + if (isModelPlotEnabled(job, detectorIndex, entityFields)) { + // Extract the partition, by, over fields on which to filter. + const criteriaFields = []; + const detector = job.analysis_config.detectors[detectorIndex]; + if (_.has(detector, 'partition_field_name')) { + const partitionEntity = _.find(entityFields, { 'fieldName': detector.partition_field_name }); + if (partitionEntity !== undefined) { + criteriaFields.push( + { fieldName: 'partition_field_name', fieldValue: partitionEntity.fieldName }, + { fieldName: 'partition_field_value', fieldValue: partitionEntity.fieldValue }); } + } - if (_.has(detector, 'over_field_name')) { - const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); - if (overEntity !== undefined) { - criteriaFields.push( - { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, - { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); - } + if (_.has(detector, 'over_field_name')) { + const overEntity = _.find(entityFields, { 'fieldName': detector.over_field_name }); + if (overEntity !== undefined) { + criteriaFields.push( + { fieldName: 'over_field_name', fieldValue: overEntity.fieldName }, + { fieldName: 'over_field_value', fieldValue: overEntity.fieldValue }); } + } - if (_.has(detector, 'by_field_name')) { - const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); - if (byEntity !== undefined) { - criteriaFields.push( - { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, - { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); - } + if (_.has(detector, 'by_field_name')) { + const byEntity = _.find(entityFields, { 'fieldName': detector.by_field_name }); + if (byEntity !== undefined) { + criteriaFields.push( + { fieldName: 'by_field_name', fieldValue: byEntity.fieldName }, + { fieldName: 'by_field_value', fieldValue: byEntity.fieldValue }); } + } + + return mlResultsService.getModelPlotOutput( + job.job_id, + detectorIndex, + criteriaFields, + earliestMs, + latestMs, + interval + ); + } else { + return new Promise((resolve, reject) => { + const obj = { + success: true, + results: {} + }; - return mlResultsService.getModelPlotOutput( - job.job_id, - detectorIndex, - criteriaFields, + const chartConfig = buildConfigFromDetector(job, detectorIndex); + + mlResultsService.getMetricData( + chartConfig.datafeedConfig.indices, + chartConfig.datafeedConfig.types, + entityFields, + chartConfig.datafeedConfig.query, + chartConfig.metricFunction, + chartConfig.metricFieldName, + chartConfig.timeField, earliestMs, latestMs, interval - ); - } else { - return $q((resolve, reject) => { - const obj = { - success: true, - results: {} - }; - - const chartConfig = buildConfigFromDetector(job, detectorIndex); - - mlResultsService.getMetricData( - chartConfig.datafeedConfig.indices, - chartConfig.datafeedConfig.types, - entityFields, - chartConfig.datafeedConfig.query, - chartConfig.metricFunction, - chartConfig.metricFieldName, - chartConfig.timeField, - earliestMs, - latestMs, - interval - ) - .then((resp) => { - _.each(resp.results, (value, time) => { - obj.results[time] = { - 'actual': value - }; - }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); + ) + .then((resp) => { + _.each(resp.results, (value, time) => { + obj.results[time] = { + 'actual': value + }; }); - }); - } + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); - }; + }); + } +} + +// Builds chart detail information (charting function description and entity counts) used +// in the title area of the time series chart. +// Queries Elasticsearch if necessary to obtain the distinct count of entities +// for which data is being plotted. +function getChartDetails(job, detectorIndex, entityFields, earliestMs, latestMs) { + return new Promise((resolve, reject) => { + const obj = { success: true, results: { functionLabel: '', entityData: { entities: [] } } }; + + const chartConfig = buildConfigFromDetector(job, detectorIndex); + let functionLabel = chartConfig.metricFunction; + if (chartConfig.metricFieldName !== undefined) { + functionLabel += ' '; + functionLabel += chartConfig.metricFieldName; + } + obj.results.functionLabel = functionLabel; - // Builds chart detail information (charting function description and entity counts) used - // in the title area of the time series chart. - // Queries Elasticsearch if necessary to obtain the distinct count of entities - // for which data is being plotted. - this.getChartDetails = function (job, detectorIndex, entityFields, earliestMs, latestMs) { - return $q((resolve, reject) => { - const obj = { success: true, results: { functionLabel: '', entityData: { entities: [] } } }; + const blankEntityFields = _.filter(entityFields, (entity) => { + return entity.fieldValue.length === 0; + }); - const chartConfig = buildConfigFromDetector(job, detectorIndex); - let functionLabel = chartConfig.metricFunction; - if (chartConfig.metricFieldName !== undefined) { - functionLabel += ' '; - functionLabel += chartConfig.metricFieldName; - } - obj.results.functionLabel = functionLabel; - - const blankEntityFields = _.filter(entityFields, (entity) => { - return entity.fieldValue.length === 0; - }); - - // Look to see if any of the entity fields have defined values - // (i.e. blank input), and if so obtain the cardinality. - if (blankEntityFields.length === 0) { - obj.results.entityData.count = 1; - obj.results.entityData.entities = entityFields; - resolve(obj); - } else { - const entityFieldNames = _.map(blankEntityFields, 'fieldName'); - ml.getCardinalityOfFields({ - index: chartConfig.datafeedConfig.indices, - types: chartConfig.datafeedConfig.types, - fieldNames: entityFieldNames, - query: chartConfig.datafeedConfig.query, - timeFieldName: chartConfig.timeField, - earliestMs, - latestMs - }) - .then((results) => { - _.each(blankEntityFields, (field) => { - obj.results.entityData.entities.push({ - fieldName: field.fieldName, - cardinality: _.get(results, field.fieldName, 0) - }); + // Look to see if any of the entity fields have defined values + // (i.e. blank input), and if so obtain the cardinality. + if (blankEntityFields.length === 0) { + obj.results.entityData.count = 1; + obj.results.entityData.entities = entityFields; + resolve(obj); + } else { + const entityFieldNames = _.map(blankEntityFields, 'fieldName'); + ml.getCardinalityOfFields({ + index: chartConfig.datafeedConfig.indices, + types: chartConfig.datafeedConfig.types, + fieldNames: entityFieldNames, + query: chartConfig.datafeedConfig.query, + timeFieldName: chartConfig.timeField, + earliestMs, + latestMs + }) + .then((results) => { + _.each(blankEntityFields, (field) => { + obj.results.entityData.entities.push({ + fieldName: field.fieldName, + cardinality: _.get(results, field.fieldName, 0) }); - - resolve(obj); - }) - .catch((resp) => { - reject(resp); }); - } - }); - }; + resolve(obj); + }) + .catch((resp) => { + reject(resp); + }); + } + + }); +} -}); +export const mlTimeSeriesSearchService = { + getMetricData, + getChartDetails +}; diff --git a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html index 03b078b7535d80..a3549c52a0dfbe 100644 --- a/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html +++ b/x-pack/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.html @@ -127,10 +127,9 @@
{ props.title }
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
index cb76698555ad4b..747407bf650c73 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
@@ -20,6 +20,7 @@ export function Overview(props) {
(
+
+ Health:
+ );
+
return (
+ Health:
+ );
+
+ return (
+
+
+
+ {props.name}
+
+
+
+
+
+
+ {formatMetric(get(props, 'doc_count'), LARGE_ABBREVIATED)}
+
+
+ {formatMetric(get(props, 'data_size'), LARGE_BYTES)}
+
+
+ {formatMetric(get(props, 'index_rate'), LARGE_FLOAT, '/s')}
+
+
+ {formatMetric(get(props, 'search_rate'), LARGE_FLOAT, '/s')}
+
+
+ {formatMetric(get(props, 'unassigned_shards'), '0')}
+
+
+);
+
+const getNoDataMessage = filterText => {
+ if (filterText) {
+ return (
+
+
+ There are no indices that match your selection with the filter [{filterText.trim()}].
+ Try changing the filter or the time range selection.
+
+
+ If you are looking for system indices (e.g., .kibana), try checking ‘Show system indices’.
+
+
+ );
+ }
+ return (
+
+ There are no indices that match your selections. Try changing the time range selection.
+ If you are looking for system indices (e.g., .kibana), try checking ‘Show system indices’.
+
+ );
+};
+
+const renderToolBarSection = ({ showSystemIndices, toggleShowSystemIndices, ...props }) => (
+
+
+ );
+}
+
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/show_system_indices_checkbox.js b/x-pack/plugins/monitoring/public/components/elasticsearch/indices/system_indices_checkbox.js
similarity index 95%
rename from x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/show_system_indices_checkbox.js
rename to x-pack/plugins/monitoring/public/components/elasticsearch/indices/system_indices_checkbox.js
index 4f2ec1b5c5897e..bfda69ae856e74 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/index_listing/show_system_indices_checkbox.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/indices/system_indices_checkbox.js
@@ -14,7 +14,7 @@ import {
} from '@elastic/eui';
import { TABLE_ACTION_RESET_PAGING } from '../../../../common/constants';
-export class ShowSytemIndicesCheckbox extends React.Component {
+export class SytemIndicesCheckbox extends React.Component {
constructor(props) {
super(props);
this.state = { showSystemIndices: props.showSystemIndices };
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node/index.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node/index.js
new file mode 100644
index 00000000000000..f8277a78f6f8ea
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/node/index.js
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { NodeStatusIcon } from './status_icon';
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node/status_icon.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node/status_icon.js
index edd7db5f1f70fa..5a7ed469eba35c 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/node/status_icon.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/node/status_icon.js
@@ -5,12 +5,12 @@
*/
import React from 'react';
-import { StatusIcon } from 'plugins/monitoring/components/status_icon';
+import { StatusIcon } from '../../status_icon';
-export function NodeStatusIcon({ status }) {
- const type = (status === 'Online') ? StatusIcon.TYPES.GREEN : StatusIcon.TYPES.GRAY;
+export function NodeStatusIcon({ isOnline, status }) {
+ const type = isOnline ? StatusIcon.TYPES.GREEN : StatusIcon.TYPES.GRAY;
return (
-
+ Status:
+ );
+
+ return (
+
+
+ {get(this.props, 'shardCount')}
+
+
+ );
+ }
+ return
+
+
+
+
+
+
+
+ {this.props.name}
+
+
+
+ {extractIp(this.props.transport_address)}
+
+
+
+
+
+ {this.getCpuComponents()}
+
+ );
+ }
+ };
+};
+
+export function ElasticsearchNodes({ clusterStatus, nodes, showCgroupMetricsElasticsearch, ...props }) {
+ const columns = getColumns(showCgroupMetricsElasticsearch);
+
+ return (
+
+
+ );
+}
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/status_icon.js b/x-pack/plugins/monitoring/public/components/elasticsearch/status_icon.js
index 3374553188f178..623fbbfde30a68 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/status_icon.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/status_icon.js
@@ -5,7 +5,7 @@
*/
import React from 'react';
-import { StatusIcon } from 'plugins/monitoring/components/status_icon';
+import { StatusIcon } from '../status_icon';
export function ElasticsearchStatusIcon({ status }) {
const type = (() => {
diff --git a/x-pack/plugins/monitoring/public/components/index.js b/x-pack/plugins/monitoring/public/components/index.js
index fe11e0b827861a..665ef7b5fce9db 100644
--- a/x-pack/plugins/monitoring/public/components/index.js
+++ b/x-pack/plugins/monitoring/public/components/index.js
@@ -5,9 +5,15 @@
*/
export { MonitoringTimeseriesContainer } from './chart';
+export { MonitoringTable } from './table';
+export { Tooltip } from './tooltip';
export { NoData } from './no_data';
export { License } from './license';
export { StatusIcon } from './status_icon';
-export { SummaryStatus } from './summary_status';
+export { SummaryStatus } from './summary_status'; // TODO this line can be removed, component is only used by other components
export { PageLoading } from './page_loading';
-export { ElasticsearchOverview } from './elasticsearch';
+export {
+ ElasticsearchOverview,
+ ElasticsearchNodes,
+ ElasticsearchIndices
+} from './elasticsearch';
diff --git a/x-pack/plugins/monitoring/public/components/kibana/cluster_status/index.js b/x-pack/plugins/monitoring/public/components/kibana/cluster_status/index.js
new file mode 100644
index 00000000000000..f8fdb6efcb1e4b
--- /dev/null
+++ b/x-pack/plugins/monitoring/public/components/kibana/cluster_status/index.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment } from 'react';
+import { SummaryStatus } from '../../summary_status';
+import { KibanaStatusIcon } from '../status_icon';
+import { formatMetric } from '../../../lib/format_number';
+
+export function ClusterStatus({ stats }) {
+ const {
+ concurrent_connections: connections,
+ count: instances,
+ memory_limit: memLimit,
+ memory_size: memSize,
+ requests_total: requests,
+ response_time_max: maxResponseTime,
+ status,
+ } = stats;
+
+ const metrics = [
+ {
+ label: 'Instances',
+ value: instances,
+ dataTestSubj: 'instances'
+ },
+ {
+ label: 'Memory',
+ value: formatMetric(memSize, 'byte') + ' / ' + formatMetric(memLimit, 'byte'),
+ dataTestSubj: 'memory'
+ },
+ {
+ label: 'Requests',
+ value: requests,
+ dataTestSubj: 'requests'
+ },
+ {
+ label: 'Connections',
+ value: connections,
+ dataTestSubj: 'connections'
+ },
+ {
+ label: 'Max. Response Time',
+ value: formatMetric(maxResponseTime, '0', 'ms'),
+ dataTestSubj: 'maxResponseTime'
+ }
+ ];
+
+ const IconComponent = ({ status }) => (
+
+ Status:
+ );
+
+ return (
+
+ Status:
+ );
+
+ return (
+
-
+
![]()
-
+
This is a conditional statement in your pipeline.
@@ -75,6 +80,7 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
-
+
![]()
-
+
This
@@ -127,7 +137,9 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
size="l"
/>
-
+
-
+
![]()
-
+
This
plugin
@@ -406,7 +423,9 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
.
-
+
-
+
![]()
-
+
This is an internal structure used by Logstash to buffer events between inputs and the rest of the pipeline.
@@ -696,6 +720,7 @@ exports[`DetailDrawer component shows vertex title 1`] = `
-
+
![]()
-
`;
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
index 4781aaa33aeed0..1567323a0153fe 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
@@ -136,7 +136,7 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
class="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -47,7 +49,9 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -111,13 +115,14 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
+
@@ -85,7 +87,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
-
+
@@ -105,7 +109,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -172,13 +178,14 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
-
+
@@ -268,7 +277,9 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -335,13 +346,14 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
- {label}: {value}
+ {label ? label + ': ' : null}
+ {value}
);
-const StatusIndicator = ({ status }) => {
+const DefaultIconComponent = ({ status }) => (
+
+ Status: {(
+
+);
+
+const StatusIndicator = ({ status, isOnline, IconComponent }) => {
if (isEmpty(status)) {
return null;
}
return (
- Health:
- {children.map(wrapChild)}
+ {metrics.map(wrapChild)}
-
+
+
+
+ );
+ }
+ return (
+ + There are no indices that match your selection with the filter [{filterText.trim()}]. + Try changing the filter or the time range selection. +
++ If you are looking for system indices (e.g., .kibana), try checking ‘Show system indices’. +
+
+
+ );
+};
+
+const renderToolBarSection = ({ showSystemIndices, toggleShowSystemIndices, ...props }) => (
+ There are no indices that match your selections. Try changing the time range selection.
+If you are looking for system indices (e.g., .kibana), try checking ‘Show system indices’.
+
+ {get(this.props, 'shardCount')}
+
+
+
+
+
+
+
+ {this.props.name}
+
+
+
+ {extractIp(this.props.transport_address)}
+
+
+
+
![]()
-
+
This is a conditional statement in your pipeline.
@@ -75,6 +80,7 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
-
+
![]()
-
+
This
@@ -127,7 +137,9 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
size="l"
/>
-
+
-
+
![]()
-
+
This
plugin
@@ -406,7 +423,9 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
.
-
+
-
+
![]()
-
+
This is an internal structure used by Logstash to buffer events between inputs and the rest of the pipeline.
@@ -696,6 +720,7 @@ exports[`DetailDrawer component shows vertex title 1`] = `
-
+
![]()
-
`;
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
index 4781aaa33aeed0..1567323a0153fe 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
@@ -136,7 +136,7 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
class="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -47,7 +49,9 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -111,13 +115,14 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
+
@@ -85,7 +87,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
-
+
@@ -105,7 +109,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -172,13 +178,14 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
-
+
@@ -268,7 +277,9 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
+
@@ -335,13 +346,14 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
- {label}: {value}
+ {label ? label + ': ' : null}
+ {value}
);
-const StatusIndicator = ({ status }) => {
+const DefaultIconComponent = ({ status }) => (
+
+ Status: {(
+
+);
+
+const StatusIndicator = ({ status, isOnline, IconComponent }) => {
if (isEmpty(status)) {
return null;
}
return (
- Health:
- {children.map(wrapChild)}
+ {metrics.map(wrapChild)}
-
This is a conditional statement in your pipeline.
@@ -75,6 +80,7 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
This
@@ -127,7 +137,9 @@ exports[`DetailDrawer component Plugin vertices Plugin does not have explicit ID
size="l"
/>
This
plugin
@@ -406,7 +423,9 @@ exports[`DetailDrawer component Plugin vertices Plugin has explicit ID shows bas
.
This is an internal structure used by Logstash to buffer events between inputs and the rest of the pipeline.
-
-
@@ -47,7 +49,9 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
@@ -111,13 +115,14 @@ exports[`ExplainCollectionEnabled should explain about xpack.monitoring.collecti
@@ -85,7 +87,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
-
@@ -105,7 +109,9 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
@@ -172,13 +178,14 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh
@@ -268,7 +277,9 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
className="euiHorizontalRule euiHorizontalRule--half euiHorizontalRule--marginLarge"
/>
-
@@ -335,13 +346,14 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect
(
- Health:
);
};
-export function SummaryStatus({ children, status, ...props }) {
+export function SummaryStatus({ metrics, status, isOnline, IconComponent = DefaultIconComponent, ...props }) {
return (