Skip to content

Commit 3a97f89

Browse files
Merge branch 'master' into add-threat-match
2 parents 404fee3 + 9497d62 commit 3a97f89

File tree

439 files changed

+13539
-7022
lines changed

Some content is hidden

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

439 files changed

+13539
-7022
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=10.22.0
4+
ARG NODE_VERSION=10.22.1
55

66
FROM node:${NODE_VERSION} AS base
77

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167

168168
# Security
169169
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
170-
/x-pack/legacy/plugins/security/ @elastic/kibana-security
171170
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
172171
/x-pack/plugins/spaces/ @elastic/kibana-security
173172
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
@@ -287,7 +286,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
287286
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
288287
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
289288
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
290-
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
291289
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
292290
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
293291
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
@@ -297,7 +295,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
297295
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
298296
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
299297
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
300-
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
298+
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
301299

302300
# Ent. Search design
303301
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design

.i18nrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"visTypeXy": "src/plugins/vis_type_xy",
5858
"visualizations": "src/plugins/visualizations",
5959
"visualize": "src/plugins/visualize",
60-
"apmOss": "src/plugins/apm_oss"
60+
"apmOss": "src/plugins/apm_oss",
61+
"usageCollection": "src/plugins/usage_collection"
6162
},
6263
"exclude": [
6364
"src/legacy/ui/ui_render/ui_render_mixin.js"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
2323
| [getStartServices](./kibana-plugin-core-server.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart, TStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md) |
2424
| [http](./kibana-plugin-core-server.coresetup.http.md) | <code>HttpServiceSetup &amp; {</code><br/><code> resources: HttpResources;</code><br/><code> }</code> | [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) |
2525
| [logging](./kibana-plugin-core-server.coresetup.logging.md) | <code>LoggingServiceSetup</code> | [LoggingServiceSetup](./kibana-plugin-core-server.loggingservicesetup.md) |
26+
| [metrics](./kibana-plugin-core-server.coresetup.metrics.md) | <code>MetricsServiceSetup</code> | [MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md) |
2627
| [savedObjects](./kibana-plugin-core-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-core-server.savedobjectsservicesetup.md) |
2728
| [status](./kibana-plugin-core-server.coresetup.status.md) | <code>StatusServiceSetup</code> | [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) |
2829
| [uiSettings](./kibana-plugin-core-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-core-server.uisettingsservicesetup.md) |
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [CoreSetup](./kibana-plugin-core-server.coresetup.md) &gt; [metrics](./kibana-plugin-core-server.coresetup.metrics.md)
4+
5+
## CoreSetup.metrics property
6+
7+
[MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md)
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
metrics: MetricsServiceSetup;
13+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface CoreStart
2020
| [capabilities](./kibana-plugin-core-server.corestart.capabilities.md) | <code>CapabilitiesStart</code> | [CapabilitiesStart](./kibana-plugin-core-server.capabilitiesstart.md) |
2121
| [elasticsearch](./kibana-plugin-core-server.corestart.elasticsearch.md) | <code>ElasticsearchServiceStart</code> | [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) |
2222
| [http](./kibana-plugin-core-server.corestart.http.md) | <code>HttpServiceStart</code> | [HttpServiceStart](./kibana-plugin-core-server.httpservicestart.md) |
23-
| [metrics](./kibana-plugin-core-server.corestart.metrics.md) | <code>MetricsServiceStart</code> | |
23+
| [metrics](./kibana-plugin-core-server.corestart.metrics.md) | <code>MetricsServiceStart</code> | [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) |
2424
| [savedObjects](./kibana-plugin-core-server.corestart.savedobjects.md) | <code>SavedObjectsServiceStart</code> | [SavedObjectsServiceStart](./kibana-plugin-core-server.savedobjectsservicestart.md) |
2525
| [uiSettings](./kibana-plugin-core-server.corestart.uisettings.md) | <code>UiSettingsServiceStart</code> | [UiSettingsServiceStart](./kibana-plugin-core-server.uisettingsservicestart.md) |
2626

docs/development/core/server/kibana-plugin-core-server.corestart.metrics.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
## CoreStart.metrics property
66

7+
[MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md)
78

89
<b>Signature:</b>
910

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
253253
| [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md) | |
254254
| [LifecycleResponseFactory](./kibana-plugin-core-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
255255
| [LoggerConfigType](./kibana-plugin-core-server.loggerconfigtype.md) | |
256+
| [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) | APIs to retrieves metrics gathered and exposed by the core platform. |
256257
| [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-core-server.migration_assistance_index_action.md) | |
257258
| [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-core-server.migration_deprecation_level.md) | |
258259
| [MutatingOperationRefreshSetting](./kibana-plugin-core-server.mutatingoperationrefreshsetting.md) | Elasticsearch Refresh setting for mutating operation |
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md)
4+
5+
## MetricsServiceStart type
6+
7+
APIs to retrieves metrics gathered and exposed by the core platform.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export declare type MetricsServiceStart = MetricsServiceSetup;
13+
```

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,22 @@ ServiceStatusLevels: Readonly<{
1313
available: Readonly<{
1414
toString: () => "available";
1515
valueOf: () => 0;
16+
toJSON: () => "available";
1617
}>;
1718
degraded: Readonly<{
1819
toString: () => "degraded";
1920
valueOf: () => 1;
21+
toJSON: () => "degraded";
2022
}>;
2123
unavailable: Readonly<{
2224
toString: () => "unavailable";
2325
valueOf: () => 2;
26+
toJSON: () => "unavailable";
2427
}>;
2528
critical: Readonly<{
2629
toString: () => "critical";
2730
valueOf: () => 3;
31+
toJSON: () => "critical";
2832
}>;
2933
}>
3034
```

0 commit comments

Comments
 (0)