tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1706 from alenorcy/dev 

Added Oracle Linux 7.7 exception in --autodetect-redhat options
This commit is contained in:
qgarnier 2019-11-14 10:35:10 +01:00 committed by GitHub
parent 499e2e547e 2106f50ccd
commit ef8e6ae252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
snmp_standard/mode/memory.pm
View File

@ -200,11 +200,17 @@ sub autodetect_rhel7 {
# https://access.redhat.com/articles/3078#RHEL7
# rhel 7.6: "Linux dev 3.10.0-957.10.1.el7.x86_64 #1 SMP Mon Mar 18 15:06:45 UTC 2019 x86_64"
# rhel 7.7: "Linux dev 3.10.0-1062.1.1.el7.x86_64 #1 SMP Fri Sep 13 22:55:44 UTC 2019 x86_64"
return if (!defined($options{result}->{sysDescr}) || $options{result}->{sysDescr} !~ /3\.10\.0-(\d+)\..*?el7\./);
my $build = $1;
if ($build >= 1062) {
$self->{option_results}->{redhat} = 1;
}
# oracle 7.6: "Linux dev 4.14.35-1844.3.2.el7uek.x86_64 #2 SMP Mon Feb 25 17:43:37 PST 2019 x86_64"
# oracle 7.7: "Linux dev 4.14.35-1902.6.6.el7uek.x86_64 #2 SMP Tue Oct 8 07:32:21 PDT 2019 x86_64 x86_64 x86_64"
return if (!defined($options{result}->{sysDescr}));
if ($options{result}->{sysDescr} =~ /3\.10\.0-(\d+)\..*?el7\./) {
my $build = $1;
if ($build >= 1062) {
$self->{option_results}->{redhat} = 1; }}
if ($options{result}->{sysDescr} =~ /4\.14\.35-(\d+)\..*?\.el7uek\./) {
my $build = $1;
if ($build >= 1902) {
$self->{option_results}->{redhat} = 1; }}
}
sub memory_calc {