Skip to content

Commit ba29472

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into kertal-pr-2020-04-15-fix-discover-csv-save-messag
2 parents cad7cce + 7b57caf commit ba29472

1,535 files changed

Lines changed: 14708 additions & 51482 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.

‎.eslintrc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ module.exports = {
567567
},
568568
{
569569
// typescript only for front and back end
570-
files: ['x-pack/legacy/plugins/siem/**/*.{ts,tsx}'],
570+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
571571
rules: {
572572
// This will be turned on after bug fixes are complete
573573
// '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -613,7 +613,7 @@ module.exports = {
613613
// },
614614
{
615615
// typescript and javascript for front and back end
616-
files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
616+
files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
617617
plugins: ['eslint-plugin-node', 'react'],
618618
env: {
619619
mocha: true,

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ A high level overview of our contributing guidelines.
2222
- [Setting Up SSL](#setting-up-ssl)
2323
- [Linting](#linting)
2424
- [Internationalization](#internationalization)
25+
- [Localization](#localization)
2526
- [Testing and Building](#testing-and-building)
2627
- [Debugging server code](#debugging-server-code)
2728
- [Instrumenting with Elastic APM](#instrumenting-with-elastic-apm)
@@ -408,6 +409,11 @@ ReactDOM.render(
408409
There are a number of tools created to support internationalization in Kibana that would allow one to validate internationalized labels,
409410
extract them to a `JSON` file or integrate translations back to Kibana. To know more, please read corresponding [readme](src/dev/i18n/README.md) file.
410411

412+
### Localization
413+
414+
We cannot support accepting contributions to the translations from any source other than the translators we have engaged to do the work.
415+
We are still to develop a proper process to accept any contributed translations. We certainly appreciate that people care enough about the localization effort to want to help improve the quality. We aim to build out a more comprehensive localization process for the future and will notify you once contributions can be supported, but for the time being, we are not able to incorporate suggestions.
416+
411417
### Testing and Building
412418

413419
To ensure that your changes will not break other functionality, please run the test suite and build process before submitting your Pull Request.

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4141
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4242
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
4343
'xpack-siemCypress': { processNumber ->
44-
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
44+
whenChanged(['x-pack/plugins/siem/', 'x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
4545
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
4646
}
4747
},

‎docs/api/saved-objects/create.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ any data that you send to the API is properly formed.
5757

5858
[source,sh]
5959
--------------------------------------------------
60-
$ curl -X POST "localhost:5601/api/saved_objects/index-pattern/my-pattern"
60+
$ curl -X POST "localhost:5601/api/saved_objects/index-pattern/my-pattern" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
6161
{
6262
"attributes": {
6363
"title": "my-pattern-*"
6464
}
65-
}
65+
}'
6666
--------------------------------------------------
6767
// KIBANA
6868

‎docs/api/saved-objects/export.asciidoc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,46 +68,46 @@ Export all index pattern saved objects:
6868

6969
[source,sh]
7070
--------------------------------------------------
71-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
71+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
7272
{
7373
"type": "index-pattern"
74-
}
74+
}'
7575
--------------------------------------------------
7676
// KIBANA
7777

7878
Export all index pattern saved objects and exclude the export summary from the stream:
7979

8080
[source,sh]
8181
--------------------------------------------------
82-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
82+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
8383
{
8484
"type": "index-pattern",
8585
"excludeExportDetails": true
86-
}
86+
}'
8787
--------------------------------------------------
8888
// KIBANA
8989

9090
Export a specific saved object:
9191

9292
[source,sh]
9393
--------------------------------------------------
94-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
94+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
9595
{
9696
"objects": [
9797
{
9898
"type": "dashboard",
9999
"id": "be3733a0-9efe-11e7-acb3-3dab96693fab"
100100
}
101101
]
102-
}
102+
}'
103103
--------------------------------------------------
104104
// KIBANA
105105

106106
Export a specific saved object and it's related objects :
107107

108108
[source,sh]
109109
--------------------------------------------------
110-
$ curl -X POST "localhost:5601/api/saved_objects/_export"
110+
$ curl -X POST "localhost:5601/api/saved_objects/_export" -H 'kbn-xsrf: true' -H 'Content-Type: application/json' -d '
111111
{
112112
"objects": [
113113
{
@@ -116,6 +116,6 @@ $ curl -X POST "localhost:5601/api/saved_objects/_export"
116116
}
117117
],
118118
"includeReferencesDeep": true
119-
}
119+
}'
120120
--------------------------------------------------
121121
// KIBANA

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
| [SavedQuery](./kibana-plugin-plugins-data-public.savedquery.md) | |
8989
| [SavedQueryService](./kibana-plugin-plugins-data-public.savedqueryservice.md) | |
9090
| [SearchSourceFields](./kibana-plugin-plugins-data-public.searchsourcefields.md) | |
91-
| [SearchStrategyProvider](./kibana-plugin-plugins-data-public.searchstrategyprovider.md) | |
9291
| [TabbedAggColumn](./kibana-plugin-plugins-data-public.tabbedaggcolumn.md) | \* |
9392
| [TabbedTable](./kibana-plugin-plugins-data-public.tabbedtable.md) | \* |
9493
| [TimeRange](./kibana-plugin-plugins-data-public.timerange.md) | |

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.id.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.isviable.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchstrategyprovider.search.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)