Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ADP spares #89

Merged
merged 2 commits into from
Sep 24, 2020
Merged

Support ADP spares #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a199d24
support ADP spares
ngarratt Sep 17, 2020
6cab42f
resolve conflict with 48k ram patch 1
ngarratt Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions check_netapp_ontap.pl
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,53 @@ sub get_spare_info {
}
}

# Include ADP spares, which are only reported under aggregate spares (not in the spare container)
$nahSpareIterator = NaElement->new("aggr-spare-get-iter");
$nahQuery = NaElement->new("query");
$nahSpareInfo = NaElement->new("storage-disk-info");
$nahSpareOwnerInfo = NaElement->new("disk-ownership-info");
$strActiveTag = "";

if (defined($strVHost)) {
$nahSpareIterator->child_add($nahQuery);
$nahQuery->child_add($nahSpareInfo);
$nahSpareInfo->child_add($nahSpareOwnerInfo);
$nahSpareOwnerInfo->child_add_string("original-owner", $strVHost);
}

while(defined($strActiveTag)) {
if ($strActiveTag ne "") {
$nahSpareIterator->child_add_string("tag", $strActiveTag);
}

$nahSpareIterator->child_add_string("max-records", 600);
my $nahResponse = $nahStorage->invoke_elem($nahSpareIterator);
validate_ontapi_response($nahResponse, "Failed filer health query: ");

$strActiveTag = $nahResponse->child_get_string("next-tag");

if ($nahResponse->child_get_string("num-records") == 0) {
last;
}

SPARE:
foreach my $nahSpare ($nahResponse->child_get("attributes-list")->children_get()) {
my $strSpareName = $nahSpare->child_get_string("disk");
my $strUsableBlk = $nahSpare->child_get_string("local-usable-data-size-blks");

# Skip root partition spares
if (!defined($strUsableBlk)) {
next SPARE;
} else {
my $nodeName = $nahSpare->child_get_string("original-owner");
my $zeroed = $nahSpare->child_get_string('is-disk-zeroed');

$hshSpareInfo{$nodeName}{$strSpareName}{'status'} = 'spare';
$hshSpareInfo{$nodeName}{$strSpareName}{'zeroed'} = $zeroed;
}
}
}

return \%hshSpareInfo;
}

Expand Down