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

[Synthetics] bump bundled package to 0.10.3 #142650

Merged
merged 6 commits into from
Oct 6, 2022
Merged

[Synthetics] bump bundled package to 0.10.3 #142650

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12c8655
synthetics - bump bundled package to 0.10.3
dominiqueclarke Oct 4, 2022
8f5324e
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Oct 4, 2022
a7eb8c4
adjust tests
dominiqueclarke Oct 5, 2022
7f15f60
Merge branch 'feature/synthetics-package-0.10.3' of https://github.co…
dominiqueclarke Oct 5, 2022
68988c5
Merge branch 'main' into feature/synthetics-package-0.10.3
kibanamachine Oct 5, 2022
fb94c87
Update x-pack/test/api_integration/apis/uptime/rest/add_monitor_proje…
dominiqueclarke Oct 5, 2022
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: 2 additions & 2 deletions fleet_packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
},
{
"name": "synthetics",
"version": "0.10.2"
"version": "0.10.3"
}
]
]
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/uptime/rest/add_monitor_private_location.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
await supertestAPI.post('/api/fleet/setup').set('kbn-xsrf', 'true').send().expect(200);
await supertestAPI
.post('/api/fleet/epm/packages/synthetics/0.10.2')
.post('/api/fleet/epm/packages/synthetics/0.10.3')
.set('kbn-xsrf', 'true')
.send({ force: true })
.expect(200);
Expand Down
17 changes: 13 additions & 4 deletions x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { PrivateLocationTestService } from './services/private_location_test_ser
import { comparePolicies, getTestProjectSyntheticsPolicy } from './sample_data/test_policy';

export default function ({ getService }: FtrProviderContext) {
// FLAKY: https://github.com/elastic/kibana/issues/142110
describe.skip('AddProjectMonitors', function () {
describe('AddProjectMonitors', function () {
dominiqueclarke marked this conversation as resolved.
Show resolved Hide resolved
this.tags('skipCloud');

const supertest = getService('supertest');
Expand Down Expand Up @@ -79,7 +78,7 @@ export default function ({ getService }: FtrProviderContext) {
before(async () => {
await supertest.post('/api/fleet/setup').set('kbn-xsrf', 'true').send().expect(200);
await supertest
.post('/api/fleet/epm/packages/synthetics/0.10.2')
.post('/api/fleet/epm/packages/synthetics/0.10.3')
.set('kbn-xsrf', 'true')
.send({ force: true })
.expect(200);
Expand Down Expand Up @@ -1798,6 +1797,14 @@ export default function ({ getService }: FtrProviderContext) {
config_id: { value: configId, type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { value: 'project', type: 'text' },
'monitor.project.id': {
type: 'text',
value: 'test-suite',
},
'monitor.project.name': {
type: 'text',
value: 'test-suite',
},
},
id: `synthetics/http-http-${id}-${testPolicyId}`,
compiled_stream: {
Expand Down Expand Up @@ -1828,6 +1835,8 @@ export default function ({ getService }: FtrProviderContext) {
fields: {
'monitor.fleet_managed': true,
config_id: configId,
'monitor.project.id': 'test-suite',
'monitor.project.name': 'test-suite',
},
},
},
Expand Down Expand Up @@ -1859,7 +1868,7 @@ export default function ({ getService }: FtrProviderContext) {

expect(packagePolicy2).eql(undefined);
} finally {
await deleteMonitor(projectMonitors.monitors[0].id, projectMonitors.project);
await deleteMonitor(httpProjectMonitors.monitors[1].id, httpProjectMonitors.project);

const apiResponsePolicy2 = await supertest.get(
'/api/fleet/package_policies?page=1&perPage=2000&kuery=ingest-package-policies.package.name%3A%20synthetics'
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration/apis/uptime/rest/delete_monitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function ({ getService }: FtrProviderContext) {
_httpMonitorJson = getFixtureJson('http_monitor');
await supertest.post('/api/fleet/setup').set('kbn-xsrf', 'true').send().expect(200);
await supertest
.post('/api/fleet/epm/packages/synthetics/0.10.2')
.post('/api/fleet/epm/packages/synthetics/0.10.3')
.set('kbn-xsrf', 'true')
.send({ force: true })
.expect(200);
Expand Down
16 changes: 14 additions & 2 deletions x-pack/test/api_integration/apis/uptime/rest/sample_data/test_policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const getTestSyntheticsPolicy = (
version: 'WzE2MjYsMV0=',
name: 'test-monitor-name-Test private location 0-default',
namespace: namespace || 'testnamespace',
package: { name: 'synthetics', title: 'Elastic Synthetics', version: '0.10.2' },
package: { name: 'synthetics', title: 'Elastic Synthetics', version: '0.10.3' },
enabled: true,
policy_id: '5347cd10-0368-11ed-8df7-a7424c6f5167',
inputs: [
Expand Down Expand Up @@ -73,6 +73,8 @@ export const getTestSyntheticsPolicy = (
config_id: { value: id, type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { value: 'ui', type: 'text' },
'monitor.project.id': { type: 'text', value: null },
'monitor.project.name': { type: 'text', value: null },
},
id: 'synthetics/http-http-2bfd7da0-22ed-11ed-8c6b-09a2d21dfbc3-27337270-22ed-11ed-8c6b-09a2d21dfbc3-default',
compiled_stream: {
Expand Down Expand Up @@ -158,6 +160,8 @@ export const getTestSyntheticsPolicy = (
config_id: { type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { type: 'text' },
'monitor.project.id': { type: 'text' },
'monitor.project.name': { type: 'text' },
},
id: 'synthetics/tcp-tcp-2bfd7da0-22ed-11ed-8c6b-09a2d21dfbc3-27337270-22ed-11ed-8c6b-09a2d21dfbc3-default',
},
Expand Down Expand Up @@ -188,6 +192,8 @@ export const getTestSyntheticsPolicy = (
config_id: { type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { type: 'text' },
'monitor.project.id': { type: 'text' },
'monitor.project.name': { type: 'text' },
},
id: 'synthetics/icmp-icmp-2bfd7da0-22ed-11ed-8c6b-09a2d21dfbc3-27337270-22ed-11ed-8c6b-09a2d21dfbc3-default',
},
Expand Down Expand Up @@ -312,7 +318,7 @@ export const getTestProjectSyntheticsPolicy = (
version: 'WzEzMDksMV0=',
name: '4b6abc6c-118b-4d93-a489-1135500d09f1-test-suite-default-Test private location 0',
namespace: 'default',
package: { name: 'synthetics', title: 'Elastic Synthetics', version: '0.10.2' },
package: { name: 'synthetics', title: 'Elastic Synthetics', version: '0.10.3' },
enabled: true,
policy_id: '46034710-0ba6-11ed-ba04-5f123b9faa8b',
inputs: [
Expand Down Expand Up @@ -359,6 +365,8 @@ export const getTestProjectSyntheticsPolicy = (
config_id: { type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { type: 'text' },
'monitor.project.id': { type: 'text' },
'monitor.project.name': { type: 'text' },
},
id: 'synthetics/http-http-4b6abc6c-118b-4d93-a489-1135500d09f1-test-suite-default-d70a46e0-22ea-11ed-8c6b-09a2d21dfbc3',
},
Expand Down Expand Up @@ -398,6 +406,8 @@ export const getTestProjectSyntheticsPolicy = (
config_id: { type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { type: 'text' },
'monitor.project.id': { type: 'text' },
'monitor.project.name': { type: 'text' },
},
id: 'synthetics/tcp-tcp-4b6abc6c-118b-4d93-a489-1135500d09f1-test-suite-default-d70a46e0-22ea-11ed-8c6b-09a2d21dfbc3',
},
Expand Down Expand Up @@ -428,6 +438,8 @@ export const getTestProjectSyntheticsPolicy = (
config_id: { type: 'text' },
run_once: { value: false, type: 'bool' },
origin: { type: 'text' },
'monitor.project.id': { type: 'text' },
'monitor.project.name': { type: 'text' },
},
id: 'synthetics/icmp-icmp-4b6abc6c-118b-4d93-a489-1135500d09f1-test-suite-default-d70a46e0-22ea-11ed-8c6b-09a2d21dfbc3',
},
Expand Down