Skip to content

Commit

Permalink
Cleanup redis fields
Browse files Browse the repository at this point in the history
  • Loading branch information
ruflin committed Sep 2, 2016
1 parent 8d6fcbf commit 0510e55
Show file tree
Hide file tree
Showing 7 changed files with 356 additions and 219 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
54 changes: 27 additions & 27 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
49 changes: 27 additions & 22 deletions metricbeat/etc/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1252,55 +1252,55 @@
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:

- name: aof.enabled
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:

Expand Down Expand Up @@ -1414,44 +1414,49 @@
- 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:

- name: sync.full
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:

Expand All @@ -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:

Expand Down
Loading

0 comments on commit 0510e55

Please sign in to comment.