Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into risk-matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
streamich committed Jun 1, 2021
2 parents 37ab7c5 + 9734d1c commit cd49778
Show file tree
Hide file tree
Showing 1,250 changed files with 42,602 additions and 34,917 deletions.
29 changes: 29 additions & 0 deletions .ci/package-testing/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/groovy
library 'kibana-pipeline-library'
kibanaLibrary.load()
kibanaPipeline(timeoutMinutes: 300) {
slackNotifications.onFailure {
ciStats.trackBuild {
workers.ci(ramDisk: false, name: "package-build", size: 'l', runErrorReporter: false) {
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
kibanaPipeline.bash("test/scripts/jenkins_xpack_package_build.sh", "Package builds")
}
}
def packageTypes = ['deb', 'docker', 'rpm']
def workers = [:]
packageTypes.each { type ->
workers["package-${type}"] = {
testPackage(type)
}
}
parallel(workers)
}
}
}
def testPackage(packageType) {
workers.ci(ramDisk: false, name: "package-${packageType}", size: 's', runErrorReporter: false) {
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
kibanaPipeline.bash("test/scripts/jenkins_xpack_package_${packageType}.sh", "Execute package testing for ${packageType}")
}
}
}
4 changes: 1 addition & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@
/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime

# Beats
/x-pack/plugins/beats_management/ @elastic/beats
#CC# /x-pack/plugins/beats_management/ @elastic/beats

# Presentation
/src/plugins/dashboard/ @elastic/kibana-presentation
Expand Down Expand Up @@ -150,6 +147,7 @@
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
/src/plugins/tile_map/ @elastic/kibana-gis
/src/plugins/region_map/ @elastic/kibana-gis
/packages/kbn-mapbox-gl @elastic/kibana-gis

# Operations
/src/dev/ @elastic/kibana-operations
Expand Down
16 changes: 13 additions & 3 deletions .github/ISSUE_TEMPLATE/v8_breaking_change.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ assignees: ''
****************************************
Please add a team label to denote the team that the
breaking change is applicable to.
breaking change is applicable to. If the work requires
changes to Upgrade Assistant itself, please tag Team:Elasticsearch UI.
-->

Expand All @@ -23,14 +24,20 @@ breaking change is applicable to.

8.0

**Is this a Kibana or Elasticsearch breaking change?**

<!-- Kibana breaking changes can be registered via the Kibana deprecations service. Elasticsearch breaking changes may require custom logic in Upgrade Assistant and assistance from the Elasticsearch UI team. See more details below. -->

**Describe the change. How will it manifest to users?**

**How many users will be affected?**

<!-- e.g. Based on telemetry data, roughly 75% of our users will need to make changes to x. -->
<!-- e.g. A majority of users will need to make changes to x. -->

**Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
**Are there any edge cases?**

**[For Kibana deprecations] Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**

<!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
It provides a way for Kibana deprecations to be resolved automatically via an API
Expand All @@ -39,8 +46,11 @@ breaking change is applicable to.
<!-- Each plugin owner is responsible for registering their deprecations via the service.
Please link to the issue/PR that will add this functionality. -->

**Are there any edge cases?**
**[For Elasticsearch deprecations] Can the Upgrade Assistant make the migration easier for users? Please explain the proposed solution in as much detail as possible.**

<!-- Upgrade Assistant consumes the ES deprecation info API to surface deprecations to users. In some cases, Upgrade Assistant can provide a way to resolve a particular deprecation returned from the API. Examples include: reindexing an old index, removing deprecated index settings, upgrading or deleting an old Machine Learning model snapshot. -->

<!-- Please provide a detailed explanation on how you foresee the proposed "fix" to work, e.g., "The deprecation will be surfaced via XXX message in the deprecation info API. Upgrade Assistant can call XXX API to resolve this deprecation". See https://github.com/elastic/kibana/issues/91879 as a real-world example. -->
## Test Data

<!-- Provide test data. We can’t build a solution without data to test it against. -->
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ npm-debug.log*
.ci/runbld
.ci/bash_standard_lib.sh
.gradle
.vagrant

## @cypress/snapshot from apm plugin
snapshots.js
Expand Down
3 changes: 1 addition & 2 deletions .i18nrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"paths": {
"common.ui": "src/legacy/ui",
"console": "src/plugins/console",
"core": "src/core",
"discover": "src/plugins/discover",
"bfetch": "src/plugins/bfetch",
"dashboard": "src/plugins/dashboard",
"data": "src/plugins/data",
"embeddableApi": "src/plugins/embeddable",
Expand Down Expand Up @@ -61,6 +61,5 @@
"apmOss": "src/plugins/apm_oss",
"usageCollection": "src/plugins/usage_collection"
},
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
"translations": []
}
22 changes: 16 additions & 6 deletions api_docs/alerting.json
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,15 @@
"label": "rule",
"description": [],
"signature": [
"Pick<Pick<",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.SanitizedRuleConfig",
"text": "SanitizedRuleConfig"
}
"section": "def-common.Alert",
"text": "Alert"
},
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
],
"source": {
"path": "x-pack/plugins/alerting/server/types.ts",
Expand Down Expand Up @@ -840,7 +842,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/server/types.ts",
"lineNumber": 75
"lineNumber": 76
},
"deprecated": false
}
Expand Down Expand Up @@ -1030,7 +1032,7 @@
],
"source": {
"path": "x-pack/plugins/alerting/server/types.ts",
"lineNumber": 107
"lineNumber": 109
},
"deprecated": false
}
Expand Down Expand Up @@ -3913,7 +3915,15 @@
"label": "SanitizedRuleConfig",
"description": [],
"signature": [
"Pick<Pick<Alert<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"muteAll\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
"Pick<Pick<",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.Alert",
"text": "Alert"
},
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">, \"enabled\" | \"name\" | \"actions\" | \"tags\" | \"consumer\" | \"schedule\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"throttle\" | \"notifyWhen\"> & { producer: string; ruleTypeId: string; ruleTypeName: string; }"
],
"source": {
"path": "x-pack/plugins/alerting/common/alert.ts",
Expand Down
14 changes: 10 additions & 4 deletions api_docs/apm.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 270
"lineNumber": 269
},
"deprecated": false,
"children": [
Expand All @@ -331,7 +331,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 270
"lineNumber": 269
},
"deprecated": false,
"isRequired": true
Expand All @@ -351,7 +351,7 @@
],
"source": {
"path": "x-pack/plugins/apm/server/plugin.ts",
"lineNumber": 289
"lineNumber": 288
},
"deprecated": false,
"children": [],
Expand Down Expand Up @@ -653,7 +653,13 @@
"<unknown>>; delete: (deleteParams: { id: string; }) => Promise<",
"DeleteResponse",
">; } | undefined>; }; start: () => Promise<undefined>; }; ruleRegistry: { setup: ",
"RuleDataPluginService",
{
"pluginId": "ruleRegistry",
"scope": "server",
"docId": "kibRuleRegistryPluginApi",
"section": "def-server.RuleRegistryPluginSetupContract",
"text": "RuleRegistryPluginSetupContract"
},
"; start: () => Promise<void>; }; security?: { setup: ",
{
"pluginId": "security",
Expand Down
72 changes: 0 additions & 72 deletions api_docs/beats_management.json

This file was deleted.

21 changes: 0 additions & 21 deletions api_docs/beats_management.mdx

This file was deleted.

8 changes: 6 additions & 2 deletions api_docs/charts.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@
"type": "Array",
"tags": [],
"label": "xValues",
"description": [],
"description": [
"sorted and unquie x values"
],
"signature": [
"number[]"
],
Expand Down Expand Up @@ -417,7 +419,9 @@
"type": "Object",
"tags": [],
"label": "splitSeriesAccessorFnMap",
"description": [],
"description": [
"needed when using `splitSeriesAccessors` as `AccessorFn`"
],
"signature": [
"Map<React.ReactText, ",
"AccessorFn",
Expand Down
Loading

0 comments on commit cd49778

Please sign in to comment.