centreon-agent => centreon-monitoring-agent

.github/workflows/package-collect.yml

@@ -105,7 +105,7 @@ jobs:
         if: ${{ matrix.package_extension == 'rpm' }}
         run: |
           cd selinux
-          for MODULE in "centreon-engine" "centreon-broker" "centreon-agent"; do
+          for MODULE in "centreon-engine" "centreon-broker" "centreon-monitoring-agent"; do
             cd $MODULE
             sed -i "s/@VERSION@/${{ inputs.version }}/g" $MODULE.te
             make -f /usr/share/selinux/devel/Makefile

agent/CMakeLists.txt

@@ -140,7 +140,7 @@ target_include_directories(${CENTREON_AGENT} PRIVATE
 )
 
 set(AGENT_VAR_LOG_DIR
-    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/centreon-agent")
+    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/centreon-monitoring-agent")
 
 
 install(TARGETS ${CENTREON_AGENT} RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
@@ -150,8 +150,8 @@ if(WITH_TESTING)
 endif()
 
 
-set(PREFIX_AGENT_CONF "${CMAKE_INSTALL_FULL_SYSCONFDIR}/centreon-agent")
-set(USER_AGENT centreon-agent)
+set(PREFIX_AGENT_CONF "${CMAKE_INSTALL_FULL_SYSCONFDIR}/centreon-monitoring-agent")
+set(USER_AGENT centreon-monitoring-agent)
 
 
 if(WITH_CONF)

agent/scripts/centagent.service.in

@@ -26,7 +26,7 @@ ReloadPropagatedFrom=centreon.service
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/@CENTREON_AGENT@ @PREFIX_AGENT_CONF@/@[email protected]
 ExecReload=/bin/kill -HUP $MAINPID
 Type=simple
-User=centreon-agent
+User=@USER_AGENT@
 
 [Install]
 WantedBy=default.target

agent/src/main.cc

@@ -92,11 +92,12 @@ int main(int argc, char* argv[]) {
   }
 
   SPDLOG_INFO(
-      "centreon-agent start, you can decrease log verbosity by kill -USR1 "
+      "centreon-monitoring-agent start, you can decrease log verbosity by kill "
+      "-USR1 "
       "{} or increase by kill -USR2 {}",
       getpid(), getpid());
 
-  const std::string logger_name = "centreon-agent";
+  const std::string logger_name = "centreon-monitoring-agent";
 
   if (conf->get_log_type() == config::file) {
     try {
@@ -129,7 +130,7 @@ int main(int argc, char* argv[]) {
   g_logger->set_level(conf->get_log_level());
 
   SPDLOG_LOGGER_INFO(g_logger,
-                     "centreon-agent start, you can decrease log "
+                     "centreon-monitoring-agent start, you can decrease log "
                      "verbosity by kill -USR1 {} or increase by kill -USR2 {}",
                      getpid(), getpid());
   std::shared_ptr<com::centreon::common::grpc::grpc_config> grpc_conf;
@@ -159,7 +160,7 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  SPDLOG_LOGGER_INFO(g_logger, "centreon-agent end");
+  SPDLOG_LOGGER_INFO(g_logger, "centreon-monitoring-agent end");
 
   return 0;
 }

agent/test/CMakeLists.txt

@@ -43,7 +43,8 @@ target_link_libraries(ut_agent PRIVATE
     GTest::gmock_main
     -L${Boost_LIBRARY_DIR_RELEASE}
     boost_program_options
-      -L${PROTOBUF_LIB_DIR}
+    stdc++fs
+    -L${PROTOBUF_LIB_DIR}
     gRPC::gpr gRPC::grpc gRPC::grpc++ gRPC::grpc++_alts
     fmt::fmt pthread
     crypto ssl

packaging/centreon-engine-daemon.yaml

@@ -114,11 +114,6 @@ contents:
       owner: centreon-engine
       group: centreon-engine
 
-  - src: "/usr/lib/nagios/plugins"
-    dst: "/usr/lib64/nagios/plugins"
-    type: symlink
-    packager: deb
-
 scripts:
   preinstall: ./scripts/centreon-engine-daemon-preinstall.sh
   postinstall: ./scripts/centreon-engine-daemon-postinstall.sh

packaging/centreon-agent-debuginfo.yaml → packaging/centreon-monitoring-agent-debuginfo.yaml

@@ -1,4 +1,4 @@
-name: "centreon-agent-debuginfo"
+name: "centreon-monitoring-agent-debuginfo"
 arch: "${ARCH}"
 platform: "linux"
 version_schema: "none"
@@ -23,16 +23,16 @@ contents:
 overrides:
   rpm:
     depends:
-      - centreon-agent = ${VERSION}-${RELEASE}${DIST}
+      - centreon-monitoring-agent = ${VERSION}-${RELEASE}${DIST}
   deb:
     depends:
-      - centreon-agent (= ${VERSION}-${RELEASE}${DIST})
+      - centreon-monitoring-agent (= ${VERSION}-${RELEASE}${DIST})
     conflicts:
-      - centreon-agent-dbgsym
+      - centreon-monitoring-agent-dbgsym
     replaces:
-      - centreon-agent-dbgsym
+      - centreon-monitoring-agent-dbgsym
     provides:
-      - centreon-agent-dbgsym
+      - centreon-monitoring-agent-dbgsym
 
 rpm:
   summary: Debuginfo package for centagent.

packaging/centreon-monitoring-agent-selinux.yaml

@@ -0,0 +1,40 @@
+name: "centreon-monitoring-agent-selinux"
+arch: "${ARCH}"
+platform: "linux"
+version_schema: "none"
+version: "${VERSION}"
+release: "${RELEASE}${DIST}"
+section: "default"
+priority: "optional"
+maintainer: "Centreon <[email protected]>"
+description: |
+  SELinux context for centreon-monitoring-agent
+vendor: "Centreon"
+homepage: "https://centreon.com"
+license: "Apache-2.0"
+
+depends:
+  - policycoreutils
+  - centreon-common-selinux
+replaces:
+  - centreon-monitoring-agent-selinux-debuginfo
+conflicts:
+  - centreon-monitoring-agent-selinux-debuginfo
+provides:
+  - centreon-monitoring-agent-selinux-debuginfo
+
+contents:
+  - src: "../selinux/centreon-monitoring-agent/centreon-monitoring-agent.pp"
+    dst: "/usr/share/selinux/packages/centreon/centreon-monitoring-agent.pp"
+    file_info:
+      mode: 0655
+
+scripts:
+  postinstall: ./scripts/centreon-monitoring-agent-selinux-postinstall.sh
+  preremove: ./scripts/centreon-monitoring-agent-selinux-preremove.sh
+
+rpm:
+  summary: SELinux context for centreon-monitoring-agent
+  signature:
+    key_file: ${RPM_SIGNING_KEY_FILE}
+    key_id: ${RPM_SIGNING_KEY_ID}

packaging/centreon-agent.yaml → packaging/centreon-monitoring-agent.yaml

@@ -1,4 +1,4 @@
-name: "centreon-agent"
+name: "centreon-monitoring-agent"
 arch: "${ARCH}"
 platform: "linux"
 version_schema: "none"
@@ -16,12 +16,12 @@ license: "Apache-2.0"
 
 contents:
   - src: "../agent/conf/centagent.json"
-    dst: "/etc/centreon-agent/centagent.json"
+    dst: "/etc/centreon-monitoring-agent/centagent.json"
     type: config|noreplace
     file_info:
       mode: 0664
-      owner: centreon-agent
-      group: centreon-agent
+      owner: centreon-monitoring-agent
+      group: centreon-monitoring-agent
 
   - src: "../agent/scripts/centagent.service"
     dst: "/usr/lib/systemd/system/centagent.service"
@@ -37,25 +37,25 @@ contents:
   - src: "../build/agent/centagent"
     dst: "/usr/bin/centagent"
 
-  - dst: "/etc/centreon-agent"
+  - dst: "/etc/centreon-monitoring-agent"
     type: dir
     file_info:
       mode: 0775
-      owner: centreon-agent
-      group: centreon-agent
+      owner: centreon-monitoring-agent
+      group: centreon-monitoring-agent
 
-  - dst: "/var/log/centreon-agent"
+  - dst: "/var/log/centreon-monitoring-agent"
     type: dir
     file_info:
       mode: 0755
-      owner: centreon-agent
-      group: centreon-agent
+      owner: centreon-monitoring-agent
+      group: centreon-monitoring-agent
 
 scripts:
-  preinstall: ./scripts/centreon-agent-daemon-preinstall.sh
-  postinstall: ./scripts/centreon-agent-daemon-postinstall.sh
-  preremove: ./scripts/centreon-agent-daemon-preremove.sh
-  postremove: ./scripts/centreon-agent-daemon-postremove.sh
+  preinstall: ./scripts/centreon-monitoring-agent-daemon-preinstall.sh
+  postinstall: ./scripts/centreon-monitoring-agent-daemon-postinstall.sh
+  preremove: ./scripts/centreon-monitoring-agent-daemon-preremove.sh
+  postremove: ./scripts/centreon-monitoring-agent-daemon-postremove.sh
 
 
 rpm:

packaging/scripts/centreon-engine-daemon-postinstall.sh

@@ -8,6 +8,12 @@ startCentengine() {
   systemctl restart centengine.service ||:
 }
 
+debianLinkNagios() {
+  if [ ! -r /usr/lib64/nagios/plugins ]; then
+    ln -s /usr/lib/nagios/plugins /usr/lib64/nagios/plugins
+  fi
+}
+
 # on debian, it is needed to recreate centreon-engine user at each upgrade because it is removed on postrm step on versions < 23.10
 if [ "$1" = "configure" ] ; then
   if [ ! "$(getent passwd centreon-engine)" ]; then
@@ -45,6 +51,13 @@ elif [ "$1" = "configure" ] && [ -n "$2" ]; then
   action="upgrade"
 fi
 
+#In debian nagios plugins are stored in /usr/lib/nagios/plugins instead of /usr/lib64/nagios/plugins
+#so we create a link /usr/lib/nagios/plugins instead => /usr/lib64/nagios/plugins in order to have
+#the same commands configuration for all pollers
+if  [ "$1" = "configure" ]; then
+  debianLinkNagios
+fi
+
 case "$action" in
   "1" | "install")
     startCentengine

packaging/scripts/centreon-monitoring-agent-postinstall.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+startCentagent() {
+  systemctl daemon-reload ||:
+  systemctl unmask centagent.service ||:
+  systemctl preset centagent.service ||:
+  systemctl enable centagent.service ||:
+  systemctl restart centagent.service ||:
+}
+
+
+debianLinkNagios() {
+  if [ ! -r /usr/lib64/nagios/plugins ]; then
+    ln -s /usr/lib/nagios/plugins /usr/lib64/nagios/plugins
+  fi
+}
+
+#In debian nagios plugins are stored in /usr/lib/nagios/plugins instead of /usr/lib64/nagios/plugins
+#so we create a link /usr/lib/nagios/plugins instead => /usr/lib64/nagios/plugins in order to have
+#the same commands configuration for all pollers
+if  [ "$1" = "configure" ]; then
+  debianLinkNagios
+fi
+
+
+startCentagent
+

packaging/scripts/centreon-monitoring-agent-postremove.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+case "$1" in
+  purge)
+    deluser centreon-monitoring-agent || :
+    delgroup centreon-monitoring-agent || :
+  ;;
+esac

packaging/scripts/centreon-monitoring-agent-preinstall.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if ! id centreon-monitoring-agent > /dev/null 2>&1; then
+  useradd -r centreon-monitoring-agent > /dev/null 2>&1
+fi
+
+if id -g nagios > /dev/null 2>&1; then
+  usermod -a -G centreon-monitoring-agent nagios
+fi
+