Merge branch 'master' into sync-hotfix-20241018

as400/changelog

@@ -1,3 +1,6 @@
+2024-10-18 Pieter Kippes <[email protected]> - 2.0.5
+ * Fixed packaging for config files
+
 2024-10-11 Olivier Mercier <[email protected]> - 2.0.4
  * Use io.undertow 2.3.17
 

as400/connector.as400.install/init-script/centreon-as400-sysconfig

@@ -1,5 +1,5 @@
 # centreon-as400 command line options
-JAVA_OPTS="-Xms128M -Xmx2G -XX:MaxPermSize=128m"
+JAVA_OPTS="-Xms128M -Xmx2G"
 CONNECTOR_OPTS="--port 8091"
 CONNECTOR_HOME=@CONNECTOR_HOME@
 CONNECTOR_ETC=@CONNECTOR_ETC@

as400/connector.as400/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.centreon.connector</groupId>
     <artifactId>centreon-as400</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <name>Centreon-AS/400</name>
     <description>Connecteur AS/400</description>
     <packaging>jar</packaging>

as400/packaging/centreon-as400-daemon.yaml

@@ -2,7 +2,7 @@ name: "centreon-plugin-Operatingsystems-AS400-daemon"
 arch: "${ARCH}"
 platform: "linux"
 version_schema: "none"
-version: "2.0.4"
+version: "2.0.5"
 release: "${RELEASE}${DIST}"
 section: "default"
 priority: "optional"
@@ -28,17 +28,20 @@ contents:
       mode: 0644
 
   - src: "../connector.as400.install/init-script/centreon-as400-sysconfig"
-    dst: "/etc/sysconfig/centreon-as400-sysconfig"
+    dst: "/etc/sysconfig/centreon-as400"
+    type: config|noreplace
     file_info:
       mode: 0644
 
   - src: "../connector.as400.install/etc/config.properties"
     dst: "/etc/centreon-as400/config.properties"
+    type: config|noreplace
     file_info:
       mode: 0644
 
   - src: "../connector.as400.install/etc/log4j2.xml"
     dst: "/etc/centreon-as400/log4j2.xml"
+    type: config|noreplace
     file_info:
       mode: 0644
 
@@ -66,4 +69,4 @@ rpm:
   summary: Centreon AS 400 Plugin daemon
   signature:
     key_file: ${RPM_SIGNING_KEY_FILE}
-    key_id: ${RPM_SIGNING_KEY_ID}
+    key_id: ${RPM_SIGNING_KEY_ID}

connectors/vmware/changelog

@@ -1,3 +1,7 @@
+2024-10-18 Olivier Mercier <[email protected]> - 3.3.2
+ * Fix: regression of case sensitiveness for container names fixed
+ * Enhancement: log messages related to the vault have been downgraded from error to info level or explained as safe to ignore if not using the vault
+
 2024-10-10 Olivier Mercier <[email protected]> - 3.3.1
  * Fix: add missing centreonvault.pm file to packaging
 

connectors/vmware/src/centreon/script/centreon_vmware.pm

@@ -54,7 +54,7 @@ BEGIN {
 
 use base qw(centreon::vmware::script);
 
-my $VERSION = '3.3.1';
+my $VERSION = '3.3.2';
 my %handlers = (TERM => {}, HUP => {}, CHLD => {});
 
 my @load_modules = (
@@ -158,6 +158,13 @@ sub read_configuration {
         our %centreon_vmware_config;
         # loads the .pm configuration (compile time)
         require($self->{opt_extra}) or $self->{logger}->writeLogFatal("There has been an error while requiring file " . $self->{opt_extra});
+        # We want all the keys to be lowercase
+        for my $conf_key (keys %{$centreon_vmware_config{vsphere_server}}) {
+            if ($conf_key ne lc($conf_key)) {
+                $self->{logger}->writeLogDebug("The container $conf_key has capital letters. We convert it to lower case.");
+                $centreon_vmware_config{vsphere_server}->{lc($conf_key)} = delete $centreon_vmware_config{vsphere_server}->{$conf_key};
+            }
+        }
         # Concatenation of the default parameters with the ones from the config file
         $self->{centreon_vmware_config} = {%{$self->{centreon_vmware_default_config}}, %centreon_vmware_config};
     } elsif ($self->{opt_extra} =~ /.*\.json$/i) {

connectors/vmware/src/centreon/script/centreonvault.pm

@@ -42,7 +42,7 @@ sub new {
 
     if ( !$self->init() ) {
         $self->{enabled} = 0;
-        $self->{logger}->writeLogError("An error occurred in init() method. Centreonvault cannot be used.");
+        $self->{logger}->writeLogInfo("Something happened during init() method that makes Centreonvault not usable. Ignore this if you don't use Centreonvault.");
     }
     return $self;
 }
@@ -86,7 +86,7 @@ sub check_options {
     }
     if ( ! -f $self->{config_file} ) {
         $self->{logger}->writeLogError("The given configuration file " . $self->{config_file}
-            . " does not exist. Centreonvault cannot be used.");
+            . " does not exist. Passwords won't be retrieved from Centreonvault. Ignore this if you don't use Centreonvault.");
         return undef;
     }
 

connectors/vmware/src/centreon/vmware/common.pm

@@ -45,7 +45,7 @@ sub init_response {
     my (%options) = @_;
 
     $manager_response->{code} = 0;
-    $manager_response->{vmware_connector_version} = '3.3.0';
+    $manager_response->{vmware_connector_version} = '3.3.2';
     $manager_response->{short_message} = 'OK';
     $manager_response->{extra_message} = '';
     $manager_response->{identity} = $options{identity} if (defined($options{identity}));