fix(broker/bam): events propagation improved in BAs (#908)

* fix(broker/bam): events propagation improved in BAs
* chore(tests): README updated
* chore(doc): broker-doc.md updated
* fix(tests): issue with the rescheduling

Co-authored-by: NITCHEU B <[email protected]>

* fix(ci): libssh2 is provided by conan not by the packaging

REFS: MON-22327

.github/docker/Dockerfile.collect-alma8

@@ -29,7 +29,6 @@ dnf install -y cmake \
     MariaDB-server \
     gnutls-devel \
     libgcrypt-devel \
-    libssh2-devel \
     lua-devel \
     make \
     perl-ExtUtils-Embed.noarch \

.github/docker/Dockerfile.collect-alma9

@@ -24,7 +24,6 @@ dnf install -y cmake \
     mariadb \
     gnutls-devel \
     libgcrypt-devel \
-    libssh2-devel \
     lua-devel \
     make \
     perl-ExtUtils-Embed.noarch \

bbdo/events.hh

@@ -1,20 +1,20 @@
 /*
-** Copyright 2021-2022 Centreon
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** For more information : [email protected]
-*/
+ * Copyright 2021-2023 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ */
 
 #ifndef CC_BROKER_EVENTS_HH
 #define CC_BROKER_EVENTS_HH
@@ -100,10 +100,10 @@ enum data_element {
   de_custom_variable,
   de_custom_variable_status,
   de_downtime,
-  de_event_handler,
-  de_flapping_status,
-  de_host_check,
-  de_host_dependency,
+  de_event_handler = 6,
+  de_flapping_status = 7,  // unused
+  de_host_check = 8,
+  de_host_dependency = 9,
   de_host_group,
   de_host_group_member,
   de_host,
@@ -137,7 +137,7 @@ enum data_element {
   de_pb_service_check = 40,
   de_pb_log_entry = 41,
   de_pb_instance_status = 42,
-  de_pb_module = 43,
+  // de_pb_module = 43,    Not used
   de_pb_instance = 44,
   de_pb_acknowledgement = 45,
   de_pb_responsive_instance = 46,
@@ -193,6 +193,11 @@ enum data_element {
   de_pb_dimension_truncate_table_signal = 30
 };
 }
+
+namespace extcmd {
+enum data_element { de_ba_info = 2 };
+}
+
 constexpr uint32_t make_type(io::data_category cat, uint32_t elem) {
   return (cat << 16) | elem;
 }

broker/bam/inc/com/centreon/broker/bam/ba.hh

@@ -1,20 +1,20 @@
-/*
-** Copyright 2014-2015, 2021-2022 Centreon
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** For more information : [email protected]
-*/
+/**
+ * Copyright 2014-2015, 2021-2023 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ */
 
 #ifndef CCB_BAM_BA_HH
 #define CCB_BAM_BA_HH
@@ -103,7 +103,7 @@ class ba : public computable, public service_listener {
   int _recompute_count{0};
 
   static double _normalize(double d);
-  virtual void _apply_impact(kpi* kpi_ptr, impact_info& impact) = 0;
+  virtual bool _apply_impact(kpi* kpi_ptr, impact_info& impact) = 0;
   virtual void _unapply_impact(kpi* kpi_ptr, impact_info& impact) = 0;
   virtual void _recompute();
   std::shared_ptr<pb_ba_status> _generate_ba_status(bool state_changed) const;
@@ -119,8 +119,6 @@ class ba : public computable, public service_listener {
   virtual ~ba() noexcept = default;
   ba& operator=(ba const& other) = delete;
   void add_impact(std::shared_ptr<kpi> const& impact);
-  bool child_has_update(computable* child,
-                        io::stream* visitor = nullptr) override;
   virtual double get_downtime_impact_hard() { return 0.0; }
   virtual double get_downtime_impact_soft() { return 0.0; }
   virtual double get_ack_impact_hard() { return 0.0; }
@@ -153,6 +151,10 @@ class ba : public computable, public service_listener {
   void set_inherited_downtime(pb_inherited_downtime const& dwn);
   void set_level_critical(double level);
   void set_level_warning(double level);
+  void update_from(computable* child, io::stream* visitor) override;
+  std::string object_info() const override;
+  void dump(const std::string& filename) const;
+  void dump(std::ofstream& output) const override;
 };
 }  // namespace bam
 

broker/bam/inc/com/centreon/broker/bam/ba_best.hh

@@ -44,7 +44,7 @@ class ba_best : public ba {
   void _commit_initial_events(io::stream* visitor);
 
  protected:
-  void _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
+  bool _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _unapply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _recompute() override;
 

broker/bam/inc/com/centreon/broker/bam/ba_impact.hh

@@ -36,7 +36,7 @@ class kpi;
  */
 class ba_impact : public ba {
  protected:
-  void _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
+  bool _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _unapply_impact(kpi* kpi_ptr, impact_info& impact) override;
 
  public:

broker/bam/inc/com/centreon/broker/bam/ba_ratio_number.hh

@@ -35,7 +35,7 @@ class kpi;
  *  of value.
  */
 class ba_ratio_number : public ba {
-  void _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
+  bool _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _unapply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _recompute() override;
 

broker/bam/inc/com/centreon/broker/bam/ba_ratio_percent.hh

@@ -35,9 +35,7 @@ class kpi;
  *  of value.
  */
 class ba_ratio_percent : public ba {
-  float _num_soft_critical_children;
-
-  void _apply_impact(kpi* kpi_ptr, ba::impact_info& impact) override;
+  bool _apply_impact(kpi* kpi_ptr, ba::impact_info& impact) override;
   void _unapply_impact(kpi* kpi_ptr, ba::impact_info& impact) override;
   void _recompute() override;
 

broker/bam/inc/com/centreon/broker/bam/ba_worst.hh

@@ -44,7 +44,7 @@ class ba_worst : public ba {
   void _commit_initial_events(io::stream* visitor);
 
  protected:
-  void _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
+  bool _apply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _unapply_impact(kpi* kpi_ptr, impact_info& impact) override;
   void _recompute() override;
 

broker/bam/inc/com/centreon/broker/bam/bool_and.hh

@@ -1,20 +1,20 @@
 /*
-** Copyright 2014, 2021 Centreon
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** For more information : [email protected]
-*/
+ * Copyright 2014, 2021, 2023 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ */
 
 #ifndef CCB_BAM_BOOL_AND_HH
 #define CCB_BAM_BOOL_AND_HH
@@ -43,8 +43,9 @@ class bool_and : public bool_binary_operator {
   ~bool_and() noexcept override = default;
   bool_and(const bool_and&) = delete;
   bool_and& operator=(const bool_and&) = delete;
-  double value_hard() override;
+  double value_hard() const override;
   bool boolean_value() const override;
+  std::string object_info() const override;
 };
 }  // namespace bam
 

broker/bam/inc/com/centreon/broker/bam/bool_binary_operator.hh

@@ -1,20 +1,20 @@
 /*
-** Copyright 2014-2016, 2021 Centreon
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** For more information : [email protected]
-*/
+ * Copyright 2014-2016, 2021-2023 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ */
 
 #ifndef CCB_BAM_BOOL_BINARY_OPERATOR_HH
 #define CCB_BAM_BOOL_BINARY_OPERATOR_HH
@@ -53,12 +53,12 @@ class bool_binary_operator : public bool_value {
   bool_binary_operator(bool_binary_operator const&) = delete;
   ~bool_binary_operator() noexcept override = default;
   bool_binary_operator& operator=(const bool_binary_operator&) = delete;
-  bool child_has_update(computable* child,
-                        io::stream* visitor = nullptr) override;
-  void set_left(std::shared_ptr<bool_value> const& left);
+  void set_left(const std::shared_ptr<bool_value>& left);
   void set_right(std::shared_ptr<bool_value> const& right);
   bool state_known() const override;
   bool in_downtime() const override;
+  void update_from(computable* child, io::stream* visitor) override;
+  void dump(std::ofstream& output) const override;
 };
 }  // namespace bam
 

broker/bam/inc/com/centreon/broker/bam/bool_call.hh

@@ -1,20 +1,20 @@
 /*
-** Copyright 2014 Centreon
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** For more information : [email protected]
-*/
+ * Copyright 2014, 2023 Centreon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ */
 
 #ifndef CCB_BAM_BOOL_CALL_HH
 #define CCB_BAM_BOOL_CALL_HH
@@ -34,24 +34,22 @@ namespace bam {
  *  to an external expression.
  */
 class bool_call : public bool_value {
+  std::string _name;
+  std::shared_ptr<bool_value> _expression;
+
  public:
   typedef std::shared_ptr<bool_call> ptr;
 
   bool_call(std::string const& name);
   ~bool_call() noexcept override = default;
   bool_call(const bool_call&) = delete;
   bool_call& operator=(const bool_call&) = delete;
-  double value_hard() override;
+  double value_hard() const override;
   bool boolean_value() const override;
   bool state_known() const override;
   std::string const& get_name() const;
   void set_expression(std::shared_ptr<bool_value> expression);
-  bool child_has_update(computable* child,
-                        io::stream* visitor = nullptr) override;
-
- private:
-  std::string _name;
-  std::shared_ptr<bool_value> _expression;
+  void update_from(computable* child, io::stream* visitor) override;
 };
 }  // namespace bam