Skip to content

Commit d24eddc

Browse files
Merge branch 'master' into by-value-export-references
2 parents 7cc6a79 + 556a882 commit d24eddc

File tree

143 files changed

+2608
-2046
lines changed

Some content is hidden

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

143 files changed

+2608
-2046
lines changed

docs/apm/service-overview.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ each dependency. By default, dependencies are sorted by _Impact_ to show the mos
6262
If there is a particular dependency you are interested in, click *View service map* to view the related
6363
<<service-maps, service map>>.
6464

65-
IMPORTANT: A known issue prevents Real User Monitoring (RUM) dependencies from being shown in the
66-
*Dependencies* table. We are working on a fix for this issue.
65+
NOTE: Displaying dependencies for services instrumented with the Real User Monitoring (RUM) agent
66+
requires an agent version ≥ v5.6.3.
6767

6868
[role="screenshot"]
6969
image::apm/images/spans-dependencies.png[Span type duration and dependencies]

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ readonly links: {
117117
};
118118
readonly date: {
119119
readonly dateMath: string;
120+
readonly dateMathIndexNames: string;
120121
};
121122
readonly management: Record<string, string>;
122123
readonly ml: Record<string, string>;
@@ -130,13 +131,15 @@ readonly links: {
130131
createApiKey: string;
131132
createPipeline: string;
132133
createTransformRequest: string;
134+
cronExpressions: string;
133135
executeWatchActionModes: string;
134136
indexExists: string;
135137
openIndex: string;
136138
putComponentTemplate: string;
137139
painlessExecute: string;
138140
painlessExecuteAPIContexts: string;
139141
putComponentTemplateMetadata: string;
142+
putSnapshotLifecyclePolicy: string;
140143
putWatch: string;
141144
updateTransform: string;
142145
}>;
@@ -158,5 +161,7 @@ readonly links: {
158161
}>;
159162
readonly watcher: Record<string, string>;
160163
readonly ccs: Record<string, string>;
164+
readonly plugins: Record<string, string>;
165+
readonly snapshotRestore: Record<string, string>;
161166
};
162167
```

docs/development/core/public/kibana-plugin-core-public.doclinksstart.md

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/setup/docker.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ The following settings have different default values when using the Docker
120120
images:
121121

122122
[horizontal]
123-
`server.name`:: `kibana`
124123
`server.host`:: `"0.0.0.0"`
125124
`elasticsearch.hosts`:: `http://elasticsearch:9200`
126125
`monitoring.ui.container.elasticsearch.enabled`:: `true`

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@
183183
"content-disposition": "0.5.3",
184184
"core-js": "^3.6.5",
185185
"custom-event-polyfill": "^0.3.0",
186-
"cypress-promise": "^1.1.0",
187186
"cytoscape": "^3.10.0",
188187
"cytoscape-dagre": "^2.2.2",
189188
"d3-array": "1.2.4",
@@ -613,6 +612,8 @@
613612
"cypress": "^6.2.1",
614613
"cypress-cucumber-preprocessor": "^2.5.2",
615614
"cypress-multi-reporters": "^1.4.0",
615+
"cypress-pipe": "^2.0.0",
616+
"cypress-promise": "^1.1.0",
616617
"d3": "3.5.17",
617618
"d3-cloud": "1.2.5",
618619
"d3-scale": "1.0.7",
@@ -833,8 +834,8 @@
833834
"val-loader": "^1.1.1",
834835
"vega": "^5.19.1",
835836
"vega-lite": "^4.17.0",
836-
"vega-spec-injector": "^0.0.2",
837837
"vega-schema-url-parser": "^2.1.0",
838+
"vega-spec-injector": "^0.0.2",
838839
"vega-tooltip": "^0.25.0",
839840
"venn.js": "0.2.20",
840841
"vinyl-fs": "^3.0.3",

packages/kbn-analytics/src/index.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66
* Side Public License, v 1.
77
*/
88

9-
export { ReportHTTP, Reporter, ReporterConfig } from './reporter';
10-
export { UiCounterMetricType, METRIC_TYPE } from './metrics';
11-
export { Report, ReportManager } from './report';
9+
// Export types separately to the actual run-time objects
10+
export type { ReportHTTP, ReporterConfig } from './reporter';
11+
export type { UiCounterMetricType } from './metrics';
12+
export type { Report } from './report';
13+
export type { Storage } from './storage';
14+
15+
export { Reporter } from './reporter';
16+
export { METRIC_TYPE } from './metrics';
17+
export { ReportManager } from './report';
1218
export { ApplicationUsageTracker } from './application_usage_tracker';
13-
export { Storage } from './storage';

packages/kbn-analytics/src/metrics/index.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
* Side Public License, v 1.
77
*/
88

9-
import { UiCounterMetric } from './ui_counter';
10-
import { UserAgentMetric } from './user_agent';
11-
import { ApplicationUsageMetric } from './application_usage';
9+
import type { UiCounterMetric } from './ui_counter';
10+
import type { UserAgentMetric } from './user_agent';
11+
import type { ApplicationUsageMetric } from './application_usage';
1212

13-
export { UiCounterMetric, createUiCounterMetric, UiCounterMetricType } from './ui_counter';
13+
// Export types separately to the actual run-time objects
14+
export type { ApplicationUsageMetric } from './application_usage';
15+
export type { UiCounterMetric, UiCounterMetricType } from './ui_counter';
16+
17+
export { createUiCounterMetric } from './ui_counter';
1418
export { trackUsageAgent } from './user_agent';
15-
export { createApplicationUsageMetric, ApplicationUsageMetric } from './application_usage';
19+
export { createApplicationUsageMetric } from './application_usage';
1620

1721
export type Metric = UiCounterMetric | UserAgentMetric | ApplicationUsageMetric;
1822
export enum METRIC_TYPE {

packages/kbn-ui-shared-deps/entry.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ export const LodashFp = require('lodash/fp');
4646

4747
// runtime deps which don't need to be copied across all bundles
4848
export const TsLib = require('tslib');
49+
export const KbnAnalytics = require('@kbn/analytics');

packages/kbn-ui-shared-deps/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ exports.externals = {
5757
* runtime deps which don't need to be copied across all bundles
5858
*/
5959
tslib: '__kbnSharedDeps__.TsLib',
60+
'@kbn/analytics': '__kbnSharedDeps__.KbnAnalytics',
6061
};
6162
exports.publicPathLoader = require.resolve('./public_path_loader');

src/core/public/doc_links/doc_links_service.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export class DocLinksService {
2020
const DOC_LINK_VERSION = injectedMetadata.getKibanaBranch();
2121
const ELASTIC_WEBSITE_URL = 'https://www.elastic.co/';
2222
const ELASTICSEARCH_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`;
23+
const PLUGIN_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`;
2324

2425
return deepFreeze({
2526
DOC_LINK_VERSION,
@@ -126,6 +127,7 @@ export class DocLinksService {
126127
addData: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/connect-to-elasticsearch.html`,
127128
kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`,
128129
elasticsearch: {
130+
indexModules: `${ELASTICSEARCH_DOCS}index-modules.html`,
129131
mapping: `${ELASTICSEARCH_DOCS}mapping.html`,
130132
remoteClusters: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html`,
131133
remoteClustersProxy: `${ELASTICSEARCH_DOCS}modules-remote-clusters.html#proxy-mode`,
@@ -145,6 +147,7 @@ export class DocLinksService {
145147
},
146148
date: {
147149
dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
150+
dateMathIndexNames: `${ELASTICSEARCH_DOCS}date-math-index-names.html`,
148151
},
149152
management: {
150153
kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
@@ -239,16 +242,34 @@ export class DocLinksService {
239242
createApiKey: `${ELASTICSEARCH_DOCS}security-api-create-api-key.html`,
240243
createPipeline: `${ELASTICSEARCH_DOCS}put-pipeline-api.html`,
241244
createTransformRequest: `${ELASTICSEARCH_DOCS}put-transform.html#put-transform-request-body`,
245+
cronExpressions: `${ELASTICSEARCH_DOCS}cron-expressions.html`,
242246
executeWatchActionModes: `${ELASTICSEARCH_DOCS}watcher-api-execute-watch.html#watcher-api-execute-watch-action-mode`,
243247
indexExists: `${ELASTICSEARCH_DOCS}indices-exists.html`,
244248
openIndex: `${ELASTICSEARCH_DOCS}indices-open-close.html`,
245249
putComponentTemplate: `${ELASTICSEARCH_DOCS}indices-component-template.html`,
246250
painlessExecute: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-execute-api.html`,
247251
painlessExecuteAPIContexts: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-execute-api.html#_contexts`,
248252
putComponentTemplateMetadata: `${ELASTICSEARCH_DOCS}indices-component-template.html#component-templates-metadata`,
253+
putSnapshotLifecyclePolicy: `${ELASTICSEARCH_DOCS}slm-api-put-policy.html`,
249254
putWatch: `${ELASTICSEARCH_DOCS}/watcher-api-put-watch.html`,
250255
updateTransform: `${ELASTICSEARCH_DOCS}update-transform.html`,
251256
},
257+
plugins: {
258+
azureRepo: `${PLUGIN_DOCS}repository-azure.html`,
259+
gcsRepo: `${PLUGIN_DOCS}repository-gcs.html`,
260+
hdfsRepo: `${PLUGIN_DOCS}repository-hdfs.html`,
261+
s3Repo: `${PLUGIN_DOCS}repository-s3.html`,
262+
snapshotRestoreRepos: `${PLUGIN_DOCS}repository.html`,
263+
},
264+
snapshotRestore: {
265+
guide: `${ELASTICSEARCH_DOCS}snapshot-restore.html`,
266+
changeIndexSettings: `${ELASTICSEARCH_DOCS}snapshots-restore-snapshot.html#change-index-settings-during-restore`,
267+
createSnapshot: `${ELASTICSEARCH_DOCS}snapshots-take-snapshot.html`,
268+
registerSharedFileSystem: `${ELASTICSEARCH_DOCS}snapshots-register-repository.html#snapshots-filesystem-repository`,
269+
registerSourceOnly: `${ELASTICSEARCH_DOCS}snapshots-register-repository.html#snapshots-source-only-repository`,
270+
registerUrl: `${ELASTICSEARCH_DOCS}snapshots-register-repository.html#snapshots-read-only-repository`,
271+
restoreSnapshot: `${ELASTICSEARCH_DOCS}snapshots-restore-snapshot.html`,
272+
},
252273
},
253274
});
254275
}
@@ -368,6 +389,7 @@ export interface DocLinksStart {
368389
};
369390
readonly date: {
370391
readonly dateMath: string;
392+
readonly dateMathIndexNames: string;
371393
};
372394
readonly management: Record<string, string>;
373395
readonly ml: Record<string, string>;
@@ -381,13 +403,15 @@ export interface DocLinksStart {
381403
createApiKey: string;
382404
createPipeline: string;
383405
createTransformRequest: string;
406+
cronExpressions: string;
384407
executeWatchActionModes: string;
385408
indexExists: string;
386409
openIndex: string;
387410
putComponentTemplate: string;
388411
painlessExecute: string;
389412
painlessExecuteAPIContexts: string;
390413
putComponentTemplateMetadata: string;
414+
putSnapshotLifecyclePolicy: string;
391415
putWatch: string;
392416
updateTransform: string;
393417
}>;
@@ -409,5 +433,7 @@ export interface DocLinksStart {
409433
}>;
410434
readonly watcher: Record<string, string>;
411435
readonly ccs: Record<string, string>;
436+
readonly plugins: Record<string, string>;
437+
readonly snapshotRestore: Record<string, string>;
412438
};
413439
}

0 commit comments

Comments
 (0)