diff --git a/plugin/core/src/main/resources/monitoring-beats.json b/plugin/core/src/main/resources/monitoring-beats.json index d2cc514d5a8..68e6c06ad09 100644 --- a/plugin/core/src/main/resources/monitoring-beats.json +++ b/plugin/core/src/main/resources/monitoring-beats.json @@ -41,20 +41,48 @@ "properties": { "cpu": { "properties": { - "total": { + "system": { "properties": { - "norm": { + "ticks": { + "type": "long" + }, + "time": { "properties": { - "pct": { - "type": "double" + "ms": { + "type": "long" } } - }, - "pct": { - "type": "double" - }, + } + } + }, + "total": { + "properties": { "value": { - "type": "double" + "type": "long" + }, + "ticks": { + "type": "long" + }, + "time": { + "properties": { + "ms": { + "type": "long" + } + } + } + } + }, + "user": { + "properties": { + "ticks": { + "type": "long" + }, + "time": { + "properties": { + "ms": { + "type": "long" + } + } } } } @@ -209,27 +237,6 @@ }, "system": { "properties": { - "cpu": { - "properties": { - "cores": { - "type": "long" - }, - "total": { - "properties": { - "norm": { - "properties": { - "pct": { - "type": "double" - } - } - }, - "pct": { - "type": "double" - } - } - } - } - }, "load": { "properties": { "1": {