X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frouteros.c;h=111feb6f81a1355eb48908e0bdbd25ed792fb899;hb=733fc645b6389d1f42aef8f1c1631f1db7d58196;hp=7f5e60833a0dca0721ca652cf98c3084c7e2f2e6;hpb=f8ce6e1a9f5d02e43e2c97dc810c40f39e3b6e72;p=collectd.git

diff --git a/src/routeros.c b/src/routeros.c
index 7f5e6083..111feb6f 100644
--- 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);
   }
@@ -214,6 +214,7 @@ static int handle_system_resource(__attribute__((unused))
   return 0;
 } /* }}} int handle_system_resource */
 
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
 static int handle_system_health(__attribute__((unused))
                                 ros_connection_t *c, /* {{{ */
                                 const ros_system_health_t *r,
@@ -224,12 +225,13 @@ 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 */
 #endif
+#endif
 
 static int cr_read(user_data_t *user_data) /* {{{ */
 {
@@ -290,6 +292,7 @@ static int cr_read(user_data_t *user_data) /* {{{ */
     }
   }
 
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
   if (rd->collect_health) {
     status = ros_system_health(rd->connection, handle_system_health,
                                /* user data = */ rd);
@@ -303,6 +306,7 @@ static int cr_read(user_data_t *user_data) /* {{{ */
     }
   }
 #endif
+#endif
 
   return 0;
 } /* }}} int cr_read */
@@ -363,9 +367,11 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */
       cf_util_get_boolean(child, &router_data->collect_df);
     else if (strcasecmp("CollectDisk", child->key) == 0)
       cf_util_get_boolean(child, &router_data->collect_disk);
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
     else if (strcasecmp("CollectHealth", child->key) == 0)
       cf_util_get_boolean(child, &router_data->collect_health);
 #endif
+#endif
     else {
       WARNING("routeros plugin: Unknown config option `%s'.", child->key);
     }
@@ -387,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;