From cef3a3a2dc96d9765b56bda48d026997bf5f5a29 Mon Sep 17 00:00:00 2001 From: qgarnier Date: Mon, 9 Nov 2020 17:36:32 +0100 Subject: [PATCH] fix rubrik (#2332) --- .../apps/backup/rubrik/restapi/mode/cluster.pm | 10 ++++------ .../apps/backup/rubrik/restapi/mode/disks.pm | 4 ++-- .../apps/backup/rubrik/restapi/mode/nodes.pm | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/centreon-plugins/apps/backup/rubrik/restapi/mode/cluster.pm b/centreon-plugins/apps/backup/rubrik/restapi/mode/cluster.pm index 6d2a429c5..adfa48b60 100644 --- a/centreon-plugins/apps/backup/rubrik/restapi/mode/cluster.pm +++ b/centreon-plugins/apps/backup/rubrik/restapi/mode/cluster.pm @@ -133,11 +133,7 @@ sub manage_selection { $self->{clusters} = { $name => { name => $name, - status => $status->{status}, - read => 0, - write => 0, - read_iops => 0, - write_iops => 0 + status => $status->{status} } }; @@ -147,10 +143,12 @@ sub manage_selection { )) { my $count = 0; foreach (@{$io_stats->{ $entry->[0] }->{ $entry->[1] }}) { + $self->{clusters}->{$name}->{ $entry->[2] } = 0 + if (!defined($self->{clusters}->{$name}->{ $entry->[2] })); $self->{clusters}->{$name}->{ $entry->[2] } += $_->{stat}; $count++; } - $self->{clusters}->{$name}->{ $entry->[2] } = int($self->{clusters}->{$name}->{ $entry->[2] } / $count); + $self->{clusters}->{$name}->{ $entry->[2] } = int($self->{clusters}->{$name}->{ $entry->[2] } / $count) if ($count > 0); } } diff --git a/centreon-plugins/apps/backup/rubrik/restapi/mode/disks.pm b/centreon-plugins/apps/backup/rubrik/restapi/mode/disks.pm index d88f9065c..d8c021f90 100644 --- a/centreon-plugins/apps/backup/rubrik/restapi/mode/disks.pm +++ b/centreon-plugins/apps/backup/rubrik/restapi/mode/disks.pm @@ -139,8 +139,8 @@ sub manage_selection { }; foreach (@{$disks->{data}}) { my $id = $_->{nodeId} . ':' . $_->{id}; - next if (defined($options{filter_disk_id}) && $options{filter_disk_id} ne '' && - $id !~ /$options{filter_disk_id}/); + next if (defined($self->{option_results}->{filter_disk_id}) && $self->{option_results}->{filter_disk_id} ne '' && + $id !~ /$self->{option_results}->{filter_disk_id}/); $self->{clusters}->{$name}->{disks}->{$id} = { id => $id, diff --git a/centreon-plugins/apps/backup/rubrik/restapi/mode/nodes.pm b/centreon-plugins/apps/backup/rubrik/restapi/mode/nodes.pm index a5a29860a..44cdece2d 100644 --- a/centreon-plugins/apps/backup/rubrik/restapi/mode/nodes.pm +++ b/centreon-plugins/apps/backup/rubrik/restapi/mode/nodes.pm @@ -138,8 +138,8 @@ sub manage_selection { } }; foreach (@{$nodes->{data}}) { - next if (defined($options{filter_node_id}) && $options{filter_node_id} ne '' && - $_->{id} !~ /$options{filter_node_id}/); + next if (defined($self->{option_results}->{filter_node_id}) && $self->{option_results}->{filter_node_id} ne '' && + $_->{id} !~ /$self->{option_results}->{filter_node_id}/); $self->{clusters}->{$name}->{nodes}->{ $_->{id} } = { id => $_->{id},