Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
andreadelrio committed Jan 21, 2022
2 parents 28e552b + 7255901 commit 3213cb7
Show file tree
Hide file tree
Showing 1,130 changed files with 25,374 additions and 24,629 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ snapshots.js
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
/packages/kbn-ui-framework/dist
/packages/kbn-ui-shared-deps-src/src/flot_charts
/packages/kbn-flot-charts/lib
/packages/kbn-monaco/src/painless/antlr

# Bazel
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ module.exports = {
},
},
{
files: ['packages/kbn-ui-shared-deps-src/src/flot_charts/**/*.js'],
files: ['packages/kbn-flot-charts/lib/**/*.js'],
env: {
jquery: true,
},
Expand Down
2 changes: 1 addition & 1 deletion .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"expressionShape": "src/plugins/expression_shape",
"expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
"fieldFormats": "src/plugins/field_formats",
"flot": "packages/kbn-ui-shared-deps-src/src/flot_charts",
"flot": "packages/kbn-flot-charts/lib",
"home": "src/plugins/home",
"indexPatternEditor": "src/plugins/data_view_editor",
"indexPatternFieldEditor": "src/plugins/data_view_field_editor",
Expand Down
2 changes: 2 additions & 0 deletions docs/canvas/canvas-expression-lifecycle.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ To use demo dataset available in Canvas to produce a table, run the following ex

[source,text]
----
/* Simple demo table */
filters
| demodata
| table
Expand All @@ -24,6 +25,7 @@ This expression starts out with the <<filters_fn, filters>> function, which prov

The filtered <<demodata_fn, demo data>> becomes the _context_ of the next function, <<table_fn, table>>, which creates a table visualization from this data set. The <<table_fn, table>> function isn’t strictly required, but by being explicit, you have the option of providing arguments to control things like the font used in the table. The output of the <<table_fn, table>> function becomes the _context_ of the <<render_fn, render>> function. Like the <<table_fn, table>>, the <<render_fn, render>> function isn’t required either, but it allows access to other arguments, such as styling the border of the element or injecting custom CSS.

It is possible to add comments to the expression by starting them with a `//` sequence or by using `/*` and `*/` to enclose multi-line comments.

[[canvas-function-arguments]]
=== Function arguments
Expand Down
7 changes: 0 additions & 7 deletions docs/developer/advanced/running-elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ elasticsearch.password: {{ password }}
elasticsearch.ssl.verificationMode: none
----

If many other users will be interacting with your remote cluster, you'll want to add the following to avoid causing conflicts:

[source,bash]
----
kibana.index: '.{YourGitHubHandle}-kibana'
----

==== Running remote clusters

Setup remote clusters for cross cluster search (CCS) and cross cluster replication (CCR).
Expand Down
3 changes: 3 additions & 0 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ All the arguments to expression functions need to be serializable, as well as in
Expression functions should try to stay 'pure'. This makes functions easy to reuse and also
make it possible to serialize the whole chain as well as output at every step of execution.
It is possible to add comments to expressions by starting them with a `//` sequence
or by using `/*` and `*/` to enclose multi-line comments.
Expressions power visualizations in Dashboard and Lens, as well as, every
*element* in Canvas is backed by an expression.
Expand Down
6 changes: 2 additions & 4 deletions docs/user/ml/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ pane:
[role="screenshot"]
image::user/ml/images/ml-job-management.png[Job Management]

You can use the *Settings* pane to create and edit
{ml-docs}/ml-ad-finding-anomalies.html#ml-ad-calendars[calendars] and the
filters that are used in
{ml-docs}/ml-ad-finding-anomalies.html#ml-ad-rules[custom rules]:
You can use the *Settings* pane to create and edit calendars and the
filters that are used in custom rules:

[role="screenshot"]
image::user/ml/images/ml-settings.png[Calendar Management]
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
"@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
"@kbn/field-types": "link:bazel-bin/packages/kbn-field-types",
"@kbn/flot-charts": "link:bazel-bin/packages/kbn-flot-charts",
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
"@kbn/i18n-react": "link:bazel-bin/packages/kbn-i18n-react",
"@kbn/interpreter": "link:bazel-bin/packages/kbn-interpreter",
Expand Down Expand Up @@ -169,6 +170,7 @@
"@kbn/ui-framework": "link:bazel-bin/packages/kbn-ui-framework",
"@kbn/ui-shared-deps-npm": "link:bazel-bin/packages/kbn-ui-shared-deps-npm",
"@kbn/ui-shared-deps-src": "link:bazel-bin/packages/kbn-ui-shared-deps-src",
"@kbn/ui-theme": "link:bazel-bin/packages/kbn-ui-theme",
"@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types",
"@kbn/utils": "link:bazel-bin/packages/kbn-utils",
"@loaders.gl/core": "^2.3.1",
Expand Down Expand Up @@ -227,7 +229,7 @@
"deep-freeze-strict": "^1.1.1",
"deepmerge": "^4.2.2",
"del": "^5.1.0",
"elastic-apm-node": "^3.26.0",
"elastic-apm-node": "^3.27.0",
"execa": "^4.0.2",
"exit-hook": "^2.2.0",
"expiry-js": "0.1.7",
Expand Down Expand Up @@ -340,7 +342,7 @@
"react-moment-proptypes": "^1.7.0",
"react-monaco-editor": "^0.41.2",
"react-popper-tooltip": "^2.10.1",
"react-query": "^3.28.0",
"react-query": "^3.34.0",
"react-redux": "^7.2.0",
"react-resizable": "^1.7.5",
"react-resize-detector": "^4.2.0",
Expand Down Expand Up @@ -411,7 +413,6 @@
"venn.js": "0.2.20",
"vinyl": "^2.2.0",
"vt-pbf": "^3.1.1",
"wellknown": "^0.5.0",
"whatwg-fetch": "^3.0.0",
"xml2js": "^0.4.22",
"yauzl": "^2.10.0"
Expand Down Expand Up @@ -603,6 +604,8 @@
"@types/kbn__std": "link:bazel-bin/packages/kbn-std/npm_module_types",
"@types/kbn__telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module_types",
"@types/kbn__ui-shared-deps-npm": "link:bazel-bin/packages/kbn-ui-shared-deps-npm/npm_module_types",
"@types/kbn__ui-shared-deps-src": "link:bazel-bin/packages/kbn-ui-shared-deps-src/npm_module_types",
"@types/kbn__ui-theme": "link:bazel-bin/packages/kbn-ui-theme/npm_module_types",
"@types/kbn__utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module_types",
"@types/kbn__utils": "link:bazel-bin/packages/kbn-utils/npm_module_types",
"@types/license-checker": "15.0.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ filegroup(
"//packages/kbn-eslint-plugin-eslint:build",
"//packages/kbn-expect:build",
"//packages/kbn-field-types:build",
"//packages/kbn-flot-charts:build",
"//packages/kbn-i18n:build",
"//packages/kbn-i18n-react:build",
"//packages/kbn-interpreter:build",
Expand Down Expand Up @@ -66,6 +67,7 @@ filegroup(
"//packages/kbn-ui-framework:build",
"//packages/kbn-ui-shared-deps-npm:build",
"//packages/kbn-ui-shared-deps-src:build",
"//packages/kbn-ui-theme:build",
"//packages/kbn-utility-types:build",
"//packages/kbn-utils:build",
],
Expand Down Expand Up @@ -121,6 +123,8 @@ filegroup(
"//packages/kbn-std:build_types",
"//packages/kbn-telemetry-tools:build_types",
"//packages/kbn-ui-shared-deps-npm:build_types",
"//packages/kbn-ui-shared-deps-src:build_types",
"//packages/kbn-ui-theme:build_types",
"//packages/kbn-utility-types:build_types",
"//packages/kbn-utils:build_types",
],
Expand Down
2 changes: 1 addition & 1 deletion packages/elastic-eslint-config-kibana/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module.exports = {
].map(from => ({
from,
to: false,
disallowedMessage: `Use "@kbn/ui-shared-deps-src/theme" to access theme vars.`
disallowedMessage: `Use "@kbn/ui-theme" to access theme vars.`
})),
],
],
Expand Down
19 changes: 17 additions & 2 deletions packages/kbn-dev-utils/src/serializers/recursive_serializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,26 @@
* Side Public License, v 1.
*/

export function createRecursiveSerializer(test: (v: any) => boolean, print: (v: any) => string) {
class RawPrint {
static fromString(s: string) {
return new RawPrint(s);
}
constructor(public readonly v: string) {}
}

export function createRecursiveSerializer(
test: (v: any) => boolean,
print: (v: any, printRaw: (v: string) => RawPrint) => string | RawPrint
) {
return {
test: (v: any) => test(v),
serialize: (v: any, ...rest: any[]) => {
const replacement = print(v);
const replacement = print(v, RawPrint.fromString);

if (replacement instanceof RawPrint) {
return replacement.v;
}

const printer = rest.pop()!;
return printer(replacement, ...rest);
},
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-es-archiver/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import readline from 'readline';
import Fs from 'fs';

import { RunWithCommands, createFlagError, CA_CERT_PATH } from '@kbn/dev-utils';
import { readConfigFile, KbnClient } from '@kbn/test';
import { readConfigFile, KbnClient, EsVersion } from '@kbn/test';
import { Client, HttpConnection } from '@elastic/elasticsearch';

import { EsArchiver } from './es_archiver';
Expand All @@ -45,7 +45,7 @@ export function runCli() {
if (typeof configPath !== 'string') {
throw createFlagError('--config must be a string');
}
const config = await readConfigFile(log, Path.resolve(configPath));
const config = await readConfigFile(log, EsVersion.getDefault(), Path.resolve(configPath));
statsMeta.set('ftrConfigPath', configPath);

let esUrl = flags['es-url'];
Expand Down
File renamed without changes.
51 changes: 51 additions & 0 deletions packages/kbn-flot-charts/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "pkg_npm")

PKG_BASE_NAME = "kbn-flot-charts"
PKG_REQUIRE_NAME = "@kbn/flot-charts"

SOURCE_FILES = glob([
"lib/**/*.js",
"index.js",
])

SRCS = SOURCE_FILES

filegroup(
name = "srcs",
srcs = SRCS,
)

NPM_MODULE_EXTRA_FILES = [
"package.json",
"API.md",
]

RUNTIME_DEPS = [
"//packages/kbn-i18n",
]

js_library(
name = PKG_BASE_NAME,
srcs = NPM_MODULE_EXTRA_FILES + [
":srcs",
],
deps = RUNTIME_DEPS,
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)

pkg_npm(
name = "npm_module",
deps = [
":%s" % PKG_BASE_NAME,
]
)

filegroup(
name = "build",
srcs = [
":npm_module",
],
visibility = ["//visibility:public"],
)
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

/* @notice
*
* This product includes code that is based on flot-charts, which was available
Expand Down Expand Up @@ -26,15 +34,15 @@
* THE SOFTWARE.
*/

import './jquery_flot';
import './jquery_flot_canvas';
import './jquery_flot_time';
import './jquery_flot_symbol';
import './jquery_flot_crosshair';
import './jquery_flot_selection';
import './jquery_flot_pie';
import './jquery_flot_stack';
import './jquery_flot_threshold';
import './jquery_flot_fillbetween';
import './jquery_flot_log';
import './jquery_flot_axislabels';
import './lib/jquery_flot';
import './lib/jquery_flot_canvas';
import './lib/jquery_flot_time';
import './lib/jquery_flot_symbol';
import './lib/jquery_flot_crosshair';
import './lib/jquery_flot_selection';
import './lib/jquery_flot_pie';
import './lib/jquery_flot_stack';
import './lib/jquery_flot_threshold';
import './lib/jquery_flot_fillbetween';
import './lib/jquery_flot_log';
import './lib/jquery_flot_axislabels';
File renamed without changes.
7 changes: 7 additions & 0 deletions packages/kbn-flot-charts/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "@kbn/flot-charts",
"version": "1.0.0",
"private": true,
"main": "./index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}
22 changes: 17 additions & 5 deletions packages/kbn-interpreter/grammar/grammar.peggy
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ start
= expression

expression
= space? first:function? rest:('|' space? fn:function { return fn; })* {
= blank? first:function? rest:('|' blank? fn:function { return fn; })* {
return addMeta({
type: 'expression',
chain: first ? [first].concat(rest) : []
Expand All @@ -44,7 +44,7 @@ function "function"
/* ----- Arguments ----- */

argument_assignment
= name:identifier space? '=' space? value:argument {
= name:identifier blank? '=' blank? value:argument {
return { name, value };
}
/ value:argument {
Expand All @@ -58,7 +58,7 @@ argument
}

arg_list
= args:(space arg:argument_assignment { return arg; })* space? {
= args:(blank arg:argument_assignment { return arg; })* blank? {
return args.reduce((accumulator, { name, value }) => ({
...accumulator,
[name]: (accumulator[name] || []).concat(value)
Expand All @@ -82,7 +82,7 @@ phrase

unquoted_string_or_number
// Make sure we're not matching the beginning of a search
= string:unquoted+ { // this also matches nulls, booleans, and numbers
= !comment string:unquoted+ { // this also matches nulls, booleans, and numbers
var result = string.join('');
// Sort of hacky, but PEG doesn't have backtracking so
// a null/boolean/number rule is hard to read, and performs worse
Expand All @@ -93,8 +93,20 @@ unquoted_string_or_number
return Number(result);
}

blank
= (space / comment)+

space
= [\ \t\r\n]+
= [\ \t\r\n]

comment
= inline_comment / multiline_comment

inline_comment
= "//" [^\n]*

multiline_comment
= "/*" (!"*/" .)* "*/"?

unquoted
= "\\" sequence:([\"'(){}<>\[\]$`|=\ \t\n\r] / "\\") { return sequence; }
Expand Down
Loading

0 comments on commit 3213cb7

Please sign in to comment.