Merge pull request #1154 from ruflin/mb-response-time

Add round trip time to metricset request

libbeat/scripts/generate_template.py

@@ -137,6 +137,11 @@ def fill_field_properties(field, defaults):
  "type": "float",
  "doc_values": "true"
  }
+ elif field.get("type") == "integer":
+ properties[field["name"]] = {
+ "type": "integer",
+ "doc_values": "true"
+ }
  elif field.get("type") == "group":
  prop = fill_section_properties(field, defaults)
 

metricbeat/docs/fields.asciidoc

@@ -43,13 +43,13 @@ required: True
 The timestamp when the log line was read. The precision is in milliseconds. The timezone is UTC.
 
 
-==== response_time
+==== rtt
 
 type: long
 
 required: True
 
-Event Reponse time in nano seconds
+Event round trip time time in nano seconds
 
 
 [[exported-fields-redis-info]]

metricbeat/etc/fields.yml

@@ -37,11 +37,12 @@ common:
  The timestamp when the log line was read. The precision is in
  milliseconds. The timezone is UTC.
 
- - name: response_time
+ - name: rtt
  type: long
  required: true
  description: >
- Event Reponse time in nano seconds
+ Event round trip time time in nano seconds
+
 mysql-status:
  type: group
  description: >

metricbeat/etc/fields_base.yml

@@ -37,8 +37,9 @@ common:
  The timestamp when the log line was read. The precision is in
  milliseconds. The timezone is UTC.
 
- - name: response_time
+ - name: rtt
  type: long
  required: true
  description: >
- Event Reponse time in nano seconds
+ Event round trip time in nano seconds
+

metricbeat/etc/metricbeat.template.json

@@ -24,8 +24,56 @@
  "@timestamp": {
  "type": "date"
  },
+ "mysql-status": {
+ "properties": {
+ "aborted": {
+ "properties": {
+ "Aborted_clients": {
+ "doc_values": "true",
+ "type": "integer"
+ },
+ "Aborted_connects": {
+ "doc_values": "true",
+ "type": "integer"
+ }
+ }
+ },
+ "bytes": {
+ "properties": {
+ "Bytes_received": {
+ "doc_values": "true",
+ "type": "integer"
+ },
+ "Bytes_sent": {
+ "doc_values": "true",
+ "type": "integer"
+ }
+ }
+ }
+ }
+ },
  "redis-info": {
  "properties": {
+ "clients": {
+ "properties": {
+ "blocked_clients": {
+ "doc_values": "true",
+ "type": "integer"
+ },
+ "client_biggest_input_buf": {
+ "doc_values": "true",
+ "type": "integer"
+ },
+ "client_longest_output_list": {
+ "doc_values": "true",
+ "type": "integer"
+ },
+ "connected_clients": {
+ "doc_values": "true",
+ "type": "integer"
+ }
+ }
+ },
  "cpu": {
  "properties": {
  "used_cpu_sys": {
@@ -48,7 +96,7 @@
  }
  }
  },
- "response_time": {
+ "rtt": {
  "doc_values": "true",
  "type": "long"
  }

metricbeat/helper/metricset.go

@@ -53,7 +53,9 @@ func (m *MetricSet) Fetch() error {
  go func(h string) {
  defer m.Module.wg.Done()
 
+ starttime := time.Now()
  event, err := m.MetricSeter.Fetch(m, h)
+ elapsed := time.Since(starttime)
 
  if err != nil {
  // Most of the time, event is nil in case of error (not required)
@@ -62,8 +64,12 @@ func (m *MetricSet) Fetch() error {
  }
  event["error"] = err
  }
+
  event = m.createEvent(event)
 
+ // Add round trip time
+ event["rtt"] = elapsed.Nanoseconds()
+
  m.Module.Publish <- event
 
  }(host)

metricbeat/helper/module.go

@@ -131,7 +131,7 @@ func (m *Module) Run(period time.Duration, b *beat.Beat) {
  ch <- struct{}{}
  }
 
- // TODO: A fetch event should take a maximum until the next ticker and
+ // TODO: A fetch event should take a maximum until the next ticker and - @ruflin,20160315
  // be stopped before the next request is sent. If a fetch is not successful
  // until the next it means it is a failure and a "error" event should be sent to es
  fetch := func(set *MetricSet) {