Skip to content

Commit

Permalink
Merge branch 'main' into fix-policy-settings-uncaught-error
Browse files Browse the repository at this point in the history
  • Loading branch information
szwarckonrad authored Apr 24, 2024
2 parents fd68892 + c912174 commit dffcd27
Show file tree
Hide file tree
Showing 1,010 changed files with 10,202 additions and 4,377 deletions.

Large diffs are not rendered by default.

35 changes: 34 additions & 1 deletion .buildkite/scripts/steps/serverless/build_and_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,41 @@ EOF
buildkite-agent meta-data set pr_comment:early_comment_job_id "$BUILDKITE_JOB_ID"
}

# This is the integration with the observability-test-environments
create_github_issue_oblt_test_environments() {

echo "--- Create GitHub issue for deploying in the oblt test env"

GITHUB_ISSUE=$(mktemp --suffix ".md")
cat <<EOF > "$GITHUB_ISSUE"
### Kibana image
$KIBANA_IMAGE
### Kibana pull request
$BUILDKITE_PULL_REQUEST
### Further details
Caused by @$GITHUB_PR_TRIGGER_USER using the github label in https://github.com/elastic/kibana/pull/$BUILDKITE_PULL_REQUEST
EOF

GH_TOKEN="$GITHUB_TOKEN" \
gh issue create \
--title "[Deploy Serverless Kibana] for user $GITHUB_PR_TRIGGER_USER with PR kibana@pr-$BUILDKITE_PULL_REQUEST" \
--body-file "${GITHUB_ISSUE}" \
--label 'deploy-custom-kibana-serverless' \
--repo 'elastic/observability-test-environments' \
--assignee "$GITHUB_PR_OWNER"
}

is_pr_with_label "ci:project-deploy-elasticsearch" && deploy "elasticsearch"
is_pr_with_label "ci:project-deploy-observability" && deploy "observability"
if is_pr_with_label "ci:project-deploy-observability" ; then
create_github_issue_oblt_test_environments
echo "--- Deploy observability with Kibana CI"
deploy "observability"
fi
is_pr_with_label "ci:project-deploy-security" && deploy "security"

exit 0;
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1524,6 +1524,7 @@ module.exports = {
],
'@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',
'@kbn/i18n/strings_should_be_translated_with_formatted_message': 'warn',
'@kbn/telemetry/event_generating_elements_should_be_instrumented': 'warn',
},
},
/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-my-kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ permissions:

jobs:
deploy-my-kibana:
if: ${{ github.event.issue.pull_request && (github.event.comment.body == '/oblt-deploy' || github.event.comment.body == '/oblt-deploy-serverless') }}
if: ${{ github.event.issue.pull_request && github.event.comment.body == '/oblt-deploy' }}
runs-on: ubuntu-latest
steps:
- uses: elastic/apm-pipeline-library/.github/actions/deploy-my-kibana@current
with:
vaultUrl: ${{ secrets.OBLT_VAULT_ADDR }}
vaultRoleId: ${{ secrets.OBLT_VAULT_ROLE_ID }}
vaultSecretId: ${{ secrets.OBLT_VAULT_SECRET_ID }}
serverless: ${{ github.event.comment.body == '/oblt-deploy-serverless' }}
serverless: false
1 change: 0 additions & 1 deletion .github/workflows/oblt-github-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
Just comment with:
- \`/oblt-deploy\` : Deploy a Kibana instance using the Observability test environments.
- \`/oblt-deploy-serverless\` : Deploy a serverless Kibana instance using the Observability test environments.
- \`run\` \`elasticsearch-ci/docs\` : Re-trigger the docs validation. (use unformatted text in the comment!)
</p>
Expand Down
90 changes: 68 additions & 22 deletions api_docs/actions.devdocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"section": "def-server.CaseConnector",
"text": "CaseConnector"
},
"<Config, Secrets> extends ",
"<Config, Secrets, Incident, GetIncidentResponse> extends ",
{
"pluginId": "actions",
"scope": "server",
Expand All @@ -240,7 +240,8 @@
"text": "SubActionConnector"
},
"<Config, Secrets> implements ",
"CaseConnectorInterface"
"CaseConnectorInterface",
"<Incident, GetIncidentResponse>"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
Expand Down Expand Up @@ -281,6 +282,29 @@
"deprecated": false,
"trackAdoption": false,
"isRequired": true
},
{
"parentPluginId": "actions",
"id": "def-server.CaseConnector.Unnamed.$2",
"type": "Object",
"tags": [],
"label": "pushToServiceIncidentParamsSchema",
"description": [],
"signature": [
"Record<string, ",
{
"pluginId": "@kbn/config-schema",
"scope": "common",
"docId": "kibKbnConfigSchemaPluginApi",
"section": "def-common.Type",
"text": "Type"
},
"<unknown>>"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
"trackAdoption": false,
"isRequired": true
}
],
"returnComment": []
Expand All @@ -293,7 +317,7 @@
"label": "addComment",
"description": [],
"signature": [
"({ incidentId, comment, }: { incidentId: string; comment: string; }) => Promise<unknown>"
"({ incidentId, comment, }: { incidentId: string; comment: string; }) => Promise<void>"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
Expand Down Expand Up @@ -345,7 +369,7 @@
"label": "createIncident",
"description": [],
"signature": [
"(incident: Record<string, unknown>) => Promise<",
"(incident: Incident) => Promise<",
"ExternalServiceIncidentResponse",
">"
],
Expand All @@ -356,12 +380,12 @@
{
"parentPluginId": "actions",
"id": "def-server.CaseConnector.createIncident.$1",
"type": "Object",
"type": "Uncategorized",
"tags": [],
"label": "incident",
"description": [],
"signature": [
"Record<string, unknown>"
"Incident"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
Expand All @@ -379,7 +403,7 @@
"label": "updateIncident",
"description": [],
"signature": [
"({ incidentId, incident, }: { incidentId: string; incident: Record<string, unknown>; }) => Promise<",
"({ incidentId, incident, }: { incidentId: string; incident: Incident; }) => Promise<",
"ExternalServiceIncidentResponse",
">"
],
Expand Down Expand Up @@ -412,12 +436,12 @@
{
"parentPluginId": "actions",
"id": "def-server.CaseConnector.updateIncident.$1.incident",
"type": "Object",
"type": "Uncategorized",
"tags": [],
"label": "incident",
"description": [],
"signature": [
"{ [x: string]: unknown; }"
"Incident"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
Expand All @@ -436,9 +460,7 @@
"label": "getIncident",
"description": [],
"signature": [
"({ id }: { id: string; }) => Promise<",
"ExternalServiceIncidentResponse",
">"
"({ id }: { id: string; }) => Promise<GetIncidentResponse>"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
Expand Down Expand Up @@ -479,9 +501,7 @@
"label": "pushToService",
"description": [],
"signature": [
"(params: ",
"PushToServiceParams",
") => Promise<",
"(params: { incident: { externalId: string | null; } & Incident; comments: { commentId: string; comment: string; }[]; }) => Promise<",
"PushToServiceResponse",
">"
],
Expand All @@ -496,13 +516,39 @@
"tags": [],
"label": "params",
"description": [],
"signature": [
"PushToServiceParams"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
"trackAdoption": false,
"isRequired": true
"children": [
{
"parentPluginId": "actions",
"id": "def-server.CaseConnector.pushToService.$1.incident",
"type": "CompoundType",
"tags": [],
"label": "incident",
"description": [],
"signature": [
"{ externalId: string | null; } & Incident"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
"trackAdoption": false
},
{
"parentPluginId": "actions",
"id": "def-server.CaseConnector.pushToService.$1.comments",
"type": "Array",
"tags": [],
"label": "comments",
"description": [],
"signature": [
"{ commentId: string; comment: string; }[]"
],
"path": "x-pack/plugins/actions/server/sub_action_framework/case.ts",
"deprecated": false,
"trackAdoption": false
}
]
}
],
"returnComment": []
Expand Down Expand Up @@ -3724,9 +3770,9 @@
"label": "getCaseConnectorClass",
"description": [],
"signature": [
"<Config, Secrets>() => ",
"IServiceAbstract",
"<Config, Secrets>"
"<Config, Secrets, Incident, GetIncidentResponse>() => ",
"ICaseServiceAbstract",
"<Config, Secrets, Incident, GetIncidentResponse>"
],
"path": "x-pack/plugins/actions/server/plugin.ts",
"deprecated": false,
Expand Down
4 changes: 2 additions & 2 deletions api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-04-23
date: 2024-04-24
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand All @@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o

| Public API count | Any count | Items lacking comments | Missing exports |
|-------------------|-----------|------------------------|-----------------|
| 298 | 0 | 292 | 32 |
| 301 | 0 | 295 | 32 |

## Client

Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-04-23
date: 2024-04-24
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-04-23
date: 2024-04-24
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-04-23
date: 2024-04-24
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/alerting.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
title: "alerting"
image: https://source.unsplash.com/400x175/?github
description: API docs for the alerting plugin
date: 2024-04-23
date: 2024-04-24
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
---
import alertingObj from './alerting.devdocs.json';
Expand Down
Loading

0 comments on commit dffcd27

Please sign in to comment.