diff --git a/oas_docs/output/kibana.serverless.staging.yaml b/oas_docs/output/kibana.serverless.staging.yaml index a7ab200940aef..fa4426b79aa23 100644 --- a/oas_docs/output/kibana.serverless.staging.yaml +++ b/oas_docs/output/kibana.serverless.staging.yaml @@ -21405,6 +21405,31 @@ components: title: Package information type: object properties: + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + items: + type: object + properties: + asset_ids: + items: + type: string + type: array + asset_types: + items: + type: string + type: array + text: + type: string + required: + - text + type: array assets: items: type: string @@ -21469,6 +21494,18 @@ components: type: array description: type: string + discovery: + type: object + properties: + fields: + items: + type: object + properties: + name: + type: string + required: + - name + type: array download: type: string elasticsearch: @@ -21491,6 +21528,19 @@ components: type: boolean name: type: string + owner: + type: object + properties: + github: + type: string + type: + enum: + - elastic + - partner + - community + type: string + required: + - github path: type: string readme: @@ -21534,6 +21584,10 @@ components: title: type: string type: + enum: + - integration + - input + - content type: string version: type: string @@ -21549,6 +21603,7 @@ components: - format_version - download - path + - owner Fleet_package_policy: allOf: - type: object diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml index a7ab200940aef..fa4426b79aa23 100644 --- a/oas_docs/output/kibana.serverless.yaml +++ b/oas_docs/output/kibana.serverless.yaml @@ -21405,6 +21405,31 @@ components: title: Package information type: object properties: + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + items: + type: object + properties: + asset_ids: + items: + type: string + type: array + asset_types: + items: + type: string + type: array + text: + type: string + required: + - text + type: array assets: items: type: string @@ -21469,6 +21494,18 @@ components: type: array description: type: string + discovery: + type: object + properties: + fields: + items: + type: object + properties: + name: + type: string + required: + - name + type: array download: type: string elasticsearch: @@ -21491,6 +21528,19 @@ components: type: boolean name: type: string + owner: + type: object + properties: + github: + type: string + type: + enum: + - elastic + - partner + - community + type: string + required: + - github path: type: string readme: @@ -21534,6 +21584,10 @@ components: title: type: string type: + enum: + - integration + - input + - content type: string version: type: string @@ -21549,6 +21603,7 @@ components: - format_version - download - path + - owner Fleet_package_policy: allOf: - type: object diff --git a/oas_docs/output/kibana.staging.yaml b/oas_docs/output/kibana.staging.yaml index e4ba9c48a3b46..3a9c8d3380c76 100644 --- a/oas_docs/output/kibana.staging.yaml +++ b/oas_docs/output/kibana.staging.yaml @@ -29184,6 +29184,31 @@ components: title: Package information type: object properties: + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + items: + type: object + properties: + asset_ids: + items: + type: string + type: array + asset_types: + items: + type: string + type: array + text: + type: string + required: + - text + type: array assets: items: type: string @@ -29248,6 +29273,18 @@ components: type: array description: type: string + discovery: + type: object + properties: + fields: + items: + type: object + properties: + name: + type: string + required: + - name + type: array download: type: string elasticsearch: @@ -29270,6 +29307,19 @@ components: type: boolean name: type: string + owner: + type: object + properties: + github: + type: string + type: + enum: + - elastic + - partner + - community + type: string + required: + - github path: type: string readme: @@ -29313,6 +29363,10 @@ components: title: type: string type: + enum: + - integration + - input + - content type: string version: type: string @@ -29328,6 +29382,7 @@ components: - format_version - download - path + - owner Fleet_package_policy: allOf: - type: object diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml index e4ba9c48a3b46..3a9c8d3380c76 100644 --- a/oas_docs/output/kibana.yaml +++ b/oas_docs/output/kibana.yaml @@ -29184,6 +29184,31 @@ components: title: Package information type: object properties: + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + items: + type: object + properties: + asset_ids: + items: + type: string + type: array + asset_types: + items: + type: string + type: array + text: + type: string + required: + - text + type: array assets: items: type: string @@ -29248,6 +29273,18 @@ components: type: array description: type: string + discovery: + type: object + properties: + fields: + items: + type: object + properties: + name: + type: string + required: + - name + type: array download: type: string elasticsearch: @@ -29270,6 +29307,19 @@ components: type: boolean name: type: string + owner: + type: object + properties: + github: + type: string + type: + enum: + - elastic + - partner + - community + type: string + required: + - github path: type: string readme: @@ -29313,6 +29363,10 @@ components: title: type: string type: + enum: + - integration + - input + - content type: string version: type: string @@ -29328,6 +29382,7 @@ components: - format_version - download - path + - owner Fleet_package_policy: allOf: - type: object diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json index 7ddd44baacf2d..c77ccc0c227d2 100644 --- a/x-pack/plugins/fleet/common/openapi/bundled.json +++ b/x-pack/plugins/fleet/common/openapi/bundled.json @@ -6700,7 +6700,12 @@ "type": "string" }, "type": { - "type": "string" + "type": "string", + "enum": [ + "integration", + "input", + "content" + ] }, "categories": { "type": "array", @@ -6853,6 +6858,83 @@ } } } + }, + "owner": { + "type": "object", + "properties": { + "github": { + "type": "string" + }, + "type": { + "type": "string", + "enum": [ + "elastic", + "partner", + "community" + ] + } + }, + "required": [ + "github" + ] + }, + "agent": { + "type": "object", + "properties": { + "privileges": { + "type": "object", + "properties": { + "root": { + "type": "boolean" + } + } + } + } + }, + "asset_tags": { + "type": "array", + "items": { + "type": "object", + "properties": { + "text": { + "type": "string" + }, + "asset_types": { + "type": "array", + "items": { + "type": "string" + } + }, + "asset_ids": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "text" + ] + } + }, + "discovery": { + "type": "object", + "properties": { + "fields": { + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "required": [ + "name" + ] + } + } + } } }, "required": [ @@ -6866,7 +6948,8 @@ "assets", "format_version", "download", - "path" + "path", + "owner" ] }, "package_usage_stats": { diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml index d60963068b8e5..0197e7e925550 100644 --- a/x-pack/plugins/fleet/common/openapi/bundled.yaml +++ b/x-pack/plugins/fleet/common/openapi/bundled.yaml @@ -4233,6 +4233,10 @@ components: type: string type: type: string + enum: + - integration + - input + - content categories: type: array items: @@ -4335,6 +4339,56 @@ components: type: array items: type: string + owner: + type: object + properties: + github: + type: string + type: + type: string + enum: + - elastic + - partner + - community + required: + - github + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + type: array + items: + type: object + properties: + text: + type: string + asset_types: + type: array + items: + type: string + asset_ids: + type: array + items: + type: string + required: + - text + discovery: + type: object + properties: + fields: + type: array + items: + type: object + properties: + name: + type: string + required: + - name required: - name - title @@ -4347,6 +4401,7 @@ components: - format_version - download - path + - owner package_usage_stats: title: Package usage stats type: object diff --git a/x-pack/plugins/fleet/common/openapi/components/schemas/package_info.yaml b/x-pack/plugins/fleet/common/openapi/components/schemas/package_info.yaml index 17f70e274ed52..d603b3d3db260 100644 --- a/x-pack/plugins/fleet/common/openapi/components/schemas/package_info.yaml +++ b/x-pack/plugins/fleet/common/openapi/components/schemas/package_info.yaml @@ -29,6 +29,10 @@ properties: type: string type: type: string + enum: + - integration + - input + - content categories: type: array items: @@ -131,6 +135,56 @@ properties: type: array items: type: string + owner: + type: object + properties: + github: + type: string + type: + type: string + enum: + - elastic + - partner + - community + required: + - github + agent: + type: object + properties: + privileges: + type: object + properties: + root: + type: boolean + asset_tags: + type: array + items: + type: object + properties: + text: + type: string + asset_types: + type: array + items: + type: string + asset_ids: + type: array + items: + type: string + required: + - text + discovery: + type: object + properties: + fields: + type: array + items: + type: object + properties: + name: + type: string + required: + - name required: - name - title @@ -143,3 +197,4 @@ required: - format_version - download - path + - owner diff --git a/x-pack/plugins/fleet/common/types/models/package_spec.ts b/x-pack/plugins/fleet/common/types/models/package_spec.ts index fa5ba6be65fab..6d1d61e7dc61c 100644 --- a/x-pack/plugins/fleet/common/types/models/package_spec.ts +++ b/x-pack/plugins/fleet/common/types/models/package_spec.ts @@ -18,7 +18,7 @@ export interface PackageSpecManifest { source?: { license: string; }; - type?: 'integration' | 'input'; + type?: PackageSpecPackageType; release?: 'experimental' | 'beta' | 'ga'; categories?: Array; conditions?: PackageSpecConditions; @@ -35,6 +35,11 @@ export interface PackageSpecManifest { privileges?: { root?: boolean }; }; asset_tags?: PackageSpecTags[]; + discovery?: { + fields?: Array<{ + name: string; + }>; + }; } export interface PackageSpecTags { text: string; @@ -42,7 +47,7 @@ export interface PackageSpecTags { asset_ids?: string[]; } -export type PackageSpecPackageType = 'integration' | 'input'; +export type PackageSpecPackageType = 'integration' | 'input' | 'content'; export type PackageSpecCategory = | 'advanced_analytics_ueba'