Adding active & inactive memory to mem plugin

closes #1213
This commit is contained in:
Cameron Sparr 2016-06-01 15:32:47 +01:00
parent 6f991ec78a
commit 52b9fc837c
3 changed files with 7 additions and 2 deletions

View File

@ -36,6 +36,7 @@ time before a new metric is included by the plugin.
- [#1197](https://github.com/influxdata/telegraf/pull/1197): Limit AWS GetMetricStatistics requests to 10 per second. - [#1197](https://github.com/influxdata/telegraf/pull/1197): Limit AWS GetMetricStatistics requests to 10 per second.
- [#1278](https://github.com/influxdata/telegraf/pull/1278) & [#1288](https://github.com/influxdata/telegraf/pull/1288) & [#1295](https://github.com/influxdata/telegraf/pull/1295): RabbitMQ/Apache/InfluxDB inputs: made url(s) parameter optional by using reasonable input defaults if not specified - [#1278](https://github.com/influxdata/telegraf/pull/1278) & [#1288](https://github.com/influxdata/telegraf/pull/1288) & [#1295](https://github.com/influxdata/telegraf/pull/1295): RabbitMQ/Apache/InfluxDB inputs: made url(s) parameter optional by using reasonable input defaults if not specified
- [#1296](https://github.com/influxdata/telegraf/issues/1296): Refactor of flush_jitter argument. - [#1296](https://github.com/influxdata/telegraf/issues/1296): Refactor of flush_jitter argument.
- [#1213](https://github.com/influxdata/telegraf/issues/1213): Add inactive & active memory to mem plugin.
### Bugfixes ### Bugfixes

View File

@ -30,6 +30,8 @@ func (s *MemStats) Gather(acc telegraf.Accumulator) error {
"free": vm.Free, "free": vm.Free,
"cached": vm.Cached, "cached": vm.Cached,
"buffered": vm.Buffers, "buffered": vm.Buffers,
"active": vm.Active,
"inactive": vm.Inactive,
"used_percent": 100 * float64(vm.Used) / float64(vm.Total), "used_percent": 100 * float64(vm.Used) / float64(vm.Total),
"available_percent": 100 * float64(vm.Available) / float64(vm.Total), "available_percent": 100 * float64(vm.Available) / float64(vm.Total),
} }

View File

@ -19,8 +19,8 @@ func TestMemStats(t *testing.T) {
Available: 7600, Available: 7600,
Used: 5000, Used: 5000,
Free: 1235, Free: 1235,
// Active: 8134, Active: 8134,
// Inactive: 1124, Inactive: 1124,
// Buffers: 771, // Buffers: 771,
// Cached: 4312, // Cached: 4312,
// Wired: 134, // Wired: 134,
@ -52,6 +52,8 @@ func TestMemStats(t *testing.T) {
"free": uint64(1235), "free": uint64(1235),
"cached": uint64(0), "cached": uint64(0),
"buffered": uint64(0), "buffered": uint64(0),
"active": uint64(8134),
"inactive": uint64(1124),
} }
acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string)) acc.AssertContainsTaggedFields(t, "mem", memfields, make(map[string]string))