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

[Uptime] Use dynamic index pattern in Uptime #55446

Merged
merged 11 commits into from
Jan 30, 2020
Merged

[Uptime] Use dynamic index pattern in Uptime #55446

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ed386a
Using auto attribute field and fixed title
shahzad31 Jan 21, 2020
266fa99
added constant
shahzad31 Jan 21, 2020
b768a5a
Merge branch 'master' into fix/auto-generated-index-pattern-uptime
shahzad31 Jan 24, 2020
8f449dd
refactor index pattern state
shahzad31 Jan 24, 2020
e2ef44c
Merge branch 'master' into fix/auto-generated-index-pattern-uptime
shahzad31 Jan 26, 2020
793e1f6
fixed type
shahzad31 Jan 26, 2020
61c2c8d
Merge branch 'master' into fix/auto-generated-index-pattern-uptime
elasticmachine Jan 26, 2020
e685373
Merge branch 'master' into fix/auto-generated-index-pattern-uptime
shahzad31 Jan 29, 2020
9ff8744
PR feedback
shahzad31 Jan 29, 2020
85a79d7
Merge branch 'master' into fix/auto-generated-index-pattern-uptime
shahzad31 Jan 30, 2020
a6c6842
resolve conflcits
shahzad31 Jan 30, 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
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/uptime/common/constants/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
*/

export const UNNAMED_LOCATION = 'Unnamed-location';

export const UPTIME_INDEX_PATTERN = 'heartbeat-8*';
shahzad31 marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 0 additions & 13 deletions x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/heartbeat_index_pattern.json
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions ...k/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@
*/

import { UMSavedObjectsAdapter } from './types';
import uptimeIndexPattern from './heartbeat_index_pattern.json';
import { UPTIME_INDEX_PATTERN } from '../../../../common/constants';

export const savedObjectsAdapter: UMSavedObjectsAdapter = {
getUptimeIndexPattern: async client => {
try {
return await client.get('index-pattern', uptimeIndexPattern.id);
return await client.get('index-pattern', UPTIME_INDEX_PATTERN);
} catch (error) {
return await client.create(
'index-pattern',
{
...uptimeIndexPattern.attributes,
title: 'UptimeIndexPattern',
timeFieldName: '@timestamp',
title: 'heartbeat-8*',
fields: '[]',
},
{ id: uptimeIndexPattern.id, overwrite: false }
{ id: UPTIME_INDEX_PATTERN, overwrite: false }
);
}
},
Expand Down