Skip to content

Commit a84a263

Browse files
committed
Merge branch 'master' into actions/feature-and-rbac
* master: (36 commits) fixed api url in example plugin (elastic#70934) [data.search.aggs]: Remove remaining client dependencies (elastic#70251) [Security Solution][Endpoint] Fix base64 download bug and adopt new user artifact/manifest format (elastic#70998) [Security Solution][Exceptions] - Exception Modal Part I (elastic#70639) [SIEM][Detection Engine][Lists] Adds additional data types to value based lists [SIEM][Detection Engine][Lists] Removes feature flag for lists [APM] Show license callout in ML settings (elastic#70959) Migrate service settings test to jest (elastic#70992) [APM] Add cloud attributes to data telemetry (elastic#71008) Fix breadcrumb on panels for visibility / round corners (elastic#71010) Improve search typescript (elastic#69333) [savedObjects field count] run in baseline job (elastic#70999) [Security Solution] [Timeline] Timeline manager tweaks (elastic#69988) [Endpoint] Support redirect from Policy Details to Ingest when user initiates Edit Policy from Datasource Edit page (elastic#70874) [APM] Add API tests (elastic#70740) [Security Solution][Exceptions] - Tie server and client code together (elastic#70918) [Audit Logging] Add AuditTrail service (elastic#69278) [Usage Collection] Ensure no type duplicates (elastic#70946) [Security Solution] [Timeline] Bugfix for timeline row actions disappear sometimes (elastic#70958) [CI] Add pipeline task queue framework and merge workers into one (elastic#64011) ...
2 parents 4d6d96e + ce18465 commit a84a263

File tree

778 files changed

+48336
-8622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

778 files changed

+48336
-8622
lines changed

.ci/Dockerfile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
ARG NODE_VERSION=10.21.0
2+
3+
FROM node:${NODE_VERSION} AS base
4+
5+
RUN apt-get update && \
6+
apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
7+
libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
8+
libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
9+
libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
10+
libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget openjdk-8-jre && \
11+
rm -rf /var/lib/apt/lists/*
12+
13+
RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
14+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
15+
&& apt-get update \
16+
&& apt-get install -y rsync jq bsdtar google-chrome-stable \
17+
--no-install-recommends \
18+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
19+
20+
RUN LATEST_VAULT_RELEASE=$(curl -s https://api.github.com/repos/hashicorp/vault/tags | jq --raw-output .[0].name[1:]) \
21+
&& curl -L https://releases.hashicorp.com/vault/${LATEST_VAULT_RELEASE}/vault_${LATEST_VAULT_RELEASE}_linux_amd64.zip -o vault.zip \
22+
&& unzip vault.zip \
23+
&& rm vault.zip \
24+
&& chmod +x vault \
25+
&& mv vault /usr/local/bin/vault
26+
27+
RUN groupadd -r kibana && useradd -r -g kibana kibana && mkdir /home/kibana && chown kibana:kibana /home/kibana
28+
29+
COPY ./bash_standard_lib.sh /usr/local/bin/bash_standard_lib.sh
30+
RUN chmod +x /usr/local/bin/bash_standard_lib.sh
31+
32+
COPY ./runbld /usr/local/bin/runbld
33+
RUN chmod +x /usr/local/bin/runbld
34+
35+
USER kibana

.ci/runbld_no_junit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
profiles:
44
- ".*": # Match any job
55
tests:
6-
junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist
6+
junit-filename-pattern: false

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
/x-pack/plugins/licensing/ @elastic/kibana-platform
145145
/x-pack/plugins/global_search/ @elastic/kibana-platform
146146
/x-pack/plugins/cloud/ @elastic/kibana-platform
147+
/x-pack/test/saved_objects_field_count/ @elastic/kibana-platform
147148
/packages/kbn-config-schema/ @elastic/kibana-platform
148149
/src/legacy/server/config/ @elastic/kibana-platform
149150
/src/legacy/server/http/ @elastic/kibana-platform

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ npm-debug.log*
4747
.tern-project
4848
.nyc_output
4949
.ci/pipeline-library/build/
50+
.ci/runbld
51+
.ci/bash_standard_lib.sh
5052
.gradle
5153

5254
# apm plugin

Jenkinsfile

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,7 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
88
ciStats.trackBuild {
99
catchError {
1010
retryable.enable()
11-
parallel([
12-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
13-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
14-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15-
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
16-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
17-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
18-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
19-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
20-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
21-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
22-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
23-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
24-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
25-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
26-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
27-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
28-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
29-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
30-
]),
31-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
32-
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
33-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
34-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
35-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
36-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
37-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
38-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
39-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
40-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
41-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
42-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
43-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44-
// 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
45-
'xpack-securitySolutionCypress': { processNumber ->
46-
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
47-
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
48-
}
49-
},
50-
51-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
52-
]),
53-
])
11+
kibanaPipeline.allCiTasks()
5412
}
5513
}
5614
}

docs/apm/api.asciidoc

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Some APM app features are provided via a REST API:
1010

1111
* <<agent-config-api>>
1212
* <<apm-annotation-api>>
13+
* <<kibana-api,Kibana API>>
1314

1415
[float]
1516
[[apm-api-example]]
@@ -468,3 +469,87 @@ curl -X POST \
468469
}
469470
}
470471
--------------------------------------------------
472+
473+
////
474+
*******************************************************
475+
////
476+
477+
[[kibana-api]]
478+
=== Kibana API
479+
480+
In addition to the APM specific API endpoints, Kibana provides its own <<api,REST API>>
481+
which you can use to automate certain aspects of configuring and deploying Kibana.
482+
An example is below.
483+
484+
[[api-create-apm-index-pattern]]
485+
==== Customize the APM index pattern
486+
487+
As an alternative to updating <<apm-settings-in-kibana,`apm_oss.indexPattern`>> in your `kibana.yml` configuration file,
488+
you can use Kibana's <<saved-objects-api-update,update object API>> to update the default APM index pattern on the fly.
489+
490+
The following example sets the default APM app index pattern to `some-other-pattern-*`:
491+
492+
[source,sh]
493+
----
494+
curl -X PUT "localhost:5601/api/saved_objects/index-pattern/apm_static_index_pattern_id" \ <1>
495+
-H 'Content-Type: application/json' \
496+
-H 'kbn-xsrf: true' \
497+
-H 'Authorization: Basic ${YOUR_AUTH_TOKEN}' \
498+
-d' {
499+
"attributes": {
500+
"title": "some-other-pattern-*", <2>
501+
}
502+
}'
503+
----
504+
<1> `apm_static_index_pattern_id` is the internal, hard-coded ID of the APM index pattern.
505+
This value should not be changed
506+
<2> Your custom index pattern matcher.
507+
508+
The API returns the following:
509+
510+
[source,json]
511+
----
512+
{
513+
"id":"apm_static_index_pattern_id",
514+
"type":"index-pattern",
515+
"updated_at":"2020-07-06T22:55:59.555Z",
516+
"version":"WzYsMV0=",
517+
"attributes":{
518+
"title":"some-other-pattern-*"
519+
}
520+
}
521+
----
522+
523+
To view the new APM app index pattern, use the <<saved-objects-api-get,GET object API>>:
524+
525+
[source,sh]
526+
----
527+
curl -X GET "localhost:5601/api/saved_objects/index-pattern/apm_static_index_pattern_id" \ <1>
528+
-H 'kbn-xsrf: true' \
529+
-H 'Authorization: Basic ${YOUR_AUTH_TOKEN}'
530+
----
531+
<1> `apm_static_index_pattern_id` is the internal, hard-coded ID of the APM index pattern.
532+
533+
The API returns the following:
534+
535+
[source,json]
536+
----
537+
{
538+
"id":"apm_static_index_pattern_id",
539+
"type":"index-pattern",
540+
"updated_at":"2020-07-06T22:55:59.555Z",
541+
"version":"WzYsMV0=",
542+
"attributes":{...}
543+
"fieldFormatMap":"{...}
544+
"fields":"[{...},{...},...]
545+
"sourceFilters":"[{\"value\":\"sourcemap.sourcemap\"}]",
546+
"timeFieldName":"@timestamp",
547+
"title":"some-other-pattern-*"
548+
},
549+
...
550+
}
551+
----
552+
553+
// More examples will go here
554+
555+
More information on Kibana's API is available in <<api,REST API>>.

docs/apm/set-up.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ simply click *Load Kibana objects* at the bottom of the Setup Instructions.
2525
[role="screenshot"]
2626
image::apm/images/apm-index-pattern.png[Setup index pattern for APM in Kibana]
2727

28-
To use a custom index pattern, see <<apm-settings-in-kibana>>.
28+
TIP: To use a custom index pattern,
29+
adjust Kibana's <<apm-settings-in-kibana,settings>> or use the <<api-create-apm-index-pattern,Kibana API>>.
2930

3031
[float]
3132
[[apm-getting-started-next]]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [AuditableEvent](./kibana-plugin-core-server.auditableevent.md)
4+
5+
## AuditableEvent interface
6+
7+
Event to audit.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export interface AuditableEvent
13+
```
14+
15+
## Remarks
16+
17+
Not a complete interface.
18+
19+
## Properties
20+
21+
| Property | Type | Description |
22+
| --- | --- | --- |
23+
| [message](./kibana-plugin-core-server.auditableevent.message.md) | <code>string</code> | |
24+
| [type](./kibana-plugin-core-server.auditableevent.type.md) | <code>string</code> | |
25+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [AuditableEvent](./kibana-plugin-core-server.auditableevent.md) &gt; [message](./kibana-plugin-core-server.auditableevent.message.md)
4+
5+
## AuditableEvent.message property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
message: string;
11+
```
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [AuditableEvent](./kibana-plugin-core-server.auditableevent.md) &gt; [type](./kibana-plugin-core-server.auditableevent.type.md)
4+
5+
## AuditableEvent.type property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
type: string;
11+
```

0 commit comments

Comments
 (0)