Skip to content

Commit

Permalink
Add remaining descriptions to security usage telemetry schema. (elast…
Browse files Browse the repository at this point in the history
  • Loading branch information
pjhampton authored and kibanamachine committed May 24, 2021
1 parent 77dadb0 commit 9b8181a
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 34 deletions.
88 changes: 71 additions & 17 deletions x-pack/plugins/security_solution/server/usage/collector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,46 @@ export const registerCollector: RegisterCollector = ({
detections: {
detection_rules: {
custom: {
enabled: { type: 'long' },
disabled: { type: 'long' },
enabled: {
type: 'long',
_meta: { description: 'The number of custom detection rules enabled' },
},
disabled: {
type: 'long',
_meta: { description: 'The number of custom detection rules disabled' },
},
},
elastic: {
enabled: { type: 'long' },
disabled: { type: 'long' },
enabled: {
type: 'long',
_meta: { description: 'The number of elastic prebuilt detection rules enabled' },
},
disabled: {
type: 'long',
_meta: { description: 'The number of elastic prebuilt detection rules disabled' },
},
},
},
ml_jobs: {
custom: {
enabled: { type: 'long' },
disabled: { type: 'long' },
enabled: {
type: 'long',
_meta: { description: 'The number of custom ML jobs rules enabled' },
},
disabled: {
type: 'long',
_meta: { description: 'The number of custom ML jobs rules disabled' },
},
},
elastic: {
enabled: { type: 'long' },
disabled: { type: 'long' },
enabled: {
type: 'long',
_meta: { description: 'The number of elastic provided ML jobs rules enabled' },
},
disabled: {
type: 'long',
_meta: { description: 'The number of elastic provided ML jobs rules disabled' },
},
},
},
},
Expand Down Expand Up @@ -398,22 +422,52 @@ export const registerCollector: RegisterCollector = ({
},
},
endpoints: {
total_installed: { type: 'long' },
active_within_last_24_hours: { type: 'long' },
total_installed: {
type: 'long',
_meta: { description: 'The number of installed endpoints' },
},
active_within_last_24_hours: {
type: 'long',
_meta: { description: 'The number of active endpoints' },
},
os: {
type: 'array',
items: {
full_name: { type: 'keyword' },
platform: { type: 'keyword' },
version: { type: 'keyword' },
count: { type: 'long' },
full_name: {
type: 'keyword',
_meta: { description: 'Full name of the operating system' },
},
platform: {
type: 'keyword',
_meta: { description: 'OS Platform. eg Centos, Ubuntu' },
},
version: {
type: 'keyword',
_meta: {
description:
'The version of the operating system, eg 16.04.7 LTS (Xenial Xerus), 8 (Core)',
},
},
count: {
type: 'long',
_meta: { description: 'The total number of endpoints from that platform' },
},
},
},
policies: {
malware: {
active: { type: 'long' },
inactive: { type: 'long' },
failure: { type: 'long' },
active: {
type: 'long',
_meta: { description: 'The total number of active malware policies' },
},
inactive: {
type: 'long',
_meta: { description: 'The total number of inactive malware policies' },
},
failure: {
type: 'long',
_meta: { description: 'The total number of failing malware policies' },
},
},
},
},
Expand Down
85 changes: 68 additions & 17 deletions x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -4531,20 +4531,32 @@
"custom": {
"properties": {
"enabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of custom detection rules enabled"
}
},
"disabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of custom detection rules disabled"
}
}
}
},
"elastic": {
"properties": {
"enabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of elastic prebuilt detection rules enabled"
}
},
"disabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of elastic prebuilt detection rules disabled"
}
}
}
}
Expand All @@ -4555,20 +4567,32 @@
"custom": {
"properties": {
"enabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of custom ML jobs rules enabled"
}
},
"disabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of custom ML jobs rules disabled"
}
}
}
},
"elastic": {
"properties": {
"enabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of elastic provided ML jobs rules enabled"
}
},
"disabled": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of elastic provided ML jobs rules disabled"
}
}
}
}
Expand Down Expand Up @@ -5055,26 +5079,44 @@
"endpoints": {
"properties": {
"total_installed": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of installed endpoints"
}
},
"active_within_last_24_hours": {
"type": "long"
"type": "long",
"_meta": {
"description": "The number of active endpoints"
}
},
"os": {
"type": "array",
"items": {
"properties": {
"full_name": {
"type": "keyword"
"type": "keyword",
"_meta": {
"description": "Full name of the operating system"
}
},
"platform": {
"type": "keyword"
"type": "keyword",
"_meta": {
"description": "OS Platform. eg Centos, Ubuntu"
}
},
"version": {
"type": "keyword"
"type": "keyword",
"_meta": {
"description": "The version of the operating system, eg 16.04.7 LTS (Xenial Xerus), 8 (Core)"
}
},
"count": {
"type": "long"
"type": "long",
"_meta": {
"description": "The total number of endpoints from that platform"
}
}
}
}
Expand All @@ -5084,13 +5126,22 @@
"malware": {
"properties": {
"active": {
"type": "long"
"type": "long",
"_meta": {
"description": "The total number of active malware policies"
}
},
"inactive": {
"type": "long"
"type": "long",
"_meta": {
"description": "The total number of inactive malware policies"
}
},
"failure": {
"type": "long"
"type": "long",
"_meta": {
"description": "The total number of failing malware policies"
}
}
}
}
Expand Down

0 comments on commit 9b8181a

Please sign in to comment.