Hello community, here is the log from the commit of package cacti-spine for openSUSE:Factory checked in at 2019-07-22 12:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old) and /work/SRC/openSUSE:Factory/.cacti-spine.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti-spine" Mon Jul 22 12:19:35 2019 rev:21 rq:715587 version:1.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2019-04-01 12:40:57.253990032 +0200 +++ /work/SRC/openSUSE:Factory/.cacti-spine.new.4126/cacti-spine.changes 2019-07-22 12:19:37.343676459 +0200 @@ -1,0 +2,16 @@ +Tue Jul 16 06:45:51 UTC 2019 - David Liedke <[email protected]> + +-Update to version 1.2.5 + -issue: Improve detection of MySQL vs. MariaDB client library requirement + -issue#98: Checking type in poller.c causes compiler error + + +------------------------------------------------------------------- +Thu Jun 13 06:01:39 UTC 2019 - David Liedke <[email protected]> + +-Update to version 1.2.4 + * issue#92: Add Data Source ID to "Empty result' error messages + * issue#94: Increase default 'results_buffer' size to 2048 and MySQL + max buffer to 131072 bytes + +------------------------------------------------------------------- Old: ---- 1.2.3.tar.gz New: ---- 1.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cacti-spine.spec ++++++ --- /var/tmp/diff_new_pack.1LEKIH/_old 2019-07-22 12:19:37.827676332 +0200 +++ /var/tmp/diff_new_pack.1LEKIH/_new 2019-07-22 12:19:37.831676331 +0200 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: cacti-spine -Version: 1.2.3 +Version: 1.2.5 Release: 0 Url: https://github.com/Cacti/spine Source: https://github.com/Cacti/spine/archive/release/%{version}.tar.gz ++++++ 1.2.3.tar.gz -> 1.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/CHANGELOG new/spine-release-1.2.5/CHANGELOG --- old/spine-release-1.2.3/CHANGELOG 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/CHANGELOG 2019-07-15 15:06:07.000000000 +0200 @@ -1,5 +1,13 @@ The Cacti Group | spine +1.2.5 +-issue: Improve detection of MySQL vs. MariaDB client library requirement +-issue#98: Checking type in poller.c causes compiler error + +1.2.4 +-issue#92: Add Data Source ID to "Empty result' error messages +-issue#94: Increase default 'results_buffer' size to 2048 and MySQL max buffer to 131072 bytes + 1.2.3 -issue#76: Spine unhandled exception signal -issue: More recent versions of MariaDB require different client library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/INSTALL new/spine-release-1.2.5/INSTALL --- old/spine-release-1.2.3/INSTALL 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/INSTALL 2019-07-15 15:06:07.000000000 +0200 @@ -23,20 +23,29 @@ To compile and install Spine using MySQL versions 5.5 or higher please do the following: - ./configure - make - make install - chown root:root /usr/local/spine/bin/spine - chmod u+s /usr/local/spine/bin/spine +1. Run the bootstrap process to automatically create the configure script -To compile and install Spine using MySQL versions previous to 5.5 -please do the following: + ./bootstratp + +2. Run the configure process to detect what is available on the system + + ./configure + +3. Build spine + + make + +4. Optionally, install spine to the default location (/usr/local/spine/bin/) + but do note that if you manually copy to another folder, change the paths + below to reflect the correct folder you want spine to run from: + + make install + chown root:root /usr/local/spine/bin/spine + chmod u+s /usr/local/spine/bin/spine - ./configure --with-reentrant - make - make install - chown root:root /usr/local/spine/bin/spine - chmod +s /usr/local/spine/bin/spine +To compile and install Spine using MySQL versions previous to 5.5 please add +the additional --with-reentrant option to the ./configure command above but +please be aware that Cacti no longer officially supports MySQL prior to 5.5. Windows Installation ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/README.md new/spine-release-1.2.5/README.md --- old/spine-release-1.2.3/README.md 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/README.md 2019-07-15 15:06:07.000000000 +0200 @@ -62,7 +62,8 @@ * gzip * help2man * libmysqlclient - * libmysqlclient-devel + * libmariadb-devel + * libssl-devel * libtool * m4 * make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/configure.ac new/spine-release-1.2.5/configure.ac --- old/spine-release-1.2.3/configure.ac 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/configure.ac 2019-07-15 15:06:07.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(Spine Poller, 1.2.3, http://www.cacti.net/issues.php) +AC_INIT(Spine Poller, 1.2.5, http://www.cacti.net/issues.php) AC_CONFIG_AUX_DIR(config) AC_SUBST(ac_aux_dir) @@ -260,7 +260,12 @@ MYSQL_LIB_CHK($i/lib/mysql) done -AC_PATH_PROG([MARIADB], [mariadb_config], []) +AC_CHECK_LIB(mysqlclient, mysql_init, + [ LIBS="-lmysqlclient -lm -ldl $LIBS" + AC_DEFINE(HAVE_MYSQL, 1, MySQL Client API) + HAVE_MYSQL=yes ], + [ HAVE_MYSQL=no ] +) if test -n "$MYSQL_LIB_DIR" ; then LDFLAGS="-L$MYSQL_LIB_DIR $LDFLAGS" @@ -276,10 +281,10 @@ if test -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then LIBS="-lmysqlclient_r -lm -ldl $LIBS" else - if test "x$MARIADB" != "x"; then - LIBS="-lmariadbclient -lm -ldl $LIBS" - else + if test "$HAVE_MYSQL" == "yes"; then LIBS="-lmysqlclient -lm -ldl $LIBS" + else + LIBS="-lmariadbclient -lm -ldl $LIBS" fi fi fi @@ -362,9 +367,9 @@ # ****************** Spine Result Buffer Check *********************** # Check for the default spine output buffer size -results_buffer=1024 +results_buffer=2048 AC_ARG_WITH(results-buffer, - AC_HELP_STRING([--with-results-buffer=N], [The size of the spine results buffer (default=1024)]), + AC_HELP_STRING([--with-results-buffer=N], [The size of the spine results buffer (default=2048)]), [results_buffer=$withval] ) AC_DEFINE_UNQUOTED(RESULTS_BUFFER, $results_buffer, The size of the spine result buffer) @@ -382,9 +387,9 @@ # ****************** Maximum MySQL Buffer Size *********************** # Check for the most scripts that can be active at one time per spine process -max_mysql_buffer=65536 +max_mysql_buffer=131072 AC_ARG_WITH(max-mysql-buffer, - AC_HELP_STRING([--with-max-mysql-buffer=N], [The maximum SQL insert size allowed (default=65536)]), + AC_HELP_STRING([--with-max-mysql-buffer=N], [The maximum SQL insert size allowed (default=131072)]), [max_mysql_buffer=$withval] ) AC_DEFINE_UNQUOTED(MAX_MYSQL_BUF_SIZE, $max_mysql_buffer, The maximum MySQL buffer size to insert) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/poller.c new/spine-release-1.2.5/poller.c --- old/spine-release-1.2.3/poller.c 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/poller.c 2019-07-15 15:06:07.000000000 +0200 @@ -754,7 +754,7 @@ break; case POLLER_ACTION_SCRIPT: /* script (popen) */ - poll_result = trim(exec_poll(host, reindex->arg1)); + poll_result = trim(exec_poll(host, reindex->arg1, reindex->data_query_id, "DQ")); if (is_debug_device(host->id)) { SPINE_LOG(("Device[%i] HT[%i] DQ[%i] RECACHE CMD: %s, output: %s", host->id, host_thread, reindex->data_query_id, reindex->arg1, poll_result)); } else { @@ -792,7 +792,7 @@ } poll_result[0] = '\0'; - snprintf(poll_result, BUFSIZE, "%d", char_count(exec_poll(host, reindex->arg1), '\n')); + snprintf(poll_result, BUFSIZE, "%d", char_count(exec_poll(host, reindex->arg1, reindex->data_query_id, "DQ"), '\n')); if (is_debug_device(host->id)) { SPINE_LOG(("Device[%i] HT[%i] DQ[%i] RECACHE CMD COUNT: %s, output: %s", host->id, host_thread, reindex->data_query_id, reindex->arg1, poll_result)); } else { @@ -1333,7 +1333,7 @@ break; case POLLER_ACTION_SCRIPT: /* execute script file */ - poll_result = exec_poll(host, poller_items[i].arg1); + poll_result = exec_poll(host, poller_items[i].arg1, poller_items[i].local_data_id, "DS"); /* process the result */ if (IS_UNDEFINED(poll_result)) { @@ -1853,10 +1853,11 @@ return FALSE; } -/*! \fn char *exec_poll(host_t *current_host, char *command) +/*! \fn char *exec_poll(host_t *current_host, char *command, int id, char *type) * \brief polls a host using a script * \param current_host a pointer to the current host structure * \param command the command to be executed + * \param id either the local_data_id or the data_query_id * * This function will poll a specific host using the script pointed to by * the command variable. @@ -1864,7 +1865,7 @@ * \return a pointer to a character buffer containing the result. * */ -char *exec_poll(host_t *current_host, char *command) { +char *exec_poll(host_t *current_host, char *command, int id, char *type) { extern sem_t active_scripts; int cmd_fd; int pid; @@ -1993,7 +1994,11 @@ if (bytes_read > 0) { result_string[bytes_read] = '\0'; } else { - SPINE_LOG(("Device[%i] ERROR: Empty result [%s]: '%s'", current_host->id, current_host->hostname, command)); + if (STRIMATCH(type,"DS")) { + SPINE_LOG(("Device[%i] DS[%i] ERROR: Empty result [%s]: '%s'", current_host->id, id, current_host->hostname, command)); + } else { + SPINE_LOG(("Device[%i] DQ[%i] ERROR: Empty result [%s]: '%s'", current_host->id, id, current_host->hostname, command)); + } SET_UNDEFINED(result_string); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.2.3/poller.h new/spine-release-1.2.5/poller.h --- old/spine-release-1.2.3/poller.h 2019-03-31 00:37:19.000000000 +0100 +++ new/spine-release-1.2.5/poller.h 2019-07-15 15:06:07.000000000 +0200 @@ -33,7 +33,7 @@ extern void *child(void *arg); extern void poll_host(int host_id, int host_thread, int last_host_thread, int host_data_ids, char *host_time, int *host_errors, double host_time_double); -extern char *exec_poll(host_t *current_host, char *command); +extern char *exec_poll(host_t *current_host, char *command, int id, char *type); extern void get_system_information(host_t *host, MYSQL *mysql, int system); extern int is_multipart_output(char *result); extern int validate_result(char *result);
