synthetics - add new ssl and filter params for browser monitors (#1778)

* synthetics - add new ssl and filter params for browser monitors * add changelog * adjust field type * adjust fields and add metadata * change metadata key and add defaults * adjust tags type
elastic · Oct 25, 2021 · 8b66949 · 8b66949
1 parent 8897427
commit 8b66949
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 2 deletions.
diff --git a/packages/synthetics/changelog.yml b/packages/synthetics/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.4.0"
+  changes:
+    - description: Add new synthetics/browser input params
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/1778
 - version: "0.3.1"
   changes:
     - description: Updates README

diff --git a/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs b/packages/synthetics/data_stream/browser/agent/stream/browser.yml.hbs
@@ -1,3 +1,4 @@
+__ui: {{__ui}}
 type: {{type}}
 name: {{name}}
 {{#if service.name}}
@@ -32,9 +33,36 @@ screenshots: {{screenshots}}
 {{#if synthetics_args}}
 synthetics_args: {{synthetics_args}}
 {{/if}}
+{{#if filter_journeys.match}}
+filter_journeys.match: {{filter_journeys.match}}
+{{/if}}
+{{#if filter_journeys.tags}}
+filter_journeys.tags: {{filter_journeys.tags}}
+{{/if}}
 {{#if ignore_https_errors}}
 ignore_https_errors: {{ignore_https_errors}}
 {{/if}}
+{{#if source.zip_url.ssl.certificate}}
+source.zip_url.ssl.certificate: {{source.zip_url.ssl.certificate}}
+{{/if}}
+{{#if source.zip_url.ssl.certificate_authorities}}
+source.zip_url.ssl.certificate_authorities: {{source.zip_url.ssl.certificate_authorities}}
+{{/if}}
+{{#if source.zip_url.ssl.key}}
+source.zip_url.ssl.key: {{source.zip_url.ssl.key}}
+{{/if}}
+{{#if source.zip_url.ssl.key_passphrase}}
+source.zip_url.ssl.key_passphrase: {{source.zip_url.ssl.key_passphrase}}
+{{/if}}
+{{#if source.zip_url.ssl.verification_mode}}
+source.zip_url.ssl.verification_mode: {{source.zip_url.ssl.verification_mode}}
+{{/if}}
+{{#if source.zip_url.ssl.supported_protocols}}
+source.zip_url.ssl.supported_protocols: {{source.zip_url.ssl.supported_protocols}}
+{{/if}}
+{{#if source.zip_url.proxy_url}}
+source.zip_url.proxy_url: {{source.zip_url.proxy_url}}
+{{/if}}
 processors:
   - add_observer_metadata:
       geo: 

diff --git a/packages/synthetics/data_stream/browser/manifest.yml b/packages/synthetics/data_stream/browser/manifest.yml
@@ -9,6 +9,12 @@ streams:
     template_path: browser.yml.hbs
     enabled: true
     vars:
+      - name: __ui
+        type: yaml
+        title: ui metadata about the policy
+        multi: false
+        required: false
+        show_user: false
       - name: type
         type: text
         title: Monitor type
@@ -28,6 +34,7 @@ streams:
         multi: false
         required: true
         show_user: true
+        default: "'@every 3m'"
       - name: service.name
         type: text
         title: APM Service Name
@@ -100,3 +107,57 @@ streams:
         multi: false
         required: false
         show_user: true
+      - name: filter_journeys.tags
+        type: yaml
+        title: run only journeys with the given tag(s), or globs
+        multi: false
+        required: false
+        show_user: true
+      - name: filter_journeys.match
+        type: text
+        title: run only journeys with a name or tags that matches the configured glob
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.certificate_authorities
+        type: yaml
+        title: Certificate authorities
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.certificate
+        type: yaml
+        title: Certificate
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.key
+        type: yaml
+        title: Certificate private key
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.key_passphrase
+        type: text
+        title: Private key passphrase
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.verification_mode
+        type: text
+        title: SSL Verification mode
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.ssl.supported_protocols
+        type: yaml
+        title: Supported protocols
+        multi: false
+        required: false
+        show_user: true
+      - name: source.zip_url.proxy_url
+        type: text
+        title: Proxy url
+        multi: false
+        required: false
+        show_user: true
diff --git a/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs b/packages/synthetics/data_stream/http/agent/stream/http.yml.hbs
@@ -1,3 +1,4 @@
+__ui: {{__ui}}
 type: {{type}}
 name: {{name}}
 urls: {{urls}}

diff --git a/packages/synthetics/data_stream/http/manifest.yml b/packages/synthetics/data_stream/http/manifest.yml
@@ -9,6 +9,12 @@ streams:
     template_path: http.yml.hbs
     enabled: false
     vars:
+      - name: __ui
+        type: yaml
+        title: metadata about the package
+        multi: false
+        required: false
+        show_user: false
       - name: type
         type: text
         title: Monitor type
@@ -28,6 +34,7 @@ streams:
         multi: false
         required: true
         show_user: true
+        default: "'@every 3m'"
       - name: urls
         type: text
         title: URL

diff --git a/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs b/packages/synthetics/data_stream/icmp/agent/stream/icmp.yml.hbs
@@ -1,3 +1,4 @@
+__ui: {{__ui}}
 type: {{type}}
 name: {{name}}
 hosts: {{hosts}}

diff --git a/packages/synthetics/data_stream/icmp/manifest.yml b/packages/synthetics/data_stream/icmp/manifest.yml
@@ -9,6 +9,12 @@ streams:
     template_path: icmp.yml.hbs
     enabled: false
     vars:
+      - name: __ui
+        type: yaml
+        title: metadata about the package
+        multi: false
+        required: false
+        show_user: false
       - name: type
         type: text
         title: Monitor type
@@ -28,6 +34,7 @@ streams:
         multi: false
         required: true
         show_user: true
+        default: "'@every 3m'"
       - name: wait
         type: text
         title: Wait

diff --git a/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs b/packages/synthetics/data_stream/tcp/agent/stream/tcp.yml.hbs
@@ -1,3 +1,4 @@
+__ui: {{__ui}}
 type: {{type}}
 name: {{name}}
 hosts: {{hosts}}

diff --git a/packages/synthetics/data_stream/tcp/manifest.yml b/packages/synthetics/data_stream/tcp/manifest.yml
@@ -9,6 +9,12 @@ streams:
     template_path: tcp.yml.hbs
     enabled: false
     vars:
+      - name: __ui
+        type: yaml
+        title: metadata about the package
+        multi: false
+        required: false
+        show_user: false
       - name: type
         type: text
         title: Monitor type
@@ -28,6 +34,7 @@ streams:
         multi: false
         required: true
         show_user: true
+        default: "'@every 3m'"
       - name: hosts
         type: text
         title: Host

diff --git 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: This Elastic integration allows you to monitor the availability of your services
-version: 0.3.1
+version: 0.4.0
 categories: ["elastic_stack", "monitoring", "web"]
 release: beta
 type: integration
@@ -25,7 +25,7 @@ policy_templates:
         title: Browser
         description: Perform an Browser check
 conditions:
-  kibana.version: "^7.15.0"
+  kibana.version: "^7.16.0"
 icons:
   - src: /img/uptime-logo-color-64px.svg
     size: 16x16