add cache patch from #237

Author: sdepassio

centreon-certified/canopsis/canopsis2x-events-apiv2.lua

@@ -54,7 +54,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
   self.bbdo_version = self.sc_common:get_bbdo_version()
 
@@ -114,6 +113,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/clickhouse/clickhouse-metrics-apiv2.lua

@@ -50,7 +50,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -86,6 +85,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/datadog/datadog-events-apiv2.lua

@@ -47,7 +47,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -79,6 +78,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/datadog/datadog-metrics-apiv2.lua

@@ -48,7 +48,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -84,6 +83,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/elasticsearch/elastic-events-apiv2.lua

@@ -49,7 +49,6 @@ function EventQueue.new(params)
     -- initiate mandatory objects
     self.sc_logger = sc_logger.new(logfile, log_level)
     self.sc_common = sc_common.new(self.sc_logger)
-    self.sc_broker = sc_broker.new(self.sc_logger)
     self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
     -- checking mandatory parameters and setting a fail flag
@@ -75,6 +74,7 @@ function EventQueue.new(params)
 
     self.sc_params:build_accepted_elements_info()
     self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+    self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
     local categories = self.sc_params.params.bbdo.categories
     local elements = self.sc_params.params.bbdo.elements

centreon-certified/elasticsearch/elastic-metrics-apiv2.lua

@@ -53,7 +53,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -103,6 +102,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/google/bigquery-events-apiv2.lua

@@ -32,8 +32,8 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
   if not self.sc_params:is_mandatory_config_set(mandatory_parameters, params) then

centreon-certified/influxdb/influxdb-metrics-apiv2.lua

@@ -48,7 +48,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -90,6 +89,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements
@@ -256,7 +256,8 @@ function EventQueue:send_data(payload, queue_metadata)
       payload_event.retry = 1
       table.insert(events_retry, payload_event)
     else
-      data_binary = data_binary .. payload_event.metric_name .. ",metric.id=" .. metrics[payload_event.metric_key] .. " value=" .. payload_event.metric_value .. " " .. payload_event.last_check .. "\n" .. payload_event.status .. "\n"
+      data_binary = data_binary .. payload_event.metric_name .. ",metric_id=" .. metrics[payload_event.metric_key] .. " value=" .. payload_event.metric_value .. " " .. payload_event.last_check .. "\n"
+      data_binary = data_binary  .. payload_event.status .. "\n"
     end
   end
 
@@ -266,10 +267,12 @@ function EventQueue:send_data(payload, queue_metadata)
       if retry_event.retry > 3 then
         self.sc_logger:debug("Retry limit reached for key: " .. retry_event.metric_key)
         data_binary = data_binary .. retry_event.metric_name .. " value=" .. retry_event.metric_value .. " " .. retry_event.last_check .. "\n"
+        data_binary = data_binary .. retry_event.status .. "\n"
         table.remove(events_retry, index)
       end
     else
-      data_binary = data_binary .. retry_event.metric_name .. ",metric.id=" .. metrics[retry_event.metric_key] .. " value=" .. retry_event.metric_value .. " " .. retry_event.last_check .. "\n" .. retry_event.status .. "\n"
+      data_binary = data_binary .. retry_event.metric_name .. ",metric_id=" .. metrics[retry_event.metric_key] .. " value=" .. retry_event.metric_value .. " " .. retry_event.last_check .. "\n"
+      data_binary = data_binary .. retry_event.status .. "\n"
       table.remove(events_retry, index)
     end
   end
@@ -368,7 +371,6 @@ function write (event)
       metrics[metric_key] = event.metric_id
     end
   end
-  --broker_log:info(0, "METRICS: " .. broker.json_encode(metrics))
 
   -- skip event if a mandatory parameter is missing
   if queue.fail then

centreon-certified/influxdb/influxdb2-metrics-apiv2.lua

@@ -51,7 +51,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
 
   -- checking mandatory parameters and setting a fail flag
@@ -90,6 +89,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements

centreon-certified/kafka/kafka-events-apiv2.lua

@@ -34,7 +34,6 @@ function EventQueue.new(params)
   -- initiate mandatory objects
   self.sc_logger = sc_logger.new(logfile, log_level)
   self.sc_common = sc_common.new(self.sc_logger)
-  self.sc_broker = sc_broker.new(self.sc_logger)
   self.sc_params = sc_params.new(self.sc_common, self.sc_logger)
   self.sc_kafka_config = kafka_config.new()
   self.sc_kafka_topic_config = kafka_topic_config.new()
@@ -86,6 +85,7 @@ function EventQueue.new(params)
 
   self.sc_params:build_accepted_elements_info()
   self.sc_flush = sc_flush.new(self.sc_params.params, self.sc_logger)
+  self.sc_broker = sc_broker.new(self.sc_params.params, self.sc_logger)
 
   local categories = self.sc_params.params.bbdo.categories
   local elements = self.sc_params.params.bbdo.elements