Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changelog/127053.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 127053
summary: Add missing fields to the Logstash Stack Monitoring Template
area: Monitoring
type: enhancement
issues:
- 125499
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,80 @@
},
"heap_used_in_bytes": {
"type": "long"
},
"heap_used_percent": {
"type": "half_float"
}
}
},
"uptime_in_millis": {
"type": "long"
},
"gc": {
"properties": {
"collectors": {
"properties": {
"young": {
"properties": {
"collection_count": {
"type": "long"
},
"collection_time_in_millis": {
"type": "long"
}
}
},
"old": {
"properties": {
"collection_count": {
"type": "long"
},
"collection_time_in_millis": {
"type": "long"
}
}
}
}
}
}
}
}
},
"logstash": {
"properties": {
"ephemeral_id": {
"type": "keyword",
"ignore_above": 1024
},
"host": {
"type": "keyword",
"ignore_above": 1024
},
"http_address": {
"type": "keyword",
"ignore_above": 1024
},
"name": {
"type": "keyword",
"ignore_above": 1024
},
"pipeline": {
"properties": {
"workers": {
"type": "short"
},
"batch_size": {
"type": "long"
}
}
},
"snapshot": {
"type": "boolean"
},
"status": {
"type": "keyword",
"ignore_above": 1024
},
"uuid": {
"ignore_above": 1024,
"type": "keyword"
Expand All @@ -56,6 +120,12 @@
"type": "double"
}
}
},
"max_file_descriptors": {
"type": "long"
},
"open_file_descriptors": {
"type": "long"
}
}
},
Expand Down Expand Up @@ -189,6 +259,9 @@
"type": "half_float"
}
}
},
"percent": {
"type": "half_float"
}
}
},
Expand All @@ -211,11 +284,19 @@
},
"cfs_quota_micros": {
"type": "long"
},
"control_group": {
"type": "keyword",
"ignore_above": 1024
}
}
},
"cpuacct": {
"properties": {
"control_group": {
"type": "keyword",
"ignore_above": 1024
},
"usage_nanos": {
"type": "long"
}
Expand Down Expand Up @@ -248,6 +329,16 @@
}
}
},
"reloads": {
"properties": {
"failures": {
"type": "long"
},
"successes": {
"type": "long"
}
}
},
"timestamp": {
"type": "date"
}
Expand Down Expand Up @@ -292,10 +383,71 @@
"graph": {
"properties": {
"vertices": {
"type": "object"
"type": "nested",
"properties": {
"config_name": {
"type": "keyword",
"ignore_above": 1024
},
"explicit_id": {
"type": "boolean"
},
"id": {
"type": "keyword",
"ignore_above": 1024
},
"meta": {
"properties": {
"source": {
"properties": {
"column": {
"type": "long"
},
"id": {
"type": "keyword",
"ignore_above": 1024
},
"line": {
"type": "long"
},
"protocol": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
},
"plugin_type": {
"type": "keyword",
"ignore_above": 1024
},
"type": {
"type": "keyword",
"ignore_above": 1024
}
}
},
"edges": {
"type": "object"
"type": "nested",
"properties": {
"from": {
"type": "keyword",
"ignore_above": 1024
},
"id": {
"type": "keyword",
"ignore_above": 1024
},
"to": {
"type": "keyword",
"ignore_above": 1024
},
"type": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
}
Expand Down Expand Up @@ -330,6 +482,14 @@
}
}
}
},
"cluster": {
"properties": {
"id": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
},
Expand Down Expand Up @@ -531,17 +691,73 @@
"version": {
"ignore_above": 1024,
"type": "keyword"
},
"node": {
"properties": {
"name": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
},
"host": {
"properties": {
"name": {
"architecture": {
"type": "keyword",
"ignore_above": 1024
},
"hostname": {
"type": "keyword",
"ignore_above": 1024
},
"id": {
"type": "keyword",
"ignore_above": 1024
},
"ip": {
"type": "ip"
},
"mac": {
"type": "keyword",
"ignore_above": 1024
},
"name": {
"type": "keyword",
"ignore_above": 1024
},
"os": {
"properties": {
"build": {
"type": "keyword",
"ignore_above": 1024
},
"family": {
"type": "keyword",
"ignore_above": 1024
},
"kernel": {
"type": "keyword",
"ignore_above": 1024
},
"name": {
"type": "keyword",
"ignore_above": 1024
},
"platform": {
"type": "keyword",
"ignore_above": 1024
},
"type": {
"type": "keyword",
"ignore_above": 1024
},
"version": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
},
Expand Down Expand Up @@ -578,6 +794,30 @@
"cluster_uuid": {
"type": "alias",
"path": "logstash.elasticsearch.cluster.id"
},
"agent": {
"properties": {
"ephemeral_id": {
"type": "keyword",
"ignore_above": 1024
},
"id": {
"type": "keyword",
"ignore_above": 1024
},
"name": {
"type": "keyword",
"ignore_above": 1024
},
"type": {
"type": "keyword",
"ignore_above": 1024
},
"version": {
"type": "keyword",
"ignore_above": 1024
}
}
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
* writes monitoring data in ECS format as of 8.0. These templates define the ECS schema as well as alias fields for the old monitoring
* mappings that point to the corresponding ECS fields.
*/
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 21;
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 22;
private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version";
private static final String STACK_TEMPLATE_VERSION = "8";
private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version";
Expand Down