Merge branch 'collectd-5.3' into collectd-5.4

diff --git a/configure.ac b/configure.ac
index d38cbb5d21f938a4d2c4964af01b50233407edfb..a911e0fec4c8ddc95160fc4a9757c49a7aa1092f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ then
                [with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
 
        if test "$with_libgcrypt" != "no"; then
-               AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
+               m4_ifdef([AM_PATH_LIBGCRYPT],[AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")])
                GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
                GCRYPT_LIBS="$LIBGCRYPT_LIBS"
        fi

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 0f9e03390d1b2d474c73aa210cb11c48b4fc98ba..d6069b2cdc72c850d5e30350d0f643f222649599 100644 (file)
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -200,7 +200,7 @@ Source:             http://collectd.org/files/%{name}-%{version}.tar.bz2
 License:       GPLv2
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgcrypt-devel, kernel-headers
+BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel
 Vendor:                collectd development team <collectd@verplant.org>
 
 Requires(post):                chkconfig
@@ -1546,6 +1546,8 @@ find %{buildroot} -type f -name .packlist -delete
 find %{buildroot} -type f -name perllocal.pod -delete
 
 %if ! %{with_java}
+rm -f %{buildroot}%{_datadir}/collectd/java/collectd-api.jar
+rm -f %{buildroot}%{_datadir}/collectd/java/generic-jmx.jar
 rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
 %endif
 
@@ -1556,6 +1558,10 @@ rm -fr perl-examples/
 rm -fr %{buildroot}/usr/lib/perl5/
 %endif
 
+%if ! %{with_postgresql}
+rm -f %{buildroot}%{_datadir}/collectd/postgresql_default.conf
+%endif
+
 %if ! %{with_python}
 rm -f %{buildroot}%{_mandir}/man5/collectd-python.5*
 %endif
@@ -1595,7 +1601,7 @@ fi
 %{_bindir}/collectd-tg
 %{_bindir}/collectdctl
 %{_sbindir}/collectdmon
-%{_datadir}/collectd/
+%{_datadir}/collectd/types.db
 %{_sharedstatedir}/collectd
 %{_mandir}/man1/collectd-nagios.1*
 %{_mandir}/man1/collectd.1*
@@ -1879,8 +1885,8 @@ fi
 
 %if %{with_java}
 %files java
-%{_prefix}/share/collectd/java/collectd-api.jar
-%{_prefix}/share/collectd/java/generic-jmx.jar
+%{_datadir}/collectd/java/collectd-api.jar
+%{_datadir}/collectd/java/generic-jmx.jar
 %{_libdir}/%{name}/java.so
 %{_mandir}/man5/collectd-java.5*
 %endif
@@ -1962,7 +1968,7 @@ fi
 
 %if %{with_postgresql}
 %files postgresql
-%{_prefix}/share/collectd/postgresql_default.conf
+%{_datadir}/collectd/postgresql_default.conf
 %{_libdir}/%{name}/postgresql.so
 %endif
 

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 1e0f78c1738bb966180ac94d50a07dc15d66e904..5088eaeaabe9847b82cb3b1c74cf40b2c2fdb382 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -677,7 +677,7 @@
 #              Password "secret"
 #              Interface "eth0"
 @LOAD_PLUGIN_NETWORK@  </Server>
-#      TimeToLive "128"
+#      TimeToLive 128
 #
 #      # server setup:
 #      Listen "ff18::efc0:4a42" "25826"

diff --git a/src/cpu.c b/src/cpu.c
index 1c4e5f6ba47ea4dc50766ccc1100bee629c20a22..6753397c0ca121fdf62c08b37859c0ca71cb6492 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -156,8 +156,6 @@ static int init (void)
 
        DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors");
        INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
-
-       cpu_temp_retry_max = 86400 / CDTIME_T_TO_TIME_T (plugin_get_interval ());
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(HAVE_LIBKSTAT)

diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c
index 726f25d424b2476f84ddaa3584d4e8f91cdf7476..49a4d8792c5c1aa991d412dd4a95dcaea4d8c8fd 100644 (file)
--- a/src/libcollectdclient/client.c
+++ b/src/libcollectdclient/client.c
@@ -258,6 +258,7 @@ static int lcc_send (lcc_connection_t *c, const char *command) /* {{{ */
     lcc_set_errno (c, errno);
     return (-1);
   }
+  fflush(c->fh);
 
   return (0);
 } /* }}} int lcc_send */

diff --git a/src/libvirt.c b/src/libvirt.c
index cfabaaa235d6efe81da7896e4c51185d6afa08a3..87b71e698b93c894a3c4cdabde0e218144ed083d 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -441,6 +441,12 @@ lv_read (void)
             continue;
         }
 
+        if (info.state != VIR_DOMAIN_RUNNING)
+        {
+            /* only gather stats for running domains */
+            continue;
+        }
+
         cpu_submit (info.cpuTime, domains[i], "virt_cpu_total");
         memory_submit ((gauge_t) info.memory * 1024, domains[i]);
 

diff --git a/src/pyvalues.c b/src/pyvalues.c
index 4f5c4ce3ac41eb46f3172e5d8b0cee89a5d50b37..78e6cf9d450413ed242fb73e6126a09f4dd86057 100644 (file)
--- a/src/pyvalues.c
+++ b/src/pyvalues.c
@@ -427,10 +427,11 @@ static meta_data_t *cpy_build_meta(PyObject *meta) {
                cpy_log_exception("building meta data");
                return NULL;
        }
-
        s = PyList_Size(l);
-       if (s < 0)
+       if (s <= 0) {
+               Py_XDECREF(l);
                return NULL;
+       }
 
        m = meta_data_create();
        for (i = 0; i < s; ++i) {

diff --git a/src/types_list.c b/src/types_list.c
index 10cb4f28b81e674c7af566b9bf288851b84d9442..887b43d87c420d76a823a64452fe788893ff1bd1 100644 (file)
--- a/src/types_list.c
+++ b/src/types_list.c
@@ -159,7 +159,7 @@ static void parse_file (FILE *fh)
       continue;
 
     while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
-         || (buf[buf_len - 1] == '\n')))
+         || (buf[buf_len - 1] == '\r')))
       buf[--buf_len] = '\0';
 
     if (buf_len == 0)

diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 3584f3b71a3c82bd73ec85cd55201422f8a8e1f8..4e7526be5a014df57b87a71d1aa136da07ab75c3 100644 (file)
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -27,12 +27,15 @@
 #include "utils_parse_option.h"
 
 #define print_to_socket(fh, ...) \
-       if (fprintf (fh, __VA_ARGS__) < 0) { \
-               char errbuf[1024]; \
-               WARNING ("handle_flush: failed to write to socket #%i: %s", \
-                               fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-               return -1; \
-       }
+       do { \
+               if (fprintf (fh, __VA_ARGS__) < 0) { \
+                       char errbuf[1024]; \
+                       WARNING ("handle_flush: failed to write to socket #%i: %s", \
+                                       fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+                       return -1; \
+               } \
+               fflush(fh); \
+       } while (0)
 
 static int add_to_array (char ***array, int *array_num, char *value)
 {

diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index ce3e28e003eafc8f671dde5acab5462a5c57847f..657483b6cf35c6f00bf62afc3e3c71a7c55c0f2f 100644 (file)
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -27,12 +27,15 @@
 #include "utils_parse_option.h"
 
 #define print_to_socket(fh, ...) \
-  if (fprintf (fh, __VA_ARGS__) < 0) { \
-    char errbuf[1024]; \
-    WARNING ("handle_getval: failed to write to socket #%i: %s", \
-       fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-    return -1; \
-  }
+  do { \
+    if (fprintf (fh, __VA_ARGS__) < 0) { \
+      char errbuf[1024]; \
+      WARNING ("handle_getval: failed to write to socket #%i: %s", \
+          fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+      return -1; \
+    } \
+    fflush(fh); \
+  } while (0)
 
 int handle_getval (FILE *fh, char *buffer)
 {

diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c
index ef66af56c408d8ae1ab300386875c7d57fe93189..fb45200a519801da29a823adba57a25ded5c263d 100644 (file)
--- a/src/utils_cmd_listval.c
+++ b/src/utils_cmd_listval.c
@@ -39,12 +39,15 @@
   } while (0)
 
 #define print_to_socket(fh, ...) \
-  if (fprintf (fh, __VA_ARGS__) < 0) { \
-    char errbuf[1024]; \
-    WARNING ("handle_listval: failed to write to socket #%i: %s", \
-       fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-    free_everything_and_return (-1); \
-  }
+  do { \
+    if (fprintf (fh, __VA_ARGS__) < 0) { \
+      char errbuf[1024]; \
+      WARNING ("handle_listval: failed to write to socket #%i: %s", \
+          fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+      free_everything_and_return (-1); \
+    } \
+    fflush(fh); \
+  } while (0)
 
 int handle_listval (FILE *fh, char *buffer)
 {

diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
index d3cf3834dea42885ff6df3d4695b53bf38d64872..bed8462817ea1b2c15a29d663a70cd37fb318b2b 100644 (file)
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils_cmd_putnotif.c
@@ -26,12 +26,15 @@
 #include "utils_parse_option.h"
 
 #define print_to_socket(fh, ...) \
-  if (fprintf (fh, __VA_ARGS__) < 0) { \
-    char errbuf[1024]; \
-    WARNING ("handle_putnotif: failed to write to socket #%i: %s", \
-       fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-    return -1; \
-  }
+  do { \
+    if (fprintf (fh, __VA_ARGS__) < 0) { \
+      char errbuf[1024]; \
+      WARNING ("handle_putnotif: failed to write to socket #%i: %s", \
+          fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+      return -1; \
+    } \
+    fflush(fh); \
+  } while (0)
 
 static int set_option_severity (notification_t *n, const char *value)
 {

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index 4cbc2f1d96d5a2237946fa69f9c4fabad709e78c..6a3c9e4e13c33fb1469e0f921ec8ca716b049c81 100644 (file)
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -26,12 +26,15 @@
 #include "utils_parse_option.h"
 
 #define print_to_socket(fh, ...) \
-       if (fprintf (fh, __VA_ARGS__) < 0) { \
-               char errbuf[1024]; \
-               WARNING ("handle_putval: failed to write to socket #%i: %s", \
-                               fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-               return -1; \
-       }
+    do { \
+        if (fprintf (fh, __VA_ARGS__) < 0) { \
+            char errbuf[1024]; \
+            WARNING ("handle_putval: failed to write to socket #%i: %s", \
+                    fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
+            return -1; \
+        } \
+        fflush(fh); \
+    } while (0)
 
 static int dispatch_values (const data_set_t *ds, value_list_t *vl,
                FILE *fh, char *buffer)