feature: Make spine compatible with Streams

* feature: Make spine work with streams
* issue: Remove old configrue --with-reentrant option

Author: TheWitness

CHANGELOG

@@ -3,6 +3,7 @@ The Cacti Group | spine
 1.3.0
 -feature#5090: Enhance number recognition within Spine
 -feature#3740: Ability to disable a site
+-feature: Make spine work with Stream feature
 
 1.2.28
 -issue#350: When using Ping or SNMP Uptime, host is not always detected properly

bootstrap

@@ -86,7 +86,7 @@ echo "  These instructions assume the default install location for spine"
 echo "  of /usr/local/spine.  If you choose to use another prefix, make"
 echo "  sure you update the commands as required for that new path."
 echo ""
-echo "  To compile and install Spine using MySQL versions 5.5 or higher"
+echo "  To compile and install Spine using MySQL or MariaDB"
 echo "  please do the following:"
 echo ""
 echo "  ./configure"
@@ -95,14 +95,5 @@ echo "  make install"
 echo "  chown root:root /usr/local/spine/bin/spine"
 echo "  chmod +s /usr/local/spine/bin/spine"
 echo ""
-echo "  To compile and install Spine using MySQL versions previous to 5.5"
-echo "  please do the following:"
-echo ""
-echo "  ./configure --with-reentrant"
-echo "  make"
-echo "  make install"
-echo "  chown root:root /usr/local/spine/bin/spine"
-echo "  chmod +s /usr/local/spine/bin/spine"
-echo ""
 
 exit 0

configure.ac

@@ -57,14 +57,6 @@ AC_ARG_WITH(snmp,
   [SNMP_DIR=$withval]
 )
 
-# reentrant
-MYSQL_REENTRANT=0
-AC_ARG_WITH(reentrant,
-  AS_HELP_STRING([--with-reentrant],[If using MySQL versions less than 5.5 you must choose this option
-  ]),
-  [MYSQL_REENTRANT=1]
-)
-
 # if host_alias is empty, ac_cv_host_alias may still have the info
 if test -z "$host_alias"; then
   host_alias=$ac_cv_host_alias
@@ -298,27 +290,23 @@ else
   )
 fi
 
-if test $MYSQL_REENTRANT = 1 ; then
+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 -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib; then
+  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 -f $MYSQL_LIB_DIR/libmysqlclient_r.a -o -f $MYSQL_LIB_DIR/libmysqlclient_r.$ShLib ; then
-      LIBS="-lmysqlclient_r -lm -ldl $LIBS"
+    if test "$HAVE_MYSQL" = "yes"; then
+      if test $unamestr = 'OpenBSD'; then
+        LIBS="-lmysqlclient -lm $LIBS"
+      else
+        LIBS="-lmysqlclient -lm -ldl $LIBS"
+      fi
     else
-      if test "$HAVE_MYSQL" = "yes"; then
-        if test $unamestr = 'OpenBSD'; then
-          LIBS="-lmysqlclient -lm $LIBS"
-        else
-          LIBS="-lmysqlclient -lm -ldl $LIBS"
-        fi
+      if test -f $MYSQL_LIB_DIR/libperconaserverclient.a -o -f $MYSQL_LIB_DIR/libperconaserverclient.$ShLib; then
+        LIBS="-lperconaserverclient -lm -ldl $LIBS"
       else
-        if test -f $MYSQL_LIB_DIR/libperconaserverclient.a -o -f $MYSQL_LIB_DIR/libperconaserverclient.$ShLib; then
-          LIBS="-lperconaserverclient -lm -ldl $LIBS"
-        else
-          LIBS="-lmariadbclient -lm -ldl $LIBS"
-        fi
+        LIBS="-lmariadbclient -lm -ldl $LIBS"
       fi
     fi
   fi

poller.c

@@ -736,6 +736,8 @@ void poll_host(int device_counter, int host_id, int host_thread, int host_thread
 					} else {
 						SPINE_LOG_MEDIUM(("Device[%i] HT[%i] No host availability check possible for '%s'", host->id, host_thread, host->hostname));
 					}
+				} else if (host->availability_method == AVAIL_STREAM) {
+					update_host_status(HOST_UP, host, ping, host->availability_method);
 				} else {
 					if (ping_host(host, ping) == HOST_UP) {
 						host->ignore_host = FALSE;

spine.c

@@ -638,7 +638,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	if (set.poller_id_exists) {
-		qp += sprintf(qp, " AND host.poller_id = %i", set.poller_id);
+		qp += sprintf(qp, " AND h.poller_id = %i", set.poller_id);
 	}
 
 	qp += sprintf(qp, " ORDER BY picount DESC");

spine.h

@@ -275,6 +275,7 @@
 #define AVAIL_SNMP_OR_PING 4
 #define AVAIL_SNMP_GET_SYSDESC 5
 #define AVAIL_SNMP_GET_NEXT 6
+#define AVAIL_STREAM 7
 
 #define PING_ICMP 1
 #define PING_UDP 2