Skip to content

Commit 533e506

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into feature-poc-kibana-fleet-server-feature-flag
2 parents 18293e9 + 82c1501 commit 533e506

467 files changed

Lines changed: 22098 additions & 3038 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.

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ kibanaPipeline(timeoutMinutes: 150) {
5656
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
5757
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
5858
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
59+
'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
60+
'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
5961
]),
6062
])
6163
}

‎.ci/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ JOB:
3232
- x-pack-ciGroup9
3333
- x-pack-ciGroup10
3434
- x-pack-ciGroup11
35+
- x-pack-ciGroup12
36+
- x-pack-ciGroup13
3537
- x-pack-accessibility
3638
- x-pack-visualRegression
3739

‎.ci/teamcity/default/build_plugins.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
1414
--scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
1515
--scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
1616
--scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
17+
--scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
1718
--verbose
1819
tc_end_block "Build Platform Plugins"
1920

‎.teamcity/src/Common.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
44
const val ENABLE_REPORTING = false
55

66
// If set to false, jobs with triggers (scheduled, on commit, etc) will be paused
7-
const val ENABLE_TRIGGERS = false
7+
const val ENABLE_TRIGGERS = true
88

99
fun getProjectBranch(): String {
1010
return DslContext.projectName

‎.teamcity/src/builds/PullRequestCi.kt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ object PullRequestCi : BuildType({
6363
}
6464

6565
features {
66-
commitStatusPublisher {
67-
enabled = isReportingEnabled()
68-
vcsRootExtId = "${Kibana.id}"
69-
publisher = github {
70-
githubUrl = "https://api.github.com"
71-
authType = personalToken {
72-
token = "credentialsJSON:07d22002-12de-4627-91c3-672bdb23b55b"
66+
if(isReportingEnabled()) {
67+
commitStatusPublisher {
68+
enabled = true
69+
vcsRootExtId = "${Kibana.id}"
70+
publisher = github {
71+
githubUrl = "https://api.github.com"
72+
authType = personalToken {
73+
token = "credentialsJSON:07d22002-12de-4627-91c3-672bdb23b55b"
74+
}
7375
}
7476
}
7577
}

‎.teamcity/src/builds/default/DefaultCiGroups.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package builds.default
33
import dependsOn
44
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
55

6-
const val DEFAULT_CI_GROUP_COUNT = 11
6+
const val DEFAULT_CI_GROUP_COUNT = 13
77
val defaultCiGroups = (1..DEFAULT_CI_GROUP_COUNT).map { DefaultCiGroup(it) }
88

99
object DefaultCiGroups : BuildType({

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,14 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
109109
| [SavedObjectsFindOptions](./kibana-plugin-core-public.savedobjectsfindoptions.md) | |
110110
| [SavedObjectsFindOptionsReference](./kibana-plugin-core-public.savedobjectsfindoptionsreference.md) | |
111111
| [SavedObjectsFindResponsePublic](./kibana-plugin-core-public.savedobjectsfindresponsepublic.md) | Return type of the Saved Objects <code>find()</code> method.<!-- -->\*Note\*: this type is different between the Public and Server Saved Objects clients. |
112+
| [SavedObjectsImportActionRequiredWarning](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md) | A warning meant to notify that a specific user action is required to finalize the import of some type of object. The <code>actionUrl</code> must be a path relative to the basePath, and not include it. |
112113
| [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) | Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite. |
113114
| [SavedObjectsImportConflictError](./kibana-plugin-core-public.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |
114115
| [SavedObjectsImportFailure](./kibana-plugin-core-public.savedobjectsimportfailure.md) | Represents a failure to import. |
115116
| [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md) | Represents a failure to import due to missing references. |
116117
| [SavedObjectsImportResponse](./kibana-plugin-core-public.savedobjectsimportresponse.md) | The response describing the result of an import. |
117118
| [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |
119+
| [SavedObjectsImportSimpleWarning](./kibana-plugin-core-public.savedobjectsimportsimplewarning.md) | A simple informative warning that will be displayed to the user. |
118120
| [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) | Represents a successful import. |
119121
| [SavedObjectsImportUnknownError](./kibana-plugin-core-public.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
120122
| [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-core-public.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
@@ -163,6 +165,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
163165
| [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
164166
| [SavedObjectAttributeSingle](./kibana-plugin-core-public.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) |
165167
| [SavedObjectsClientContract](./kibana-plugin-core-public.savedobjectsclientcontract.md) | SavedObjectsClientContract as implemented by the [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md) |
168+
| [SavedObjectsImportWarning](./kibana-plugin-core-public.savedobjectsimportwarning.md) | Composite type of all the possible types of import warnings.<!-- -->See [SavedObjectsImportSimpleWarning](./kibana-plugin-core-public.savedobjectsimportsimplewarning.md) and [SavedObjectsImportActionRequiredWarning](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md) for more details. |
166169
| [SavedObjectsNamespaceType](./kibana-plugin-core-public.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global. |
167170
| [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) | Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. |
168171
| [StringValidation](./kibana-plugin-core-public.stringvalidation.md) | Allows regex objects or a regex string |

‎docs/development/core/public/kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.actionpath.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-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportActionRequiredWarning](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md) &gt; [actionPath](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.actionpath.md)
4+
5+
## SavedObjectsImportActionRequiredWarning.actionPath property
6+
7+
The path (without the basePath) that the user should be redirect to to address this warning.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
actionPath: string;
13+
```

‎docs/development/core/public/kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.buttonlabel.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-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportActionRequiredWarning](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md) &gt; [buttonLabel](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.buttonlabel.md)
4+
5+
## SavedObjectsImportActionRequiredWarning.buttonLabel property
6+
7+
An optional label to use for the link button. If unspecified, a default label will be used.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
buttonLabel?: string;
13+
```

‎docs/development/core/public/kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsImportActionRequiredWarning](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.md)
4+
5+
## SavedObjectsImportActionRequiredWarning interface
6+
7+
A warning meant to notify that a specific user action is required to finalize the import of some type of object.
8+
9+
The `actionUrl` must be a path relative to the basePath, and not include it.
10+
11+
<b>Signature:</b>
12+
13+
```typescript
14+
export interface SavedObjectsImportActionRequiredWarning
15+
```
16+
17+
## Properties
18+
19+
| Property | Type | Description |
20+
| --- | --- | --- |
21+
| [actionPath](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.actionpath.md) | <code>string</code> | The path (without the basePath) that the user should be redirect to to address this warning. |
22+
| [buttonLabel](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.buttonlabel.md) | <code>string</code> | An optional label to use for the link button. If unspecified, a default label will be used. |
23+
| [message](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.message.md) | <code>string</code> | The translated message to display to the user. |
24+
| [type](./kibana-plugin-core-public.savedobjectsimportactionrequiredwarning.type.md) | <code>'action_required'</code> | |
25+

0 commit comments

Comments
 (0)