core(rrd) move global rrd cache option

www/class/config-generate/broker.class.php

@@ -89,9 +89,9 @@ private function getExternalValues()
         global $pearDB;
 
         if (!is_null($this->cacheExternalValue)) {
-            return ;
+            return;
         }
-        
+
         $this->cacheExternalValue = array();
         $stmt = $this->backend_instance->db->prepare("SELECT 
             CONCAT(cf.fieldname, '_', cttr.cb_tag_id, '_', ctfr.cb_type_id) as name, external FROM cb_field cf, cb_type_field_relation ctfr, cb_tag_type_relation cttr
@@ -108,7 +108,7 @@ private function getExternalValues()
     private function generate($poller_id, $localhost)
     {
         $this->getExternalValues();
-        
+
         if (is_null($this->stmt_broker)) {
             $this->stmt_broker = $this->backend_instance->db->prepare("SELECT 
               $this->attributes_select
@@ -144,7 +144,7 @@ private function generate($poller_id, $localhost)
             $stats_activate = $row['stats_activate'];
             $correlation_activate = $row['correlation_activate'];
 
-            # Base parameters
+            // Base parameters
             $object['broker_id'] = $row['config_id'];
             $object['broker_name'] = $row['config_name'];
             $object['poller_id'] = $this->engine['id'];
@@ -171,7 +171,7 @@ private function generate($poller_id, $localhost)
             $this->stmt_broker_parameters->execute();
             $resultParameters = $this->stmt_broker_parameters->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC);
 
-            # Flow parameters
+            // Flow parameters
             foreach ($resultParameters as $key => $value) {
                 // We search the BlockId
                 $blockId = 0;
@@ -184,6 +184,7 @@ private function generate($poller_id, $localhost)
                     }
                 }
 
+                $rrdCacheOption = 'disable';
                 foreach ($value as $subvalue) {
                     if (!isset($subvalue['fieldIndex']) ||
                         $subvalue['fieldIndex'] == "" ||
@@ -202,9 +203,22 @@ private function generate($poller_id, $localhost)
                             $object[$subvalue['config_group_id']][$key]['filters'][][$subvalue['config_key']] =
                                 $subvalue['config_value'];
                         } else {
+                            if ($subvalue['config_key'] === 'rrd_cached_option') {
+                                $rrdCacheOption = $subvalue['config_value'];
+                                continue;
+                            }
+
+                            if ($subvalue['config_key'] === 'rrd_cached') {
+                                if ($rrdCacheOption === 'tcp') {
+                                    $object[$subvalue['config_group_id']][$key]['port'] = $subvalue['config_value'];
+                                } elseif ($rrdCacheOption === 'unix') {
+                                    $object[$subvalue['config_group_id']][$key]['path'] = $subvalue['config_value'];
+                                }
+                                continue;
+                            }
+
                             $object[$subvalue['config_group_id']][$key][$subvalue['config_key']] =
                                 $subvalue['config_value'];
-
                             // We override with external values
                             if (isset($this->cacheExternalValue[$subvalue['config_key'] . '_' . $blockId])) {
                                 $object[$subvalue['config_group_id']][$key][$subvalue['config_key']] =
@@ -223,7 +237,7 @@ private function generate($poller_id, $localhost)
                     }
                     $flow_count++;
                 }
-                
+
                 // Check if we need to add values from external
                 foreach ($this->cacheExternalValue as $key2 => $value2) {
                     if (preg_match('/^(.+)_' . $blockId . '$/', $key2, $matches)) {
@@ -235,7 +249,7 @@ private function generate($poller_id, $localhost)
                 }
             }
 
-            # Stats parameters
+            // Stats parameters
             if ($stats_activate == '1') {
                 $object[$flow_count]['stats'] = array(
                     'type' => 'stats',
@@ -244,7 +258,7 @@ private function generate($poller_id, $localhost)
                 );
             }
 
-            # Generate file
+            // Generate file
             $this->generateFile($object, true, 'centreonBroker');
             $this->writeFile($this->backend_instance->getPath());
         }
@@ -289,7 +303,7 @@ public function generateFromPoller($poller)
     {
         $this->generate($poller['id'], $poller['localhost']);
     }
-    
+
     private function getInfoDb($string)
     {
         /*
@@ -352,10 +366,10 @@ private function getInfoDb($string)
                 $db = $this->backend_instance->db_cs;
                 break;
         }
-        
+
         $stmt = $db->prepare($query);
         $stmt->execute();
-        
+
         $infos = array();
         while (($row = $stmt->fetch(PDO::FETCH_ASSOC))) {
             $val = $row[$s_column];
@@ -371,7 +385,7 @@ private function getInfoDb($string)
         }
         return $infos;
     }
-    
+
     private function rpnCalc($rpn, $val)
     {
         if (!is_numeric($val)) {
@@ -387,7 +401,7 @@ private function rpnCalc($rpn, $val)
             return $val;
         }
     }
-    
+
     private function rpnOperation($result, $item)
     {
         if (in_array($item, array('+', '-', '*', '/'))) {

www/include/Administration/parameters/rrdtool/form.ihtml

@@ -22,27 +22,6 @@
             </td>
             <td class="FormRowValue">{$form.rrdtool_version.html}</td>
         </tr>
-
-        <tr class="list_lvl_1">
-            <td class="ListColLvl1_name" colspan="2">
-                <h4>{$form.header.rrdcached_title}</h4>
-            </td>
-        </tr>
-        <tr class="list_two">
-            <td class="FormRowField"><img class="helpTooltip" name="tip_rrdcached_enable">{$form.rrdcached_enable.label}
-            </td>
-            <td class="FormRowValue">{$form.rrdcached_enable.html}</td>
-        </tr>
-        <tr class="list_one">
-            <td class="FormRowField"><img class="helpTooltip" name="tip_rrdcached_port">{$form.rrdcached_port.label}
-            </td>
-            <td class="FormRowValue">{$form.rrdcached_port.html}</td>
-        </tr>
-        <tr class="list_two">
-            <td class="FormRowField"><img class="helpTooltip" name="tip_rrdcached_unix_path">{$form.rrdcached_unix_path.label}
-            </td>
-            <td class="FormRowValue">{$form.rrdcached_unix_path.html}</td>
-        </tr>
     </table>
     {if !$valid}
     <div id="validForm" class="oreonbutton">

www/include/Administration/parameters/rrdtool/form.php

@@ -65,17 +65,6 @@
 $form->addElement('text', 'rrdtool_path_bin', _("Directory + RRDTOOL Binary"), $attrsText);
 $form->addElement('text', 'rrdtool_version', _("RRDTool Version"), $attrsText2);
 
-/*
- * Rrdcached
- */
-$attrEnable = array('onclick' => 'toggleRrdcached(this)');
-$form->addElement('header', 'rrdcached_title', _("Rrdcached configuration : work only with Centreon Broker"));
-$rrdcachedEnable[] = $form->createElement('radio', 'rrdcached_enable', null, _("Yes"), '1', $attrEnable);
-$rrdcachedEnable[] = $form->createElement('radio', 'rrdcached_enable', null, _("No"), '0', $attrEnable);
-$form->addGroup($rrdcachedEnable, 'rrdcached_enable', _("Enable RRDCached"), ' ');
-$form->addElement('text', 'rrdcached_port', _('TCP Port'), $attrsText2);
-$form->addElement('text', 'rrdcached_unix_path', _('UNIX Socket path'), $attrsText);
-
 $form->addElement('hidden', 'gopt_id');
 $redirect = $form->addElement('hidden', 'o');
 $redirect->setValue($o);

www/include/common/javascript/centreon/brokerConfig.js

@@ -62,7 +62,6 @@ function clonifyTableFields(attributeName,displayName){
             //table1.prepend(control);
             firstPosition.after(newdiv);
         }
-
     }
 
     // Finaly, we make each group of fields clonable (if not alreadyProcessed)
@@ -141,9 +140,41 @@ jQuery(function () {
    });
 });
 
-/* Hooks for some fields */
+// Hooks for some fields
+var rrdArguments = {
+    // Hook on load tab
+    onLoad: function (element, argument) {
+        argument = window.JSON.parse(argument);
+        return function () {
+            var entry = element.name.match('(input|output)(\\[\\d\\])\\[(\\w*)\\]');
+            var option = entry.input;
+            var target = entry[1] + entry[2] + '[' + argument.target + ']';
+
+            if (document.querySelector('input[name="' + option + '"]:checked').value === 'disable') {
+                document.getElementsByName(target)[1].disabled = true;
+            }
+        }
+    },
+    // Hook on change the target
+    onChange: function (argument) {
+        return function (self) {
+            var entry = self.name.match('(input|output)(\\[\\d\\])\\[(\\w*)\\]');
+            var option = entry.input;
+            var target = entry[1] + entry[2] + '[' + argument.target + ']';
+
+            if (document.querySelector('input[name="' + option + '"]:checked').value === 'disable') {
+                document.getElementsByName(target)[1].value = '';
+                document.getElementsByName(target)[1].disabled = true;
+            } else {
+                document.getElementsByName(target)[1].disabled = false;
+            }
+        }
+    }
+}
+
+// Hooks for some fields
 var luaArguments = {
-    /* Hook on load tab */
+    // Hook on load tab
     onLoad: function (element, argument) {
         argument = window.JSON.parse(argument);
         return function () {
@@ -155,7 +186,7 @@ var luaArguments = {
             luaArguments.changeInput(type, target)
         }
     },
-    /* Hook on change the target */
+    // Hook on change the target
     onChange: function (argument) {
         return function (self) {
             var entry = self.name.match('(input|output)(\\[\\d\\])\\[(\\w*)\\]');
@@ -166,9 +197,9 @@ var luaArguments = {
             luaArguments.changeInput(type,target)
         }
     },
-    /* Internal function for apply the input change */
+    // Internal function for apply the input change
     changeInput: function (type, name) {
-        /* Get all attributes */
+        // Get all attributes
         var attrs = {};
         name = '[name="' + name + '"]:input';
         jQuery.each(jQuery(name)[0].attributes, function (idx, attr) {
@@ -180,7 +211,7 @@ var luaArguments = {
         var $elParent = jQuery(name).parent();
         var value = jQuery(name).val();
         jQuery(name).remove();
-        /* Find the good input for the type by default text => string */
+        // Find the good input for the type by default text => string
         if (type === 'number') {
             var newEl = jQuery('<input />')
                 .attr(attrs)

www/install/insertBaseConf.sql

@@ -544,8 +544,8 @@ INSERT INTO `cb_field` (`cb_field_id`, `fieldname`, `displayname`, `description`
 (33, 'fifo', 'File for Centreon Broker statistics', 'File where Centreon Broker statistics will be stored', 'text', NULL),
 (34, 'queries_per_transaction', 'Maximum queries per transaction', 'The maximum queries per transaction before commit.', 'int', NULL),
 (35, 'read_timeout', 'Transaction commit timeout', 'The transaction timeout before running commit.', 'int', NULL),
-(36, 'path', 'Unix socket', 'The Unix socket used to communicate with rrdcached. This is a global option, go to Administration > Options > RRDTool to modify it.', 'text', 'T=options:C=value:CK=key:K=rrdcached_unix_path'),
-(37, 'port', 'TCP port', 'The TCP port used to communicate with rrdcached. This is a global option, go to Administration > Options > RRDTool to modify it.', 'int', 'T=options:C=value:CK=key:K=rrdcached_port'),
+(36, 'rrd_cached_option', 'Cache Option', 'Use RRD cache.', 'radio', NULL),
+(37, 'rrd_cached', 'Cache Link', 'The Unix socket or the TCP port used to communicate with rrdcached.', 'text', NULL),
 (38, 'max_size', 'Max file size in bytes', 'The maximum size of log file.', 'int', NULL),
 (39, 'check_replication', 'Replication enabled', 'When enabled, the broker engine will check whether or not the replication is up to date before attempting to update data.', 'radio', NULL),
 (40, 'rebuild_check_interval', 'Rebuild check interval in seconds', 'The interval between check if some metrics must be rebuild. The default value is 300s', 'int', NULL),
@@ -620,7 +620,8 @@ INSERT INTO `cb_list` (`cb_list_id`, `cb_field_id`, `default_value`) VALUES
 (10, 62, 'false'),
 (1, 63, 'yes'),
 (1, 70, 'no'),
-(11, 73, 'string');
+(11, 73, 'string'),
+(12, 36, 'disable');
 
 --
 -- Contenu de la table `cb_list_values`
@@ -658,7 +659,10 @@ INSERT INTO `cb_list_values` (`cb_list_id`, `value_name`, `value_value`) VALUES
 (10, 'False', 'false'),
 (11, 'String', 'string'),
 (11, 'Number', 'number'),
-(11, 'Password', 'password');
+(11, 'Password', 'password'),
+(12, 'Disable', 'disable'),
+(12, 'TCP Port', 'tcp'),
+(12, 'UNIX Socket', 'unix');
 
 --
 -- Contenu de la table `cb_module_relation`
@@ -726,7 +730,6 @@ INSERT INTO `cb_type_field_relation` (`cb_type_id`, `cb_field_id`, `is_required`
 (11, 11, 1, 1),
 (11, 12, 1, 2),
 (11, 41, 0, 3),
-(13, 36, 0, 4),
 (13, 37, 0, 3),
 (13, 13, 1, 1),
 (13, 14, 1, 2),
@@ -843,7 +846,8 @@ INSERT INTO `cb_type_field_relation` (`cb_type_id`, `cb_field_id`, `is_required`
 -- Contenu de la table `cb_type_field_relation`
 --
 INSERT INTO `cb_type_field_relation` (`cb_type_id`, `cb_field_id`, `is_required`, `order_display`, `jshook_name`, `jshook_arguments`) VALUES
-(33, 73, 0, 5, 'luaArguments', '{"target": "lua_parameter__value_%d"}');
+(33, 73, 0, 5, 'luaArguments', '{"target": "lua_parameter__value_%d"}'),
+(13, 36, 0, 4, 'rrdArguments', '{"target": "rrd_cached"}');
 
 --
 -- Contenu de la table `widget_parameters_field_type`