-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
feat: add labels meta #959
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -255,6 +255,7 @@ export type PushOptions = Partial<ProjectSettings> & | |
kibanaVersion?: string; | ||
yes?: boolean; | ||
tags?: Array<string>; | ||
labels?: Record<string, string>; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's rename this to fields to map with the heartbeat top level fields name and under the hood in Kibana, you can map to labels. Having labels as top level is confusing - https://www.elastic.co/guide/en/beats/heartbeat/8.12/configuration-general-options.html#libbeat-configuration-fields Also let's write JS doc annotation so it's visible on TS config. |
||
alert?: AlertConfig; | ||
retestOnFailure?: MonitorConfig['retestOnFailure']; | ||
enabled?: boolean; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -268,6 +268,7 @@ export function buildMonitorFromYaml( | |
enabled: config.enabled ?? options.enabled, | ||
locations: options.locations, | ||
tags: options.tags, | ||
labels: parseLabels(config, options.labels), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add this new field to some of the unit tests validating lightweight monitors There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i have added here |
||
...normalizeConfig(config), | ||
retestOnFailure, | ||
privateLocations, | ||
|
@@ -311,6 +312,25 @@ export const parseAlertConfig = ( | |
return Object.keys(result).length > 0 ? result : undefined; | ||
}; | ||
|
||
export const parseLabels = ( | ||
config: MonitorConfig, | ||
gLabels?: Record<string, string> | ||
) => { | ||
// get all keys starting with `label.` | ||
const keys = Object.keys(config).filter(key => key.startsWith('labels.')); | ||
const labels = {}; | ||
for (const key of keys) { | ||
labels[key.replace('labels.', '')] = config[key]; | ||
delete config[key]; | ||
} | ||
if (gLabels) { | ||
for (const key of Object.keys(gLabels)) { | ||
labels[key] = gLabels[key]; | ||
} | ||
} | ||
return Object.keys(labels).length > 0 ? labels : undefined; | ||
}; | ||
|
||
export function getAlertKeyValue( | ||
key: 'status' | 'tls', | ||
config: MonitorConfig, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add test for browser monitor as well.