Skip to content

Commit 5b3c20d

Browse files
authored
Revert "Add support for an optional value in discovery fields" (#923)
1 parent 71b0d42 commit 5b3c20d

File tree

6 files changed

+2
-34
lines changed

6 files changed

+2
-34
lines changed

code/go/pkg/validator/validator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func TestValidateFile(t *testing.T) {
278278
[]string{
279279
"field discovery.fields.0.name: Invalid type. Expected: string, given: integer",
280280
"field discovery.fields.1: name is required",
281-
"field discovery.fields.2.value: String length must be greater than or equal to 1",
281+
"field discovery.fields.2: name is required",
282282
},
283283
},
284284
}

compliance/testdata/packages/basic_content/manifest.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ conditions:
1919
discovery:
2020
fields:
2121
- name: process.pid
22-
- name: event.dataset
23-
value: nginx.access
24-
- name: event.dataset
25-
value: nginx.error
26-
- name: process.owner.id
27-
value: 12345
28-
- name: test.boolean
29-
value: true
3022
screenshots:
3123
- src: /img/kibana-system.png
3224
title: kibana system

spec/changelog.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
- description: Add fips_compatible boolean flag for input package policy templates.
1616
type: enhancement
1717
link: https://github.com/elastic/package-spec/pull/914
18-
- description: Add support to define an optional value for discovery fields.
19-
type: enhancement
20-
link: https://github.com/elastic/package-spec/pull/917
2118
- version: 3.4.0
2219
changes:
2320
- description: Add kibana/security_ai_prompt to support security AI prompt assets.

spec/content/manifest.spec.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@ spec:
2222
name:
2323
description: Name of the field.
2424
type: string
25-
value:
26-
description: >
27-
An optional expected value for the "name" field.
28-
oneOf:
29-
- type: string
30-
minLength: 1
31-
- type: number
32-
- type: boolean
33-
examples:
34-
- "nginx.access"
35-
- true
36-
- 12345
3725
required:
3826
- name
3927
properties:

test/packages/bad_discovery_fields/manifest.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ conditions:
1616
discovery:
1717
fields:
1818
- name: 12345
19+
- {}
1920
- value: nginx.access
20-
- name: event.dataset
21-
value: ""
2221
screenshots:
2322
- src: /img/sample-screenshot.png
2423
title: Sample screenshot

test/packages/good_content/manifest.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ conditions:
1818
discovery:
1919
fields:
2020
- name: process.pid
21-
- name: event.dataset
22-
value: nginx.access
23-
- name: event.dataset
24-
value: nginx.error
25-
- name: process.owner.id
26-
value: 12345
27-
- name: test.boolean
28-
value: true
2921
screenshots:
3022
- src: /img/kibana-system.png
3123
title: kibana system

0 commit comments

Comments
 (0)