Skip to content

Commit 04f950b

Browse files
Merge branch '7.x' into backport/7.x/pr-52671
2 parents d15d909 + 4855bcd commit 04f950b

125 files changed

Lines changed: 8684 additions & 5610 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/canvas/canvas-expression-lifecycle.asciidoc

Lines changed: 261 additions & 0 deletions
Large diffs are not rendered by default.
615 KB
Loading
1.1 MB
Loading
42.6 KB
Loading
35.7 KB
Loading

docs/user/canvas.asciidoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[]
3737

3838
include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[]
3939

40+
include::{kib-repo-dir}/canvas/canvas-expression-lifecycle.asciidoc[]
41+
4042
include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[]
4143

42-
include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
44+
include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]

docs/user/reporting/reporting-troubleshooting.asciidoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dependencies for Chromium.
1717
Make sure Kibana server OS has the appropriate packages installed for the distribution.
1818

1919
If you are using CentOS/RHEL systems, install the following packages:
20+
2021
* `ipa-gothic-fonts`
2122
* `xorg-x11-fonts-100dpi`
2223
* `xorg-x11-fonts-75dpi`
@@ -28,6 +29,7 @@ If you are using CentOS/RHEL systems, install the following packages:
2829
* `freetype`
2930

3031
If you are using Ubuntu/Debian systems, install the following packages:
32+
3133
* `fonts-liberation`
3234
* `libfontconfig1`
3335

@@ -105,9 +107,10 @@ has its own command-line method to generate its own debug logs, which can someti
105107
caused by Kibana or Chromium. See more at https://github.com/GoogleChrome/puppeteer/blob/v1.19.0/README.md#debugging-tips
106108

107109
Using Puppeteer's debug method when launching Kibana would look like:
108-
> Enable verbose logging - internal DevTools protocol traffic will be logged via the debug module under the puppeteer namespace.
109-
> ```
110-
> env DEBUG="puppeteer:*" ./bin/kibana
111-
> ```
110+
```
111+
env DEBUG="puppeteer:*" ./bin/kibana
112+
```
113+
The internal DevTools protocol traffic will be logged via the `debug` module under the `puppeteer` namespace.
114+
112115

113116
The Puppeteer logs are very verbose and could possibly contain sensitive information. Handle the generated output with care.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
"react-resize-detector": "^4.2.0",
232232
"react-router-dom": "^5.1.2",
233233
"react-sizeme": "^2.3.6",
234-
"react-use": "^13.10.2",
234+
"react-use": "^13.13.0",
235235
"reactcss": "1.2.3",
236236
"redux": "4.0.0",
237237
"redux-actions": "2.2.1",

src/legacy/ui/public/vis/editors/default/components/agg_params.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
import React, { useReducer, useEffect, useMemo } from 'react';
2121
import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
2222
import { i18n } from '@kbn/i18n';
23+
import useUnmount from 'react-use/lib/useUnmount';
2324

2425
import { VisState } from 'ui/vis';
25-
import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
2626
import { IndexPattern } from 'ui/index_patterns';
27+
import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
2728

2829
import { DefaultEditorAggSelect } from './agg_select';
2930
import { DefaultEditorAggParam } from './agg_param';
@@ -44,9 +45,6 @@ import {
4445
} from './agg_params_state';
4546
import { editorConfigProviders } from '../../config/editor_config_providers';
4647
import { FixedParam, TimeIntervalParam, EditorParamConfig } from '../../config/types';
47-
// TODO: Below import is temporary, use `react-use` lib instead.
48-
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
49-
import { useUnmount } from '../../../../../../../plugins/kibana_react/public/util/use_unmount';
5048
import { AggGroupNames } from '../agg_groups';
5149
import { OnAggParamsChange } from './agg_common_props';
5250

src/plugins/expressions/public/expression_renderer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import React from 'react';
2222
import classNames from 'classnames';
2323
import { Subscription } from 'rxjs';
2424
import { filter } from 'rxjs/operators';
25+
import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
2526
import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
2627
import theme from '@elastic/eui/dist/eui_theme_light.json';
27-
import { useShallowCompareEffect } from '../../kibana_react/public';
2828
import { IExpressionLoaderParams, IInterpreterRenderHandlers, RenderError } from './types';
2929
import { ExpressionAST } from '../common/types';
3030
import { ExpressionLoader } from './loader';

0 commit comments

Comments
 (0)