Mon 15671 instance nego 241109

.github/workflows/centreon-collect.yml

@@ -21,7 +21,7 @@ on:
       legacy_engine:
         description: 'Compile Engine with legacy configuration library'
         required: true
-        default: true
+        default: false
         type: boolean
       packages_in_artifact:
         description: 'Save packages in artifacts'
@@ -147,7 +147,7 @@ jobs:
       SCCACHE_REGION: "eu-west-1"
       AWS_ACCESS_KEY_ID: ${{ secrets.COLLECT_S3_ACCESS_KEY }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.COLLECT_S3_SECRET_KEY }}
-      LEGACY_ENGINE: ${{ github.event.inputs.legacy_engine != 'false' && 'ON' || 'OFF' }}
+      LEGACY_ENGINE: ${{ github.event.inputs.legacy_engine != 'true' && 'OFF' || 'ON' }}
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/centreon-collect-${{ matrix.distrib }}:${{ needs.get-environment.outputs.img_version }}
@@ -286,7 +286,7 @@ jobs:
       release: ${{ needs.get-environment.outputs.release }}
       commit_hash: ${{ github.sha }}
       stability: ${{ needs.get-environment.outputs.stability }}
-      legacy_engine: ${{ github.event.inputs.legacy_engine != 'false' && 'ON' || 'OFF' }}
+      legacy_engine: ${{ github.event.inputs.legacy_engine != 'true' && 'OFF' || 'ON' }}
       packages_in_artifact: ${{ github.event.inputs.packages_in_artifact == 'true' }}
       image: ${{ matrix.image }}
       distrib: ${{ matrix.distrib }}

.gitignore

@@ -147,3 +147,5 @@ tests/resources/*_pb2.py
 tests/resources/*_pb2_grpc.py
 tests/resources/grpc_stream.proto
 tests/resources/opentelemetry
+
+compile_commands.json

bbdo/CMakeLists.txt

@@ -18,6 +18,7 @@
 
 set(protobuf_files
     header
+    common
     rebuild_message
     remove_graph_message
     bbdo
@@ -43,45 +44,12 @@ foreach(name IN LISTS protobuf_files)
   add_custom_target(
     "target_${name}" DEPENDS "${CMAKE_SOURCE_DIR}/bbdo/${name}.pb.cc"
                              "${CMAKE_SOURCE_DIR}/bbdo/${name}.pb.h")
+  add_library("pb_${name}_lib" STATIC "${name}.pb.cc"
+                                      "${name}.pb.h")
+  add_dependencies("pb_${name}_lib" "target_${name}")
+  set_target_properties("pb_${name}_lib" PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endforeach()
 
-add_library(pb_header_lib STATIC header.pb.cc header.pb.h)
-add_dependencies(pb_header_lib target_header)
-set_target_properties(pb_header_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_neb_lib STATIC neb.pb.cc neb.pb.h)
-add_dependencies(pb_neb_lib target_neb target_header)
-set_target_properties(pb_neb_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_storage_lib STATIC storage.pb.cc storage.pb.h)
-add_dependencies(pb_storage_lib target_storage target_header)
-set_target_properties(pb_storage_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_bbdo_lib STATIC bbdo.pb.cc bbdo.pb.h)
-add_dependencies(pb_bbdo_lib target_bbdo)
-set_target_properties(pb_bbdo_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_bam_lib STATIC bam.pb.cc bam.pb.h bam_state.pb.cc bam_state.pb.h)
-add_dependencies(pb_bam_lib target_bam target_bam_state target_header)
-set_target_properties(pb_bam_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_extcmd_lib STATIC extcmd.pb.cc extcmd.pb.h)
-add_dependencies(pb_extcmd_lib target_extcmd target_header)
-set_target_properties(pb_extcmd_lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_rebuild_message_lib STATIC rebuild_message.pb.cc
-                                          rebuild_message.pb.h)
-add_dependencies(pb_rebuild_message_lib target_rebuild_message target_header)
-set_target_properties(pb_rebuild_message_lib
-                      PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-add_library(pb_remove_graph_message_lib STATIC remove_graph_message.pb.cc
-                                               remove_graph_message.pb.h)
-add_dependencies(pb_remove_graph_message_lib target_remove_graph_message
-                 target_header)
-set_target_properties(pb_remove_graph_message_lib
-                      PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
 set(otl_protobuf_files
     opentelemetry/proto/collector/metrics/v1/metrics_service
     opentelemetry/proto/metrics/v1/metrics
@@ -100,7 +68,7 @@ foreach(name IN LISTS otl_protobuf_files)
       --proto_path=${CMAKE_SOURCE_DIR}/opentelemetry-proto ${proto_file}
     VERBATIM)
 endforeach()
-           
+
 add_library(pb_open_telemetry_lib STATIC 
 ${CMAKE_SOURCE_DIR}/bbdo/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.cc
 ${CMAKE_SOURCE_DIR}/bbdo/opentelemetry/proto/metrics/v1/metrics.pb.cc
@@ -184,4 +152,4 @@ add_library(
   "bam/kpi_event.hh")
 set_target_properties(bbdo_bam PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_precompile_headers(bbdo_bam REUSE_FROM bbdo_bbdo)
-add_dependencies(bbdo_bam table_max_size pb_bam_lib)
+add_dependencies(bbdo_bam table_max_size pb_bam_lib pb_bam_state_lib)

bbdo/bbdo.proto

@@ -1,23 +1,24 @@
-/*
-** Copyright 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 2022-2024 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]
+ */
 syntax = "proto3";
 
+import "common.proto";
+
 package com.centreon.broker;
 
 /* Ignore */
@@ -33,6 +34,12 @@ message Welcome {
   string extensions = 2;
   uint64 poller_id = 3;
   string poller_name = 4;
+  /* Broker name is more relevant than poller name because for example on the
+   * central, rrd broker, central broker and engine share the same poller name
+   * that is 'Central'. */
+  string broker_name = 5;
+  com.centreon.common.PeerType peer_type = 6;
+  bool extended_negotiation = 7;
 }
 
 /* io::bbdo, bbdo::de_pb_ack, 50 */
@@ -44,3 +51,16 @@ message Ack {
 message Stop {
   uint64 poller_id = 1;
 }
+
+/* io::bbdo, bbdo::de_pb_engine_configuration, 52 */
+message EngineConfiguration {
+  uint64 poller_id = 1;    // Poller ID of the sender (Engine or Broker)
+  string poller_name = 2;  // Poller name of the sender
+  string broker_name = 3;  // Broker name of the sender
+  com.centreon.common.PeerType peer_type =
+      4;  // Peer type of the sender (Engine or Broker)
+  string engine_config_version =
+      5;  // Engine uses this to send the conf version
+  bool need_update =
+      6;  // Broker uses this to tell Engine if an update is needed
+}

bbdo/bbdo/ack.hh

@@ -20,7 +20,6 @@
 #define CCB_BBDO_ACK_HH
 
 #include "com/centreon/broker/bbdo/internal.hh"
-#include "com/centreon/broker/io/data.hh"
 #include "com/centreon/broker/io/events.hh"
 #include "com/centreon/broker/mapping/entry.hh"
 

bbdo/bbdo/stop.hh

@@ -20,7 +20,6 @@
 #define CCB_BBDO_STOP_HH
 
 #include "com/centreon/broker/bbdo/internal.hh"
-#include "com/centreon/broker/io/data.hh"
 #include "com/centreon/broker/io/events.hh"
 #include "com/centreon/broker/mapping/entry.hh"
 

bbdo/bbdo/version_response.hh

@@ -21,7 +21,6 @@
 
 #include "bbdo/bbdo/bbdo_version.hh"
 #include "com/centreon/broker/bbdo/internal.hh"
-#include "com/centreon/broker/io/data.hh"
 #include "com/centreon/broker/io/events.hh"
 #include "com/centreon/broker/mapping/entry.hh"
 

bbdo/common.proto

@@ -0,0 +1,33 @@
+/**
+* Copyright 2024 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]
+*/
+
+syntax = "proto3";
+
+package com.centreon.common;
+
+/**
+ * @brief Type of the peer. Used in Welcome message, also in the Broker gRPC
+ * service.
+ *
+ */
+enum PeerType {
+  UNKNOWN = 0;
+  BROKER = 1;
+  ENGINE = 2;
+  MAP = 3;
+}

bbdo/events.hh

@@ -93,7 +93,8 @@ enum data_element {
   de_remove_poller = 6,
   de_welcome = 7,
   de_pb_ack = 8,
-  de_pb_stop = 9
+  de_pb_stop = 9,
+  de_pb_engine_configuration = 10,
 };
 }
 namespace neb {

bbdo/neb.proto

@@ -424,7 +424,7 @@ message HostStatus {
  * @brief Message sent in BBDO 3.0.0 to update a host status partially
  * changed. For example, it is convenient for downtime changed.
  */
-/* io::neb, neb::de_pb_adaptive_host_status, 55 */
+/* io::neb, neb::de_pb_adaptive_host_status, 54 */
 message AdaptiveHostStatus {
   uint64 host_id = 1;
   optional int32 scheduled_downtime_depth = 2;
@@ -649,6 +649,7 @@ message Instance {
   int64 end_time = 7;
   int64 start_time = 8;
   string version = 9;
+  string engine_config_version = 10;
 }
 
 /* io::neb, neb::de_pb_responsive_instance, 19 */

broker/CMakeLists.txt

@@ -104,26 +104,28 @@ add_custom_command(
   COMMAND
     ${Protobuf_PROTOC_EXECUTABLE} ARGS
     --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} --proto_path=${SRC_DIR}
+    --proto_path=${CMAKE_SOURCE_DIR}/bbdo
     --proto_path=${CMAKE_SOURCE_DIR}/common/src --grpc_out="${SRC_DIR}"
     ${SRC_DIR}/broker.proto
   DEPENDS ${SRC_DIR}/broker.proto
   COMMENT "Generating interface files of the proto file (protobuf)"
   OUTPUT ${SRC_DIR}/broker.pb.cc ${SRC_DIR}/broker.pb.h
   COMMAND
     ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out="${SRC_DIR}"
+    --proto_path=${CMAKE_SOURCE_DIR}/bbdo
     --proto_path=${SRC_DIR} --proto_path=${CMAKE_SOURCE_DIR}/common/src
     ${SRC_DIR}/broker.proto
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
-add_custom_target("target_broker_message" DEPENDS "${SRC_DIR}/broker.pb.cc"
+add_custom_target(target_broker_message DEPENDS "${SRC_DIR}/broker.pb.cc"
                                                   "${SRC_DIR}/broker.pb.h")
 
 include_directories(${SRC_DIR} ${CMAKE_SOURCE_DIR}/common/src
                     ${CMAKE_SOURCE_DIR}/common/inc ${CMAKE_SOURCE_DIR}/bbdo)
 
 add_library(berpc STATIC ${SRC_DIR}/broker.grpc.pb.cc ${SRC_DIR}/broker.pb.cc
                          ${SRC_DIR}/broker.grpc.pb.h ${SRC_DIR}/broker.pb.h)
-target_link_libraries(berpc protobuf)
+target_link_libraries(berpc protobuf pb_common_lib)
 set_target_properties(berpc PROPERTIES COMPILE_FLAGS "-fPIC")
 
 # Version.
@@ -453,6 +455,7 @@ target_link_libraries(
   ctncrypto
   dl
   pb_bbdo_lib
+  pb_common_lib
   pb_extcmd_lib
   pb_open_telemetry_lib
   pthread

broker/bam/CMakeLists.txt

@@ -142,7 +142,7 @@ add_library(
   "${INC_DIR}/service_book.hh"
   "${INC_DIR}/service_listener.hh"
   "${INC_DIR}/timeperiod_map.hh")
-target_link_libraries("${BAM}" bbdo_storage bbdo_bam pb_bam_lib
+target_link_libraries("${BAM}" bbdo_storage bbdo_bam pb_bam_lib pb_bam_state_lib
                       spdlog::spdlog)
 target_precompile_headers(${BAM} PRIVATE precomp_inc/precomp.hpp)
 set_target_properties("${BAM}" PROPERTIES PREFIX "")

broker/bam/test/ba/kpi_ba.cc

@@ -46,7 +46,7 @@ class KpiBA : public ::testing::Test {
   void SetUp() override {
     // Initialization.
     _logger = log_v2::instance().get(log_v2::BAM);
-    config::applier::init(0, "test_broker", 0);
+    config::applier::init(com::centreon::common::BROKER, 0, "test_broker", 0);
 
     _aply_state = std::make_unique<bam::configuration::applier::state>(_logger);
     _state = std::make_unique<bam::configuration::state>(_logger);

broker/bam/test/ba/kpi_service.cc

@@ -37,7 +37,6 @@
 
 using namespace com::centreon::broker;
 
-
 class BamBA : public ::testing::Test {
  protected:
   std::unique_ptr<bam::configuration::applier::state> _aply_state;
@@ -49,7 +48,7 @@ class BamBA : public ::testing::Test {
   void SetUp() override {
     // Initialization.
     _logger = log_v2::instance().get(log_v2::BAM);
-    config::applier::init(0, "test_broker", 0);
+    config::applier::init(com::centreon::common::BROKER, 0, "test_broker", 0);
 
     _aply_state = std::make_unique<bam::configuration::applier::state>(_logger);
     _state = std::make_unique<bam::configuration::state>(_logger);

broker/bam/test/configuration/applier-boolexp.cc

@@ -30,7 +30,7 @@ class ApplierBoolexp : public ::testing::Test {
  public:
   void SetUp() override {
     // Initialization.
-    config::applier::init(0, "test_broker", 0);
+    config::applier::init(com::centreon::common::BROKER, 0, "test_broker", 0);
     auto logger = log_v2::instance().get(log_v2::BAM);
 
     _aply_state = std::make_unique<bam::configuration::applier::state>(logger);

broker/bam/test/exp_builder/exp_builder.cc

@@ -35,7 +35,6 @@
 using namespace com::centreon::broker;
 using log_v2 = com::centreon::common::log_v2::log_v2;
 
-
 class BamExpBuilder : public ::testing::Test {
  protected:
   std::unique_ptr<test_visitor> _visitor;
@@ -45,7 +44,7 @@ class BamExpBuilder : public ::testing::Test {
   void SetUp() override {
     _logger = log_v2::instance().get(log_v2::BAM);
     try {
-      config::applier::init(0, "test_broker", 0);
+      config::applier::init(com::centreon::common::BROKER, 0, "test_broker", 0);
       _logger->set_level(spdlog::level::debug);
       _logger->flush_on(spdlog::level::debug);
     } catch (std::exception const& e) {

broker/bam/test/monitoring_stream.cc

@@ -31,7 +31,9 @@ using namespace com::centreon::broker;
 using namespace com::centreon::broker::bam;
 
 class BamMonitoringStream : public testing::Test {
-  void SetUp() override { config::applier::init(0, "test_broker", 0); }
+  void SetUp() override {
+    config::applier::init(com::centreon::common::BROKER, 0, "test_broker", 0);
+  }
   void TearDown() override { config::applier::deinit(); }
 };