Merge branch 'develop' into MON-53495

centreon · May 23, 2024 · 0a0705c · 0a0705c
2 parents 6d2557d + ad0fd66
commit 0a0705c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/centreon-gorgone/gorgone/modules/core/action/class.pm b/centreon-gorgone/gorgone/modules/core/action/class.pm
@@ -387,14 +387,14 @@ sub action_command {
         }
 
         if ($self->is_command_authorized(command => $command->{command})) {
-            $self->{logger}->writeLogInfo("[action] command not allowed (whitelist): " . $command->{command});
+            $self->{logger}->writeLogError("[action] command not allowed (whitelist): " . $command->{command});
             $self->send_log(
                 socket => $options{socket_log},
                 code => GORGONE_ACTION_FINISH_KO,
                 token => $options{token},
                 logging => $options{data}->{logging},
                 data => {
-                    message => "command not allowed (whitelist) at array index '" . $index . "'"
+                    message => "command not allowed (whitelist) at array index '$index' : $command->{command}"
                 }
             );
             return -1;
@@ -679,14 +679,14 @@ sub action_actionengine {
     }
 
     if ($self->is_command_authorized(command => $options{data}->{content}->{command})) {
-        $self->{logger}->writeLogInfo("[action] command not allowed (whitelist): " . $options{data}->{content}->{command});
+        $self->{logger}->writeLogError("[action] command not allowed (whitelist): " . $options{data}->{content}->{command});
         $self->send_log(
             socket => $options{socket_log},
             code => GORGONE_ACTION_FINISH_KO,
             token => $options{token},
             logging => $options{data}->{logging},
             data => {
-                message => 'command not allowed (whitelist)'
+                message => 'command not allowed (whitelist)' . $options{data}->{content}->{command}
             }
         );
         return -1;

diff --git a/centreon/unattended.sh b/centreon/unattended.sh
@@ -1173,7 +1173,7 @@ function install_central() {
 
 	log "INFO" "Centreon [$topology] installation from [${CENTREON_REPO}]"
 
-	if [[ "$version" =~ "24.0[1-9]" || "$version" =~ "24.1[0-2]" ]]; then
+	if [[ "$version" =~ ^24\.0[1-9]$ || "$version" =~ ^24\.1[0-2]$ ]]; then
 		if [[ $dbms == "MariaDB" ]]; then
 			CENTREON_DBMS_PKG="centreon-mariadb"
 		else