Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Metricbeat field names for redis aof #2059

Merged
merged 1 commit into from
Jul 20, 2016
Merged

Fix Metricbeat field names for redis aof #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix Metricbeat field names for redis aof 
It was called `used`, probably due to a copy & paste error. Fixes #2027.
  • Loading branch information
Tudor Golubenco committed Jul 19, 2016
commit edf6edcdcd8ce43207995d0fb4c3b118406efa52
6 changes: 3 additions & 3 deletions filebeat/filebeat.full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ filebeat.prospectors:

#================================ Processors =====================================

# Processors are used to reduce the number of fields in the exported event or to
# enhance the event with external meta data. This section defines a list of processors
# Processors are used to reduce the number of fields in the exported event or to
# enhance the event with external meta data. This section defines a list of processors
# that are applied one by one and the first one receives the initial event:
#
# event -> filter1 -> event1 -> filter2 ->event2 ...
Expand Down Expand Up @@ -380,7 +380,7 @@ output.elasticsearch:
#template.overwrite: false

# If set to true, filebeat checks the Elasticsearch version at connect time, and if it
# is 2.x, it loads the file specified by the template.versions.2x.path setting. The
# is 2.x, it loads the file specified by the template.versions.2x.path setting. The
# default is true.
#template.versions.2x.enabled: true

Expand Down
14 changes: 7 additions & 7 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,49 +1466,49 @@ type: integer
None

[float]
=== redis.info.persistence.used.enabled
=== redis.info.persistence.aof.enabled

type: boolean

None

[float]
=== redis.info.persistence.used.rewrite_in_progress
=== redis.info.persistence.aof.rewrite_in_progress

type: boolean

None

[float]
=== redis.info.persistence.used.rewrite_scheduled
=== redis.info.persistence.aof.rewrite_scheduled

type: boolean

None

[float]
=== redis.info.persistence.used.last_rewrite_time_sec
=== redis.info.persistence.aof.last_rewrite_time_sec

type: integer

None

[float]
=== redis.info.persistence.used.current_rewrite_time_sec
=== redis.info.persistence.aof.current_rewrite_time_sec

type: integer

None

[float]
=== redis.info.persistence.used.last_bgrewrite_status
=== redis.info.persistence.aof.last_bgrewrite_status

type: keyword

None

[float]
=== redis.info.persistence.used.last_write_status
=== redis.info.persistence.aof.last_write_status

type: keyword

Expand Down
14 changes: 7 additions & 7 deletions metricbeat/etc/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,31 +861,31 @@
type: integer
description:

- name: used.enabled
- name: aof.enabled
type: boolean
description:

- name: used.rewrite_in_progress
- name: aof.rewrite_in_progress
type: boolean
description:

- name: used.rewrite_scheduled
- name: aof.rewrite_scheduled
type: boolean
description:

- name: used.last_rewrite_time_sec
- name: aof.last_rewrite_time_sec
type: integer
description:

- name: used.current_rewrite_time_sec
- name: aof.current_rewrite_time_sec
type: integer
description:

- name: used.last_bgrewrite_status
- name: aof.last_bgrewrite_status
type: keyword
description:

- name: used.last_write_status
- name: aof.last_write_status
type: keyword
description:

Expand Down
56 changes: 28 additions & 28 deletions metricbeat/metricbeat.template-es2x.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,34 +705,7 @@
},
"persistence": {
"properties": {
"loading": {
"type": "boolean"
},
"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"
},
"last_save_time": {
"type": "long"
}
}
},
"used": {
"aof": {
"properties": {
"current_rewrite_time_sec": {
"type": "long"
Expand Down Expand Up @@ -760,6 +733,33 @@
"type": "boolean"
}
}
},
"loading": {
"type": "boolean"
},
"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"
},
"last_save_time": {
"type": "long"
}
}
}
}
},
Expand Down
54 changes: 27 additions & 27 deletions metricbeat/metricbeat.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,33 +692,7 @@
},
"persistence": {
"properties": {
"loading": {
"type": "boolean"
},
"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"
},
"last_save_time": {
"type": "long"
}
}
},
"used": {
"aof": {
"properties": {
"current_rewrite_time_sec": {
"type": "long"
Expand All @@ -744,6 +718,32 @@
"type": "boolean"
}
}
},
"loading": {
"type": "boolean"
},
"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"
},
"last_save_time": {
"type": "long"
}
}
}
}
},
Expand Down
14 changes: 7 additions & 7 deletions metricbeat/module/redis/info/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,31 +126,31 @@
type: integer
description:

- name: used.enabled
- name: aof.enabled
type: boolean
description:

- name: used.rewrite_in_progress
- name: aof.rewrite_in_progress
type: boolean
description:

- name: used.rewrite_scheduled
- name: aof.rewrite_scheduled
type: boolean
description:

- name: used.last_rewrite_time_sec
- name: aof.last_rewrite_time_sec
type: integer
description:

- name: used.current_rewrite_time_sec
- name: aof.current_rewrite_time_sec
type: integer
description:

- name: used.last_bgrewrite_status
- name: aof.last_bgrewrite_status
type: keyword
description:

- name: used.last_write_status
- name: aof.last_write_status
type: keyword
description:

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/redis/info/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var (
"last_bgsave_time_sec": c.Int("rdb_last_bgsave_time_sec"),
"current_bgsave_time_sec": c.Int("rdb_current_bgsave_time_sec"),
},
"used": s.Object{
"aof": s.Object{
"enabled": c.Bool("aof_enabled"),
"rewrite_in_progress": c.Bool("aof_rewrite_in_progress"),
"rewrite_scheduled": c.Bool("aof_rewrite_scheduled"),
Expand Down