diff --git a/.github/actions/package-nfpm/action.yml b/.github/actions/package-nfpm/action.yml index 50bc05e38..cc3d24650 100644 --- a/.github/actions/package-nfpm/action.yml +++ b/.github/actions/package-nfpm/action.yml @@ -10,6 +10,9 @@ inputs: distrib: description: The package distrib required: true + version: + description: The package version ([major_version].[minor_version]) + required: false major_version: description: The major version required: false @@ -18,7 +21,7 @@ inputs: required: false release: description: The package release number - required: false + required: true arch: description: The package architecture required: false @@ -37,6 +40,9 @@ inputs: rpm_gpg_signing_passphrase: description: The rpm gpg signing passphrase required: true + stability: + description: "Branch stability (stable, testing, unstable, canary)" + required: true runs: using: composite @@ -59,8 +65,15 @@ runs: RPM_GPG_SIGNING_KEY_ID: ${{ inputs.rpm_gpg_signing_key_id }} RPM_GPG_SIGNING_PASSPHRASE: ${{ inputs.rpm_gpg_signing_passphrase }} run: | - export MAJOR_VERSION="${{ inputs.major_version }}" - export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}" + if [ -z ${{ inputs.version }} ]; then + export VERSION="${{ inputs.major_version }}.${{ inputs.minor_version }}" + export MAJOR_VERSION="${{ inputs.major_version }}" + export MINOR_VERSION="${{ inputs.minor_version }}" + elif [ -z ${{ inputs.major_version }} ]; then + export VERSION="${{ inputs.version }}" + export MAJOR_VERSION=$( echo $VERSION | cut -d "-" -f1 ) + export MINOR_VERSION=$( echo $VERSION | cut -d "-" -f2 ) + fi export RELEASE="${{ inputs.release }}" export ARCH="${{ inputs.arch }}" @@ -70,23 +83,28 @@ runs: export APACHE_GROUP="apache" else export DIST="" + if [ "${{ inputs.stability }}" == "unstable" ] || [ "${{ inputs.stability }}" == "canary" ]; then + export RELEASE="$RELEASE~${{ inputs.distrib }}" + elif [ "${{ inputs.stability }}" == "testing" ]; then + export RELEASE="1~${{ inputs.distrib }}" + fi export APACHE_USER="www-data" export APACHE_GROUP="www-data" fi - MAJOR_LEFT=$( echo $MAJOR_VERSION | cut -d "." -f1 ) - MAJOR_RIGHT=$( echo $MAJOR_VERSION | cut -d "-" -f1 | cut -d "." -f2 ) - BUMP_MAJOR_RIGHT=$(( MAJOR_RIGHT_PART + 1 )) - if [ "$MAJOR_RIGHT" = "04" ]; then - BUMP_MAJOR_LEFT="$MAJOR_LEFT" - BUMP_MAJOR_RIGHT="10" - else - BUMP_MAJOR_LEFT=$(( $MAJOR_LEFT + 1 )) - BUMP_MAJOR_RIGHT="04" + if [ -z "$MAJOR_VERSION" ]; then + MAJOR_LEFT=$( echo $VERSION | cut -d "." -f1 ) + MAJOR_RIGHT=$( echo $VERSION | cut -d "-" -f1 | cut -d "." -f2 ) + if [ "$MAJOR_RIGHT" == "04" ]; then + BUMP_MAJOR_LEFT="$MAJOR_LEFT" + BUMP_MAJOR_RIGHT="10" + else + BUMP_MAJOR_LEFT=$(( $MAJOR_LEFT + 1 )) + BUMP_MAJOR_RIGHT="04" + fi + export NEXT_MAJOR_VERSION="$BUMP_MAJOR_LEFT.$BUMP_MAJOR_RIGHT" fi - export NEXT_MAJOR_VERSION="$BUMP_MAJOR_LEFT.$BUMP_MAJOR_RIGHT" - export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg" export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID" export NFPM_RPM_PASSPHRASE="$RPM_GPG_SIGNING_PASSPHRASE" diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml deleted file mode 100644 index 5d669333b..000000000 --- a/.github/actions/package/action.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: package -description: Package module using nfpm -inputs: - nfpm_file_pattern: - description: The pattern of the nfpm configuration file(s) - required: true - package_extension: - description: The package extension (deb or rpm) - required: true - distrib: - description: The package distrib - required: true - version: - description: The package version - required: false - release: - description: The package release number - required: false - commit_hash: - description: The commit hash - required: true - cache_key: - description: The package files cache key - required: true - rpm_gpg_key: - description: The rpm gpg key - required: true - rpm_gpg_signing_key_id: - description: The rpm gpg signing key identifier - required: true - rpm_gpg_signing_passphrase: - description: The rpm gpg signing passphrase - required: true - stability: - description: "The package stability (stable, testing, unstable, canary)" - required: true - -runs: - using: composite - - steps: - - name: Import gpg key - env: - RPM_GPG_SIGNING_KEY: ${{ inputs.rpm_gpg_key }} - run: echo -n "$RPM_GPG_SIGNING_KEY" > key.gpg - shell: bash - - - name: Build ${{ inputs.package_extension }} files - env: - RPM_GPG_SIGNING_KEY_ID: ${{ inputs.rpm_gpg_signing_key_id }} - RPM_GPG_SIGNING_PASSPHRASE: ${{ inputs.rpm_gpg_signing_passphrase }} - run: | - export VERSION="${{ inputs.version }}" - export RELEASE="${{ inputs.release }}" - - if [ "${{ inputs.package_extension }}" = "rpm" ]; then - export DIST=".${{ inputs.distrib }}" - else - if [ "${{ inputs.stability }}" = "unstable" ] || [ "${{ inputs.stability }}" = "canary" ]; then - export RELEASE="$RELEASE-${{ inputs.distrib }}" - elif [ "${{ inputs.stability }}" = "testing" ]; then - export RELEASE="${{ inputs.distrib }}" - fi - export DIST="" - fi - - export RPM_SIGNING_KEY_FILE="$(pwd)/key.gpg" - export RPM_SIGNING_KEY_ID="$RPM_GPG_SIGNING_KEY_ID" - export NFPM_RPM_PASSPHRASE="$RPM_GPG_SIGNING_PASSPHRASE" - - for FILE in ${{ inputs.nfpm_file_pattern }}; do - DIRNAME=$(dirname $FILE) - BASENAME=$(basename $FILE) - cd $DIRNAME - sed -i "s/@COMMIT_HASH@/${{ inputs.commit_hash }}/g" $BASENAME - nfpm package --config $BASENAME --packager ${{ inputs.package_extension }} - cd - - mv $DIRNAME/*.${{ inputs.package_extension }} ./ - done - shell: bash - - - name: Upload package artifacts - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 - with: - name: packages-${{ inputs.distrib }} - path: ./*.${{ inputs.package_extension }} - retention-days: 1 - - - name: Cache packages - uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 - with: - path: ./*.${{ inputs.package_extension }} - key: ${{ inputs.cache_key }} diff --git a/.github/workflows/connector-vmware.yml b/.github/workflows/connector-vmware.yml index 08afc8a8f..2fa17f036 100644 --- a/.github/workflows/connector-vmware.yml +++ b/.github/workflows/connector-vmware.yml @@ -60,7 +60,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "connectors/vmware/packaging/centreon-plugin-virtualization-vmware-daemon.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/nrpe.yml b/.github/workflows/nrpe.yml index e84ec58ec..68722820d 100644 --- a/.github/workflows/nrpe.yml +++ b/.github/workflows/nrpe.yml @@ -100,7 +100,7 @@ jobs: shell: bash - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "nrpe/packaging/*.yaml" distrib: ${{ matrix.distrib }} @@ -143,7 +143,7 @@ jobs: strategy: matrix: - distrib: [bullseye] + distrib: [bullseye, bookworm] steps: - name: Checkout sources diff --git a/.github/workflows/perl-crypt-argon2.yml b/.github/workflows/perl-crypt-argon2.yml index 16119fe18..4e281bb13 100644 --- a/.github/workflows/perl-crypt-argon2.yml +++ b/.github/workflows/perl-crypt-argon2.yml @@ -119,11 +119,13 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: 3 commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-crypt-argon2-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-json-path.yml b/.github/workflows/perl-json-path.yml index f70f82424..5c9b554c5 100644 --- a/.github/workflows/perl-json-path.yml +++ b/.github/workflows/perl-json-path.yml @@ -104,12 +104,14 @@ jobs: nfpm_file_pattern: "dependencies/perl-json-path/perl-json-path.yaml" distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} + release: 3 arch: all commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-json-path-${{ matrix.distrib }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-libssh-session.yml b/.github/workflows/perl-libssh-session.yml index d25ffa6ff..663a13b69 100644 --- a/.github/workflows/perl-libssh-session.yml +++ b/.github/workflows/perl-libssh-session.yml @@ -117,11 +117,13 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: 4 commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-libssh-session-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-net-curl.yml b/.github/workflows/perl-net-curl.yml index 326b51809..83547316c 100644 --- a/.github/workflows/perl-net-curl.yml +++ b/.github/workflows/perl-net-curl.yml @@ -118,10 +118,12 @@ jobs: package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + release: 3 + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-net-curl-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} # set condition to true if artifacts are needed - if: ${{ false }} @@ -129,7 +131,7 @@ jobs: uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: packages-${{ matrix.distrib }}-${{ matrix.arch }} - path: ./*.${{ matrix.package_extension}} + path: ./*.${{ matrix.package_extension }} retention-days: 1 deliver-rpm: diff --git a/.github/workflows/perl-openwsman.yml b/.github/workflows/perl-openwsman.yml index 82b188f2c..b948eda3a 100644 --- a/.github/workflows/perl-openwsman.yml +++ b/.github/workflows/perl-openwsman.yml @@ -157,11 +157,13 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: 2 commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-sblim-sfcc-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} - name: Package libwsman uses: ./.github/actions/package-nfpm @@ -170,11 +172,13 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: 4 commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-libwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} - name: Package perl-openwsman uses: ./.github/actions/package-nfpm @@ -183,11 +187,13 @@ jobs: distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} arch: ${{ matrix.arch }} + release: 4 commit_hash: ${{ github.sha }} - cache_key: cache-${{ github.sha }}-${{ matrix.package_extension}}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} + cache_key: cache-${{ github.sha }}-${{ matrix.package_extension }}-perl-openwsman-${{ matrix.distrib }}-${{ matrix.arch }}-${{ github.head_ref || github.ref_name }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} rpm_gpg_signing_passphrase: ${{ secrets.RPM_GPG_SIGNING_PASSPHRASE }} + stability: ${{ needs.get-environment.outputs.stability }} # set condition to true if artifacts are needed - if: ${{ false }} diff --git a/.github/workflows/perl-vmware-vsphere.yml b/.github/workflows/perl-vmware-vsphere.yml index 0a234d329..caa7d2da1 100644 --- a/.github/workflows/perl-vmware-vsphere.yml +++ b/.github/workflows/perl-vmware-vsphere.yml @@ -88,12 +88,13 @@ jobs: fail-on-cache-miss: true - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "dependencies/perl-vmware-vsphere/packaging/perl-vmware-vsphere.yaml" distrib: ${{ matrix.distrib }} package_extension: ${{ matrix.package_extension }} commit_hash: ${{ github.sha }} + release: ${{ needs.get-environment.outputs.release }} cache_key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-${{ matrix.distrib }} rpm_gpg_key: ${{ secrets.RPM_GPG_SIGNING_KEY }} rpm_gpg_signing_key_id: ${{ secrets.RPM_GPG_SIGNING_KEY_ID }} diff --git a/.github/workflows/plugins-selinux.yml b/.github/workflows/plugins-selinux.yml index fe7e92ea1..0236b5aa0 100644 --- a/.github/workflows/plugins-selinux.yml +++ b/.github/workflows/plugins-selinux.yml @@ -55,7 +55,7 @@ jobs: shell: bash - name: Package - uses: ./.github/actions/package + uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: "selinux/packaging/centreon-plugins-selinux.yaml" distrib: ${{ matrix.distrib }} diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml index 02e1553eb..09199674d 100644 --- a/.github/workflows/plugins.yml +++ b/.github/workflows/plugins.yml @@ -220,7 +220,7 @@ jobs: done shell: bash - - uses: ./.github/actions/package + - uses: ./.github/actions/package-nfpm with: nfpm_file_pattern: ".github/packaging/*.yaml" distrib: ${{ matrix.distrib }} diff --git a/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml b/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml index 57945b531..943d069dd 100644 --- a/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml +++ b/dependencies/perl-crypt-argon2/perl-crypt-argon2.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.019" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-json-path/perl-json-path.yaml b/dependencies/perl-json-path/perl-json-path.yaml index d44ed290a..8d968c366 100644 --- a/dependencies/perl-json-path/perl-json-path.yaml +++ b/dependencies/perl-json-path/perl-json-path.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-libssh-session/perl-libssh-session.yaml b/dependencies/perl-libssh-session/perl-libssh-session.yaml index b63ba2796..a1f9c7116 100644 --- a/dependencies/perl-libssh-session/perl-libssh-session.yaml +++ b/dependencies/perl-libssh-session/perl-libssh-session.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.8" -release: "3${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-net-curl/perl-net-curl.yaml b/dependencies/perl-net-curl/perl-net-curl.yaml index 7648ba9e2..61cdfccf6 100644 --- a/dependencies/perl-net-curl/perl-net-curl.yaml +++ b/dependencies/perl-net-curl/perl-net-curl.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "0.54" -release: "2${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/libwsman.yaml b/dependencies/perl-openwsman/libwsman.yaml index 4af6428b4..637fe8395 100644 --- a/dependencies/perl-openwsman/libwsman.yaml +++ b/dependencies/perl-openwsman/libwsman.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "1${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/perl-openwsman.yaml b/dependencies/perl-openwsman/perl-openwsman.yaml index 08572463a..b30faae46 100644 --- a/dependencies/perl-openwsman/perl-openwsman.yaml +++ b/dependencies/perl-openwsman/perl-openwsman.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "@VERSION@" -release: "3${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/dependencies/perl-openwsman/sblim-sfcc.yaml b/dependencies/perl-openwsman/sblim-sfcc.yaml index a3be033e7..fe6cf25c8 100644 --- a/dependencies/perl-openwsman/sblim-sfcc.yaml +++ b/dependencies/perl-openwsman/sblim-sfcc.yaml @@ -3,7 +3,7 @@ arch: "${ARCH}" platform: "linux" version_schema: "none" version: "2.7.2" -release: "1${DIST}" +release: "${RELEASE}${DIST}" section: "default" priority: "optional" maintainer: "Centreon " diff --git a/src/apps/java/jvm/actuator/mode/cpuload.pm b/src/apps/java/jvm/actuator/mode/cpuload.pm index a6d817f76..27ff03fee 100644 --- a/src/apps/java/jvm/actuator/mode/cpuload.pm +++ b/src/apps/java/jvm/actuator/mode/cpuload.pm @@ -86,19 +86,19 @@ WARN : Probably not work for java -version < 7. =item B<--warning-system> -Warning threshold of System cpuload +Warning threshold of system CPU load. =item B<--critical-system> -Critical threshold of System cpuload +Critical threshold of system CPU load. =item B<--warning-process> -Warning threshold of Process cpuload +Warning threshold of process CPU load. =item B<--critical-process> -Critical threshold of Process cpuload +Critical threshold of process CPU load. =back diff --git a/src/apps/protocols/http/mode/collection.pm b/src/apps/protocols/http/mode/collection.pm index 3aae1dc25..1ddddb697 100644 --- a/src/apps/protocols/http/mode/collection.pm +++ b/src/apps/protocols/http/mode/collection.pm @@ -1957,7 +1957,7 @@ __END__ =head1 MODE -Collect and compute HTTP datas. +Collect and compute HTTP data. =over 8 diff --git a/src/apps/protocols/snmp/mode/cache.pm b/src/apps/protocols/snmp/mode/cache.pm index 582104f7e..cfc6e0ddf 100644 --- a/src/apps/protocols/snmp/mode/cache.pm +++ b/src/apps/protocols/snmp/mode/cache.pm @@ -94,7 +94,7 @@ __END__ =head1 MODE -Cache SNMP datas in a JSON cache file. +Cache SNMP data in a JSON cache file. =over 8 diff --git a/src/apps/protocols/snmp/mode/collection.pm b/src/apps/protocols/snmp/mode/collection.pm index 2a224d014..625bbc531 100644 --- a/src/apps/protocols/snmp/mode/collection.pm +++ b/src/apps/protocols/snmp/mode/collection.pm @@ -1646,7 +1646,7 @@ __END__ =head1 MODE -Collect and compute SNMP datas. +Collect and compute SNMP data. =over 8 diff --git a/src/apps/virtualization/ovirt/mode/cpuhost.pm b/src/apps/virtualization/ovirt/mode/cpuhost.pm index 70a12a884..5077ad417 100644 --- a/src/apps/virtualization/ovirt/mode/cpuhost.pm +++ b/src/apps/virtualization/ovirt/mode/cpuhost.pm @@ -111,7 +111,7 @@ __END__ =head1 MODE -Check host cpu utilization. +Check host CPU utilization. =over 8 diff --git a/src/apps/vmware/connector/mode/cpucluster.pm b/src/apps/vmware/connector/mode/cpucluster.pm index 33644d202..9f522d33f 100644 --- a/src/apps/vmware/connector/mode/cpucluster.pm +++ b/src/apps/vmware/connector/mode/cpucluster.pm @@ -115,7 +115,7 @@ __END__ =head1 MODE -Check cluster cpu usage. +Check cluster CPU usage. =over 8 diff --git a/src/apps/vmware/connector/mode/cpuhost.pm b/src/apps/vmware/connector/mode/cpuhost.pm index a60d4a42f..810a9315d 100644 --- a/src/apps/vmware/connector/mode/cpuhost.pm +++ b/src/apps/vmware/connector/mode/cpuhost.pm @@ -173,7 +173,7 @@ __END__ =head1 MODE -Check ESX cpu usage. +Check ESX CPU usage. =over 8 diff --git a/src/apps/vmware/connector/mode/cpuvm.pm b/src/apps/vmware/connector/mode/cpuvm.pm index ed93d99df..6ca365380 100644 --- a/src/apps/vmware/connector/mode/cpuvm.pm +++ b/src/apps/vmware/connector/mode/cpuvm.pm @@ -197,7 +197,7 @@ __END__ =head1 MODE -Check virtual machine cpu usage. +Check virtual machine CPU usage. =over 8 diff --git a/src/apps/vmware/vcsa/snmp/mode/cpu.pm b/src/apps/vmware/vcsa/snmp/mode/cpu.pm index b20c67101..893514e41 100644 --- a/src/apps/vmware/vcsa/snmp/mode/cpu.pm +++ b/src/apps/vmware/vcsa/snmp/mode/cpu.pm @@ -39,7 +39,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU. =over 8 diff --git a/src/apps/vmware/vcsa/snmp/mode/interfaces.pm b/src/apps/vmware/vcsa/snmp/mode/interfaces.pm index 75c7bd2e9..193b4bbf8 100644 --- a/src/apps/vmware/vcsa/snmp/mode/interfaces.pm +++ b/src/apps/vmware/vcsa/snmp/mode/interfaces.pm @@ -177,7 +177,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/apps/vmware/vcsa/snmp/mode/storage.pm b/src/apps/vmware/vcsa/snmp/mode/storage.pm index a73748ee8..2775517fc 100644 --- a/src/apps/vmware/vcsa/snmp/mode/storage.pm +++ b/src/apps/vmware/vcsa/snmp/mode/storage.pm @@ -110,7 +110,7 @@ Example: adding --display-transform-src='dev' --display-transform-dst='run' wil =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--space-reservation> diff --git a/src/centreon/common/airespace/snmp/mode/cpu.pm b/src/centreon/common/airespace/snmp/mode/cpu.pm index d631ff08e..61b5983bb 100644 --- a/src/centreon/common/airespace/snmp/mode/cpu.pm +++ b/src/centreon/common/airespace/snmp/mode/cpu.pm @@ -73,7 +73,7 @@ __END__ =head1 MODE -Check cpu usage (AIRESPACE-SWITCHING-MIB). +Check CPU usage (AIRESPACE-SWITCHING-MIB). =over 8 diff --git a/src/centreon/common/bluearc/snmp/mode/interfaces.pm b/src/centreon/common/bluearc/snmp/mode/interfaces.pm index d18f9f58f..70b499717 100644 --- a/src/centreon/common/bluearc/snmp/mode/interfaces.pm +++ b/src/centreon/common/bluearc/snmp/mode/interfaces.pm @@ -185,7 +185,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/centreon/common/cisco/ironport/snmp/mode/cpu.pm b/src/centreon/common/cisco/ironport/snmp/mode/cpu.pm index bdb5629c4..8df319dd2 100644 --- a/src/centreon/common/cisco/ironport/snmp/mode/cpu.pm +++ b/src/centreon/common/cisco/ironport/snmp/mode/cpu.pm @@ -84,7 +84,7 @@ __END__ =head1 MODE -Check cpu usage of web security and mail (ASYNCOS-MAIL-MIB, ASYNCOSWEBSECURITYAPPLIANCE-MIB). +Check CPU usage of web security and mail (ASYNCOS-MAIL-MIB, ASYNCOSWEBSECURITYAPPLIANCE-MIB). =over 8 diff --git a/src/centreon/common/cisco/smallbusiness/snmp/mode/cpu.pm b/src/centreon/common/cisco/smallbusiness/snmp/mode/cpu.pm index 937559c89..7fc89033d 100644 --- a/src/centreon/common/cisco/smallbusiness/snmp/mode/cpu.pm +++ b/src/centreon/common/cisco/smallbusiness/snmp/mode/cpu.pm @@ -126,7 +126,7 @@ __END__ =head1 MODE -Check cpu usage (CISCOSBmng.mib). +Check CPU usage (CISCOSBmng.mib). =over 8 diff --git a/src/centreon/common/cisco/standard/snmp/mode/cpu.pm b/src/centreon/common/cisco/standard/snmp/mode/cpu.pm index faf97fd78..b845d8e2d 100644 --- a/src/centreon/common/cisco/standard/snmp/mode/cpu.pm +++ b/src/centreon/common/cisco/standard/snmp/mode/cpu.pm @@ -265,13 +265,13 @@ __END__ =head1 MODE -Check cpu usage (CISCO-PROCESS-MIB and CISCO-SYSTEM-EXT-MIB). +Check CPU usage (CISCO-PROCESS-MIB and CISCO-SYSTEM-EXT-MIB). =over 8 =item B<--check-order> -Check cpu in standard cisco mib. If you have some issue (wrong cpu information in a specific mib), you can change the order +Check CPU in standard cisco mib. If you have some issue (wrong CPU information in a specific mib), you can change the order (default: 'process,old_sys,system_ext'). =item B<--warning-*> B<--critical-*> diff --git a/src/centreon/common/cisco/standard/snmp/mode/interfaces.pm b/src/centreon/common/cisco/standard/snmp/mode/interfaces.pm index aef987560..8fddf4a3f 100644 --- a/src/centreon/common/cisco/standard/snmp/mode/interfaces.pm +++ b/src/centreon/common/cisco/standard/snmp/mode/interfaces.pm @@ -456,7 +456,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/centreon/common/cisco/standard/snmp/mode/load.pm b/src/centreon/common/cisco/standard/snmp/mode/load.pm index deae192e4..9bee27b9f 100644 --- a/src/centreon/common/cisco/standard/snmp/mode/load.pm +++ b/src/centreon/common/cisco/standard/snmp/mode/load.pm @@ -128,7 +128,7 @@ __END__ =head1 MODE -Check cpu load usage. +Check CPU load. =over 8 diff --git a/src/centreon/common/dell/fastpath/snmp/mode/cpu.pm b/src/centreon/common/dell/fastpath/snmp/mode/cpu.pm index 3b0ee7439..85dc7e181 100644 --- a/src/centreon/common/dell/fastpath/snmp/mode/cpu.pm +++ b/src/centreon/common/dell/fastpath/snmp/mode/cpu.pm @@ -161,7 +161,7 @@ __END__ =head1 MODE -Check cpu usage (FASTPATH-SWITCHING-MIB). +Check CPU usage (FASTPATH-SWITCHING-MIB). =over 8 diff --git a/src/centreon/common/force10/snmp/mode/cpu.pm b/src/centreon/common/force10/snmp/mode/cpu.pm index fe2373422..e7b4d5f08 100644 --- a/src/centreon/common/force10/snmp/mode/cpu.pm +++ b/src/centreon/common/force10/snmp/mode/cpu.pm @@ -177,7 +177,7 @@ __END__ =head1 MODE -Check cpu usages. +Check CPU usage. =over 8 diff --git a/src/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm b/src/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm index 8798696fe..09b841c53 100644 --- a/src/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm +++ b/src/centreon/common/fortinet/fortigate/snmp/mode/cpu.pm @@ -168,7 +168,7 @@ __END__ =head1 MODE -Check system cpu usage (FORTINET-FORTIGATE-MIB). +Check system CPU usage (FORTINET-FORTIGATE-MIB). =over 8 @@ -179,11 +179,11 @@ Can be: 'core', 'average', 'cluster-average'. =item B<--cluster> -Add cluster cpu informations. +Add cluster CPU informations. =item B<--filter-core> -Core cpu to monitor (can be a regexp). +Core CPU to monitor (can be a regexp). =back diff --git a/src/centreon/common/fortinet/fortigate/snmp/mode/interfaces.pm b/src/centreon/common/fortinet/fortigate/snmp/mode/interfaces.pm index 56283e18f..8cfffe38f 100644 --- a/src/centreon/common/fortinet/fortigate/snmp/mode/interfaces.pm +++ b/src/centreon/common/fortinet/fortigate/snmp/mode/interfaces.pm @@ -184,7 +184,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/centreon/common/h3c/snmp/mode/interfaces.pm b/src/centreon/common/h3c/snmp/mode/interfaces.pm index 052466958..d7263afee 100644 --- a/src/centreon/common/h3c/snmp/mode/interfaces.pm +++ b/src/centreon/common/h3c/snmp/mode/interfaces.pm @@ -307,7 +307,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/centreon/common/ibm/nos/snmp/mode/disk.pm b/src/centreon/common/ibm/nos/snmp/mode/disk.pm index 4eaba6894..b30b3f1b5 100644 --- a/src/centreon/common/ibm/nos/snmp/mode/disk.pm +++ b/src/centreon/common/ibm/nos/snmp/mode/disk.pm @@ -93,7 +93,7 @@ Time in minutes before reloading cache file (default: 180). =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--filter-storage-type> diff --git a/src/centreon/common/jvm/mode/cpuload.pm b/src/centreon/common/jvm/mode/cpuload.pm index e4ad233b0..2b2308e18 100644 --- a/src/centreon/common/jvm/mode/cpuload.pm +++ b/src/centreon/common/jvm/mode/cpuload.pm @@ -94,19 +94,19 @@ perl centreon_plugins.pl --plugin=apps::tomcat::jmx::plugin --custommode=jolokia =item B<--warning-system> -Warning threshold of System cpuload +Warning threshold of system CPU load. =item B<--critical-system> -Critical threshold of System cpuload +Critical threshold of system CPU load. =item B<--warning-process> -Warning threshold of Process cpuload +Warning threshold of process CPU load. =item B<--critical-process> -Critical threshold of Process cpuload +Critical threshold of process CPU load. =back diff --git a/src/centreon/common/protocols/sql/mode/collection.pm b/src/centreon/common/protocols/sql/mode/collection.pm index b0a48e4fe..ed40f7e0a 100644 --- a/src/centreon/common/protocols/sql/mode/collection.pm +++ b/src/centreon/common/protocols/sql/mode/collection.pm @@ -1534,7 +1534,7 @@ __END__ =head1 MODE -Collect and compute SQL datas. +Collect and compute SQL data. =over 8 diff --git a/src/centreon/common/radlan/snmp/mode/cpu.pm b/src/centreon/common/radlan/snmp/mode/cpu.pm index 12fa0113b..5f4292699 100644 --- a/src/centreon/common/radlan/snmp/mode/cpu.pm +++ b/src/centreon/common/radlan/snmp/mode/cpu.pm @@ -106,7 +106,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/centreon/plugins/output.pm b/src/centreon/plugins/output.pm index 3b4eeeeb2..e2f9e540f 100644 --- a/src/centreon/plugins/output.pm +++ b/src/centreon/plugins/output.pm @@ -176,7 +176,7 @@ sub add_option_msg { sub set_ignore_label { my ($self, %options) = @_; - $self->{option_results}->{output_ignore_label} = 1; + $self->{option_results}->{output_ignore_label} = 1; } sub set_status { @@ -208,7 +208,7 @@ sub output_add { } else { $self->{global_short_concat_outputs}->{uc($options->{severity})} = $options->{short_msg}; } - + push @{$self->{global_short_outputs}->{uc($options->{severity})}}, $options->{short_msg}; $self->set_status(exit_litteral => $options->{severity}); } @@ -231,7 +231,7 @@ sub perfdata_add { $perfdata->{$_} = $options{$_}; } - if ((defined($self->{option_results}->{use_new_perfdata}) || defined($options{force_new_perfdata})) && + if ((defined($self->{option_results}->{use_new_perfdata}) || defined($options{force_new_perfdata})) && defined($options{nlabel})) { $perfdata->{label} = $options{nlabel}; } @@ -293,7 +293,7 @@ sub output_json { outputs => [], perfdatas => [] } - }; + }; foreach my $code_litteral (keys %{$self->{global_short_outputs}}) { foreach (@{$self->{global_short_outputs}->{$code_litteral}}) { @@ -343,7 +343,7 @@ sub output_xml { my ($self, %options) = @_; my $force_ignore_perfdata = (defined($options{force_ignore_perfdata}) && $options{force_ignore_perfdata} == 1) ? 1 : 0; my $force_long_output = (defined($options{force_long_output}) && $options{force_long_output} == 1) ? 1 : 0; - my ($child_plugin_name, $child_plugin_mode, $child_plugin_exit, $child_plugin_output, $child_plugin_perfdata); + my ($child_plugin_name, $child_plugin_mode, $child_plugin_exit, $child_plugin_output, $child_plugin_perfdata); my $root = $self->{xml_output}->createElement('plugin'); $self->{xml_output}->setDocumentElement($root); @@ -411,7 +411,7 @@ sub output_xml { foreach my $perf (@{$self->{perfdatas}}) { next if ($self->filter_perfdata(perf => $perf)); $self->range_perfdata(ranges => [\$perf->{warning}, \$perf->{critical}]); - + my ($child_perfdata); $child_perfdata = $self->{xml_output}->createElement('perfdata'); $child_plugin_perfdata->addChild($child_perfdata); @@ -593,8 +593,8 @@ sub display { $self->create_xml_document(); if ($self->{is_output_xml}) { $self->output_xml( - exit_litteral => $self->get_litteral_status(), - nolabel => $nolabel, + exit_litteral => $self->get_litteral_status(), + nolabel => $nolabel, force_ignore_perfdata => $force_ignore_perfdata, force_long_output => $force_long_output ); return ; @@ -603,7 +603,7 @@ sub display { $self->create_json_document(); if ($self->{is_output_json}) { $self->output_json( - exit_litteral => $self->get_litteral_status(), + exit_litteral => $self->get_litteral_status(), nolabel => $nolabel, force_ignore_perfdata => $force_ignore_perfdata, force_long_output => $force_long_output ); @@ -615,7 +615,7 @@ sub display { } $self->output_txt( - exit_litteral => $self->get_litteral_status(), + exit_litteral => $self->get_litteral_status(), nolabel => $nolabel, force_ignore_perfdata => $force_ignore_perfdata, force_long_output => $force_long_output ); @@ -642,7 +642,7 @@ sub die_exit { $self->output_json(exit_litteral => $exit_litteral, nolabel => $nolabel, force_ignore_perfdata => 1); $self->exit(exit_litteral => $exit_litteral); } - } + } $self->output_txt(exit_litteral => $exit_litteral, nolabel => $nolabel, force_ignore_perfdata => 1); $self->exit(exit_litteral => $exit_litteral); @@ -729,13 +729,13 @@ sub get_litteral_status { sub is_status { my ($self, %options) = @_; - # $options{value} = string status + # $options{value} = string status # $options{litteral} = value is litteral - # $options{compare} = string status + # $options{compare} = string status if (defined($options{litteral})) { my $value = defined($options{value}) ? $options{value} : $self->get_litteral_status(); - + if (uc($value) eq uc($options{compare})) { return 1; } @@ -906,7 +906,7 @@ sub parameter { sub add_disco_entry { my ($self, %options) = @_; - + push @{$self->{disco_entries}}, {%options}; } @@ -950,7 +950,7 @@ sub load_eval { my ($self) = @_; my ($code) = centreon::plugins::misc::mymodule_load( - output => $self->{output}, module => 'Safe', + output => $self->{output}, module => 'Safe', no_quit => 1 ); if ($code == 0) { @@ -1140,8 +1140,8 @@ sub apply_pfdata_scale { if (defined(${$options{perf}}->{max}) && ${$options{perf}}->{max} ne '') { ($value) = centreon::plugins::misc::scale_bytesbit(value => ${$options{perf}}->{max}, - src_quantity => $src_quantity, src_unit => $src_unit, - dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, + src_quantity => $src_quantity, src_unit => $src_unit, + dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, dst_unit => defined($dst_unit) ? $dst_unit : $options{args}->{unit}); ${$options{perf}}->{max} = sprintf('%.2f', $value); } @@ -1153,14 +1153,14 @@ sub apply_pfdata_scale { if ($result->{start} ne '' && $result->{infinite_neg} == 0) { ($result->{start}) = centreon::plugins::misc::scale_bytesbit(value => $result->{start}, - src_quantity => $src_quantity, src_unit => $src_unit, - dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, + src_quantity => $src_quantity, src_unit => $src_unit, + dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, dst_unit => defined($dst_unit) ? $dst_unit : $options{args}->{unit}); } if ($result->{end} ne '' && $result->{infinite_pos} == 0) { ($result->{end}) = centreon::plugins::misc::scale_bytesbit(value => $result->{end}, - src_quantity => $src_quantity, src_unit => $src_unit, - dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, + src_quantity => $src_quantity, src_unit => $src_unit, + dst_quantity => defined($dst_unit) ? $dst_quantity : $options{args}->{quantity}, dst_unit => defined($dst_unit) ? $dst_unit : $options{args}->{unit}); } @@ -1216,7 +1216,7 @@ sub apply_pfdata_percent { ${$options{perf}}->{$threshold} = centreon::plugins::misc::get_threshold_litteral(%$result); } - ${$options{perf}}->{max} = 100; + ${$options{perf}}->{max} = 100; } sub apply_pfdata_eval { @@ -1364,7 +1364,7 @@ sub parse_perfdata_extend_args { my ($self, %options) = @_; # --extend-perfdata=searchlabel,newlabel,method[,[newuom],[min],[max],[warning],[critical]] - my ($pfdata_match, $pfdata_substitute, $method, $uom_sub, $min_sub, $max_sub, $warn_sub, $crit_sub) = + my ($pfdata_match, $pfdata_substitute, $method, $uom_sub, $min_sub, $max_sub, $warn_sub, $crit_sub) = split /,/, $options{arg}; return if ((!defined($pfdata_match) || $pfdata_match eq '') && $options{type} != 3); @@ -1539,29 +1539,29 @@ remove all metrics whose value equals 0 and that don't have a maximum value. =item B<--explode-perfdata-max> Create a new metric for each metric that comes with a maximum limit. The new -metric will be named identically with a '_max' suffix). +metric will be named identically with a '_max' suffix). Example: it will split 'used_prct'=26.93%;0:80;0:90;0;100 into 'used_prct'=26.93%;0:80;0:90;0;100 'used_prct_max'=100%;;;; -=item B<--change-perfdata> B<--extend-perfdata> +=item B<--change-perfdata> B<--extend-perfdata> -Change or extend perfdata. +Change or extend perfdata. Syntax: --extend-perfdata=searchlabel,newlabel,target[,[newuom],[min],[max]] Common examples: =over 4 -Convert storage free perfdata into used: --change-perfdata=free,used,invert() +Convert storage free perfdata into used: --change-perfdata='free,used,invert()' -Convert storage free perfdata into used: --change-perfdata=used,free,invert() +Convert storage free perfdata into used: --change-perfdata='used,free,invert()' -Scale traffic values automatically: --change-perfdata=traffic,,scale(auto) +Scale traffic values automatically: --change-perfdata='traffic,,scale(auto)' -Scale traffic values in Mbps: --change-perfdata=traffic_in,,scale(Mbps),mbps +Scale traffic values in Mbps: --change-perfdata='traffic_in,,scale(Mbps),mbps' -Change traffic values in percent: --change-perfdata=traffic_in,,percent() +Change traffic values in percent: --change-perfdata='traffic_in,,percent()' =back @@ -1622,7 +1622,7 @@ and an output. =item B<--output-ignore-label> -Remove the status label ("OK:", "WARNING:", "UNKNOWN:", CRITICAL:") from the +Remove the status label ("OK:", "WARNING:", "UNKNOWN:", CRITICAL:") from the beginning of the output. Example: 'OK: Ram Total:...' will become 'Ram Total:...' diff --git a/src/cloud/prometheus/exporters/cadvisor/mode/cpu.pm b/src/cloud/prometheus/exporters/cadvisor/mode/cpu.pm index af01a29b9..207daee8f 100644 --- a/src/cloud/prometheus/exporters/cadvisor/mode/cpu.pm +++ b/src/cloud/prometheus/exporters/cadvisor/mode/cpu.pm @@ -158,7 +158,7 @@ Check containers CPU usage and throttled. =item B<--cpu-attribute> -Set the cpu attribute to match element (must be a PromQL filter, Default: 'cpu="total"') +Set the CPU attribute to match element (must be a PromQL filter, Default: 'cpu="total"') =item B<--container> diff --git a/src/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm b/src/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm index dac303c71..761716859 100644 --- a/src/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm +++ b/src/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm @@ -182,7 +182,7 @@ Filter on a specific instance (must be a PromQL filter, Default: 'instance=~".*" =item B<--cpu> -Filter on a specific cpu (must be a PromQL filter, Default: 'cpu=~".*"') +Filter on a specific CPU (must be a PromQL filter, Default: 'cpu=~".*"') =item B<--warning-*> diff --git a/src/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm b/src/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm index 42a47811c..ca7d5dc3c 100644 --- a/src/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm +++ b/src/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm @@ -312,7 +312,7 @@ Filter on a specific instance (must be a PromQL filter, Default: 'instance=~".*" =item B<--cpu> -Filter on a specific cpu (must be a PromQL filter, Default: 'cpu=~".*"') +Filter on a specific CPU (must be a PromQL filter, Default: 'cpu=~".*"') =item B<--type> diff --git a/src/hardware/devices/camera/hikvision/snmp/mode/cpu.pm b/src/hardware/devices/camera/hikvision/snmp/mode/cpu.pm index 531270f20..117bb82bd 100644 --- a/src/hardware/devices/camera/hikvision/snmp/mode/cpu.pm +++ b/src/hardware/devices/camera/hikvision/snmp/mode/cpu.pm @@ -81,7 +81,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/hardware/devices/camera/optelecom/snmp/mode/interfaces.pm b/src/hardware/devices/camera/optelecom/snmp/mode/interfaces.pm index c7939feca..d9db00c88 100644 --- a/src/hardware/devices/camera/optelecom/snmp/mode/interfaces.pm +++ b/src/hardware/devices/camera/optelecom/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/hardware/devices/hikvision/nvr/isapi/mode/cpu.pm b/src/hardware/devices/hikvision/nvr/isapi/mode/cpu.pm index 2bc4cbd9c..633225987 100644 --- a/src/hardware/devices/hikvision/nvr/isapi/mode/cpu.pm +++ b/src/hardware/devices/hikvision/nvr/isapi/mode/cpu.pm @@ -72,7 +72,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/hardware/devices/polycom/trio/restapi/mode/device.pm b/src/hardware/devices/polycom/trio/restapi/mode/device.pm index 4cef2ae30..eb81715d2 100644 --- a/src/hardware/devices/polycom/trio/restapi/mode/device.pm +++ b/src/hardware/devices/polycom/trio/restapi/mode/device.pm @@ -142,7 +142,7 @@ __END__ =head1 MODE -Check device cpu, memory and state. +Check device CPU, memory and state. =over 8 diff --git a/src/network/3com/snmp/mode/cpu.pm b/src/network/3com/snmp/mode/cpu.pm index 8cd9b4fc8..8aeef6953 100644 --- a/src/network/3com/snmp/mode/cpu.pm +++ b/src/network/3com/snmp/mode/cpu.pm @@ -120,7 +120,7 @@ __END__ =head1 MODE -Check cpu usages. +Check CPU usages. =over 8 diff --git a/src/network/adva/fsp3000/snmp/mode/interfaces.pm b/src/network/adva/fsp3000/snmp/mode/interfaces.pm index eb88ec12f..2e51fc26f 100644 --- a/src/network/adva/fsp3000/snmp/mode/interfaces.pm +++ b/src/network/adva/fsp3000/snmp/mode/interfaces.pm @@ -383,7 +383,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/alcatel/omniswitch/snmp/mode/cpu.pm b/src/network/alcatel/omniswitch/snmp/mode/cpu.pm index 5e5c951cd..621a4db52 100644 --- a/src/network/alcatel/omniswitch/snmp/mode/cpu.pm +++ b/src/network/alcatel/omniswitch/snmp/mode/cpu.pm @@ -172,7 +172,7 @@ __END__ =head1 MODE -Check cpu usage (AlcatelIND1Health.mib). +Check CPU usage (AlcatelIND1Health.mib). =over 8 diff --git a/src/network/allied/snmp/mode/cpu.pm b/src/network/allied/snmp/mode/cpu.pm index 152e5ae9d..78b765082 100644 --- a/src/network/allied/snmp/mode/cpu.pm +++ b/src/network/allied/snmp/mode/cpu.pm @@ -95,7 +95,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/aruba/aoscx/snmp/mode/cpu.pm b/src/network/aruba/aoscx/snmp/mode/cpu.pm index 8f1c6b82c..fe4b4852c 100644 --- a/src/network/aruba/aoscx/snmp/mode/cpu.pm +++ b/src/network/aruba/aoscx/snmp/mode/cpu.pm @@ -100,7 +100,7 @@ __END__ =head1 MODE -Check cpu (worked since firmware 10.10). +Check CPU (worked since firmware 10.10). =over 8 diff --git a/src/network/aruba/cppm/snmp/mode/cpu.pm b/src/network/aruba/cppm/snmp/mode/cpu.pm index f48c713b5..ff19f61e1 100644 --- a/src/network/aruba/cppm/snmp/mode/cpu.pm +++ b/src/network/aruba/cppm/snmp/mode/cpu.pm @@ -45,7 +45,7 @@ Check system CPUs. =item B<--use-ucd> -Use UCD mib for cpu average. +Use UCD mib for CPU average. =item B<--warning-average> diff --git a/src/network/aruba/cppm/snmp/mode/interfaces.pm b/src/network/aruba/cppm/snmp/mode/interfaces.pm index 10b7aeff5..5bb679fc9 100644 --- a/src/network/aruba/cppm/snmp/mode/interfaces.pm +++ b/src/network/aruba/cppm/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/atrica/snmp/mode/connections.pm b/src/network/atrica/snmp/mode/connections.pm index 8e765e5e2..e66a1855d 100644 --- a/src/network/atrica/snmp/mode/connections.pm +++ b/src/network/atrica/snmp/mode/connections.pm @@ -477,7 +477,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/barracuda/bma/snmp/mode/load.pm b/src/network/barracuda/bma/snmp/mode/load.pm index ca671ddfb..b0b8bba94 100644 --- a/src/network/barracuda/bma/snmp/mode/load.pm +++ b/src/network/barracuda/bma/snmp/mode/load.pm @@ -75,7 +75,7 @@ __END__ =head1 MODE -Check system cpu load. +Check system CPU load. =over 8 diff --git a/src/network/beeware/snmp/plugin.pm b/src/network/beeware/snmp/plugin.pm index 31b3c43e7..baed4efcc 100644 --- a/src/network/beeware/snmp/plugin.pm +++ b/src/network/beeware/snmp/plugin.pm @@ -45,6 +45,6 @@ __END__ =head1 PLUGIN DESCRIPTION Check Beeware equipments in SNMP. -Please use plugin SNMP Linux for system checks ('cpu', 'memory', 'traffic',...). +Please use the SNMP Linux plugin for system checks (CPU, memory, traffic, ...). =cut diff --git a/src/network/brocade/snmp/mode/cpu.pm b/src/network/brocade/snmp/mode/cpu.pm index 64769fb3f..96aa365ca 100644 --- a/src/network/brocade/snmp/mode/cpu.pm +++ b/src/network/brocade/snmp/mode/cpu.pm @@ -97,7 +97,7 @@ __END__ =head1 MODE -Check system cpu usage (SW.mib). +Check system CPU usage (SW.mib). =over 8 diff --git a/src/network/brocade/snmp/mode/interfaces.pm b/src/network/brocade/snmp/mode/interfaces.pm index e00450114..fa7515eaf 100644 --- a/src/network/brocade/snmp/mode/interfaces.pm +++ b/src/network/brocade/snmp/mode/interfaces.pm @@ -377,7 +377,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/cambium/cnpilot/snmp/mode/interfaces.pm b/src/network/cambium/cnpilot/snmp/mode/interfaces.pm index 0e35ba15c..4a7eb6d0f 100644 --- a/src/network/cambium/cnpilot/snmp/mode/interfaces.pm +++ b/src/network/cambium/cnpilot/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/cambium/epmp/snmp/mode/interfaces.pm b/src/network/cambium/epmp/snmp/mode/interfaces.pm index 871bdb9ef..87601d35b 100644 --- a/src/network/cambium/epmp/snmp/mode/interfaces.pm +++ b/src/network/cambium/epmp/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/chapsvision/crossing/snmp/mode/interfaces.pm b/src/network/chapsvision/crossing/snmp/mode/interfaces.pm index a711f82e4..77ef8aff5 100644 --- a/src/network/chapsvision/crossing/snmp/mode/interfaces.pm +++ b/src/network/chapsvision/crossing/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/checkpoint/snmp/mode/cpu.pm b/src/network/checkpoint/snmp/mode/cpu.pm index b0154819d..13734ae1c 100644 --- a/src/network/checkpoint/snmp/mode/cpu.pm +++ b/src/network/checkpoint/snmp/mode/cpu.pm @@ -116,7 +116,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/cisco/standard/ssh/mode/cpu.pm b/src/network/cisco/standard/ssh/mode/cpu.pm index fae406582..ee5c8c6a5 100644 --- a/src/network/cisco/standard/ssh/mode/cpu.pm +++ b/src/network/cisco/standard/ssh/mode/cpu.pm @@ -98,7 +98,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/cisco/wap/snmp/mode/cpu.pm b/src/network/cisco/wap/snmp/mode/cpu.pm index 262b86f78..4feefce93 100644 --- a/src/network/cisco/wap/snmp/mode/cpu.pm +++ b/src/network/cisco/wap/snmp/mode/cpu.pm @@ -74,7 +74,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/citrix/appacceleration/snmp/mode/cpu.pm b/src/network/citrix/appacceleration/snmp/mode/cpu.pm index 84e2ccd1a..b58b1cdf6 100644 --- a/src/network/citrix/appacceleration/snmp/mode/cpu.pm +++ b/src/network/citrix/appacceleration/snmp/mode/cpu.pm @@ -83,7 +83,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/citrix/netscaler/snmp/mode/cpu.pm b/src/network/citrix/netscaler/snmp/mode/cpu.pm index e3b8ca051..646451a86 100644 --- a/src/network/citrix/netscaler/snmp/mode/cpu.pm +++ b/src/network/citrix/netscaler/snmp/mode/cpu.pm @@ -87,7 +87,7 @@ __END__ =head1 MODE -Check cpu usage (NS-MIB-smiv2). +Check CPU usage (NS-MIB-smiv2). =over 8 diff --git a/src/network/dell/nseries/snmp/mode/interfaces.pm b/src/network/dell/nseries/snmp/mode/interfaces.pm index fa4d75a79..41a3d65c5 100644 --- a/src/network/dell/nseries/snmp/mode/interfaces.pm +++ b/src/network/dell/nseries/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/digi/sarian/snmp/mode/cpu.pm b/src/network/digi/sarian/snmp/mode/cpu.pm index 2b0a10ef4..87ccf77dc 100644 --- a/src/network/digi/sarian/snmp/mode/cpu.pm +++ b/src/network/digi/sarian/snmp/mode/cpu.pm @@ -84,7 +84,7 @@ __END__ =head1 MODE -Check cpu usage (sarian-monitor.mib). +Check CPU usage (sarian-monitor.mib). =over 8 diff --git a/src/network/dlink/dgs3100/snmp/mode/cpu.pm b/src/network/dlink/dgs3100/snmp/mode/cpu.pm index 4654608b5..224da3b76 100644 --- a/src/network/dlink/dgs3100/snmp/mode/cpu.pm +++ b/src/network/dlink/dgs3100/snmp/mode/cpu.pm @@ -131,7 +131,7 @@ __END__ =head1 MODE -Check cpu usage (env_mib.mib). +Check CPU usage (env_mib.mib). =over 8 diff --git a/src/network/dlink/standard/snmp/mode/cpu.pm b/src/network/dlink/standard/snmp/mode/cpu.pm index e344481e8..be2a64c7a 100644 --- a/src/network/dlink/standard/snmp/mode/cpu.pm +++ b/src/network/dlink/standard/snmp/mode/cpu.pm @@ -256,13 +256,13 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 =item B<--check-order> -Check cpu in standard dlink mib. If you have some issue (wrong cpu information in a specific mib), you can change the order +Check CPU in standard dlink mib. If you have some issue (wrong CPU information in a specific mib), you can change the order (default: 'common,industrial,agent'). =item B<--warning-*> B<--critical-*> diff --git a/src/network/dlink/standard/snmp/mode/interfaces.pm b/src/network/dlink/standard/snmp/mode/interfaces.pm index d723c9dac..b304860c2 100644 --- a/src/network/dlink/standard/snmp/mode/interfaces.pm +++ b/src/network/dlink/standard/snmp/mode/interfaces.pm @@ -248,7 +248,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/efficientip/snmp/plugin.pm b/src/network/efficientip/snmp/plugin.pm index 43cd13260..98ff9274f 100644 --- a/src/network/efficientip/snmp/plugin.pm +++ b/src/network/efficientip/snmp/plugin.pm @@ -46,6 +46,6 @@ __END__ =head1 PLUGIN DESCRIPTION Check Efficient IP equipment in SNMP. -Please use plugin SNMP Linux for system checks ('cpu', 'memory', 'traffic',...). +Please use the SNMP Linux plugin for system checks (CPU, memory, traffic, ...). =cut diff --git a/src/network/enterasys/snmp/mode/cpu.pm b/src/network/enterasys/snmp/mode/cpu.pm index 0d9702383..48ad4d700 100644 --- a/src/network/enterasys/snmp/mode/cpu.pm +++ b/src/network/enterasys/snmp/mode/cpu.pm @@ -260,7 +260,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/enterasys/snmp/mode/interfaces.pm b/src/network/enterasys/snmp/mode/interfaces.pm index 5a756d5b5..bf589c090 100644 --- a/src/network/enterasys/snmp/mode/interfaces.pm +++ b/src/network/enterasys/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/extreme/snmp/mode/interfaces.pm b/src/network/extreme/snmp/mode/interfaces.pm index c69bd6a28..ac4e328dc 100644 --- a/src/network/extreme/snmp/mode/interfaces.pm +++ b/src/network/extreme/snmp/mode/interfaces.pm @@ -201,7 +201,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/f5/bigip/snmp/plugin.pm b/src/network/f5/bigip/snmp/plugin.pm index 016d6d751..29ed15ec8 100644 --- a/src/network/f5/bigip/snmp/plugin.pm +++ b/src/network/f5/bigip/snmp/plugin.pm @@ -56,6 +56,6 @@ __END__ =head1 PLUGIN DESCRIPTION Check F-5 hardware in SNMP. -Please use plugin SNMP Linux for system checks ('cpu', 'memory', 'traffic',...). +Please use the SNMP Linux plugin for system checks (CPU, memory, traffic, ...). =cut diff --git a/src/network/fiberstore/snmp/mode/cpu.pm b/src/network/fiberstore/snmp/mode/cpu.pm index 89ef50420..69924e092 100644 --- a/src/network/fiberstore/snmp/mode/cpu.pm +++ b/src/network/fiberstore/snmp/mode/cpu.pm @@ -79,7 +79,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/fortinet/fortiadc/snmp/mode/cpu.pm b/src/network/fortinet/fortiadc/snmp/mode/cpu.pm index a719d65f3..76cabbe3c 100644 --- a/src/network/fortinet/fortiadc/snmp/mode/cpu.pm +++ b/src/network/fortinet/fortiadc/snmp/mode/cpu.pm @@ -168,7 +168,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/fortinet/fortiadc/snmp/mode/interfaces.pm b/src/network/fortinet/fortiadc/snmp/mode/interfaces.pm index f08af94ab..620e5bb11 100644 --- a/src/network/fortinet/fortiadc/snmp/mode/interfaces.pm +++ b/src/network/fortinet/fortiadc/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/fortinet/fortiauthenticator/snmp/mode/cpu.pm b/src/network/fortinet/fortiauthenticator/snmp/mode/cpu.pm index 20685b9f4..5ee64a59f 100644 --- a/src/network/fortinet/fortiauthenticator/snmp/mode/cpu.pm +++ b/src/network/fortinet/fortiauthenticator/snmp/mode/cpu.pm @@ -73,7 +73,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/fortinet/fortimail/snmp/mode/cpu.pm b/src/network/fortinet/fortimail/snmp/mode/cpu.pm index 75a610ca5..4d5df9625 100644 --- a/src/network/fortinet/fortimail/snmp/mode/cpu.pm +++ b/src/network/fortinet/fortimail/snmp/mode/cpu.pm @@ -72,7 +72,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/fortinet/fortimail/snmp/mode/interfaces.pm b/src/network/fortinet/fortimail/snmp/mode/interfaces.pm index aa68eaa57..e2e9d3723 100644 --- a/src/network/fortinet/fortimail/snmp/mode/interfaces.pm +++ b/src/network/fortinet/fortimail/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/fortinet/fortiswitch/snmp/mode/cpu.pm b/src/network/fortinet/fortiswitch/snmp/mode/cpu.pm index 278fed295..32d5275f2 100644 --- a/src/network/fortinet/fortiswitch/snmp/mode/cpu.pm +++ b/src/network/fortinet/fortiswitch/snmp/mode/cpu.pm @@ -72,7 +72,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/fortinet/fortiswitch/snmp/mode/interfaces.pm b/src/network/fortinet/fortiswitch/snmp/mode/interfaces.pm index ec7894bd7..f4fbb7b66 100644 --- a/src/network/fortinet/fortiswitch/snmp/mode/interfaces.pm +++ b/src/network/fortinet/fortiswitch/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/hirschmann/standard/snmp/mode/cpu.pm b/src/network/hirschmann/standard/snmp/mode/cpu.pm index 1bb1d0156..a3c9771ce 100644 --- a/src/network/hirschmann/standard/snmp/mode/cpu.pm +++ b/src/network/hirschmann/standard/snmp/mode/cpu.pm @@ -120,7 +120,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/hp/moonshot/snmp/mode/cpu.pm b/src/network/hp/moonshot/snmp/mode/cpu.pm index 7dea63ca7..8b434df8e 100644 --- a/src/network/hp/moonshot/snmp/mode/cpu.pm +++ b/src/network/hp/moonshot/snmp/mode/cpu.pm @@ -101,7 +101,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/hp/moonshot/snmp/mode/interfaces.pm b/src/network/hp/moonshot/snmp/mode/interfaces.pm index 08042c644..63135884c 100644 --- a/src/network/hp/moonshot/snmp/mode/interfaces.pm +++ b/src/network/hp/moonshot/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/hp/procurve/snmp/mode/cpu.pm b/src/network/hp/procurve/snmp/mode/cpu.pm index 5c11c2f9e..99be56c87 100644 --- a/src/network/hp/procurve/snmp/mode/cpu.pm +++ b/src/network/hp/procurve/snmp/mode/cpu.pm @@ -81,7 +81,7 @@ __END__ =head1 MODE -Check cpu usage (hpSwitchStat.mib). +Check CPU usage (hpSwitchStat.mib). =over 8 diff --git a/src/network/hp/procurve/snmp/mode/interfaces.pm b/src/network/hp/procurve/snmp/mode/interfaces.pm index 22c9b62b0..5af2451d2 100644 --- a/src/network/hp/procurve/snmp/mode/interfaces.pm +++ b/src/network/hp/procurve/snmp/mode/interfaces.pm @@ -394,7 +394,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/huawei/snmp/mode/interfaces.pm b/src/network/huawei/snmp/mode/interfaces.pm index fabb78c21..067279559 100644 --- a/src/network/huawei/snmp/mode/interfaces.pm +++ b/src/network/huawei/snmp/mode/interfaces.pm @@ -303,7 +303,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/juniper/common/junos/mode/cpu.pm b/src/network/juniper/common/junos/mode/cpu.pm index 0dc5d117c..f0919b239 100644 --- a/src/network/juniper/common/junos/mode/cpu.pm +++ b/src/network/juniper/common/junos/mode/cpu.pm @@ -141,7 +141,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/juniper/common/junos/mode/interfaces.pm b/src/network/juniper/common/junos/mode/interfaces.pm index 40340eb3c..a32b35d33 100644 --- a/src/network/juniper/common/junos/mode/interfaces.pm +++ b/src/network/juniper/common/junos/mode/interfaces.pm @@ -378,7 +378,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/juniper/common/screenos/snmp/mode/cpu.pm b/src/network/juniper/common/screenos/snmp/mode/cpu.pm index 545636a54..95148c0eb 100644 --- a/src/network/juniper/common/screenos/snmp/mode/cpu.pm +++ b/src/network/juniper/common/screenos/snmp/mode/cpu.pm @@ -124,7 +124,7 @@ __END__ =head1 MODE -Check Juniper cpu usage (NETSCREEN-RESOURCE-MIB). +Check Juniper CPU usage (NETSCREEN-RESOURCE-MIB). =over 8 diff --git a/src/network/lenovo/rackswitch/snmp/mode/interfaces.pm b/src/network/lenovo/rackswitch/snmp/mode/interfaces.pm index 067e299dc..4dbb4e50c 100644 --- a/src/network/lenovo/rackswitch/snmp/mode/interfaces.pm +++ b/src/network/lenovo/rackswitch/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/libraesva/snmp/mode/interfaces.pm b/src/network/libraesva/snmp/mode/interfaces.pm index 299c40997..a97bf2318 100644 --- a/src/network/libraesva/snmp/mode/interfaces.pm +++ b/src/network/libraesva/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/libraesva/snmp/mode/storage.pm b/src/network/libraesva/snmp/mode/storage.pm index ad75b21fe..5e8d4c75a 100644 --- a/src/network/libraesva/snmp/mode/storage.pm +++ b/src/network/libraesva/snmp/mode/storage.pm @@ -110,7 +110,7 @@ Example: adding --display-transform-src='dev' --display-transform-dst='run' wil =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--space-reservation> diff --git a/src/network/meru/snmp/mode/cpu.pm b/src/network/meru/snmp/mode/cpu.pm index 5d4a701b4..1f252038f 100644 --- a/src/network/meru/snmp/mode/cpu.pm +++ b/src/network/meru/snmp/mode/cpu.pm @@ -72,7 +72,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/microsens/g6/snmp/mode/interfaces.pm b/src/network/microsens/g6/snmp/mode/interfaces.pm index 6673d7f1e..8af12d3bb 100644 --- a/src/network/microsens/g6/snmp/mode/interfaces.pm +++ b/src/network/microsens/g6/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/mikrotik/snmp/mode/disk.pm b/src/network/mikrotik/snmp/mode/disk.pm index fceba7577..20a4807a5 100644 --- a/src/network/mikrotik/snmp/mode/disk.pm +++ b/src/network/mikrotik/snmp/mode/disk.pm @@ -93,7 +93,7 @@ Time in minutes before reloading cache file (default: 180). =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--filter-storage-type> diff --git a/src/network/mikrotik/snmp/mode/interfaces.pm b/src/network/mikrotik/snmp/mode/interfaces.pm index 5a15a197f..e6c6b6be1 100644 --- a/src/network/mikrotik/snmp/mode/interfaces.pm +++ b/src/network/mikrotik/snmp/mode/interfaces.pm @@ -274,7 +274,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/mikrotik/snmp/mode/memory.pm b/src/network/mikrotik/snmp/mode/memory.pm index 651f325a7..f4e7d1b8c 100644 --- a/src/network/mikrotik/snmp/mode/memory.pm +++ b/src/network/mikrotik/snmp/mode/memory.pm @@ -93,7 +93,7 @@ Time in minutes before reloading cache file (default: 180). =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--filter-storage-type> diff --git a/src/network/mrv/optiswitch/snmp/mode/interfaces.pm b/src/network/mrv/optiswitch/snmp/mode/interfaces.pm index 70200fb78..242c63866 100644 --- a/src/network/mrv/optiswitch/snmp/mode/interfaces.pm +++ b/src/network/mrv/optiswitch/snmp/mode/interfaces.pm @@ -537,7 +537,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/netgear/sseries/snmp/mode/cpu.pm b/src/network/netgear/sseries/snmp/mode/cpu.pm index bd57023be..4c3345aef 100644 --- a/src/network/netgear/sseries/snmp/mode/cpu.pm +++ b/src/network/netgear/sseries/snmp/mode/cpu.pm @@ -93,7 +93,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/netgear/sseries/snmp/mode/interfaces.pm b/src/network/netgear/sseries/snmp/mode/interfaces.pm index 1e4310425..b38c79914 100644 --- a/src/network/netgear/sseries/snmp/mode/interfaces.pm +++ b/src/network/netgear/sseries/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/nortel/standard/snmp/mode/interfaces.pm b/src/network/nortel/standard/snmp/mode/interfaces.pm index 99e59a6e9..5325b5691 100644 --- a/src/network/nortel/standard/snmp/mode/interfaces.pm +++ b/src/network/nortel/standard/snmp/mode/interfaces.pm @@ -195,7 +195,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/oneaccess/snmp/mode/cpu.pm b/src/network/oneaccess/snmp/mode/cpu.pm index 1ba1f0f72..ce2b03f20 100644 --- a/src/network/oneaccess/snmp/mode/cpu.pm +++ b/src/network/oneaccess/snmp/mode/cpu.pm @@ -86,7 +86,7 @@ __END__ =head1 MODE -Check cpu usage (oneaccess-sys-mib). +Check CPU usage (oneaccess-sys-mib). =over 8 diff --git a/src/network/oneaccess/snmp/mode/interfaces.pm b/src/network/oneaccess/snmp/mode/interfaces.pm index 28387804c..84e020104 100644 --- a/src/network/oneaccess/snmp/mode/interfaces.pm +++ b/src/network/oneaccess/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/opengear/snmp/mode/interfaces.pm b/src/network/opengear/snmp/mode/interfaces.pm index 55a6ed72e..474c61307 100644 --- a/src/network/opengear/snmp/mode/interfaces.pm +++ b/src/network/opengear/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/paloalto/snmp/mode/memory.pm b/src/network/paloalto/snmp/mode/memory.pm index 5981a78f8..61a21917e 100644 --- a/src/network/paloalto/snmp/mode/memory.pm +++ b/src/network/paloalto/snmp/mode/memory.pm @@ -87,7 +87,7 @@ Time in minutes before reloading cache file (default: 180). =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--filter-storage-type> diff --git a/src/network/peplink/balance/snmp/mode/cpu.pm b/src/network/peplink/balance/snmp/mode/cpu.pm index 422326c60..017836ddc 100644 --- a/src/network/peplink/balance/snmp/mode/cpu.pm +++ b/src/network/peplink/balance/snmp/mode/cpu.pm @@ -81,7 +81,7 @@ __END__ =head1 MODE -Check cpu usage (PEPLINK-BALANCE-MIB). +Check CPU usage (PEPLINK-BALANCE-MIB). =over 8 diff --git a/src/network/radware/alteon/snmp/mode/cpu.pm b/src/network/radware/alteon/snmp/mode/cpu.pm index ac8c14367..c71933912 100644 --- a/src/network/radware/alteon/snmp/mode/cpu.pm +++ b/src/network/radware/alteon/snmp/mode/cpu.pm @@ -213,7 +213,7 @@ __END__ =head1 MODE -Check MP cpu usage (ALTEON-CHEETAH-SWITCH-MIB). +Check MP CPU usage (ALTEON-CHEETAH-SWITCH-MIB). =over 8 diff --git a/src/network/raisecom/snmp/mode/interfaces.pm b/src/network/raisecom/snmp/mode/interfaces.pm index 7e00e13bd..2b3ffdfb5 100644 --- a/src/network/raisecom/snmp/mode/interfaces.pm +++ b/src/network/raisecom/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/redback/snmp/mode/cpu.pm b/src/network/redback/snmp/mode/cpu.pm index a555e4e84..bfd67d278 100644 --- a/src/network/redback/snmp/mode/cpu.pm +++ b/src/network/redback/snmp/mode/cpu.pm @@ -141,7 +141,7 @@ __END__ =head1 MODE -Check cpu usage (RBN-CPU-METER-MIB). +Check CPU usage (RBN-CPU-METER-MIB). =over 8 diff --git a/src/network/securactive/plugin.pm b/src/network/securactive/plugin.pm index 006044f76..02cca4f08 100644 --- a/src/network/securactive/plugin.pm +++ b/src/network/securactive/plugin.pm @@ -49,6 +49,6 @@ __END__ =head1 PLUGIN DESCRIPTION Check SecurActive in SNMP. -The system (cpu, memory, traffic,...) can be used monitor with linux snmp plugin. +The system checks (CPU, memory, traffic,...) can be monitored with the linux snmp plugin. =cut diff --git a/src/network/sonus/sbc/snmp/mode/cpu.pm b/src/network/sonus/sbc/snmp/mode/cpu.pm index 229740151..48b2a5e8e 100644 --- a/src/network/sonus/sbc/snmp/mode/cpu.pm +++ b/src/network/sonus/sbc/snmp/mode/cpu.pm @@ -47,7 +47,7 @@ of time that this processor was not idle) =item B<--use-ucd> -Use UCD mib for cpu average. +Use UCD mib for CPU average. =item B<--warning-average> diff --git a/src/network/sonus/sbc/snmp/mode/interfaces.pm b/src/network/sonus/sbc/snmp/mode/interfaces.pm index b1daaa4d1..a64c1d48e 100644 --- a/src/network/sonus/sbc/snmp/mode/interfaces.pm +++ b/src/network/sonus/sbc/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/sonus/sbc/snmp/mode/storage.pm b/src/network/sonus/sbc/snmp/mode/storage.pm index f74688034..588749fa4 100644 --- a/src/network/sonus/sbc/snmp/mode/storage.pm +++ b/src/network/sonus/sbc/snmp/mode/storage.pm @@ -110,7 +110,7 @@ Example: adding --display-transform-src='dev' --display-transform-dst='run' wil =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--space-reservation> diff --git a/src/network/stormshield/api/mode/cpu.pm b/src/network/stormshield/api/mode/cpu.pm index 39e45b374..4d068aac4 100644 --- a/src/network/stormshield/api/mode/cpu.pm +++ b/src/network/stormshield/api/mode/cpu.pm @@ -106,7 +106,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 @@ -117,7 +117,7 @@ Can be: 'core', 'average'. =item B<--filter-core> -Core cpu to monitor (can be a regexp). +Core CPU to monitor (can be a regexp). =back diff --git a/src/network/teldat/snmp/mode/cpu.pm b/src/network/teldat/snmp/mode/cpu.pm index 394dacdac..10001cfbb 100644 --- a/src/network/teldat/snmp/mode/cpu.pm +++ b/src/network/teldat/snmp/mode/cpu.pm @@ -102,7 +102,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/teldat/snmp/mode/interfaces.pm b/src/network/teldat/snmp/mode/interfaces.pm index cfcbe6f7c..5420de371 100644 --- a/src/network/teldat/snmp/mode/interfaces.pm +++ b/src/network/teldat/snmp/mode/interfaces.pm @@ -175,7 +175,7 @@ Regexp dst to transform display value. =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/teltonika/snmp/mode/interfaces.pm b/src/network/teltonika/snmp/mode/interfaces.pm index 87df8b281..73dbd6a19 100644 --- a/src/network/teltonika/snmp/mode/interfaces.pm +++ b/src/network/teltonika/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/network/tplink/snmp/mode/cpu.pm b/src/network/tplink/snmp/mode/cpu.pm index 52b36da0e..e2a2576e0 100644 --- a/src/network/tplink/snmp/mode/cpu.pm +++ b/src/network/tplink/snmp/mode/cpu.pm @@ -167,7 +167,7 @@ __END__ =head1 MODE -Check cpu usage. +Check CPU usage. =over 8 diff --git a/src/network/vectra/restapi/mode/cpu.pm b/src/network/vectra/restapi/mode/cpu.pm index b333c468e..d0bd02262 100644 --- a/src/network/vectra/restapi/mode/cpu.pm +++ b/src/network/vectra/restapi/mode/cpu.pm @@ -68,7 +68,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/viptela/snmp/mode/cpu.pm b/src/network/viptela/snmp/mode/cpu.pm index bbfc36187..08cbc0c02 100644 --- a/src/network/viptela/snmp/mode/cpu.pm +++ b/src/network/viptela/snmp/mode/cpu.pm @@ -72,7 +72,7 @@ __END__ =head1 MODE -Check cpu. +Check CPU usage. =over 8 diff --git a/src/network/viptela/snmp/mode/interfaces.pm b/src/network/viptela/snmp/mode/interfaces.pm index f0ff67464..e47f635f9 100644 --- a/src/network/viptela/snmp/mode/interfaces.pm +++ b/src/network/viptela/snmp/mode/interfaces.pm @@ -173,7 +173,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/os/linux/local/mode/process.pm b/src/os/linux/local/mode/process.pm index 4eb3f8d8c..63c00f7cd 100644 --- a/src/os/linux/local/mode/process.pm +++ b/src/os/linux/local/mode/process.pm @@ -382,7 +382,7 @@ bash -c 'tail -n +1 /proc/{pid1,pid2,...}/{statm,stat,io}' =item B<--add-cpu> -Monitor cpu usage. +Monitor CPU usage. =item B<--add-memory> diff --git a/src/os/picos/snmp/mode/interfaces.pm b/src/os/picos/snmp/mode/interfaces.pm index 684fb1719..0030ba2ce 100644 --- a/src/os/picos/snmp/mode/interfaces.pm +++ b/src/os/picos/snmp/mode/interfaces.pm @@ -307,7 +307,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/snmp_standard/mode/cpu.pm b/src/snmp_standard/mode/cpu.pm index 18e18cfe6..8c43f2e86 100644 --- a/src/snmp_standard/mode/cpu.pm +++ b/src/snmp_standard/mode/cpu.pm @@ -138,7 +138,7 @@ of time that this processor was not idle) =item B<--use-ucd> -Use UCD mib for cpu average. +Use UCD mib for CPU average. =item B<--warning-average> diff --git a/src/snmp_standard/mode/diskusage.pm b/src/snmp_standard/mode/diskusage.pm index e5e0d1534..23f42981a 100644 --- a/src/snmp_standard/mode/diskusage.pm +++ b/src/snmp_standard/mode/diskusage.pm @@ -400,7 +400,7 @@ Example: adding --display-transform-src='dev' --display-transform-dst='run' wil =item B<--show-cache> -Display cache disk path datas. +Display cache disk path data. =item B<--space-reservation> diff --git a/src/snmp_standard/mode/interfaces.pm b/src/snmp_standard/mode/interfaces.pm index 6e3399820..c5bd5de15 100644 --- a/src/snmp_standard/mode/interfaces.pm +++ b/src/snmp_standard/mode/interfaces.pm @@ -1745,7 +1745,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/snmp_standard/mode/listprocesses.pm b/src/snmp_standard/mode/listprocesses.pm index 68ffed251..cf6a62ffe 100644 --- a/src/snmp_standard/mode/listprocesses.pm +++ b/src/snmp_standard/mode/listprocesses.pm @@ -163,7 +163,7 @@ Filter by service name (can be a regexp). =item B<--add-stats> -Add cpu and memory stats. +Add CPU and memory stats. =back diff --git a/src/snmp_standard/mode/processcount.pm b/src/snmp_standard/mode/processcount.pm index b5f322541..c19273c86 100644 --- a/src/snmp_standard/mode/processcount.pm +++ b/src/snmp_standard/mode/processcount.pm @@ -284,7 +284,7 @@ sub run { min => 0); } - # Check cpu + # Check CPU if (defined($self->{option_results}->{cpu}) && $num_processes_match > 0) { my $datas = {}; $datas->{last_timestamp} = time(); @@ -354,7 +354,7 @@ __END__ =head1 MODE Check system number of processes. -Can also check memory usage and cpu usage. +Can also check memory usage and CPU usage. =over 8 @@ -434,19 +434,19 @@ memory used by matching processes (in Bytes). =item B<--cpu> -Check cpu usage. Should be used with fix processes. +Check CPU usage. Should be used with fix processes. If processes pid changes too much, the plugin can't compute values. =item B<--warning-cpu-total> -Warning threshold of cpu usage for all processes (in percent). -CPU usage is in % of one cpu, so maximum can be 100% * number of CPU +Warning threshold of CPU usage for all processes (in percent). +CPU usage is in % of one CPU, so maximum can be 100% * number of CPU and a process can have a value greater than 100%. =item B<--critical-cpu-total> -Critical threshold of cpu usage for all processes (in percent). -CPU usage is in % of one cpu, so maximum can be 100% * number of CPU +Critical threshold of CPU usage for all processes (in percent). +CPU usage is in % of one CPU, so maximum can be 100% * number of CPU and a process can have a value greater than 100%. =item B<--top> diff --git a/src/snmp_standard/mode/storage.pm b/src/snmp_standard/mode/storage.pm index fced0e6ed..6eca26d92 100644 --- a/src/snmp_standard/mode/storage.pm +++ b/src/snmp_standard/mode/storage.pm @@ -673,7 +673,7 @@ Example: adding --display-transform-src='dev' --display-transform-dst='run' wil =item B<--show-cache> -Display cache storage datas. +Display cache storage data. =item B<--space-reservation> diff --git a/src/storage/lenovo/iomega/snmp/mode/interfaces.pm b/src/storage/lenovo/iomega/snmp/mode/interfaces.pm index a16e7b755..4df9ec0f3 100644 --- a/src/storage/lenovo/iomega/snmp/mode/interfaces.pm +++ b/src/storage/lenovo/iomega/snmp/mode/interfaces.pm @@ -174,7 +174,7 @@ Example: adding --display-transform-src='eth' --display-transform-dst='ens' wil =item B<--show-cache> -Display cache interface datas. +Display cache interface data. =back diff --git a/src/storage/panzura/snmp/mode/cpucloud.pm b/src/storage/panzura/snmp/mode/cpucloud.pm index aaba1aad6..83b1053b3 100644 --- a/src/storage/panzura/snmp/mode/cpucloud.pm +++ b/src/storage/panzura/snmp/mode/cpucloud.pm @@ -80,7 +80,7 @@ __END__ =head1 MODE -Check cpu usage of cloud controller (panzura-systemext). +Check CPU usage of cloud controller (panzura-systemext). =over 8 diff --git a/src/storage/violin/3000/snmp/plugin.pm b/src/storage/violin/3000/snmp/plugin.pm index 802c791a5..b0a282261 100644 --- a/src/storage/violin/3000/snmp/plugin.pm +++ b/src/storage/violin/3000/snmp/plugin.pm @@ -44,6 +44,6 @@ __END__ =head1 PLUGIN DESCRIPTION Check Violin 3000 series in SNMP. -Please use plugin SNMP Linux for system checks ('cpu', 'memory', 'traffic',...). +Please use the SNMP Linux plugin for system checks (CPU, memory, traffic, ...). =cut