From 05a0d6273cdb0b3805e5c79c01e1c3d3956c642c Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Fri, 23 Mar 2018 16:19:40 -0700
Subject: [PATCH] [Monitoring/Beats] Add new CPU fields, remove old CPU fields
 (elastic/x-pack-elasticsearch#3991)

* [Monitoring/Beats] Add new CPU fields, remove old CPU fields

* use long instead of double for cpu counters

* time => time.ms

Original commit: elastic/x-pack-elasticsearch@244b08a574df68fadb3c122fe7a39f7d828538ba
---
 .../src/main/resources/monitoring-beats.json  | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

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": {