Skip to content

Commit

Permalink
Merge branch 'master' into routing-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibanamachine
kibanamachine authored Jun 16, 2021
2 parents 63700d1 + dcb5a67 commit 9ec68f1
Show file tree
Hide file tree
Showing 1,186 changed files with 37,936 additions and 19,704 deletions.
3 changes: 2 additions & 1 deletion .ci/Jenkinsfile_flaky
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ library 'kibana-pipeline-library'
kibanaLibrary.load()

def TASK_PARAM = params.TASK ?: params.CI_GROUP

// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke'
def JOB_PARTS = TASK_PARAM.split(':')
def IS_XPACK = JOB_PARTS[0] == 'xpack'
Expand Down Expand Up @@ -111,6 +110,8 @@ def getWorkerFromParams(isXpack, job, ciGroup) {
return kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh')
} else if (job == 'apiIntegration') {
return kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh')
} else if (job == 'pluginFunctional') {
return kibanaPipeline.functionalTestProcess('oss-pluginFunctional', './test/scripts/jenkins_plugin_functional.sh')
} else {
return kibanaPipeline.ossCiGroupProcess(ciGroup)
}
Expand Down
4 changes: 2 additions & 2 deletions .ci/end2end.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ pipeline {
BASE_DIR = 'src/github.com/elastic/kibana'
HOME = "${env.WORKSPACE}"
E2E_DIR = 'x-pack/plugins/apm/e2e'
PIPELINE_LOG_LEVEL = 'DEBUG'
PIPELINE_LOG_LEVEL = 'INFO'
KBN_OPTIMIZER_THEMES = 'v7light'
}
options {
timeout(time: 1, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '40', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10', daysToKeepStr: '30'))
timestamps()
ansiColor('xterm')
disableResume()
Expand Down
143 changes: 95 additions & 48 deletions api_docs/alerting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,42 @@
"functions": [],
"interfaces": [],
"enums": [],
"misc": [],
"misc": [
{
"parentPluginId": "alerting",
"id": "def-public.AlertNavigationHandler",
"type": "Type",
"tags": [],
"label": "AlertNavigationHandler",
"description": [
"\nReturns information that can be used to navigate to a specific page to view the given rule.\n"
],
"signature": [
"(alert: 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\">) => string | ",
{
"pluginId": "kibanaUtils",
"scope": "common",
"docId": "kibKibanaUtilsPluginApi",
"section": "def-common.JsonObject",
"text": "JsonObject"
}
],
"source": {
"path": "x-pack/plugins/alerting/public/alert_navigation_registry/types.ts",
"lineNumber": 20
},
"deprecated": false,
"initialIsOpen": false
}
],
"objects": [],
"setup": {
"parentPluginId": "alerting",
Expand All @@ -24,44 +59,58 @@
"parentPluginId": "alerting",
"id": "def-public.PluginSetupContract.registerNavigation",
"type": "Function",
"tags": [],
"tags": [
"throws"
],
"label": "registerNavigation",
"description": [],
"description": [
"\nRegister a customized view of the particular rule type. Stack Management provides a generic overview, but a developer can register a\ncustom navigation to provide the user an extra link to a more curated view. The alerting plugin doesn't actually do\nanything with this information, but it can be used by other plugins via the `getNavigation` functionality. Currently\nthe trigger_actions_ui plugin uses it to expose the link from the generic rule view in Stack Management.\n"
],
"signature": [
"(consumer: string, alertType: string, handler: ",
"AlertNavigationHandler",
"(applicationId: string, ruleType: string, handler: ",
{
"pluginId": "alerting",
"scope": "public",
"docId": "kibAlertingPluginApi",
"section": "def-public.AlertNavigationHandler",
"text": "AlertNavigationHandler"
},
") => void"
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 15
"lineNumber": 30
},
"deprecated": false,
"returnComment": [],
"children": [
{
"parentPluginId": "alerting",
"id": "def-public.consumer",
"id": "def-public.applicationId",
"type": "string",
"tags": [],
"label": "consumer",
"description": [],
"label": "applicationId",
"description": [
"The application id that the user should be navigated to, to view a particular alert in a custom way."
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 16
"lineNumber": 31
},
"deprecated": false
},
{
"parentPluginId": "alerting",
"id": "def-public.alertType",
"id": "def-public.ruleType",
"type": "string",
"tags": [],
"label": "alertType",
"description": [],
"label": "ruleType",
"description": [
"The rule type that has been registered with Alerting.Server.PluginSetupContract.registerType. If\nno such rule with that id exists, a warning is output to the console log. It used to throw an error, but that was temporarily moved\nbecause it was causing flaky test failures with https://github.com/elastic/kibana/issues/59229 and needs to be\ninvestigated more."
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 17
"lineNumber": 32
},
"deprecated": false
},
Expand All @@ -71,7 +120,9 @@
"type": "Function",
"tags": [],
"label": "handler",
"description": [],
"description": [
"The navigation handler should return either a relative URL, or a state object. This information can be used,\nin conjunction with the consumer id, to navigate the user to a custom URL to view a rule's details."
],
"signature": [
"(alert: Pick<",
{
Expand All @@ -81,15 +132,7 @@
"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\">, alertType: ",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.AlertType",
"text": "AlertType"
},
"<\"default\", \"recovered\">) => string | ",
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">) => string | ",
{
"pluginId": "kibanaUtils",
"scope": "common",
Expand All @@ -100,7 +143,7 @@
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 18
"lineNumber": 33
},
"deprecated": false
}
Expand All @@ -112,29 +155,39 @@
"type": "Function",
"tags": [],
"label": "registerDefaultNavigation",
"description": [],
"description": [
"\nRegister a customized view for all rule types. Stack Management provides a generic overview, but a developer can register a\ncustom navigation to provide the user an extra link to a more curated view. The alerting plugin doesn't actually do\nanything with this information, but it can be used by other plugins via the `getNavigation` functionality. Currently\nthe trigger_actions_ui plugin uses it to expose the link from the generic rule view in Stack Management.\n"
],
"signature": [
"(consumer: string, handler: ",
"AlertNavigationHandler",
"(applicationId: string, handler: ",
{
"pluginId": "alerting",
"scope": "public",
"docId": "kibAlertingPluginApi",
"section": "def-public.AlertNavigationHandler",
"text": "AlertNavigationHandler"
},
") => void"
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 20
"lineNumber": 46
},
"deprecated": false,
"returnComment": [],
"children": [
{
"parentPluginId": "alerting",
"id": "def-public.consumer",
"id": "def-public.applicationId",
"type": "string",
"tags": [],
"label": "consumer",
"description": [],
"label": "applicationId",
"description": [
"The application id that the user should be navigated to, to view a particular alert in a custom way."
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 20
"lineNumber": 46
},
"deprecated": false
},
Expand All @@ -144,7 +197,9 @@
"type": "Function",
"tags": [],
"label": "handler",
"description": [],
"description": [
"The navigation handler should return either a relative URL, or a state object. This information can be used,\nin conjunction with the consumer id, to navigate the user to a custom URL to view a rule's details."
],
"signature": [
"(alert: Pick<",
{
Expand All @@ -154,15 +209,7 @@
"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\">, alertType: ",
{
"pluginId": "alerting",
"scope": "common",
"docId": "kibAlertingPluginApi",
"section": "def-common.AlertType",
"text": "AlertType"
},
"<\"default\", \"recovered\">) => string | ",
"<never>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">) => string | ",
{
"pluginId": "kibanaUtils",
"scope": "common",
Expand All @@ -173,7 +220,7 @@
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 20
"lineNumber": 46
},
"deprecated": false
}
Expand All @@ -192,7 +239,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 22
"lineNumber": 48
},
"deprecated": false,
"children": [
Expand Down Expand Up @@ -224,7 +271,7 @@
],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 23
"lineNumber": 49
},
"deprecated": false,
"returnComment": [],
Expand All @@ -238,7 +285,7 @@
"description": [],
"source": {
"path": "x-pack/plugins/alerting/public/plugin.ts",
"lineNumber": 23
"lineNumber": 49
},
"deprecated": false
}
Expand Down Expand Up @@ -3857,7 +3904,7 @@
"label": "ReservedActionGroups",
"description": [],
"signature": [
"\"recovered\" | RecoveryActionGroupId"
"RecoveryActionGroupId | \"recovered\""
],
"source": {
"path": "x-pack/plugins/alerting/common/builtin_action_groups.ts",
Expand Down
3 changes: 3 additions & 0 deletions api_docs/alerting.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ import alertingObj from './alerting.json';
### Start
<DocDefinitionList data={[alertingObj.client.start]}/>

### Consts, variables and types
<DocDefinitionList data={alertingObj.client.misc}/>

## Server

### Functions
Expand Down
Loading

0 comments on commit 9ec68f1

Please sign in to comment.