From: Florian Forster <octo@google.com>
Date: Mon, 29 Jun 2020 08:35:35 +0000 (+0200)
Subject: cpu plugin: Actually set the metric value.
X-Git-Tag: 6.0.0-rc0~144^2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab6e646b3b9fa8e5fa90ed782dd7a63ac105e882;p=thirdparty%2Fcollectd.git

cpu plugin: Actually set the metric value.

Fixes a regression introduced in 18b6e8502e6acdb79d5d55ac6dca38fc6e98dc13.
---

diff --git a/src/cpu.c b/src/cpu.c
index f20d5d434..6e644b926 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -488,7 +488,7 @@ static void cpu_commit_num_cpu(gauge_t value) /* {{{ */
 {
   metric_family_t fam = {
       .name = "cpu_count",
-      .type = VALUE_TYPE_GAUGE,
+      .type = METRIC_TYPE_GAUGE,
   };
   metric_family_metric_append(&fam, (metric_t){
                                         .value.gauge = value,
@@ -518,7 +518,7 @@ static void cpu_commit_without_aggregation(void) /* {{{ */
 {
   metric_family_t fam = {
       .name = "cpu_usage_total",
-      .type = VALUE_TYPE_DERIVE,
+      .type = METRIC_TYPE_COUNTER,
   };
 
   metric_t m = {0};
@@ -536,6 +536,8 @@ static void cpu_commit_without_aggregation(void) /* {{{ */
       snprintf(cpu_num_str, sizeof(cpu_num_str), "%zu", cpu_num);
       metric_label_set(&m, "cpu", cpu_num_str);
 
+      m.value.derive = s->conv.last_value.derive;
+
       metric_family_metric_append(&fam, m);
     }
   }