Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes timestamp_field from data_stream #71727

Merged
merged 4 commits into from
Jul 15, 2020
Merged

Removes timestamp_field from data_stream #71727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ebfa62
Removes timestamp_field from data_stream
Jul 14, 2020
1c745e1
Updates snapshots and type
Jul 14, 2020
8f600d7
Merge remote-tracking branch 'upstream/master' into remove-timestamp_…
Jul 15, 2020
6171b04
[test] Re-enables test due to data stream timestamp_field change
Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions x-pack/plugins/ingest_manager/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,7 @@ export interface IndexTemplate {
mappings: any;
aliases: object;
};
data_stream: {
timestamp_field: string;
};
data_stream: object;
composed_of: string[];
_meta: object;
}
Expand Down
12 changes: 3 additions & 9 deletions ...st_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,7 @@ function getBaseTemplate(
// To be filled with the aliases that we need
aliases: {},
},
data_stream: {
timestamp_field: '@timestamp',
},
data_stream: {},
composed_of: composedOfTemplates,
_meta: {
package: {
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/api_integration/apis/fleet/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
*/

export default function loadTests({ loadTestFile }) {
// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('Fleet Endpoints', () => {
describe('Fleet Endpoints', () => {
loadTestFile(require.resolve('./setup'));
loadTestFile(require.resolve('./delete_agent'));
loadTestFile(require.resolve('./list_agent'));
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/api_integration/apis/management/index_management/data_streams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ export default function ({ getService }: FtrProviderContext) {
await deleteComposableIndexTemplate(name);
};

// Temporarily skipping tests until ES snapshot is updated
describe.skip('Data streams', function () {
describe('Data streams', function () {
describe('Get', () => {
const testDataStreamName = 'test-data-stream';

Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/ingest_manager_api_integration/apis/epm/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ export default function ({ getService }: FtrProviderContext) {
const mappingsPackage = 'overrides-0.1.0';
const server = dockerServers.get('registry');

// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('installs packages that include settings and mappings overrides', async () => {
describe('installs packages that include settings and mappings overrides', async () => {
after(async () => {
if (server.enabled) {
// remove the package just in case it being installed will affect other tests
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const testSubjects = getService('testSubjects');
const policyTestResources = getService('policyTestResources');

// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('When on the Endpoint Policy Details Page', function () {
describe('When on the Endpoint Policy Details Page', function () {
this.tags(['ciGroup7']);

describe('with an invalid policy id', () => {
Expand Down
4 changes: 1 addition & 3 deletions x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const policyTestResources = getService('policyTestResources');
const RELATIVE_DATE_FORMAT = /\d (?:seconds|minutes) ago/i;

// Temporarily skipped to promote snapshot
// Re-enabled in https://github.com/elastic/kibana/pull/71727
describe.skip('When on the Endpoint Policy List', function () {
describe('When on the Endpoint Policy List', function () {
this.tags(['ciGroup7']);
before(async () => {
await pageObjects.policy.navigateToPolicyList();
Expand Down