X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frouteros.c;h=7598698da3de8f0b77782b3adba4ff4dc7ab554d;hb=98c0b6509f4d33d6696d8b581cdf43e8d1ac3015;hp=c0d5ef7f6ee2f2d0f0ac61a8ee4eb7dfe3801201;hpb=7f07c55bac640c7a50d516248a3152235a14af59;p=collectd.git

diff --git a/src/routeros.c b/src/routeros.c
index c0d5ef7f..7598698d 100644
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -45,6 +45,7 @@ struct cr_data_s {
   bool collect_memory;
   bool collect_df;
   bool collect_disk;
+  bool collect_health;
 };
 typedef struct cr_data_s cr_data_t;
 
@@ -212,6 +213,24 @@ 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,
+                                __attribute__((unused)) void *user_data) {
+  cr_data_t *rd;
+
+  if ((r == NULL) || (user_data == NULL))
+    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);
+
+  return (0);
+} /* }}} int handle_system_health */
+#endif
 #endif
 
 static int cr_read(user_data_t *user_data) /* {{{ */
@@ -272,6 +291,21 @@ static int cr_read(user_data_t *user_data) /* {{{ */
       return -1;
     }
   }
+
+#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);
+    if (status != 0) {
+      char errbuf[128];
+      ERROR("routeros plugin: ros_system_health failed: %s",
+            sstrerror(status, errbuf, sizeof(errbuf)));
+      ros_disconnect(rd->connection);
+      rd->connection = NULL;
+      return (-1);
+    }
+  }
+#endif
 #endif
 
   return 0;
@@ -333,6 +367,10 @@ 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);
@@ -355,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;