Code

Merge pull request #2246 from maryamtahhan/feat_mcelog_notification_bugfixes
authorFlorian Forster <ff@octo.it>
Mon, 24 Jul 2017 13:37:45 +0000 (15:37 +0200)
committerGitHub <noreply@github.com>
Mon, 24 Jul 2017 13:37:45 +0000 (15:37 +0200)
Feat mcelog notification bugfixes

1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/mcelog.c

Simple merge
Simple merge
diff --cc src/mcelog.c
index b8731c73391ca6796080823cebee64951e984ff1,22c8807c9e7d6280c07d3959e9f20d57423e3bb7..66699ede265554812ba4cf2a925d5f9c4b70d851
@@@ -288,11 -422,13 +422,13 @@@ static int mcelog_submit(const mcelog_m
        .time = cdtime(),
        .plugin = MCELOG_PLUGIN,
        .type = "errors",
-       .type_instance = "corrected_memory_errors"};
+       .type_instance = MCELOG_CORRECTED_ERR_TYPE_INS};
+   mcelog_update_dimm_stats(dimm, mr);
  
    if (mr->dimm_name[0] != '\0')
 -    ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s_%s",
 -              mr->location, mr->dimm_name);
 +    snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s_%s",
 +             mr->location, mr->dimm_name);
    else
      sstrncpy(vl.plugin_instance, mr->location, sizeof(vl.plugin_instance));