update collectd contrib

Author: lloucas-imvu

contrib/collectd/Makefile

@@ -1,11 +1,12 @@
 CC=gcc
-CFLAGS+= -I/usr/include -Wall -DHAVE_CONFIG_H 
+CFLAGS+= -I/usr/include -Wall -DHAVE_CONFIG_H -I. -I/usr/include/collectd -I/usr/include/collectd/core
 LDFLAGS+= -L/usr/lib -lstatgrab -shared -fPIC
 PLUGIN_INSTALL_DIR = /usr/lib/collectd
 
 build: istatd ipcu
 
 istatd:
+	./statgrab_detect.sh
 	$(CC) plugins/istatd.c $(CFLAGS) $(LDFLAGS) -o plugins/istatd.so 
 
 ipcu:

contrib/collectd/plugins/icpu.c

@@ -1,39 +1,10 @@
-/**
- * Copyright (C) 2011-2014  IMVU, Inc
- * Copyright (C) 2005-2010  Florian octo Forster
- * Copyright (C) 2008       Oleg King
- * Copyright (C) 2009       Simon Kuhnle
- * Copyright (C) 2009       Manuel Sanmartin
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * ICPU Plugin Authors:
- *   IMVU, Inc
- * Original CPU Plugin Authors:
- *   Florian octo Forster <octo at verplant.org>
- *   Oleg King <king2 at kaluga.ru>
- *   Simon Kuhnle <simon at blarzwurst.de>
- *   Manuel Sanmartin
- **/
-
-/* count cpu stats in percentages. mostly lifted from collectd's src/cpu.c plugin */
-
-#include <collectd/collectd.h>
-#include <collectd/common.h>
-#include <collectd/plugin.h>
+/* mostly lifted from collectd's cpu.c */
+#include <collectd.h>
+#include <common.h>
+#include <plugin.h>
 
 #include <statgrab.h>
+#include "config.h"
 
 #define ICPU_PLUGIN_NAME "icpu"
 
@@ -63,8 +34,11 @@ static int icpu_init() {
 
 static int icpu_read() {
     sg_cpu_percents *cp;
-
+    #if defined(LIBSTATGRAB_API_0_90)
+    cp = sg_get_cpu_percents(NULL);
+    #else
     cp = sg_get_cpu_percents();
+    #endif
     if (cp == NULL) {
         ERROR("icpu plugin: sg_get_cpu_percents failed.");
         return -1;

contrib/collectd/plugins/istatd.c

@@ -27,18 +27,19 @@
  * This plugin writes collectd stats to istatd.  It started life as the collectd
  * CSV plugin.
  */
-#include <collectd/collectd.h>
-#include <collectd/plugin.h>
-#include <collectd/common.h>
-#include <collectd/utils_cache.h>
-#include <collectd/utils_parse_option.h>
+#include <collectd.h>
+#include <plugin.h>
+#include <common.h>
+#include <utils_cache.h>
+#include <utils_parse_option.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <stdbool.h>
 
 #define ISTATD_PLUGIN_DEBUG 0
 
@@ -48,10 +49,12 @@
 static const char *config_keys[] =
 {
     "Port",
+    "Suffix",
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 static int istatd_agent_port = 0;
+static bool add_suffixes = true;
 static char *counter_suffix = "";
 static char *istatd_categories = "/etc/istatd.categories";
 
@@ -281,12 +284,16 @@ static char *get_my_hostname(char *buffer, int buffer_len) {
     return buffer;
 }
 
-static char *get_counter_suffix(char *buffer, int buffer_len, const char* fname, const char* hostname) {
+static char *get_counter_suffix(char *buffer, int buffer_len, const char* fname, const char* hostname, const bool should_add_suffixes) {
     const char *validchars = "ABCDEFGHIJKLMNOPQRSTUVWXZY"
                              "abcdefghijklmnopqrstuvwxzy"
                              "0123456789"
                              "-_.";
     memset(buffer,'\0',buffer_len);
+    if (!should_add_suffixes)
+    {
+        return buffer;
+    }
 
     FILE *f = fopen(fname, "rt");
     if (f != NULL) {
@@ -342,15 +349,43 @@ static int istatd_config (const char *key, const char *value)
     {
         INFO("processing port value %s", value);
         istatd_agent_port = atoi(value);
+        return (0);
+    }
+    else if (strcasecmp ("suffix", key) == 0)
+    {
+        INFO("processing suffix value %s", value);
+        if ( IS_TRUE ( value ) )
+        {
+          add_suffixes = true;
+        }
+        else
+        {
+          add_suffixes = false;
+        }
+        return (0);
+    }
+    return (-1);
+} /* int istatd_config */
+
+static int should_skip_recording(const value_list_t *vl)
+{
+    if ((strcmp(vl->plugin, "disk") == 0) && strncmp("md", vl->plugin_instance, 2) != 0 && isdigit(vl->plugin_instance[strlen(vl->plugin_instance)-1])) {
+        // we don't needs disk.sda1 or disk.sdb2, etc.
+        return (1);
     }
     else
     {
-        return (-1);
+        return (0);
     }
+}
+
+
+static int istatd_init (void)
+{
     char *hostname = get_my_hostname((char *)malloc(128), 128);
-    counter_suffix = get_counter_suffix((char*)malloc(2048), 2048, istatd_categories, hostname);
+    counter_suffix = get_counter_suffix((char*)malloc(2048), 2048, istatd_categories, hostname, add_suffixes);
     return (0);
-} /* int istatd_config */
+} /* int istatd_init */
 
 #if ISTATD_PLUGIN_DEBUG
 static void log_incoming_data(const data_set_t *ds, const value_list_t *vl)
@@ -380,7 +415,7 @@ static int istatd_write (const data_set_t *ds, const value_list_t *vl,
     log_incoming_data(ds, vl);
 #endif
 
-    if ((strcmp(vl->plugin, "disk") == 0) && isdigit(vl->plugin_instance[strlen(vl->plugin_instance)-1])) {
+    if (should_skip_recording(vl)) {
         // we don't needs disk.sda1 or disk.sdb2, etc.
         return (0);
     }
@@ -396,5 +431,6 @@ void module_register (void)
     INFO ("istatd plugin: register");
     plugin_register_config ("istatd", istatd_config,
             config_keys, config_keys_num);
+    plugin_register_init ("istatd", istatd_init);
     plugin_register_write ("istatd", istatd_write, /* user_data = */ NULL);
 } /* void module_register */

contrib/collectd/plugins/test_istatd.c

@@ -30,6 +30,7 @@ gauge_t *uc_get_rate(const data_set_t *dset, const value_list_t *vl) {
         if (dset->ds[i].type != DS_TYPE_GAUGE) {
             INFO ("uc_get_rate: %d, calc fake rate", i);
             rates[i] = (gauge_t)(val/10.0);
+            INFO ("uc_get_rate: %f, calc fake rate was ", rates[i]);
         }
     }
 
@@ -51,6 +52,9 @@ int plugin_register_config (const char *name,
         int (*callback) (const char *key, const char *val),
         const char **keys, int keys_num) { return 0;}
 
+int plugin_register_init (const char *name,
+        int (*callback) (void)) { return 0;}
+
 int plugin_register_write (const char *name,
         plugin_write_cb callback, user_data_t *user_data) { return 0;}
 
@@ -63,7 +67,19 @@ static void c_assert_str_equal(const char *fname, int line, const char *s1, cons
     }
 }
 
+static void c_assert_equal(const char *fname, int line, const int s1, const int s2) {
+    if (s1 != s2) {
+        fprintf(stderr, "ERROR %s: %d - \"%d\" does not equal \"%d\"\n", fname, line, s1, s2);
+        error_count++;
+    }
+}
+
+
 #define assert_str_equal(s1,s2) c_assert_str_equal(__FILE__, __LINE__, (s1), (s2))
+#define assert_equal(v1,v2) c_assert_equal(__FILE__, __LINE__, (v1), (v2))
+#define assert_true(b1) c_assert_equal(__FILE__, __LINE__, (b1), (1))
+#define assert_false(b1) c_assert_equal(__FILE__, __LINE__, (b1), (0))
+
 
 void test_make_istatd_metric_name() {
     char buffer[1024];
@@ -151,8 +167,8 @@ void make_fake_data(data_set_t *dset, value_list_t *vl,
 
     vl->values = values;
     vl->values_len = num_values;
-    vl->time = (cdtime_t)0;
-    vl->interval = (cdtime_t)10;
+    vl->time = TIME_T_TO_CDTIME_T(0);
+    vl->interval = TIME_T_TO_CDTIME_T(10);
     strcpy(vl->host, "localhost");
     strcpy(vl->plugin, plugin);
     strcpy(vl->plugin_instance, plugin_instance);
@@ -177,7 +193,7 @@ void test_map_to_istatd() {
     make_fake_data(&ds, &vl, DS_TYPE_COUNTER, "cpu", "", "idle", "", values, 1);
 
     map_to_istatd(buffer, sizeof(buffer), &ds, &vl);
-    assert_str_equal("cpu.idle^buildbot.linu-15-14^host.linu-15-14 0.900000\n", buffer);
+    assert_str_equal("*cpu.idle^buildbot.linu-15-14^host.linu-15-14 9\n", buffer);
     destroy_fake_data(&ds, &vl);
 
     // test memcache_ps_count
@@ -216,8 +232,8 @@ void test_map_to_istatd() {
     values[1].derive = 5.0;
     make_fake_data(&ds, &vl, DS_TYPE_DERIVE, "interface", "eth0", "if_packets", "", values, 2);
     map_to_istatd(buffer, sizeof(buffer), &ds, &vl);
-    assert_str_equal("interface.eth0.if_packets.in^buildbot.linu-15-14^host.linu-15-14 0.100000\n"
-                     "interface.eth0.if_packets.out^buildbot.linu-15-14^host.linu-15-14 0.500000\n"
+    assert_str_equal("*interface.eth0.if_packets.fake_data_source^buildbot.linu-15-14^host.linu-15-14 1\n"
+                     "*interface.eth0.if_packets.fake_data_source^buildbot.linu-15-14^host.linu-15-14 5\n"
                      , buffer);
     destroy_fake_data(&ds, &vl);
 
@@ -256,21 +272,90 @@ void test_get_counter_suffix() {
     char *suffix;
 
     // test non-existant file
-    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/does_not_exist", "fakehost");
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/does_not_exist", "fakehost", true);
     assert_str_equal("^host.fakehost", suffix);
 
     // test empty file
-    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/empty_istatd.categories", "fakehost");
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/empty_istatd.categories", "fakehost", true);
     assert_str_equal("^host.fakehost", suffix);
 
     // test sample file
-    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/istatd.categories", "fakehost");
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/istatd.categories", "fakehost", true);
     assert_str_equal("^class^trailing_ws^leading_ws^surrounded_ws^clean_me_up__por_-favor5^host.fakehost", suffix);
+
+    //Test no suffix addition
+
+    // test non-existant file
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/does_not_exist", "fakehost", false);
+    assert_str_equal("", suffix);
+
+    // test empty file
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/empty_istatd.categories", "fakehost", false);
+    assert_str_equal("", suffix);
+
+    // test sample file
+    suffix = get_counter_suffix(buffer, sizeof(buffer), "test_data/istatd.categories", "fakehost", false);
+    assert_str_equal("", suffix);
+}
+
+void test_should_skip_recording() {
+    value_list_t vl;
+    int res = 0;
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "disk");
+    strcpy(vl.plugin_instance, "sda1");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_true(res);
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "disk");
+    strcpy(vl.plugin_instance, "sdb");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_false(res);
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "disk");
+    strcpy(vl.plugin_instance, "md0");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_false(res);
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "disk");
+    strcpy(vl.plugin_instance, "sdmd0");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_true(res);
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "cpu");
+    strcpy(vl.plugin_instance, "idle");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_false(res);
+
+    memset(&vl, 0, sizeof(vl));
+    strcpy(vl.type, "type");
+    strcpy(vl.plugin, "others");
+    strcpy(vl.plugin_instance, "idle");
+    strcpy(vl.type_instance, "more");
+    res = should_skip_recording(&vl);
+    assert_false(res);
 }
 
+
 int main(int argc, char** argv) {
     test_make_istatd_metric_name();
     test_map_to_istatd();
     test_get_counter_suffix();
+    test_should_skip_recording();
     return(0);
 }

contrib/collectd/statgrab_detect.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+set -u
+
+echo "checking for libstatgrab interface version"
+echo "/* config.h generated by configure script */" >> config.h
+echo "" >> config.h
+
+mkdir -p tmp
+fn=tmp/sg.c
+echo "#include <statgrab.h>" > "$fn"
+echo "int main() { sg_get_cpu_percents(); }" >> "$fn"
+if ! gcc -o tmp/sg.o -c "$fn" > /dev/null 2>&1; then
+    echo "libstatgrab 0.17 interface doesn't work, assuming 0.90"
+    echo "#define LIBSTATGRAB_API_0_90" >> config.h
+else
+    echo "found libstatgrab 0.17 interface"
+    echo "#define LIBSTATGRAB_API_0_17" >> config.h
+fi
+rm -rf tmp
+