From 5edae56efc7bfa7ad1958b55f434705a7105ce44 Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 30 Nov 2022 10:25:34 -0500 Subject: [PATCH 1/4] synthetics - remove run_from field --- packages/synthetics/changelog.yml | 5 +++++ .../data_stream/browser/agent/stream/browser.yml.hbs | 3 --- .../synthetics/data_stream/http/agent/stream/http.yml.hbs | 3 --- .../synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs | 3 --- packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs | 3 --- packages/synthetics/manifest.yml | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/synthetics/changelog.yml b/packages/synthetics/changelog.yml index b327bc1398a..0868d0b3f49 100644 --- a/packages/synthetics/changelog.yml +++ b/packages/synthetics/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.11.4" + changes: + - description: Remove run_from field to monitor config to preserve location name + type: bugfix + link: https://github.com/elastic/integrations/pull/4673 - version: "0.11.3" changes: - description: Add run_from field to monitor config diff --git a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs index f56e302199f..37d2577bb40 100644 --- a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs +++ b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs @@ -7,9 +7,6 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} -{{#if location_name}} -run_from.id: {{location_name}} -{{/if}} enabled: {{enabled}} {{#if service.name}} service.name: {{service.name}} diff --git a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs index 534096fde51..d464a4ad58a 100644 --- a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs +++ b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs @@ -7,9 +7,6 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} -{{#if location_name}} -run_from.id: {{location_name}} -{{/if}} enabled: {{enabled}} urls: {{urls}} {{#if service.name}} diff --git a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs index 397b96ca60c..25b9658e6f6 100644 --- a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs +++ b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs @@ -7,9 +7,6 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} -{{#if location_name}} -run_from.id: {{location_name}} -{{/if}} enabled: {{enabled}} hosts: {{hosts}} {{#if service.name}} diff --git a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs index 56c7c002efa..c111b8d5c3d 100644 --- a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs +++ b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs @@ -7,9 +7,6 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} -{{#if location_name}} -run_from.id: {{location_name}} -{{/if}} enabled: {{enabled}} hosts: {{hosts}} {{#if service.name}} diff --git a/packages/synthetics/manifest.yml b/packages/synthetics/manifest.yml index 736ae5a21be..a3b64af6240 100644 --- a/packages/synthetics/manifest.yml +++ b/packages/synthetics/manifest.yml @@ -2,7 +2,7 @@ format_version: 1.0.0 name: synthetics title: Elastic Synthetics description: Monitor the availability of your services with Elastic Synthetics. -version: 0.11.3 +version: 0.11.4 categories: ["elastic_stack", "monitoring", "web"] release: beta type: integration From 0d6d4d1da6a78c79447203f27c85a596719cd753 Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 30 Nov 2022 12:25:20 -0500 Subject: [PATCH 2/4] restore run_from options and add --- .../data_stream/browser/agent/stream/browser.yml.hbs | 6 ++++++ .../synthetics/data_stream/http/agent/stream/http.yml.hbs | 6 ++++++ .../synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs | 6 ++++++ .../synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs index 37d2577bb40..564fc3df222 100644 --- a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs +++ b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs @@ -7,6 +7,12 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} +{{#if location_name}} +run_from.id: {{location_name}} +{{/if}} +{{#if location_name}} +run_from.geo.name: {{location_name}} +{{/if}} enabled: {{enabled}} {{#if service.name}} service.name: {{service.name}} diff --git a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs index d464a4ad58a..0eb055feab4 100644 --- a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs +++ b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs @@ -7,6 +7,12 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} +{{#if location_name}} +run_from.id: {{location_name}} +{{/if}} +{{#if location_name}} +run_from.geo.name: {{location_name}} +{{/if}} enabled: {{enabled}} urls: {{urls}} {{#if service.name}} diff --git a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs index 25b9658e6f6..5de3afe446c 100644 --- a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs +++ b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs @@ -7,6 +7,12 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} +{{#if location_name}} +run_from.id: {{location_name}} +{{/if}} +{{#if location_name}} +run_from.geo.name: {{location_name}} +{{/if}} enabled: {{enabled}} hosts: {{hosts}} {{#if service.name}} diff --git a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs index c111b8d5c3d..ce93e634869 100644 --- a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs +++ b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs @@ -7,6 +7,12 @@ id: {{id}} {{#if origin}} origin: {{origin}} {{/if}} +{{#if location_name}} +run_from.id: {{location_name}} +{{/if}} +{{#if location_name}} +run_from.geo.name: {{location_name}} +{{/if}} enabled: {{enabled}} hosts: {{hosts}} {{#if service.name}} From 54e3bdd1fe4529b9919097b6b1e0a946ad0d347c Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 30 Nov 2022 12:36:14 -0500 Subject: [PATCH 3/4] adjust changelog --- packages/synthetics/changelog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/synthetics/changelog.yml b/packages/synthetics/changelog.yml index 0868d0b3f49..cb6727e5f54 100644 --- a/packages/synthetics/changelog.yml +++ b/packages/synthetics/changelog.yml @@ -1,9 +1,9 @@ # newer versions go on top - version: "0.11.4" changes: - - description: Remove run_from field to monitor config to preserve location name + - description: Add run_from.geo.name field to monitor config to preserve location name type: bugfix - link: https://github.com/elastic/integrations/pull/4673 + link: https://github.com/elastic/integrations/pull/4741 - version: "0.11.3" changes: - description: Add run_from field to monitor config @@ -13,7 +13,7 @@ changes: - description: Change incorrectly typed `states.ends.duration` field from `date` to long type: bugfix - link: https://github.com/elastic/integrations/pull/4477 + link: https://github.com/elastic/integrations/pull/4541 - version: "0.11.1" changes: - description: Change incorrectly typed `states.duration` field from `date` to long From e785d4aca9d784748867a9e12fc16f8e3feb970e Mon Sep 17 00:00:00 2001 From: Dominique Clarke Date: Wed, 30 Nov 2022 13:01:41 -0500 Subject: [PATCH 4/4] remove extra observer metadata processor --- .../data_stream/browser/agent/stream/browser.yml.hbs | 3 --- packages/synthetics/data_stream/http/agent/stream/http.yml.hbs | 3 --- packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs | 3 --- packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs | 3 --- 4 files changed, 12 deletions(-) diff --git a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs index 564fc3df222..8535b62e8c8 100644 --- a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs +++ b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs @@ -84,9 +84,6 @@ source.zip_url.ssl.supported_protocols: {{source.zip_url.ssl.supported_protocols source.zip_url.proxy_url: {{source.zip_url.proxy_url}} {{/if}} processors: - - add_observer_metadata: - geo: - name: {{location_name}} - add_fields: target: '' fields: diff --git a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs index 0eb055feab4..338a6ceb1ac 100644 --- a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs +++ b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs @@ -73,9 +73,6 @@ ssl.verification_mode: {{ssl.verification_mode}} ssl.supported_protocols: {{ssl.supported_protocols}} {{/if}} processors: - - add_observer_metadata: - geo: - name: {{location_name}} - add_fields: target: '' fields: diff --git a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs index 5de3afe446c..49fad0d9c23 100644 --- a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs +++ b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs @@ -25,9 +25,6 @@ timeout: {{timeout}} tags: {{tags}} {{/if}} processors: - - add_observer_metadata: - geo: - name: {{location_name}} - add_fields: target: '' fields: diff --git a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs index ce93e634869..0474c909476 100644 --- a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs +++ b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs @@ -52,9 +52,6 @@ ssl.verification_mode: {{ssl.verification_mode}} ssl.supported_protocols: {{ssl.supported_protocols}} {{/if}} processors: - - add_observer_metadata: - geo: - name: {{location_name}} - add_fields: target: '' fields: