Merge branch 'collectd-5.8' into master

[collectd.git] / src / routeros.c

diff --git a/src/routeros.c b/src/routeros.c
index 5ba92c3..111feb6 100644 (file)
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -206,7 +206,7 @@ static int handle_system_resource(__attribute__((unused))
   }
 
   if (rd->collect_disk) {
-    cr_submit_counter(rd, "counter", "secors_written",
+    cr_submit_counter(rd, "counter", "sectors_written",
                       (derive_t)r->write_sect_total);
     cr_submit_gauge(rd, "gauge", "bad_blocks", (gauge_t)r->bad_blocks);
   }
@@ -225,8 +225,8 @@ static int handle_system_health(__attribute__((unused))
     return (EINVAL);
   rd = user_data;
 
-  cr_submit_gauge(rd, "gauge", "voltage", (gauge_t)r->voltage);
-  cr_submit_gauge(rd, "gauge", "temperature", (gauge_t)r->temperature);
+  cr_submit_gauge(rd, "voltage", "system", (gauge_t)r->voltage);
+  cr_submit_gauge(rd, "temperature", "system", (gauge_t)r->temperature);
 
   return (0);
 } /* }}} int handle_system_health */
@@ -393,7 +393,27 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */
       status = -1;
     }
 
-    if (!router_data->collect_interface && !router_data->collect_regtable) {
+    int report = 0;
+    if (router_data->collect_interface)
+      report++;
+    if (router_data->collect_regtable)
+      report++;
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0)
+    if (router_data->collect_cpu_load)
+      report++;
+    if (router_data->collect_memory)
+      report++;
+    if (router_data->collect_df)
+      report++;
+    if (router_data->collect_disk)
+      report++;
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
+    if (router_data->collect_health)
+      report++;
+#endif
+#endif
+
+    if (!report) {
       ERROR("routeros plugin: No `Collect*' option within a `Router' block. "
             "What statistics should I collect?");
       status = -1;