Merge remote-tracking branch 'origin/master' into ecs-dimensions

elastic · Nov 9, 2021 · a650270 · a650270
2 parents 4f8a8fd + 43a0e54
commit a650270
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/test/packages/good/manifest.yml b/test/packages/good/manifest.yml
@@ -17,7 +17,8 @@ policy_templates:
         multi: false
         vars:
           - name: hosts
-            type: text
+            type: url
+            url_allowed_schemes: ['http', 'https']
             title: Hosts
             multi: true
             required: true

diff --git a/test/packages/input_groups/data_stream/spamfirewall/manifest.yml b/test/packages/input_groups/data_stream/spamfirewall/manifest.yml
@@ -22,7 +22,7 @@ streams:
         show_user: true
         default: 9540
       - name: tz_offset
-        type: text
+        type: time_zone
         title: Timezone offset (+HH:mm format)
         required: false
         show_user: true

diff --git a/versions/1/changelog.yml b/versions/1/changelog.yml
@@ -10,6 +10,9 @@
   - description: Add support for dimension fields.
     type: enhancement
     link: https://github.com/elastic/package-spec/pull/236
+  - description: Add email, time_zone and url config types.
+    type: enhancement
+    link: https://github.com/elastic/package-spec/pull/241
   - description: Add support for dimension fields from external sources.
     type: enhancement
     link: https://github.com/elastic/package-spec/pull/248

diff --git a/versions/1/data_stream/manifest.spec.yml b/versions/1/data_stream/manifest.spec.yml
@@ -48,10 +48,13 @@ spec:
             description: Data type of variable.
             type: string
             enum:
-              - integer
               - bool
+              - email
+              - integer
               - password
               - text
+              - time_zone
+              - url
               - yaml
             examples:
               - text
@@ -83,6 +86,18 @@ spec:
             default: true
             examples:
               - false
+          url_allowed_schemes:
+            description: >
+              List of allowed URL schemes for the url type. If empty, any scheme is allowed.
+              An empty string can be used to indicate that the scheme is not mandatory.
+            type: array
+            items:
+              type: string
+            default: []
+            examples:
+              - ['http', 'https']
+              - ['redis', 'rediss']
+              - ['', 'mysql']
           default:
             description: Default value(s) for variable
             $ref: "#/definitions/input_variable_value"