Merge branch 'develop' into new-centreon-log-management-plugin

Author: Nohzoh

.github/workflows/nrpe.yml

@@ -32,6 +32,9 @@ jobs:
       needs.get-environment.outputs.skip_workflow == 'false' &&
       needs.get-environment.outputs.stability != 'stable'
     runs-on: ubuntu-24.04
+    env:
+      nrpe_official_version: "4.1.3"
+
     strategy:
       fail-fast: false
       matrix:
@@ -69,8 +72,10 @@ jobs:
 
       - name: Download nrpe sources
         run: |
-          curl -sLo - "https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-${{ needs.get-environment.outputs.version }}/nrpe-${{ needs.get-environment.outputs.version }}.tar.gz" | tar zxpf -
-          mv nrpe-${{ needs.get-environment.outputs.version }} nrpe-src
+          # Pinning latest known release assets here instead of using get-environment output version
+          # since NRPE versioning is not in line with standard centreon plugins versioning
+          curl -sLo - "https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-${{ env.nrpe_official_version }}/nrpe-${{ env.nrpe_official_version }}.tar.gz" | tar zxpf -
+          mv nrpe-${{ env.nrpe_official_version }} nrpe-src
         shell: bash
 
       - name: Compile sources

.github/workflows/plugins-robot-tests.yml

@@ -62,6 +62,7 @@ jobs:
 
       - name: Load image
         run: |
+          docker image prune -af
           docker pull ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{inputs.image}}
         shell: bash
 

.github/workflows/plugins.yml

@@ -244,7 +244,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Prepare FatPacker
-        uses: shogo82148/actions-setup-perl@f9f0bf89e0d19ddbabb2f40d43db2e944bce7d2f # v1.36.0
+        uses: shogo82148/actions-setup-perl@b6cfc127f1b0a63ac98797800f641494d80f42f8 # v1.37.1
         with:
           perl-version: '5.34'
           install-modules-with: cpm

.github/workflows/spellchecker.yml

@@ -34,7 +34,7 @@ jobs:
               - added|modified: 'src/**/*.pm'
 
       - name: Install CPAN Libraries
-        uses: shogo82148/actions-setup-perl@f9f0bf89e0d19ddbabb2f40d43db2e944bce7d2f # v1.36.0
+        uses: shogo82148/actions-setup-perl@b6cfc127f1b0a63ac98797800f641494d80f42f8 # v1.37.1
         with:
           perl-version: '5.34'
           install-modules-with: cpm

nrpe/packaging/centreon-nrpe3-daemon.yaml

@@ -2,7 +2,7 @@ name: "centreon-nrpe3-daemon"
 arch: "amd64"
 platform: "linux"
 version_schema: "none"
-version: "4.1.0"
+version: "4.1.3"
 release: "${RELEASE}${DIST}"
 section: "default"
 priority: "optional"

nrpe/packaging/centreon-nrpe3-plugin.yaml

@@ -2,7 +2,7 @@ name: "centreon-nrpe3-plugin"
 arch: "amd64"
 platform: "linux"
 version_schema: "none"
-version: "4.1.0"
+version: "4.1.3"
 release: "${RELEASE}${DIST}"
 section: "default"
 priority: "optional"

nrpe/packaging/centreon-nrpe4-daemon.yaml

@@ -2,7 +2,7 @@ name: "centreon-nrpe4-daemon"
 arch: "amd64"
 platform: "linux"
 version_schema: "none"
-version: "4.1.0"
+version: "4.1.3"
 release: "${RELEASE}${DIST}"
 section: "default"
 priority: "optional"

src/apps/apache/serverstatus/mode/slotstates.pm

@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Centreon (http://www.centreon.com/)
+# Copyright 2026-Present Centreon (http://www.centreon.com/)
 #
 # Centreon is a full-fledged industry-strength solution that meets
 # the needs in IT infrastructure and application monitoring for
@@ -25,6 +25,7 @@ use base qw(centreon::plugins::templates::counter);
 use strict;
 use warnings;
 use centreon::plugins::http;
+use centreon::plugins::constants qw/:values :counters/;
 
 sub custom_value_threshold {
     my ($self, %options) = @_;
@@ -79,7 +80,7 @@ sub custom_value_calc {
     $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'};
     if ($self->{result_values}->{total} == 0) {
         $self->{error_msg} = "skipped";
-        return -2;
+        return NOT_PROCESSED;
     }
     $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}};    
     $self->{result_values}->{prct} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
@@ -92,7 +93,7 @@ sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
-        { name => 'global', type => 0, cb_prefix_output => 'prefix_global_output', skipped_code => { -2 => 1 } }
+        { name => 'global', type => COUNTER_TYPE_GLOBAL, cb_prefix_output => 'prefix_global_output', skipped_code => { NOT_PROCESSED() => 1 } }
     ];
 
     $self->{maps_counters}->{global} = [

src/apps/backup/backupexec/local/mode/jobs.pm

@@ -1,5 +1,5 @@
 #
-# Copyright 2024 Centreon (http://www.centreon.com/)
+# Copyright 2026-Present Centreon (http://www.centreon.com/)
 #
 # Centreon is a full-fledged industry-strength solution that meets
 # the needs in IT infrastructure and application monitoring for
@@ -27,6 +27,7 @@ use warnings;
 use centreon::common::powershell::backupexec::jobs;
 use apps::backup::backupexec::local::mode::resources::types qw($job_status $job_substatus $job_type);
 use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
+use centreon::plugins::constants qw(:values :counters);
 use centreon::plugins::misc;
 use JSON::XS;
 
@@ -57,9 +58,9 @@ sub custom_long_calc {
     $self->{result_values}->{type} = $options{new_datas}->{$self->{instance} . '_type'};
     $self->{result_values}->{isActive} = $options{new_datas}->{$self->{instance} . '_isActive'};
 
-    return -11 if ($self->{result_values}->{isActive} != 1);
+    return NOT_PROCESSED if ($self->{result_values}->{isActive} != 1);
 
-    return 0;
+    return RUN_OK;
 }
 
 sub prefix_job_output {
@@ -72,8 +73,8 @@ sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
-        { name => 'global', type => 0 },
-        { name => 'jobs', type => 1, cb_prefix_output => 'prefix_job_output', message_multiple => 'All jobs are ok', skipped_code => { -11 => 1, -10 => 1 } }
+        { name => 'global', type => COUNTER_TYPE_GLOBAL },
+        { name => 'jobs', type => COUNTER_TYPE_INSTANCE, cb_prefix_output => 'prefix_job_output', message_multiple => 'All jobs are ok', skipped_code => { NOT_PROCESSED() => 1, NO_VALUE() => 1 } }
     ];
 
     $self->{maps_counters}->{global} = [
@@ -88,7 +89,7 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{jobs} = [
-        { label => 'status', type => 2, critical_default => 'not %{status} =~ /succeeded/i', set => {
+        { label => 'status', type => COUNTER_KIND_TEXT, critical_default => 'not %{status} =~ /succeeded/i', set => {
                 key_values => [
                     { name => 'name' }, { name => 'type' },
                     { name => 'status' }, { name => 'subStatus' },
@@ -99,7 +100,7 @@ sub set_counters {
                 closure_custom_threshold_check => \&catalog_status_threshold_ng
             }
         },
-        { label => 'long', type => 2, set => {
+        { label => 'long', type => COUNTER_KIND_TEXT, set => {
                 key_values => [
                     { name => 'name' }, { name => 'type' },
                     { name => 'status' }, { name => 'subStatus' },

src/apps/backup/commvault/commserve/restapi/mode/jobs.pm

@@ -27,6 +27,7 @@ use warnings;
 use Digest::MD5 qw(md5_hex);
 use centreon::plugins::misc qw/is_excluded/;
 use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
+use centreon::plugins::constants qw(:values :counters);
 
 sub custom_status_output {
     my ($self, %options) = @_;
@@ -70,22 +71,22 @@ sub custom_long_calc {
     $self->{result_values}->{elapsed} = $options{new_datas}->{$self->{instance} . '_elapsed'};
     $self->{result_values}->{type} = $options{new_datas}->{$self->{instance} . '_type'};
 
-    return -11 if ($self->{result_values}->{status} !~ /running|queued|waiting/i);
+    return NOT_PROCESSED if ($self->{result_values}->{status} !~ /running|queued|waiting/i);
 
-    return 0;
+    return RUN_OK;
 }
 
 sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
-        { name => 'global', type => 0 },
-        { name => 'policy', type => 2,
+        { name => 'global', type => COUNTER_TYPE_GLOBAL },
+        { name => 'policy', type => COUNTER_TYPE_GROUP,
           cb_prefix_output        => 'prefix_policy_output', 
           cb_long_output          => 'policy_long_output',
           display_counter_problem => { nlabel => 'jobs.problems.current.count', min => 0 },
           message_multiple        => 'All policies are ok',
-          group => [ { name => 'job', cb_prefix_output => 'prefix_job_output', skipped_code => { -11 => 1 } } ]
+          group => [ { name => 'job', cb_prefix_output => 'prefix_job_output', skipped_code => { NOT_PROCESSED() => 1 } } ]
         }
     ];
 
@@ -103,7 +104,7 @@ sub set_counters {
     $self->{maps_counters}->{job} = [
         {
             label => 'status',
-            type => 2,
+            type => COUNTER_KIND_TEXT,
             warning_default => '%{status} =~ /abnormal/i',
             critical_default => '%{status} =~ /errors|failed/i',
             set => {
@@ -114,7 +115,7 @@ sub set_counters {
                 closure_custom_threshold_check => \&catalog_status_threshold_ng
             }
         },
-        { label => 'long', type => 2, set => {
+        { label => 'long', type => COUNTER_KIND_TEXT, set => {
                 key_values => [
                     { name => 'status' }, { name => 'display' }, { name => 'elapsed' }, { name => 'type' }, { name => 'client_name' }
                 ],