Change field type system.process.cpu.start_time from keyword to date (#…

…2191) Fixes #1565
elastic · Aug 9, 2016 · 21852f6 · 21852f6
1 parent 9d547aa
commit 21852f6
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -16,6 +16,7 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha5...master[Check the HEAD d
 - Change Elasticsearch output index configuration to be based on format strings. If index has been configured, no date will be appended anymore to the index name. {pull}2119[2119]
 
 *Metricbeat*
+- Change field type system.process.cpu.start_time from keyword to date. {issue}1565[1565]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -2802,9 +2802,9 @@ The total CPU time spent by the process.
 [float]
 === system.process.cpu.start_time
 
-type: keyword
+type: date
 
-The time when the process was started. Example: "17:45".
+The time when the process was started.
 
 
 [float]

diff --git a/metricbeat/etc/fields.yml b/metricbeat/etc/fields.yml
@@ -1681,9 +1681,9 @@
                   description: >
                     The total CPU time spent by the process.
                 - name: start_time
-                  type: keyword
+                  type: date
                   description: >
-                    The time when the process was started. Example: "17:45".
+                    The time when the process was started.
             - name: memory
               type: group
               description: Memory-specific statistics per process.

diff --git a/metricbeat/etc/kibana/index-pattern/metricbeat.json b/metricbeat/etc/kibana/index-pattern/metricbeat.json
diff --git a/metricbeat/metricbeat.template-es2x.json b/metricbeat/metricbeat.template-es2x.json
@@ -1760,9 +1760,7 @@
                 "cpu": {
                   "properties": {
                     "start_time": {
-                      "ignore_above": 1024,
-                      "index": "not_analyzed",
-                      "type": "string"
+                      "type": "date"
                     },
                     "system": {
                       "type": "long"

diff --git a/metricbeat/metricbeat.template.json b/metricbeat/metricbeat.template.json
@@ -1744,8 +1744,7 @@
                 "cpu": {
                   "properties": {
                     "start_time": {
-                      "ignore_above": 1024,
-                      "type": "keyword"
+                      "type": "date"
                     },
                     "system": {
                       "type": "long"

diff --git a/metricbeat/module/system/process/_meta/data.json b/metricbeat/module/system/process/_meta/data.json
@@ -14,7 +14,7 @@
         "process": {
             "cmdline": "go test -tags=integration github.com/elastic/beats/metricbeat/module/... -data",
             "cpu": {
-                "start_time": "07:16",
+                "start_time": "2016-08-08T16:39:13.040Z",
                 "total": {
                     "pct": 0.01
                 }

diff --git a/metricbeat/module/system/process/_meta/fields.yml b/metricbeat/module/system/process/_meta/fields.yml
@@ -59,9 +59,9 @@
           description: >
             The total CPU time spent by the process.
         - name: start_time
-          type: keyword
+          type: date
           description: >
-            The time when the process was started. Example: "17:45".
+            The time when the process was started.
     - name: memory
       type: group
       description: Memory-specific statistics per process.

diff --git a/metricbeat/module/system/process/helper.go b/metricbeat/module/system/process/helper.go
@@ -160,14 +160,14 @@ func (procStats *ProcStats) GetProcessEvent(process *Process, last *Process) com
 				"ticks": process.Cpu.Total,
 				"pct":   GetProcCpuPercentage(last, process),
 			},
-			"start_time": process.Cpu.FormatStartTime(),
+			"start_time": unixTimeMsToTime(process.Cpu.StartTime),
 		}
 	} else {
 		proc["cpu"] = common.MapStr{
 			"total": common.MapStr{
 				"pct": GetProcCpuPercentage(last, process),
 			},
-			"start_time": process.Cpu.FormatStartTime(),
+			"start_time": unixTimeMsToTime(process.Cpu.StartTime),
 		}
 	}
 
@@ -304,3 +304,9 @@ func (procStats *ProcStats) GetProcStatsEvents() ([]common.MapStr, error) {
 
 	return events, nil
 }
+
+// unixTimeMsToTime converts a unix time given in milliseconds since Unix epoch
+// to a common.Time value.
+func unixTimeMsToTime(unixTimeMs uint64) common.Time {
+	return common.Time(time.Unix(0, int64(unixTimeMs*1000000)))
+}