Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into apm-fleet-tut…
Browse files Browse the repository at this point in the history
…orial
  • Loading branch information
cauemarcondes committed May 31, 2021
2 parents 07f91b5 + af4b8e6 commit 23695bc
Show file tree
Hide file tree
Showing 570 changed files with 23,723 additions and 7,823 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}")
}
}
}
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
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
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
56 changes: 31 additions & 25 deletions api_docs/core.json

Large diffs are not rendered by default.

20 changes: 15 additions & 5 deletions api_docs/core_application.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@
"type": "string",
"tags": [],
"label": "basePath",
"description": [],
"description": [
"the URL path scope for the sub history"
],
"signature": [
"string"
],
Expand Down Expand Up @@ -207,7 +209,9 @@
"type": "CompoundType",
"tags": [],
"label": "pathOrLocation",
"description": [],
"description": [
"a string or location descriptor"
],
"signature": [
"string | ",
"LocationDescriptorObject",
Expand Down Expand Up @@ -266,7 +270,9 @@
"type": "CompoundType",
"tags": [],
"label": "pathOrLocation",
"description": [],
"description": [
"a string or location descriptor"
],
"signature": [
"string | ",
"LocationDescriptorObject",
Expand Down Expand Up @@ -323,7 +329,9 @@
"type": "number",
"tags": [],
"label": "n",
"description": [],
"description": [
"number of positions in the stack to go. Negative numbers indicate number of entries backward, positive\nnumbers for forwards. If passed 0, the current location will be reloaded. If `n` exceeds the number of\nentries available, this is a no-op."
],
"signature": [
"number"
],
Expand Down Expand Up @@ -449,7 +457,9 @@
"type": "Function",
"tags": [],
"label": "listener",
"description": [],
"description": [
"a function that receives location updates."
],
"signature": [
"(location: ",
"Location",
Expand Down
16 changes: 12 additions & 4 deletions api_docs/core_saved_objects.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@
"type": "Array",
"tags": [],
"label": "objects",
"description": [],
"description": [
"- [{ type, id, attributes, references, migrationVersion }]"
],
"signature": [
{
"pluginId": "core",
Expand Down Expand Up @@ -451,7 +453,9 @@
"type": "Array",
"tags": [],
"label": "objects",
"description": [],
"description": [
"- an array ids, or an array of objects containing id and optionally type"
],
"signature": [
"{ id: string; type: string; }[]"
],
Expand Down Expand Up @@ -9362,7 +9366,9 @@
"type": "string",
"tags": [],
"label": "namespace",
"description": [],
"description": [
"The namespace ID, which must be either a non-empty string or `undefined`."
],
"signature": [
"string | undefined"
],
Expand Down Expand Up @@ -9400,7 +9406,9 @@
"type": "string",
"tags": [],
"label": "namespace",
"description": [],
"description": [
"The namespace string, which must be non-empty."
],
"signature": [
"string"
],
Expand Down
Loading

0 comments on commit 23695bc

Please sign in to comment.