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.

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

Merged
merged 5 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 51 additions & 1 deletion __tests__/push/monitor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('Monitors', () => {
hash: expect.any(String),
locations: ['europe-west2-a', 'australia-southeast1-a'],
privateLocations: ['germany'],
fields: { area: 'website' },
});
});

Expand All @@ -102,10 +103,15 @@ describe('Monitors', () => {
filter: {
match: 'test',
},
fields: { area: 'website' },
});
monitor.update({ locations: ['brazil'] });
monitor.update({ locations: ['brazil'], fields: { env: 'dev' } });
const schema1 = await buildMonitorSchema([monitor], true);
expect(schema1[0].hash).not.toEqual(schema[0].hash);
expect(schema1[0].fields).toEqual({
area: 'website',
env: 'dev',
});
});

it('parse @every schedule format', async () => {
Expand Down Expand Up @@ -472,6 +478,50 @@ heartbeat.monitors:
hosts: ['elastic.co:443'],
});
});

it('supports fields in config', async () => {
await writeHBFile(`
heartbeat.monitors:
- type: icmp
schedule: @every 5m
id: "test-icmp"
name: "test-icmp"
privateLocations:
- baz
tags:
- ltag1
- ltag2
fields.foo: bar
fields.baz: qux
`);

const [mon] = await createLightweightMonitors(PROJECT_DIR, {
auth: 'foo',
params: { foo: 'bar' },
kibanaVersion: '8.8.0',
locations: ['australia_east'],
tags: ['gtag1', 'gtag2'],
privateLocations: ['gbaz'],
schedule: 10,
retestOnFailure: false,
});

expect(mon.config).toEqual({
id: 'test-icmp',
name: 'test-icmp',
locations: ['australia_east'],
privateLocations: ['baz'],
type: 'icmp',
params: { foo: 'bar' },
schedule: 5,
tags: ['ltag1', 'ltag2'],
retestOnFailure: false,
fields: {
baz: 'qux',
foo: 'bar',
},
});
});
});

describe('parseAlertConfig', () => {
Expand Down
1 change: 1 addition & 0 deletions __tests__/utils/test-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export function createTestMonitor(filename: string, type = 'browser') {
enabled: true,
locations: ['united_kingdom', 'australia_east'],
privateLocations: ['germany'],
fields: { area: 'website' },
});
monitor.setSource({
file: join(FIXTURES_DIR, filename),
Expand Down
1 change: 1 addition & 0 deletions src/common_types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export type PushOptions = Partial<ProjectSettings> &
kibanaVersion?: string;
yes?: boolean;
tags?: Array<string>;
fields?: MonitorConfig['fields'];
alert?: AlertConfig;
retestOnFailure?: MonitorConfig['retestOnFailure'];
enabled?: boolean;
Expand Down
1 change: 1 addition & 0 deletions src/dsl/monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export type MonitorConfig = {
name?: string;
type?: string;
tags?: string[];
fields?: Record<string, string>;
schedule?: typeof ALLOWED_SCHEDULES[number];
enabled?: boolean;
locations?: SyntheticsLocationsType[];
Expand Down
20 changes: 20 additions & 0 deletions src/push/monitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ export function buildMonitorFromYaml(
enabled: config.enabled ?? options.enabled,
locations: options.locations,
tags: options.tags,
fields: parseFields(config, options.fields),
...normalizeConfig(config),
retestOnFailure,
privateLocations,
Expand Down Expand Up @@ -311,6 +312,25 @@ export const parseAlertConfig = (
return Object.keys(result).length > 0 ? result : undefined;
};

export const parseFields = (
config: MonitorConfig,
gFields?: Record<string, string>
) => {
// get all keys starting with `label.`
const keys = Object.keys(config).filter(key => key.startsWith('fields.'));
const fields = {};
for (const key of keys) {
fields[key.replace('fields.', '')] = config[key];
delete config[key];
}
if (gFields) {
for (const key of Object.keys(gFields)) {
fields[key] = gFields[key];
}
}
return Object.keys(fields).length > 0 ? fields : undefined;
};

export function getAlertKeyValue(
key: 'status' | 'tls',
config: MonitorConfig,
Expand Down