-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '7.17' into fix-for-data-view-missing-index-errors
Showing
38 changed files
with
3,717 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,24 @@ | ||
Bag Attributes | ||
friendlyName: ca | ||
localKeyID: 54 69 6D 65 20 31 35 37 38 35 38 34 39 34 35 33 30 37 | ||
localKeyID: 54 69 6D 65 20 31 36 37 33 34 34 39 31 31 30 31 33 33 | ||
subject=/CN=Test Root CA | ||
issuer=/CN=Test Root CA | ||
-----BEGIN CERTIFICATE----- | ||
MIIDETCCAfmgAwIBAgIUeHdJYDvncxgGdUWnjo60TuSa47AwDQYJKoZIhvcNAQEL | ||
BQAwFzEVMBMGA1UEAxMMVGVzdCBSb290IENBMCAXDTIwMDEwOTE1NDkwNVoYDzIw | ||
NjkxMjI3MTU0OTA1WjAXMRUwEwYDVQQDEwxUZXN0IFJvb3QgQ0EwggEiMA0GCSqG | ||
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2G9Bmax5yFvdWEMleXcFK7G0ir04/sd4v | ||
pRuqYhg+LhxlDOnd7HFtSsI2GGZaBktpL4eWOA8sAZ+eL89P3JV5WFDAuvlK8RZt | ||
ECnPzl7Yar3nhPjNO5F1xbyHCPNSiQVYx7avkLJu3sv/okA65ON+BHYijbNNwS0/ | ||
YtZYZWF7qR6rygXiLHcCIwWwZntBAKHGsBzxZv+28xRMUGsYWHq1PI25CRfDuVub | ||
jC3LpAiJUTkrN5cE8Mpy6R9EH3c/qCk1I2daUKJVJhIzrUrsyNYwpCpbtrE605lK | ||
qsRVkxoAK5i3zZRqiQ/m4FEmr0rTmbLJw09u+jIzfye2ivNiC7PZAgMBAAGjUzBR | ||
MB0GA1UdDgQWBBQDm/+IyjOiccUxUabaFe9EwsvTnzAfBgNVHSMEGDAWgBQDm/+I | ||
yjOiccUxUabaFe9EwsvTnzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA | ||
A4IBAQBclwdYhVNp3I4gTzxl0kbjya28auokp1+NUhAJ++eGGeTySEzbggHWkSSw | ||
jXhzbwri1T+80smvj4XkbSvLzPurSxT1if4kmUDh+XApx/pQb/2l88lRdLqBCcSn | ||
UxrdeDGPGMAYsxH/+/s2rMoaagBb4n8dayBesqIa+Nt+Mf8cqfM30pRGqk5HtoI/ | ||
ZUZDOQ7JJc3mg1usjA3mtgsUQ88zAH9C3fMpf/I3sr2UQqaXYZlzmh3r5U9yNYyw | ||
SV0NnaDd3BVJ4qOumTjlYalRJFDrvn+aNkyPN6XiwxA1qd/uVW5mIJhkoxPYWkG4 | ||
M1b0sea/9IVucYYyXI+GyFNI7B5N | ||
MIIDEjCCAfqgAwIBAgIVAKFMwaHZ9v6DB/eXbRzUjLEbYw3WMA0GCSqGSIb3DQEB | ||
CwUAMBcxFTATBgNVBAMTDFRlc3QgUm9vdCBDQTAgFw0yMzAxMTExNDU4MzBaGA8y | ||
MDcyMTIyOTE0NTgzMFowFzEVMBMGA1UEAxMMVGVzdCBSb290IENBMIIBIjANBgkq | ||
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2LBEaZX4ym+/Q0ibZAst2sFMdv3kuxwH | ||
TjYudmbae36GTGKXdMMBYzhnMTJdmoMALt+ItpJ4ATD1HgMtlcV+7/Z1xZai0Kk1 | ||
6OgweYruR4NxDhx/rUI9XAkNtW+Nz0BTcB5PkD5eDdcEWEHyt086CfGEN+hOIqIK | ||
dftWwLHnSnqcv9D1c+QN1dQTdwsnQoJ2LHtcTQSAoCmDb1f9oAMYdKp6xjCKE/bv | ||
YaXZkFXsh6GR3HM/o9P0v0CLe+C8SeJbxFztg6Qfs4t4Hsn9fXqyhRgOdq9WSnoF | ||
/dNwUQKWWgWXvcoMyY3ORk8bDAR277bfUTnzARzqlxZspAPvFOdKqwIDAQABo1Mw | ||
UTAdBgNVHQ4EFgQU3lLywLKZIsLOk7b5B5yHRU/AaegwHwYDVR0jBBgwFoAU3lLy | ||
wLKZIsLOk7b5B5yHRU/AaegwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsF | ||
AAOCAQEASfiIJ8v8nsoi6PCKF8BhFFWhZn/VpPHY12FyFBh+s9oVe5Ll4q94AmVz | ||
W8IgUjyFrCYV4WH9g0gS5DXxuU3tVShXMU8MTKMu2eaRJevJ21ZWNG/h6ZSi7Cm7 | ||
kWnUdUPLhhajW1apWFaRwLnwxs3iCShP32/4ON7eNC4JCeksqhXUU4iKVLvSTL7M | ||
vrh5sc/AQ8faQL+3F7x574zzgOOjUEoIG4v12n/v2xZCAyQV73upReaYQZ3n/Div | ||
RLznyIRQE29mS+U5yT31Xy/3MF1LSoyKSjdwEpdvXysw5fuHfHoUvDbTqatQyT+G | ||
82UxYdf7Eqg3xZY62G+7QZsfHjtT5g== | ||
-----END CERTIFICATE----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
x-pack/plugins/reporting/common/types/export_types/csv_saved_object.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import type { BaseParams, BasePayload } from '../base'; | ||
|
||
interface CsvFromSavedObjectBase { | ||
objectType: 'saved search'; | ||
timerange?: { | ||
timezone?: string; | ||
min?: string | number; | ||
max?: string | number; | ||
}; | ||
savedObjectId: string; | ||
} | ||
|
||
export type JobParamsCsvFromSavedObject = CsvFromSavedObjectBase & BaseParams; | ||
export type TaskPayloadCsvFromSavedObject = CsvFromSavedObjectBase & BasePayload; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
x-pack/plugins/reporting/server/export_types/csv_saved_object/create_job.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import { CreateJobFn, CreateJobFnFactory } from '../../types'; | ||
import { JobParamsCsvFromSavedObject, TaskPayloadCsvFromSavedObject } from './types'; | ||
|
||
type CreateJobFnType = CreateJobFn<JobParamsCsvFromSavedObject, TaskPayloadCsvFromSavedObject>; | ||
|
||
export const createJobFnFactory: CreateJobFnFactory<CreateJobFnType> = | ||
function createJobFactoryFn() { | ||
return async function createJob(jobParams) { | ||
// params have been finalized in server/routes/generate_from_savedobject.ts | ||
return jobParams; | ||
}; | ||
}; |
Oops, something went wrong.