Skip to content

Commit ebcdaa6

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-75257
2 parents 479a68e + 02b6cea commit ebcdaa6

304 files changed

Lines changed: 9511 additions & 4247 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.

‎.telemetryrc.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"src/plugins/testbed/",
88
"src/plugins/kibana_utils/",
99
"src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
10-
"src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
1110
"src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
1211
"src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
1312
"src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"

‎docs/developer/contributing/development-tests.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ root)
2020
|`yarn test:jest_integration -t regexp [test path]`
2121

2222
|Mocha
23-
|`src/**/__tests__/**/*.js` `!src/**/public/__tests__/*.js``packages/kbn-datemath/test/**/*.js` `packages/kbn-dev-utils/src/**/__tests__/**/*.js` `tasks/**/__tests__/**/*.js`
23+
|`src/**/__tests__/**/*.js` `!src/**/public/__tests__/*.js` `packages/kbn-dev-utils/src/**/__tests__/**/*.js` `tasks/**/__tests__/**/*.js`
2424
|`node scripts/mocha --grep=regexp [test path]`
2525

2626
|Functional

‎docs/development/core/server/kibana-plugin-core-server.coresetup.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
2626
| [savedObjects](./kibana-plugin-core-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-core-server.savedobjectsservicesetup.md) |
2727
| [status](./kibana-plugin-core-server.coresetup.status.md) | <code>StatusServiceSetup</code> | [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) |
2828
| [uiSettings](./kibana-plugin-core-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-core-server.uisettingsservicesetup.md) |
29-
| [uuid](./kibana-plugin-core-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) |
3029

‎docs/development/core/server/kibana-plugin-core-server.coresetup.uuid.md‎

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

‎docs/development/core/server/kibana-plugin-core-server.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
214214
| [UiSettingsServiceStart](./kibana-plugin-core-server.uisettingsservicestart.md) | |
215215
| [URLMeaningfulParts](./kibana-plugin-core-server.urlmeaningfulparts.md) | We define our own typings because the current version of @<!-- -->types/node declares properties to be optional "hostname?: string". Although, parse call returns "hostname: null \| string". |
216216
| [UserProvidedValues](./kibana-plugin-core-server.userprovidedvalues.md) | Describes the values explicitly set by user. |
217-
| [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) | APIs to access the application's instance uuid. |
218217

219218
## Variables
220219

‎docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.env.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
env: {
1111
mode: EnvironmentMode;
1212
packageInfo: Readonly<PackageInfo>;
13+
instanceUuid: string;
1314
};
1415
```

‎docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface PluginInitializerContext<ConfigSchema = unknown>
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [config](./kibana-plugin-core-server.plugininitializercontext.config.md) | <code>{</code><br/><code> legacy: {</code><br/><code> globalConfig$: Observable&lt;SharedGlobalConfig&gt;;</code><br/><code> };</code><br/><code> create: &lt;T = ConfigSchema&gt;() =&gt; Observable&lt;T&gt;;</code><br/><code> createIfExists: &lt;T = ConfigSchema&gt;() =&gt; Observable&lt;T &#124; undefined&gt;;</code><br/><code> }</code> | |
20-
| [env](./kibana-plugin-core-server.plugininitializercontext.env.md) | <code>{</code><br/><code> mode: EnvironmentMode;</code><br/><code> packageInfo: Readonly&lt;PackageInfo&gt;;</code><br/><code> }</code> | |
20+
| [env](./kibana-plugin-core-server.plugininitializercontext.env.md) | <code>{</code><br/><code> mode: EnvironmentMode;</code><br/><code> packageInfo: Readonly&lt;PackageInfo&gt;;</code><br/><code> instanceUuid: string;</code><br/><code> }</code> | |
2121
| [logger](./kibana-plugin-core-server.plugininitializercontext.logger.md) | <code>LoggerFactory</code> | |
2222
| [opaqueId](./kibana-plugin-core-server.plugininitializercontext.opaqueid.md) | <code>PluginOpaqueId</code> | |
2323

‎docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md‎

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

‎docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.md‎

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

‎packages/elastic-datemath/.babelrc‎

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

0 commit comments

Comments
 (0)