Skip to content

Commit 63beff2

Browse files
parkiinoparkiino
committed
Merge remote-tracking branch 'upstream/master' into task/prettify-endpoint-details
2 parents f570137 + 20e16bd commit 63beff2

1,394 files changed

Lines changed: 47768 additions & 26906 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/Jenkinsfile_baseline_capture‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,17 @@ kibanaPipeline(timeoutMinutes: 120) {
1212
]) {
1313
parallel([
1414
'oss-baseline': {
15-
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false) {
15+
workers.ci(name: 'oss-baseline', size: 'l', ramDisk: true, runErrorReporter: false, bootstrapped: false) {
16+
// bootstrap ourselves, but with the env needed to upload the ts refs cache
17+
withGcpServiceAccount.fromVaultSecret('secret/kibana-issues/dev/ci-artifacts-key', 'value') {
18+
withEnv([
19+
'BUILD_TS_REFS_CACHE_ENABLE=true',
20+
'BUILD_TS_REFS_CACHE_CAPTURE=true'
21+
]) {
22+
kibanaPipeline.doSetup()
23+
}
24+
}
25+
1626
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
1727
}
1828
},

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@
7474
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
7575
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
7676

77-
# Client Side Monitoring (lives in APM directories but owned by Uptime)
77+
# Uptime
78+
/x-pack/plugins/uptime @elastic/uptime
79+
/x-pack/test/functional_with_es_ssl/apps/uptime @elastic/uptime
80+
/x-pack/test/functional/apps/uptime @elastic/uptime
81+
/x-pack/test/api_integration/apis/uptime @elastic/uptime
82+
83+
# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
7884
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
7985
/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
8086
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
@@ -106,7 +112,6 @@
106112
/x-pack/plugins/fleet/ @elastic/fleet
107113
/x-pack/plugins/observability/ @elastic/observability-ui
108114
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
109-
/x-pack/plugins/uptime @elastic/uptime
110115

111116
# Machine Learning
112117
/x-pack/plugins/ml/ @elastic/ml-ui

‎.github/workflows/backport.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,20 @@ jobs:
1818
)
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: 'Get backport config'
22-
run: |
23-
curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
24-
25-
- name: Use Node.js 14.x
26-
uses: actions/setup-node@v1
21+
- name: Checkout Actions
22+
uses: actions/checkout@v2
2723
with:
28-
node-version: 14.x
29-
30-
- name: Install backport CLI
31-
run: npm install -g backport@5.6.4
24+
repository: 'elastic/kibana-github-actions'
25+
ref: main
26+
path: ./actions
3227

33-
- name: Backport PR
34-
run: |
35-
git config --global user.name "kibanamachine"
36-
git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
37-
backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
38-
env:
39-
PR_NUMBER: ${{ github.event.pull_request.number }}
40-
PR_OWNER: ${{ github.event.pull_request.user.login }}
28+
- name: Install Actions
29+
run: npm install --production --prefix ./actions
4130

42-
- name: Report backport status
43-
run: |
44-
COMMENT="Backport result
45-
\`\`\`
46-
$(cat output.log)
47-
\`\`\`"
48-
49-
GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
50-
env:
51-
PR_NUMBER: ${{ github.event.pull_request.number }}
31+
- name: Run Backport
32+
uses: ./actions/backport
33+
with:
34+
branch: master
35+
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
36+
commit_user: kibanamachine
37+
commit_email: 42973632+kibanamachine@users.noreply.github.com

0 commit comments

Comments
 (0)