Skip to content

Commit ee2f66f

Browse files
jgowdyelasticjgowdyelastic
committed
Merge remote-tracking branch 'origin/master' into moving-file-data-visualizer-UI-to-file-upload-plugin
2 parents e36a733 + f374920 commit ee2f66f

327 files changed

Lines changed: 20184 additions & 2579 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{
33
"output": "src/plugins/telemetry/schema/oss_plugins.json",
44
"root": "src/plugins/",
5-
"exclude": []
5+
"exclude": [
6+
"src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts"
7+
]
68
}
79
]

‎docs/developer/getting-started/index.asciidoc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ In order to support Windows development we currently require you to use one of t
1212
- https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them)
1313
- https://docs.microsoft.com/en-us/windows/wsl/about[WSL]
1414

15-
Before running the steps listed below, please make sure you have installed Git bash or WSL and that
16-
you are running the mentioned commands through one of them.
15+
As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].
16+
17+
Before running the steps listed below, please make sure you have installed everything
18+
that we require and listed above and that you are running the mentioned commands
19+
through Git bash or WSL.
1720

1821
[discrete]
1922
[[get-kibana-code]]

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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; [MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md)
4+
5+
## MakeUsageFromSchema type
6+
7+
List of configuration values that will be exposed to usage collection. If parent node or actual config path is set to `true` then the actual value of these configs will be reoprted. If parent node or actual config path is set to `false` then the config will be reported as \[redacted\].
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export declare type MakeUsageFromSchema<T> = {
13+
[Key in keyof T]?: T[Key] extends Maybe<object[]> ? false : T[Key] extends Maybe<any[]> ? boolean : T[Key] extends Maybe<object> ? MakeUsageFromSchema<T[Key]> | boolean : boolean;
14+
};
15+
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
272272
| [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md) | |
273273
| [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. |
274274
| [LoggerConfigType](./kibana-plugin-core-server.loggerconfigtype.md) | |
275+
| [MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md) | List of configuration values that will be exposed to usage collection. If parent node or actual config path is set to <code>true</code> then the actual value of these configs will be reoprted. If parent node or actual config path is set to <code>false</code> then the config will be reported as \[redacted\]. |
275276
| [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) | APIs to retrieves metrics gathered and exposed by the core platform. |
276277
| [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-core-server.migration_assistance_index_action.md) | |
277278
| [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-core-server.migration_deprecation_level.md) | |

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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; [PluginConfigDescriptor](./kibana-plugin-core-server.pluginconfigdescriptor.md) &gt; [exposeToUsage](./kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md)
4+
5+
## PluginConfigDescriptor.exposeToUsage property
6+
7+
Expose non-default configs to usage collection to be sent via telemetry. set a config to `true` to report the actual changed config value. set a config to `false` to report the changed config value as \[redacted\].
8+
9+
All changed configs except booleans and numbers will be reported as \[redacted\] unless otherwise specified.
10+
11+
[MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md)
12+
13+
<b>Signature:</b>
14+
15+
```typescript
16+
exposeToUsage?: MakeUsageFromSchema<T>;
17+
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ export const config: PluginConfigDescriptor<ConfigType> = {
4646
| --- | --- | --- |
4747
| [deprecations](./kibana-plugin-core-server.pluginconfigdescriptor.deprecations.md) | <code>ConfigDeprecationProvider</code> | Provider for the to apply to the plugin configuration. |
4848
| [exposeToBrowser](./kibana-plugin-core-server.pluginconfigdescriptor.exposetobrowser.md) | <code>{</code><br/><code> [P in keyof T]?: boolean;</code><br/><code> }</code> | List of configuration properties that will be available on the client-side plugin. |
49+
| [exposeToUsage](./kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md) | <code>MakeUsageFromSchema&lt;T&gt;</code> | Expose non-default configs to usage collection to be sent via telemetry. set a config to <code>true</code> to report the actual changed config value. set a config to <code>false</code> to report the changed config value as \[redacted\].<!-- -->All changed configs except booleans and numbers will be reported as \[redacted\] unless otherwise specified.[MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md) |
4950
| [schema](./kibana-plugin-core-server.pluginconfigdescriptor.schema.md) | <code>PluginConfigSchema&lt;T&gt;</code> | Schema to use to validate the plugin configuration.[PluginConfigSchema](./kibana-plugin-core-server.pluginconfigschema.md) |
5051

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
error: (msg: string, meta: LogMeta) => void;
10+
error: <Meta extends LogMeta = LogMeta>(msg: string, meta: Meta) => void;
1111
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface SavedObjectsMigrationLogger
1616
| Property | Type | Description |
1717
| --- | --- | --- |
1818
| [debug](./kibana-plugin-core-server.savedobjectsmigrationlogger.debug.md) | <code>(msg: string) =&gt; void</code> | |
19-
| [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | <code>(msg: string, meta: LogMeta) =&gt; void</code> | |
19+
| [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | <code>&lt;Meta extends LogMeta = LogMeta&gt;(msg: string, meta: Meta) =&gt; void</code> | |
2020
| [info](./kibana-plugin-core-server.savedobjectsmigrationlogger.info.md) | <code>(msg: string) =&gt; void</code> | |
2121
| [warn](./kibana-plugin-core-server.savedobjectsmigrationlogger.warn.md) | <code>(msg: string) =&gt; void</code> | |
2222
| [warning](./kibana-plugin-core-server.savedobjectsmigrationlogger.warning.md) | <code>(msg: string) =&gt; void</code> | |

‎docs/settings/fleet-settings.asciidoc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
3737

3838
[cols="2*<"]
3939
|===
40-
| `xpack.fleet.agents.kibana.host`
41-
| The hostname used by {agent} for accessing {kib}.
40+
| `xpack.fleet.agents.fleet_server.hosts`
41+
| Hostnames used by {agent} for accessing {fleet-server}.
4242
| `xpack.fleet.agents.elasticsearch.host`
4343
| The hostname used by {agent} for accessing {es}.
44-
| `xpack.fleet.agents.tlsCheckDisabled`
45-
| Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
4644
|===
4745

4846
[NOTE]

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
103103
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
104104
"@elastic/ems-client": "7.12.0",
105-
"@elastic/eui": "32.0.4",
105+
"@elastic/eui": "32.1.0",
106106
"@elastic/filesaver": "1.1.2",
107107
"@elastic/good": "^9.0.1-kibana3",
108108
"@elastic/maki": "6.3.0",

0 commit comments

Comments
 (0)