diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 395bc9331e0..1438348f2d8 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -24,6 +24,7 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha5...master[Check the HEAD d *Metricbeat* - Change field type system.process.cpu.start_time from keyword to date. {issue}1565[1565] +- redis/info metricset fields were renamed up according to the naming conventions. *Packetbeat* - Group HTTP fields under `http.request` and `http.response` {pull}2167[2167] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index b2c8b19d5cc..b8116fbef1d 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -2091,42 +2091,42 @@ type: boolean None [float] -=== redis.info.persistence.rdb.changes_since_last_save +=== redis.info.persistence.rdb.last_save.changes_since type: long None [float] -=== redis.info.persistence.rdb.bgsave_in_progress +=== redis.info.persistence.rdb.bgsave.in_progress type: boolean None [float] -=== redis.info.persistence.rdb.last_save_time +=== redis.info.persistence.rdb.last_save.time type: long None [float] -=== redis.info.persistence.rdb.last_bgsave_status +=== redis.info.persistence.rdb.bgsave.last_status type: keyword None [float] -=== redis.info.persistence.rdb.last_bgsave_time_sec +=== redis.info.persistence.rdb.bgsave.last_time.sec type: long None [float] -=== redis.info.persistence.rdb.current_bgsave_time_sec +=== redis.info.persistence.rdb.bgsave.current_time.sec type: long @@ -2140,42 +2140,42 @@ type: boolean None [float] -=== redis.info.persistence.aof.rewrite_in_progress +=== redis.info.persistence.aof.rewrite.in_progress type: boolean None [float] -=== redis.info.persistence.aof.rewrite_scheduled +=== redis.info.persistence.aof.rewrite.scheduled type: boolean None [float] -=== redis.info.persistence.aof.last_rewrite_time_sec +=== redis.info.persistence.aof.rewrite.last_time.sec type: long None [float] -=== redis.info.persistence.aof.current_rewrite_time_sec +=== redis.info.persistence.aof.rewrite.current_time.sec type: long None [float] -=== redis.info.persistence.aof.last_bgrewrite_status +=== redis.info.persistence.aof.bgrewrite.last_status type: keyword None [float] -=== redis.info.persistence.aof.last_write_status +=== redis.info.persistence.aof.write.last_status type: keyword @@ -2368,52 +2368,52 @@ Redis stats. type: long -None +Total number of connections received. [float] === redis.info.stats.connections.rejected type: long -None +Total number of connections rejected. [float] -=== redis.info.stats.total_commands_processed +=== redis.info.stats.commands_processed type: long -None +Total number of commands preocessed. [float] -=== redis.info.stats.total_net_input_bytes +=== redis.info.stats.net.input.bytes type: long -None +Total network input in bytes. [float] -=== redis.info.stats.total_net_output_bytes +=== redis.info.stats.net.output.bytes type: long -None +Total network output in bytes. [float] -=== redis.info.stats.instantaneous_ops_per_sec +=== redis.info.stats.instantaneous.ops_per_sec type: long None [float] -=== redis.info.stats.instantaneous_input_kbps +=== redis.info.stats.instantaneous.input_kbps type: scaled_float None [float] -=== redis.info.stats.instantaneous_output_kbps +=== redis.info.stats.instantaneous.output_kbps type: scaled_float @@ -2427,14 +2427,14 @@ type: long None [float] -=== redis.info.stats.sync.partial_ok +=== redis.info.stats.sync.partial.ok type: long None [float] -=== redis.info.stats.sync.partial_err +=== redis.info.stats.sync.partial.err type: long @@ -2469,14 +2469,14 @@ type: long None [float] -=== redis.info.stats.pubsub_channels +=== redis.info.stats.pubsub.channels type: long None [float] -=== redis.info.stats.pubsub_patterns +=== redis.info.stats.pubsub.patterns type: long diff --git a/metricbeat/etc/fields.yml b/metricbeat/etc/fields.yml index a67f3970c1a..0818ff2d0f7 100644 --- a/metricbeat/etc/fields.yml +++ b/metricbeat/etc/fields.yml @@ -1252,27 +1252,27 @@ type: boolean description: - - name: rdb.changes_since_last_save + - name: rdb.last_save.changes_since type: long description: - - name: rdb.bgsave_in_progress + - name: rdb.bgsave.in_progress type: boolean description: - - name: rdb.last_save_time + - name: rdb.last_save.time type: long description: - - name: rdb.last_bgsave_status + - name: rdb.bgsave.last_status type: keyword description: - - name: rdb.last_bgsave_time_sec + - name: rdb.bgsave.last_time.sec type: long description: - - name: rdb.current_bgsave_time_sec + - name: rdb.bgsave.current_time.sec type: long description: @@ -1280,27 +1280,27 @@ type: boolean description: - - name: aof.rewrite_in_progress + - name: aof.rewrite.in_progress type: boolean description: - - name: aof.rewrite_scheduled + - name: aof.rewrite.scheduled type: boolean description: - - name: aof.last_rewrite_time_sec + - name: aof.rewrite.last_time.sec type: long description: - - name: aof.current_rewrite_time_sec + - name: aof.rewrite.current_time.sec type: long description: - - name: aof.last_bgrewrite_status + - name: aof.bgrewrite.last_status type: keyword description: - - name: aof.last_write_status + - name: aof.write.last_status type: keyword description: @@ -1414,32 +1414,37 @@ - name: connections.received type: long description: + Total number of connections received. - name: connections.rejected type: long description: + Total number of connections rejected. - - name: total_commands_processed + - name: commands_processed type: long description: + Total number of commands preocessed. - - name: total_net_input_bytes + - name: net.input.bytes type: long description: + Total network input in bytes. - - name: total_net_output_bytes + - name: net.output.bytes type: long description: + Total network output in bytes. - - name: instantaneous_ops_per_sec + - name: instantaneous.ops_per_sec type: long description: - - name: instantaneous_input_kbps + - name: instantaneous.input_kbps type: scaled_float description: - - name: instantaneous_output_kbps + - name: instantaneous.output_kbps type: scaled_float description: @@ -1447,11 +1452,11 @@ type: long description: - - name: sync.partial_ok + - name: sync.partial.ok type: long description: - - name: sync.partial_err + - name: sync.partial.err type: long description: @@ -1471,11 +1476,11 @@ type: long description: - - name: pubsub_channels + - name: pubsub.channels type: long description: - - name: pubsub_patterns + - name: pubsub.patterns type: long description: diff --git a/metricbeat/metricbeat.template-es2x.json b/metricbeat/metricbeat.template-es2x.json index 1a936aa91ec..9c88b144f25 100644 --- a/metricbeat/metricbeat.template-es2x.json +++ b/metricbeat/metricbeat.template-es2x.json @@ -1058,30 +1058,50 @@ "properties": { "aof": { "properties": { - "current_rewrite_time_sec": { - "type": "long" + "bgrewrite": { + "properties": { + "last_status": { + "ignore_above": 1024, + "index": "not_analyzed", + "type": "string" + } + } }, "enabled": { "type": "boolean" }, - "last_bgrewrite_status": { - "ignore_above": 1024, - "index": "not_analyzed", - "type": "string" - }, - "last_rewrite_time_sec": { - "type": "long" - }, - "last_write_status": { - "ignore_above": 1024, - "index": "not_analyzed", - "type": "string" - }, - "rewrite_in_progress": { - "type": "boolean" + "rewrite": { + "properties": { + "current_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "in_progress": { + "type": "boolean" + }, + "last_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "scheduled": { + "type": "boolean" + } + } }, - "rewrite_scheduled": { - "type": "boolean" + "write": { + "properties": { + "last_status": { + "ignore_above": 1024, + "index": "not_analyzed", + "type": "string" + } + } } } }, @@ -1090,25 +1110,41 @@ }, "rdb": { "properties": { - "bgsave_in_progress": { - "type": "boolean" - }, - "changes_since_last_save": { - "type": "long" - }, - "current_bgsave_time_sec": { - "type": "long" - }, - "last_bgsave_status": { - "ignore_above": 1024, - "index": "not_analyzed", - "type": "string" - }, - "last_bgsave_time_sec": { - "type": "long" + "bgsave": { + "properties": { + "current_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "in_progress": { + "type": "boolean" + }, + "last_status": { + "ignore_above": 1024, + "index": "not_analyzed", + "type": "string" + }, + "last_time": { + "properties": { + "sec": { + "type": "long" + } + } + } + } }, - "last_save_time": { - "type": "long" + "last_save": { + "properties": { + "changes_since": { + "type": "long" + }, + "time": { + "type": "long" + } + } } } } @@ -1221,6 +1257,9 @@ }, "stats": { "properties": { + "commands_processed": { + "type": "long" + }, "connections": { "properties": { "received": { @@ -1231,14 +1270,18 @@ } } }, - "instantaneous_input_kbps": { - "type": "float" - }, - "instantaneous_ops_per_sec": { - "type": "long" - }, - "instantaneous_output_kbps": { - "type": "float" + "instantaneous": { + "properties": { + "input_kbps": { + "type": "float" + }, + "ops_per_sec": { + "type": "long" + }, + "output_kbps": { + "type": "float" + } + } }, "keys": { "properties": { @@ -1266,33 +1309,50 @@ "migrate_cached_sockets": { "type": "long" }, - "pubsub_channels": { - "type": "long" + "net": { + "properties": { + "input": { + "properties": { + "bytes": { + "type": "long" + } + } + }, + "output": { + "properties": { + "bytes": { + "type": "long" + } + } + } + } }, - "pubsub_patterns": { - "type": "long" + "pubsub": { + "properties": { + "channels": { + "type": "long" + }, + "patterns": { + "type": "long" + } + } }, "sync": { "properties": { "full": { "type": "long" }, - "partial_err": { - "type": "long" - }, - "partial_ok": { - "type": "long" + "partial": { + "properties": { + "err": { + "type": "long" + }, + "ok": { + "type": "long" + } + } } } - }, - "total_commands_processed": { - "type": "long" - }, - "total_net_input_bytes": { - "type": "long" - }, - "total_net_output_bytes": { - "type": "long" } } } diff --git a/metricbeat/metricbeat.template.json b/metricbeat/metricbeat.template.json index 1e354df3328..5d858f097fa 100644 --- a/metricbeat/metricbeat.template.json +++ b/metricbeat/metricbeat.template.json @@ -1052,28 +1052,48 @@ "properties": { "aof": { "properties": { - "current_rewrite_time_sec": { - "type": "long" + "bgrewrite": { + "properties": { + "last_status": { + "ignore_above": 1024, + "type": "keyword" + } + } }, "enabled": { "type": "boolean" }, - "last_bgrewrite_status": { - "ignore_above": 1024, - "type": "keyword" - }, - "last_rewrite_time_sec": { - "type": "long" - }, - "last_write_status": { - "ignore_above": 1024, - "type": "keyword" - }, - "rewrite_in_progress": { - "type": "boolean" + "rewrite": { + "properties": { + "current_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "in_progress": { + "type": "boolean" + }, + "last_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "scheduled": { + "type": "boolean" + } + } }, - "rewrite_scheduled": { - "type": "boolean" + "write": { + "properties": { + "last_status": { + "ignore_above": 1024, + "type": "keyword" + } + } } } }, @@ -1082,24 +1102,40 @@ }, "rdb": { "properties": { - "bgsave_in_progress": { - "type": "boolean" - }, - "changes_since_last_save": { - "type": "long" - }, - "current_bgsave_time_sec": { - "type": "long" - }, - "last_bgsave_status": { - "ignore_above": 1024, - "type": "keyword" - }, - "last_bgsave_time_sec": { - "type": "long" + "bgsave": { + "properties": { + "current_time": { + "properties": { + "sec": { + "type": "long" + } + } + }, + "in_progress": { + "type": "boolean" + }, + "last_status": { + "ignore_above": 1024, + "type": "keyword" + }, + "last_time": { + "properties": { + "sec": { + "type": "long" + } + } + } + } }, - "last_save_time": { - "type": "long" + "last_save": { + "properties": { + "changes_since": { + "type": "long" + }, + "time": { + "type": "long" + } + } } } } @@ -1200,6 +1236,9 @@ }, "stats": { "properties": { + "commands_processed": { + "type": "long" + }, "connections": { "properties": { "received": { @@ -1210,16 +1249,20 @@ } } }, - "instantaneous_input_kbps": { - "scaling_factor": 1000, - "type": "scaled_float" - }, - "instantaneous_ops_per_sec": { - "type": "long" - }, - "instantaneous_output_kbps": { - "scaling_factor": 1000, - "type": "scaled_float" + "instantaneous": { + "properties": { + "input_kbps": { + "scaling_factor": 1000, + "type": "scaled_float" + }, + "ops_per_sec": { + "type": "long" + }, + "output_kbps": { + "scaling_factor": 1000, + "type": "scaled_float" + } + } }, "keys": { "properties": { @@ -1247,33 +1290,50 @@ "migrate_cached_sockets": { "type": "long" }, - "pubsub_channels": { - "type": "long" + "net": { + "properties": { + "input": { + "properties": { + "bytes": { + "type": "long" + } + } + }, + "output": { + "properties": { + "bytes": { + "type": "long" + } + } + } + } }, - "pubsub_patterns": { - "type": "long" + "pubsub": { + "properties": { + "channels": { + "type": "long" + }, + "patterns": { + "type": "long" + } + } }, "sync": { "properties": { "full": { "type": "long" }, - "partial_err": { - "type": "long" - }, - "partial_ok": { - "type": "long" + "partial": { + "properties": { + "err": { + "type": "long" + }, + "ok": { + "type": "long" + } + } } } - }, - "total_commands_processed": { - "type": "long" - }, - "total_net_input_bytes": { - "type": "long" - }, - "total_net_output_bytes": { - "type": "long" } } } diff --git a/metricbeat/module/redis/info/_meta/fields.yml b/metricbeat/module/redis/info/_meta/fields.yml index 8ebfb3675fb..3cdb32fddc9 100644 --- a/metricbeat/module/redis/info/_meta/fields.yml +++ b/metricbeat/module/redis/info/_meta/fields.yml @@ -102,27 +102,27 @@ type: boolean description: - - name: rdb.changes_since_last_save + - name: rdb.last_save.changes_since type: long description: - - name: rdb.bgsave_in_progress + - name: rdb.bgsave.in_progress type: boolean description: - - name: rdb.last_save_time + - name: rdb.last_save.time type: long description: - - name: rdb.last_bgsave_status + - name: rdb.bgsave.last_status type: keyword description: - - name: rdb.last_bgsave_time_sec + - name: rdb.bgsave.last_time.sec type: long description: - - name: rdb.current_bgsave_time_sec + - name: rdb.bgsave.current_time.sec type: long description: @@ -130,27 +130,27 @@ type: boolean description: - - name: aof.rewrite_in_progress + - name: aof.rewrite.in_progress type: boolean description: - - name: aof.rewrite_scheduled + - name: aof.rewrite.scheduled type: boolean description: - - name: aof.last_rewrite_time_sec + - name: aof.rewrite.last_time.sec type: long description: - - name: aof.current_rewrite_time_sec + - name: aof.rewrite.current_time.sec type: long description: - - name: aof.last_bgrewrite_status + - name: aof.bgrewrite.last_status type: keyword description: - - name: aof.last_write_status + - name: aof.write.last_status type: keyword description: @@ -264,32 +264,37 @@ - name: connections.received type: long description: + Total number of connections received. - name: connections.rejected type: long description: + Total number of connections rejected. - - name: total_commands_processed + - name: commands_processed type: long description: + Total number of commands preocessed. - - name: total_net_input_bytes + - name: net.input.bytes type: long description: + Total network input in bytes. - - name: total_net_output_bytes + - name: net.output.bytes type: long description: + Total network output in bytes. - - name: instantaneous_ops_per_sec + - name: instantaneous.ops_per_sec type: long description: - - name: instantaneous_input_kbps + - name: instantaneous.input_kbps type: scaled_float description: - - name: instantaneous_output_kbps + - name: instantaneous.output_kbps type: scaled_float description: @@ -297,11 +302,11 @@ type: long description: - - name: sync.partial_ok + - name: sync.partial.ok type: long description: - - name: sync.partial_err + - name: sync.partial.err type: long description: @@ -321,11 +326,11 @@ type: long description: - - name: pubsub_channels + - name: pubsub.channels type: long description: - - name: pubsub_patterns + - name: pubsub.patterns type: long description: diff --git a/metricbeat/module/redis/info/data.go b/metricbeat/module/redis/info/data.go index 4a32cbaa0c7..3fc0272c726 100644 --- a/metricbeat/module/redis/info/data.go +++ b/metricbeat/module/redis/info/data.go @@ -37,21 +37,25 @@ var ( "persistence": s.Object{ "loading": c.Bool("loading"), "rdb": s.Object{ - "changes_since_last_save": c.Int("rdb_changes_since_last_save"), - "bgsave_in_progress": c.Bool("rdb_bgsave_in_progress"), - "last_save_time": c.Int("rdb_last_save_time"), - "last_bgsave_status": c.Str("rdb_last_bgsave_status"), - "last_bgsave_time_sec": c.Int("rdb_last_bgsave_time_sec"), - "current_bgsave_time_sec": c.Int("rdb_current_bgsave_time_sec"), + "last_save.changes_since": c.Int("rdb_changes_since_last_save"), + "last_save.time": c.Int("rdb_last_save_time"), + "bgsave": s.Object{ + "last_status": c.Str("rdb_last_bgsave_status"), + "in_progress": c.Bool("rdb_bgsave_in_progress"), + "last_time.sec": c.Int("rdb_last_bgsave_time_sec"), + "current_time.sec": c.Int("rdb_current_bgsave_time_sec"), + }, }, "aof": s.Object{ - "enabled": c.Bool("aof_enabled"), - "rewrite_in_progress": c.Bool("aof_rewrite_in_progress"), - "rewrite_scheduled": c.Bool("aof_rewrite_scheduled"), - "last_rewrite_time_sec": c.Int("aof_last_rewrite_time_sec"), - "current_rewrite_time_sec": c.Int("aof_current_rewrite_time_sec"), - "last_bgrewrite_status": c.Str("aof_last_bgrewrite_status"), - "last_write_status": c.Str("aof_last_write_status"), + "enabled": c.Bool("aof_enabled"), + "rewrite": s.Object{ + "in_progress": c.Bool("aof_rewrite_in_progress"), + "scheduled": c.Bool("aof_rewrite_scheduled"), + "last_time.sec": c.Int("aof_last_rewrite_time_sec"), + "current_time.sec": c.Int("aof_current_rewrite_time_sec"), + }, + "bgrewrite.last_status": c.Str("aof_last_bgrewrite_status"), + "write.last_status": c.Str("aof_last_write_status"), }, }, "replication": s.Object{ @@ -88,16 +92,18 @@ var ( "received": c.Int("total_connections_received"), "rejected": c.Int("rejected_connections"), }, - "total_commands_processed": c.Int("total_commands_processed"), - "total_net_input_bytes": c.Int("total_net_input_bytes"), - "total_net_output_bytes": c.Int("total_net_output_bytes"), - "instantaneous_ops_per_sec": c.Int("instantaneous_ops_per_sec"), - "instantaneous_input_kbps": c.Float("instantaneous_input_kbps"), - "instantaneous_output_kbps": c.Float("instantaneous_output_kbps"), + "commands_processed": c.Int("total_commands_processed"), + "net.input.bytes": c.Int("total_net_input_bytes"), + "net.output.bytes": c.Int("total_net_output_bytes"), + "instantaneous": s.Object{ + "ops_per_sec": c.Int("instantaneous_ops_per_sec"), + "input_kbps": c.Float("instantaneous_input_kbps"), + "output_kbps": c.Float("instantaneous_output_kbps"), + }, "sync": s.Object{ "full": c.Int("sync_full"), - "partial_ok": c.Int("sync_partial_ok"), - "partial_err": c.Int("sync_partial_err"), + "partial.ok": c.Int("sync_partial_ok"), + "partial.err": c.Int("sync_partial_err"), }, "keys": s.Object{ "expired": c.Int("expired_keys"), @@ -107,8 +113,8 @@ var ( "hits": c.Int("keyspace_hits"), "misses": c.Int("keyspace_misses"), }, - "pubsub_channels": c.Int("pubsub_channels"), - "pubsub_patterns": c.Int("pubsub_patterns"), + "pubsub.channels": c.Int("pubsub_channels"), + "pubsub.patterns": c.Int("pubsub_patterns"), "latest_fork_usec": c.Int("latest_fork_usec"), "migrate_cached_sockets": c.Int("migrate_cached_sockets"), },