Skip to content

Commit 691320c

Browse files
author
John Dorlus
committed
Merge branch 'main' of github.com:elastic/kibana into Paramaterize_Visualize_CCS_Tests
2 parents ce54b05 + 64910b3 commit 691320c

282 files changed

Lines changed: 2091 additions & 1495 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.

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ module.exports = {
304304
*/
305305
{
306306
files: [
307-
'packages/elastic-datemath/**/*.{js,mjs,ts,tsx}',
308307
'packages/elastic-eslint-config-kibana/**/*.{js,mjs,ts,tsx}',
308+
'packages/kbn-datemath/**/*.{js,mjs,ts,tsx}',
309309
],
310310
rules: {
311311
'@kbn/eslint/require-license-header': [

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/examples/field_formats_example/ @elastic/kibana-app-services
5656
/examples/partial_results_example/ @elastic/kibana-app-services
5757
/examples/search_examples/ @elastic/kibana-app-services
58-
/packages/elastic-datemath/ @elastic/kibana-app-services
58+
/packages/kbn-datemath/ @elastic/kibana-app-services
5959
/packages/kbn-interpreter/ @elastic/kibana-app-services
6060
/packages/kbn-react-field/ @elastic/kibana-app-services
6161
/packages/kbn-es-query/ @elastic/kibana-app-services
@@ -324,6 +324,7 @@
324324
/src/plugins/interactive_setup/ @elastic/kibana-security
325325
/test/interactive_setup_api_integration/ @elastic/kibana-security
326326
/test/interactive_setup_functional/ @elastic/kibana-security
327+
/test/plugin_functional/test_suites/core_plugins/rendering.ts @elastic/kibana-security
327328
/x-pack/plugins/spaces/ @elastic/kibana-security
328329
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
329330
/x-pack/plugins/security/ @elastic/kibana-security

‎WORKSPACE.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1010
# Fetch Node.js rules
1111
http_archive(
1212
name = "build_bazel_rules_nodejs",
13-
sha256 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c",
14-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"],
13+
sha256 = "523da2d6b50bc00eaf14b00ed28b1a366b3ab456e14131e9812558b26599125c",
14+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.3.1/rules_nodejs-5.3.1.tar.gz"],
1515
)
1616

17-
# Now that we have the rules let's import from them to complete the work
18-
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
17+
# Build Node.js rules dependencies
18+
load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
19+
build_bazel_rules_nodejs_dependencies()
1920

20-
# Assure we have at least a given rules_nodejs version
21-
check_rules_nodejs_version(minimum_version_string = "4.0.0")
21+
# Now that we have the rules let's import from them to complete the work
22+
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
2223

2324
# Setup the Node.js toolchain for the architectures we want to support
2425
#
@@ -38,14 +39,13 @@ node_repositories(
3839
node_urls = [
3940
"https://nodejs.org/dist/v{version}/{filename}",
4041
],
41-
yarn_repositories = {
42+
yarn_releases = {
4243
"1.21.1": ("yarn-v1.21.1.tar.gz", "yarn-v1.21.1", "d1d9f4a0f16f5ed484e814afeb98f39b82d4728c6c8beaafb5abc99c02db6674"),
4344
},
4445
yarn_version = "1.21.1",
4546
yarn_urls = [
4647
"https://github.com/yarnpkg/yarn/releases/download/v{version}/{filename}",
4748
],
48-
package_json = ["//:package.json"],
4949
)
5050

5151
# Run yarn_install rule to take care of dependencies

‎docs/developer/getting-started/monorepo-packages.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ yarn kbn watch
5151
[discrete]
5252
=== List of Already Migrated Packages to Bazel
5353

54-
- @elastic/datemath
5554
- @elastic/eslint-config-kibana
5655
- @elastic/safer-lodash-set
5756
- @kbn/ace
@@ -64,6 +63,7 @@ yarn kbn watch
6463
- @kbn/config
6564
- @kbn/config-schema
6665
- @kbn/crypto
66+
- @kbn/datemath
6767
- @kbn/dev-utils
6868
- @kbn/docs-utils
6969
- @kbn/es

‎docs/management/advanced-options.asciidoc‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -478,25 +478,13 @@ The default index when using the `.es()` query.
478478
[[timelion-estimefield]]`timelion:es.timefield`::
479479
The default field containing a timestamp when using the `.es()` query.
480480

481-
[[timelion-graphite-url]]`timelion:graphite.url`::
482-
experimental:[]
483-
Used with graphite queries, this is the URL of your graphite host
484-
in the form https://www.hostedgraphite.com/UID/ACCESS_KEY/graphite. This URL can
485-
be selected from an allow-list configured in the `kibana.yml` under
486-
`timelion.graphiteUrls`.
487-
488481
[[timelion-maxbuckets]]`timelion:max_buckets`::
489482
The maximum number of buckets a single data source can return. This value is
490483
used for calculating automatic intervals in visualizations.
491484

492485
[[timelion-mininterval]]`timelion:min_interval`::
493486
The smallest interval to calculate when using "auto".
494487

495-
[[timelion-quandlkey]]`timelion:quandl.key`::
496-
experimental:[]
497-
Used with quandl queries, this is your API key from
498-
https://www.quandl.com/[www.quandl.com].
499-
500488
[[timelion-targetbuckets]]`timelion:target_buckets`::
501489
Used for calculating automatic intervals in visualizations, this is the number
502490
of buckets to try to represent.

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"@elastic/apm-rum-react": "^1.3.4",
107107
"@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
108108
"@elastic/charts": "45.1.1",
109-
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
109+
"@elastic/datemath": "5.0.3",
110110
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.2",
111111
"@elastic/ems-client": "8.2.0",
112112
"@elastic/eui": "53.0.1",
@@ -140,6 +140,7 @@
140140
"@kbn/config": "link:bazel-bin/packages/kbn-config",
141141
"@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema",
142142
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
143+
"@kbn/datemath": "link:bazel-bin/packages/kbn-datemath",
143144
"@kbn/doc-links": "link:bazel-bin/packages/kbn-doc-links",
144145
"@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
145146
"@kbn/eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports",
@@ -310,7 +311,7 @@
310311
"mime-types": "^2.1.27",
311312
"mini-css-extract-plugin": "1.1.0",
312313
"minimatch": "^3.1.2",
313-
"moment": "^2.24.0",
314+
"moment": "^2.29.2",
314315
"moment-duration-format": "^2.3.2",
315316
"moment-timezone": "^0.5.27",
316317
"monaco-editor": "^0.22.3",
@@ -455,7 +456,7 @@
455456
"@babel/traverse": "^7.17.3",
456457
"@babel/types": "^7.17.0",
457458
"@bazel/ibazel": "^0.16.2",
458-
"@bazel/typescript": "4.0.0",
459+
"@bazel/typescript": "5.3.1",
459460
"@cypress/code-coverage": "^3.9.12",
460461
"@cypress/snapshot": "^2.1.7",
461462
"@cypress/webpack-preprocessor": "^5.6.0",
@@ -545,7 +546,6 @@
545546
"@types/delete-empty": "^2.0.0",
546547
"@types/ejs": "^3.0.6",
547548
"@types/elastic__apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace/npm_module_types",
548-
"@types/elastic__datemath": "link:bazel-bin/packages/elastic-datemath/npm_module_types",
549549
"@types/enzyme": "^3.10.8",
550550
"@types/eslint": "^7.28.0",
551551
"@types/express": "^4.17.13",
@@ -595,6 +595,7 @@
595595
"@types/kbn__config": "link:bazel-bin/packages/kbn-config/npm_module_types",
596596
"@types/kbn__config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module_types",
597597
"@types/kbn__crypto": "link:bazel-bin/packages/kbn-crypto/npm_module_types",
598+
"@types/kbn__datemath": "link:bazel-bin/packages/kbn-datemath/npm_module_types",
598599
"@types/kbn__dev-utils": "link:bazel-bin/packages/kbn-dev-utils/npm_module_types",
599600
"@types/kbn__doc-links": "link:bazel-bin/packages/kbn-doc-links/npm_module_types",
600601
"@types/kbn__docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module_types",

‎packages/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ filegroup(
1111
srcs = [
1212
"//packages/elastic-analytics:build",
1313
"//packages/elastic-apm-synthtrace:build",
14-
"//packages/elastic-datemath:build",
1514
"//packages/elastic-eslint-config-kibana:build",
1615
"//packages/elastic-safer-lodash-set:build",
1716
"//packages/kbn-ace:build",
@@ -30,6 +29,7 @@ filegroup(
3029
"//packages/kbn-config-schema:build",
3130
"//packages/kbn-config:build",
3231
"//packages/kbn-crypto:build",
32+
"//packages/kbn-datemath:build",
3333
"//packages/kbn-dev-utils:build",
3434
"//packages/kbn-doc-links:build",
3535
"//packages/kbn-docs-utils:build",
@@ -102,7 +102,6 @@ filegroup(
102102
srcs = [
103103
"//packages/elastic-analytics:build_types",
104104
"//packages/elastic-apm-synthtrace:build_types",
105-
"//packages/elastic-datemath:build_types",
106105
"//packages/elastic-safer-lodash-set:build_types",
107106
"//packages/kbn-ace:build_types",
108107
"//packages/kbn-alerts:build_types",
@@ -116,6 +115,7 @@ filegroup(
116115
"//packages/kbn-config-schema:build_types",
117116
"//packages/kbn-config:build_types",
118117
"//packages/kbn-crypto:build_types",
118+
"//packages/kbn-datemath:build_types",
119119
"//packages/kbn-dev-utils:build_types",
120120
"//packages/kbn-doc-links:build_types",
121121
"//packages/kbn-docs-utils:build_types",

‎packages/elastic-apm-synthtrace/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
2525
]
2626

2727
RUNTIME_DEPS = [
28-
"//packages/elastic-datemath",
28+
"//packages/kbn-datemath",
2929
"@npm//@elastic/elasticsearch",
3030
"@npm//lodash",
3131
"@npm//moment",
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
3636
]
3737

3838
TYPES_DEPS = [
39-
"//packages/elastic-datemath:npm_module_types",
39+
"//packages/kbn-datemath:npm_module_types",
4040
"@npm//@elastic/elasticsearch",
4141
"@npm//@types/jest",
4242
"@npm//@types/lodash",

‎packages/elastic-apm-synthtrace/src/scripts/run.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* in compliance with, at your election, the Elastic License 2.0 or the Server
66
* Side Public License, v 1.
77
*/
8-
import datemath from '@elastic/datemath';
8+
import datemath from '@kbn/datemath';
99
import yargs from 'yargs/yargs';
1010
import { Argv } from 'yargs';
1111
import { intervalToMs } from './utils/interval_to_ms';

‎packages/kbn-config-schema/src/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
NullableProps,
3939
RecordOfOptions,
4040
RecordOfType,
41+
SchemaStructureEntry,
4142
StringOptions,
4243
StringType,
4344
Type,
@@ -49,7 +50,7 @@ import {
4950
StreamType,
5051
} from './types';
5152

52-
export type { AnyType, ConditionalType, TypeOf, Props, NullableProps };
53+
export type { AnyType, ConditionalType, TypeOf, Props, SchemaStructureEntry, NullableProps };
5354
export { ObjectType, Type };
5455
export { ByteSizeValue } from './byte_size_value';
5556
export { SchemaTypeError, ValidationError } from './errors';

0 commit comments

Comments
 (0)