summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 577e34a)
raw | patch | inline | side by side (parent: 577e34a)
author | Florian Forster <octo@collectd.org> | |
Tue, 14 Jan 2014 08:08:01 +0000 (09:08 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Tue, 14 Jan 2014 08:15:25 +0000 (09:15 +0100) |
src/collectd.conf.pod | patch | blob | history | |
src/memory.c | patch | blob | history |
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 96a4556747c1aa92fc466061ecef57c2abf05c9c..e2fb09f2b9dc2dc9003a8ce62f8f7f89695553be 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
=item B<ValuesPercentage> B<false>|B<true>
Enables or disables reporting of physical memory usage in percentages, e.g.
-percent of physical memory used. Defaults to B<true>.
+percent of physical memory used. Defaults to B<false>.
This is useful for deploying I<collectd> in a heterogeneous environment in
which the sizes of physical memory vary.
diff --git a/src/memory.c b/src/memory.c
index b1f2e76906c03d572be273a986f13f17608bc425..e8ba93487f2de172d64bba55b8c7a97241557354 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
free = (gauge_t) (((uint64_t) vm_data.free_count) * ((uint64_t) pagesize));
MEMORY_SUBMIT ("wired", wired,
- "active", active,
+ "active", active,
"inactive", inactive,
"free", free);
/* #endif HAVE_HOST_STATISTICS */
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKSTAT
- /* Most of the additions here were taken as-is from the k9toolkit from
- * Brendan Gregg and are subject to change I guess */
+ /* Most of the additions here were taken as-is from the k9toolkit from
+ * Brendan Gregg and are subject to change I guess */
long long mem_used;
long long mem_free;
long long mem_lock;
long long mem_kern;
long long mem_unus;
- long long mem_total;
long long pp_kernel;
long long physmem;