Merge pull request #140 from redBorder/development

Release 2.2.0

VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

resources/bin/rb_configure_leader.sh

@@ -377,7 +377,7 @@ function configure_leader(){
   listCookbooks="rb-common rb-selinux cron zookeeper kafka druid http2k memcached chef-server consul
                 hadoop samza nginx geoip webui snmp mongodb rbmonitor rbscanner
                 f2k logstash pmacct minio postgresql rbdswatcher rbevents-counter
-                rsyslog freeradius rbnmsp n2klocd rbale rbcep k2http rblogstatter rb-arubacentral rbcgroup rb-exporter rb-proxy rb-postfix
+                rsyslog freeradius rbnmsp n2klocd rbale rbcep k2http rblogstatter rb-arubacentral rbcgroup rb-exporter rb-clamav rb-proxy rb-postfix
                 keepalived snort barnyard2 rb-ips rbaioutliers rb-manager" # The order matters!
 
   for n in $listCookbooks; do # cookbooks

resources/check/memcached/rb_check_memcached.rb

@@ -17,7 +17,7 @@
 require_relative '/usr/lib/redborder/lib/check/check_functions.rb'
 require_relative 'rb_check_memcached_functions.rb'
 
-red = "/usr/lib/redborder/scripts/red.rb"
+rbcli = "/usr/lib/redborder/scripts/rbcli.rb"
 
 opt = Getopt::Std.getopts("cq")
 
@@ -37,14 +37,14 @@
 
   if status == 0
     subtitle("Keys", colorless, quiet)
-    output = execute_command_on_node(node,"#{red} memcached keys | grep -v '==\|--\|bytes' | wc -l").gsub("\n","")
+    output = execute_command_on_node(node,"#{rbcli} memcached keys | grep -v '==\|--\|bytes' | wc -l").gsub("\n","")
     return_value = $?.exitstatus
     has_errors = true if return_value != 0
     print_command_output(node + " " +  output + " keys", return_value, colorless, quiet)
 
 
     subtitle("Darklist keys", colorless, quiet)
-    output = execute_command_on_node(node,"#{red} memcached keys darklist | grep -c darklist").gsub("\n","")
+    output = execute_command_on_node(node,"#{rbcli} memcached keys darklist | grep -c darklist").gsub("\n","")
     return_value = $?.exitstatus
     has_errors = true if return_value != 0
     print_command_output(node + " " +  output + " darklist keys", return_value, colorless, quiet)