fix indention, revert merge failures

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 0940c749348f8f81b1d48016ab4666c402157385..c2b3598e96df544fcc0781e19b1f994415bff5e4 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -1170,7 +1170,7 @@
 #<Plugin processes>
 #      CollectFileDescriptor true
 #      CollectContextSwitch true
-#       CollectMemoryMaps true
+#      CollectMemoryMaps true
 #      Process "name"
 #      ProcessMatch "name" "regex"
 #      <Process "collectd">

diff --git a/src/processes.c b/src/processes.c
index d2b6fee70fc4d72c9231a373cd35339b61cfdd3d..459ab985dd8e156a07a6d34831c77854da7d6004 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -752,7 +752,7 @@ static void ps_submit_proc_list(procstat_t *ps) {
   plugin_dispatch_values(&vl);
 
   if ((ps->io_rchar != -1) && (ps->io_wchar != -1)) {
-    sstrncpy(vl.type, "ps_disk_octets", sizeof(vl.type));
+    sstrncpy(vl.type, "io_octets", sizeof(vl.type));
     vl.values[0].derive = ps->io_rchar;
     vl.values[1].derive = ps->io_wchar;
     vl.values_len = 2;
@@ -775,7 +775,7 @@ static void ps_submit_proc_list(procstat_t *ps) {
     plugin_dispatch_values(&vl);
   }
 
- if (ps->num_fd > 0) {
+  if (ps->num_fd > 0) {
     sstrncpy(vl.type, "file_handles", sizeof(vl.type));
     vl.values[0].gauge = ps->num_fd;
     vl.values_len = 1;