Skip to content

Commit b037200

Browse files
committed
Merge branch 'master' of github.com:elastic/kibana into implement/kbn-optimizer
2 parents c190d78 + deda49e commit b037200

File tree

86 files changed

+570
-631
lines changed

Some content is hidden

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

86 files changed

+570
-631
lines changed

.eslintrc.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,7 @@ module.exports = {
355355
settings: {
356356
// instructs import/no-extraneous-dependencies to treat certain modules
357357
// as core modules, even if they aren't listed in package.json
358-
'import/core-modules': [
359-
'plugins',
360-
'legacy/ui',
361-
'uiExports',
362-
// TODO: Remove once https://github.com/benmosher/eslint-plugin-import/issues/1374 is fixed
363-
'querystring',
364-
],
358+
'import/core-modules': ['plugins', 'legacy/ui', 'uiExports'],
365359

366360
'import/resolver': {
367361
'@kbn/eslint-import-resolver-kibana': {

NOTICE.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -218,28 +218,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
218218
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
219219
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
220220

221-
---
222-
This product includes code that was extracted from angular@1.3.
223-
Original license:
224-
The MIT License
225-
226-
Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
227-
228-
Permission is hereby granted, free of charge, to any person obtaining a copy
229-
of this software and associated documentation files (the "Software"), to deal
230-
in the Software without restriction, including without limitation the rights
231-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
232-
copies of the Software, and to permit persons to whom the Software is
233-
furnished to do so, subject to the following conditions:
234-
235-
The above copyright notice and this permission notice shall be included in
236-
all copies or substantial portions of the Software.
237-
238-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
239-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
240-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
241-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
242-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
243-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
244-
THE SOFTWARE.
245-

docs/limitations.asciidoc

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,38 @@
1+
[chapter]
12
[[limitations]]
23
= Limitations
34

4-
[partintro]
5-
--
6-
{kib} currently has the following limitations.
5+
Following are the known limitations in {kib}.
76

8-
* <<nested-objects>>
9-
* <<export-data>>
10-
* <<graph-limitations,Graph analytics>>
7+
[float]
8+
=== Exporting data
119

12-
These {stack} features also have limitations that affect {kib}:
10+
Exporting a data table or saved search from a dashboard or visualization report
11+
has known limitations. The PDF report only includes the data visible on the screen.
1312

14-
* {ref}/watcher-limitations.html[Alerting]
15-
* {ml-docs}/ml-limitations.html[Machine learning]
16-
* {ref}/security-limitations.html[Security]
13+
[float]
14+
=== Nested objects
15+
16+
Kibana cannot perform aggregations across fields that contain nested objects.
17+
It also cannot search on nested objects when Lucene Query Syntax is used in
18+
the query bar.
19+
20+
[IMPORTANT]
21+
==============================================
22+
Using `include_in_parent` or `copy_to` as a workaround is not supported and may stop functioning in future releases.
23+
==============================================
1724

18-
--
25+
[float]
26+
=== Graph
1927

20-
include::limitations/nested-objects.asciidoc[]
28+
Graph has limited support for multiple indices.
29+
Go to <<graph-limitations, Graph limitations>> for details.
2130

22-
include::limitations/export-data.asciidoc[]
31+
[float]
32+
=== Other limitations
33+
34+
These {stack} features have limitations that affect {kib}:
35+
36+
* {ref}/watcher-limitations.html[Alerting]
37+
* {ml-docs}/ml-limitations.html[Machine learning]
38+
* {ref}/security-limitations.html[Security]

docs/limitations/export-data.asciidoc

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/limitations/nested-objects.asciidoc

Lines changed: 0 additions & 11 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"prop-types": "15.6.0",
226226
"proxy-from-env": "1.0.0",
227227
"pug": "^2.0.4",
228-
"querystring-browser": "1.0.4",
228+
"query-string": "6.10.1",
229229
"raw-loader": "3.1.0",
230230
"react": "^16.12.0",
231231
"react-color": "^2.13.8",

packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ exports.getWebpackConfig = function(kibanaPath, projectRoot, config) {
2929
// Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36
3030
ui: fromKibana('src/legacy/ui/public'),
3131
test_harness: fromKibana('src/test_harness/public'),
32-
querystring: 'querystring-browser',
3332

3433
// Dev defaults for test bundle https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/core_plugins/tests_bundle/index.js#L73-L78
3534
ng_mock$: fromKibana('src/test_utils/public/ng_mock'),

packages/kbn-optimizer/src/worker/webpack.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
199199
extensions: ['.js', '.ts', '.tsx', '.json'],
200200
alias: {
201201
tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
202-
querystring: require.resolve('querystring-browser'),
203202
},
204203
},
205204

src/core/server/http/http_server.mocks.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import { Request } from 'hapi';
2020
import { merge } from 'lodash';
2121
import { Socket } from 'net';
22-
23-
import querystring from 'querystring';
22+
import { stringify } from 'query-string';
2423

2524
import { schema } from '@kbn/config-schema';
2625

@@ -55,7 +54,8 @@ function createKibanaRequestMock({
5554
socket = new Socket(),
5655
routeTags,
5756
}: RequestFixtureOptions = {}) {
58-
const queryString = querystring.stringify(query);
57+
const queryString = stringify(query, { sort: false });
58+
5959
return KibanaRequest.from(
6060
createRawRequestMock({
6161
headers,

src/core/utils/url.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
20-
import { ParsedUrlQuery } from 'querystring';
19+
import { ParsedQuery } from 'query-string';
2120
import { format as formatUrl, parse as parseUrl, UrlObject } from 'url';
2221

2322
/**
@@ -33,7 +32,7 @@ export interface URLMeaningfulParts {
3332
protocol?: string | null;
3433
slashes?: boolean | null;
3534
port?: string | null;
36-
query: ParsedUrlQuery;
35+
query: ParsedQuery;
3736
}
3837

3938
/**

0 commit comments

Comments
 (0)