tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-04-07 20:35:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from centreon/master

Browse Source 
Merge from master
This commit is contained in:
Sims24 2016-01-27 13:07:01 +01:00
commit 2d29ed0039
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
centreon/common/emc/navisphere/mode/disk.pm
View File

@ -264,6 +264,9 @@ sub run {
#Busy Ticks: 462350
#Idle Ticks: 388743630
#Raid Group ID: 0
# Add a "\n" for the end.
$response .= "\n";
while ($response =~ /^Bus\s+(\S+)\s+Enclosure\s+(\S+)\s+Disk\s+(\S+)(.*?)\n\n/msgi) {
my $disk_instance = "$1_$2_$3";
my $values = $4;
@ -319,7 +322,6 @@ sub run {
$critical = $self->{perfdata}->get_perfdata_for_output(label => $maps_counters->{$_}->{thresholds}->{$name}->{label}) if ($maps_counters->{$_}->{thresholds}->{$name}->{exit_value} eq 'critical');
}
$self->{output}->output_add(long_msg => "Disk '$disk_instance':$long_msg");
$self->{output}->perfdata_add(label => $_ . '_' . $disk_instance, unit => $maps_counters->{$_}->{unit},
value => sprintf($maps_counters->{$_}->{perfdata}, $value_check),
warning => $warning,
@ -327,6 +329,7 @@ sub run {
min => 0);
}
$self->{output}->output_add(long_msg => "Disk '$disk_instance':$long_msg");
$exit = $self->{output}->get_most_critical(status => [ @exits ]);
if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) {
$self->{output}->output_add(severity => $exit,

2
centreon/plugins/templates/counter.pm
View File

@ -181,7 +181,7 @@ sub run_global {
short_msg => "${prefix_output}${short_msg}${suffix_output}"
);
} else {
$self->{output}->output_add(short_msg => "${prefix_output}${long_msg}${suffix_output}");
$self->{output}->output_add(short_msg => "${prefix_output}${long_msg}${suffix_output}") if ($long_msg ne '');
}
}

36
database/oracle/mode/tablespaceusage.pm
View File

@ -29,10 +29,10 @@ sub new {
my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class;
$self->{version} = '1.0';
$options{options}->add_options(arguments =>
{
{
"warning:s" => { name => 'warning', },
"critical:s" => { name => 'critical', },
"filter:s" => { name => 'filter', },
@ -67,7 +67,24 @@ sub run {
$self->{sql}->connect();
my $query;
if ($self->{sql}->is_version_minimum(version => '9')) {
if ($self->{sql}->is_version_minimum(version => '11')) {
$query = q{
SELECT
tum.tablespace_name "Tablespace",
t.status "Status",
t.contents "Type",
t.extent_management "Extent Mgmt",
tum.used_space*t.block_size bytes,
tum.tablespace_size*t.block_size bytes_max
FROM
DBA_TABLESPACE_USAGE_METRICS tum
INNER JOIN
dba_tablespaces t on tum.tablespace_name=t.tablespace_name
WHERE
t.contents<>'UNDO'
OR (t.contents='UNDO' AND t.tablespace_name =(SELECT value FROM v$parameter WHERE name='undo_tablespace'))
};
} elsif ($self->{sql}->is_version_minimum(version => '9')) {
$query = q{
SELECT
a.tablespace_name "Tablespace",
@ -263,18 +280,23 @@ sub run {
my ($name, $status, $type, $extentmgmt, $bytes, $bytes_max, $bytes_free) = @$row;
next if (defined($self->{option_results}->{filter}) && $name !~ /$self->{option_results}->{filter}/);
next if (defined($self->{option_results}->{skip}) && $status =~ /offline/i);
if (!defined($bytes)) {
# seems corrupted, cannot get value
$self->{output}->output_add(severity => 'UNKNOWN',
short_msg => sprintf("tbs '%s' cannot get data", $name));
next;
}
$status = lc $status;
$type = lc $type;
my ($percent_used, $percent_free, $used, $free, $size);
if ((!defined($bytes_max)) || ($bytes_max == 0)) {
if ($self->{sql}->is_version_minimum(version => '11')) {
$percent_used = $bytes / $bytes_max * 100;
$size = $bytes_max;
$free = $bytes_max - $bytes;
$used = $bytes;
} elsif ((!defined($bytes_max)) || ($bytes_max == 0)) {
$percent_used = ($bytes - $bytes_free) / $bytes * 100;
$size = $bytes;
$free = $bytes_free;
@ -306,7 +328,7 @@ sub run {
min => 0,
max => $size);
} else {
my $exit_code = $self->{perfdata}->threshold_check(value => $percent_used, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
my $exit_code = $self->{perfdata}->threshold_check(value => $percent_used, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
if (!$self->{output}->is_status(value => $exit_code, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit_code,
short_msg => sprintf("tbs '%s' Used: %.2f%s (%.2f%%) Size: %.2f%s", $name, $used_value, $used_unit, $percent_used, $size_value, $size_unit));