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

[BeatsCM] remove type from ES template and requests (#30549) #30823

Merged
merged 2 commits into from
Feb 14, 2019
Merged

[BeatsCM] remove type from ES template and requests (#30549) #30823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d507c5
[BeatsCM] remove type from ES template and requests (#30549)
mattapperson Feb 11, 2019
d860f5e
Merge branch 'master' of github.com:elastic/kibana into beats/re-scal…
mattapperson Feb 13, 2019
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
230 changes: 114 additions & 116 deletions x-pack/plugins/beats_management/server/index_templates/beats_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"index_patterns": [".management-beats"],
"version": 67000,
"version": 70000,
"settings": {
"index": {
"number_of_shards": 1,
Expand All @@ -9,128 +9,126 @@
}
},
"mappings": {
"_doc": {
"dynamic": "strict",
"properties": {
"type": {
"type": "keyword"
},
"configuration_block": {
"properties": {
"id": {
"type": "keyword"
},
"type": {
"type": "keyword"
},
"tag": {
"type": "keyword"
},
"description": {
"type": "text"
},
"config": {
"type": "keyword"
},
"last_updated": {
"type": "date"
}
"dynamic": "strict",
"properties": {
"type": {
"type": "keyword"
},
"configuration_block": {
"properties": {
"id": {
"type": "keyword"
},
"type": {
"type": "keyword"
},
"tag": {
"type": "keyword"
},
"description": {
"type": "text"
},
"config": {
"type": "keyword"
},
"last_updated": {
"type": "date"
}
},
"enrollment_token": {
"properties": {
"token": {
"type": "keyword"
},
"expires_on": {
"type": "date"
}
}
},
"enrollment_token": {
"properties": {
"token": {
"type": "keyword"
},
"expires_on": {
"type": "date"
}
},
"tag": {
"properties": {
"id": {
"type": "keyword"
},
"name": {
"type": "keyword"
},
"color": {
"type": "keyword"
},
"hasConfigurationBlocksTypes": {
"type": "keyword"
}
}
},
"tag": {
"properties": {
"id": {
"type": "keyword"
},
"name": {
"type": "keyword"
},
"color": {
"type": "keyword"
},
"hasConfigurationBlocksTypes": {
"type": "keyword"
}
},
"beat": {
"properties": {
"id": {
"type": "keyword"
},
"status": {
"properties": {
"type": {
"type": "keyword"
},
"timestamp": {
"type": "date"
},
"event": {
"properties": {
"type": {
"type": "keyword"
},
"message": {
"type": "text"
},
"uuid": {
"type": "keyword"
}
}
},
"beat": {
"properties": {
"id": {
"type": "keyword"
},
"status": {
"properties": {
"type": {
"type": "keyword"
},
"timestamp": {
"type": "date"
},
"event": {
"properties": {
"type": {
"type": "keyword"
},
"message": {
"type": "text"
},
"uuid": {
"type": "keyword"
}
}
}
},
"active": {
"type": "boolean"
},
"last_checkin": {
"type": "date"
},
"enrollment_token": {
"type": "keyword"
},
"access_token": {
"type": "keyword"
},
"verified_on": {
"type": "date"
},
"type": {
"type": "keyword"
},
"version": {
"type": "keyword"
},
"host_ip": {
"type": "ip"
},
"host_name": {
"type": "keyword"
},
"ephemeral_id": {
"type": "keyword"
},
"tags": {
"type": "keyword"
},
"metadata": {
"dynamic": "true",
"type": "object"
},
"name": {
"type": "keyword"
}
},
"active": {
"type": "boolean"
},
"last_checkin": {
"type": "date"
},
"enrollment_token": {
"type": "keyword"
},
"access_token": {
"type": "keyword"
},
"verified_on": {
"type": "date"
},
"type": {
"type": "keyword"
},
"version": {
"type": "keyword"
},
"host_ip": {
"type": "ip"
},
"host_name": {
"type": "keyword"
},
"ephemeral_id": {
"type": "keyword"
},
"tags": {
"type": "keyword"
},
"metadata": {
"dynamic": "true",
"type": "object"
},
"name": {
"type": "keyword"
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
id: `beat:${id}`,
ignore: [404],
index: INDEX_NAMES.BEATS,
type: '_doc',
};

const response = await this.database.get(user, params);
Expand All @@ -46,7 +45,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
id: `beat:${beat.id}`,
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
});
}

Expand All @@ -61,7 +59,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
id: `beat:${beat.id}`,
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
};
await this.database.index(user, params);
}
Expand All @@ -74,7 +71,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
ids,
},
index: INDEX_NAMES.BEATS,
type: '_doc',
};
const response = await this.database.mget(user, params);

Expand All @@ -87,7 +83,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
const params = {
ignore: [404],
index: INDEX_NAMES.BEATS,
type: '_doc',
body: {
query: {
terms: { 'beat.tags': tagIds },
Expand Down Expand Up @@ -115,7 +110,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
const params = {
ignore: [404],
index: INDEX_NAMES.BEATS,
type: '_doc',
body: {
query: {
match: { 'beat.enrollment_token': enrollmentToken },
Expand All @@ -140,7 +134,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
index: INDEX_NAMES.BEATS,
size: 10000,
ignore: [404],
type: '_doc',
body: {
query: {
bool: {
Expand Down Expand Up @@ -201,7 +194,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
body,
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
});
return _get<any>(response, 'items', []).map((item: any, resultIdx: number) => ({
idxInRequest: removals[resultIdx].idxInRequest,
Expand Down Expand Up @@ -236,7 +228,6 @@ export class ElasticsearchBeatsAdapter implements CMBeatsAdapter {
body,
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
});
// console.log(response.items[0].update.error);
return _get<any>(response, 'items', []).map((item: any, resultIdx: any) => ({
Expand Down
5 changes: 0 additions & 5 deletions ...ent/server/lib/adapters/configuration_blocks/elasticsearch_configuration_block_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
_source: true,
size: 10000,
index: INDEX_NAMES.BEATS,
type: '_doc',
body: {
ids: ids.map(id => `configuration_block:${id}`),
},
Expand Down Expand Up @@ -58,7 +57,6 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
const params = {
ignore: [404],
index: INDEX_NAMES.BEATS,
type: '_doc',
body: {
from: page === -1 ? undefined : page * size,
size,
Expand Down Expand Up @@ -93,7 +91,6 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
body: ids.map(id => ({ delete: { _id: `configuration_block:${id}` } })),
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
});

if (result.errors) {
Expand Down Expand Up @@ -123,7 +120,6 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
},
},
index: INDEX_NAMES.BEATS,
type: '_doc',
});

if (result.failures.length > 0) {
Expand Down Expand Up @@ -156,7 +152,6 @@ export class ElasticsearchConfigurationBlockAdapter implements ConfigurationBloc
body,
index: INDEX_NAMES.BEATS,
refresh: 'wait_for',
type: '_doc',
});

if (result.errors) {
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/test_contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const contractTests = (testName: string, config: ContractConfig) => {
id: `beat:foo`,
ignore: [404],
index: '.management-beats',
type: '_doc',
};
let ranWithoutError = false;
try {
Expand All @@ -48,7 +47,6 @@ export const contractTests = (testName: string, config: ContractConfig) => {
id: `beat:foo`,
ignore: [404],
index: '.management-beats',
type: '_doc',
};
const response = await database.get({ kind: 'internal' }, params);

Expand Down
Loading