Skip to content

Commit f763640

Browse files
glenscglensc
authored
Merge pull request #220 from ixs/patch-1
Parse 3ware VERIFY-PAUSED as okay
2 parents b8880d2 + 1e62e06 commit f763640

File tree

8 files changed

+211
-2
lines changed

8 files changed

+211
-2
lines changed

Diff for: ‎lib/App/Monitoring/Plugin/CheckRaid/Plugins/tw_cli.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ sub check {
433433
$this->warning;
434434
$s .= " $u->{vim_percent}";
435435

436-
} elsif ($s eq 'VERIFYING') {
436+
} elsif ($s =~ /VERIFYING|VERIFY-PAUSED/) {
437437
$this->check_status;
438438
$s .= " $u->{vim_percent}";
439439

@@ -464,7 +464,7 @@ sub check {
464464
foreach my $p (sort { $a cmp $b } keys %{$c->{drivestatus}}) {
465465
my $d = $c->{drivestatus}->{$p};
466466
my $ds = $d->{status};
467-
if ($ds eq 'VERIFYING') {
467+
if ($ds =~ /VERIFYING|VERIFY-PAUSED/) {
468468
$this->check_status;
469469
} elsif ($ds ne 'OK') {
470470
$this->critical;

Diff for: ‎t/check_tw_cli.t

+10
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ my @tests = (
9292
message => 'c0(9750-4i): u0(RAID-6): VERIFYING 29%(A), Cache:RiW, c0(9750-4i): u1(RAID-6): VERIFYING 18%(A), Cache:RiW, c0(9750-4i): u2(SPARE): VERIFYING 14%, c0(9750-4i): u3(SPARE): VERIFYING 0%, Drives(18): p10,p11,p12,p13,p14,p15,p16,p17,p18,p19,p20,p21,p22,p23,p24,p8=OK p25,p9=VERIFYING, Enclosure: /c0/e0(fan0=OK(2670),fan1=OK(9500),fan2=OK(8540),fan3=OK(2830),fan4=OK(9120),fan5=OK(8330),temp0=OK(41C),temp1=OK(38C),temp2=OK(34C),temp3=OK(38C),temp4=OK(38C),temp5=OK(34C),pwrs0=OK(status=on,voltage=OK,current=OK),pwrs1=OK(status=on,voltage=OK,current=OK),slot0=OK,slot10=OK,slot2=OK,slot3=OK,slot4=OK,slot5=OK,slot6=OK,slot7=OK,slot8=OK,slot9=OK)',
9393
c => 'bootc-enc',
9494
},
95+
{
96+
status => OK,
97+
info => 'sysiphus/info',
98+
show => 'sysiphus/show',
99+
unitstatus => 'sysiphus/info.c0.unitstatus',
100+
drivestatus => 'sysiphus/info.c0.drivestatus',
101+
bbustatus => 'sysiphus/info.c0.bbustatus',
102+
message => 'c0(9650SE-16ML): u0(RAID-10): VERIFYING 25%, Cache:W, c0(9650SE-16ML): u1(SPARE): VERIFY-PAUSED 0%, c0(9650SE-16ML): u2(SPARE): VERIFY-PAUSED 0%, Drives(12): p0,p1,p2,p3,p4,p5,p6,p7,p8,p9=OK p10,p11=VERIFYING, BBU: OK(Volt=OK,Temp=OK,Hours=255,LastCapTest=07-May-2022)',
103+
c => 'sysiphus',
104+
},
95105
{
96106
status => OK,
97107
info => 'grubbs/info',

Diff for: ‎t/data/tw_cli/sysiphus/info

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
Ctl Model (V)Ports Drives Units NotOpt RRate VRate BBU
3+
------------------------------------------------------------------------
4+
c0 9650SE-16ML 16 12 3 0 1 1 OK
5+

Diff for: ‎t/data/tw_cli/sysiphus/info.c0.bbustatus

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
Name OnlineState BBUReady Status Volt Temp Hours LastCapTest
3+
---------------------------------------------------------------------------
4+
bbu On Yes OK OK OK 255 07-May-2022
5+

Diff for: ‎t/data/tw_cli/sysiphus/info.c0.drivestatus

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
VPort Status Unit Size Type Phy Encl-Slot Model
3+
------------------------------------------------------------------------------
4+
p0 OK u0 298.09 GB SATA 0 - ST3320620AS
5+
p1 OK u0 298.09 GB SATA 1 - ST3320620AS
6+
p2 OK u0 298.09 GB SATA 2 - ST3320620AS
7+
p3 OK u0 298.09 GB SATA 3 - ST3320620AS
8+
p4 OK u0 298.09 GB SATA 4 - ST3320620AS
9+
p5 OK u0 298.09 GB SATA 5 - ST3320620AS
10+
p6 OK u0 298.09 GB SATA 6 - ST3320620AS
11+
p7 OK u0 298.09 GB SATA 7 - ST3320620AS
12+
p8 OK u0 298.09 GB SATA 8 - ST3320620AS
13+
p9 OK u0 298.09 GB SATA 9 - ST3320620AS
14+
p10 VERIFYING u1 298.09 GB SATA 10 - ST3320620AS
15+
p11 VERIFYING u2 298.09 GB SATA 11 - ST3320620AS
16+

Diff for: ‎t/data/tw_cli/sysiphus/info.c0.unitstatus

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
Unit UnitType Status %RCmpl %V/I/M Stripe Size(GB) Cache AVrfy
3+
------------------------------------------------------------------------------
4+
u0 RAID-10 VERIFYING - 25% 64K 1490.06 W ON
5+
u1 SPARE VERIFY-PAUSED - 0% - 298.082 - ON
6+
u2 SPARE VERIFY-PAUSED - 0% - 298.082 - ON
7+

Diff for: ‎t/data/tw_cli/sysiphus/show

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
info

Diff for: ‎t/dump/tw_cli/sysiphus

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
$VAR1 = {
2+
'c0' => {
3+
'bbu' => 'OK',
4+
'bbustatus' => {
5+
'bbu' => {
6+
'BBUReady' => 'Yes',
7+
'Hours' => '255',
8+
'LastCapTest' => '07-May-2022',
9+
'OnlineState' => 'On',
10+
'Status' => 'OK',
11+
'Temp' => 'OK',
12+
'Volt' => 'OK'
13+
}
14+
},
15+
'drives' => 12,
16+
'drivestatus' => {
17+
'p0' => {
18+
'encl' => '-',
19+
'model' => 'ST3320620AS',
20+
'phy' => 0,
21+
'size' => '298.09 GB',
22+
'status' => 'OK',
23+
'type' => 'SATA',
24+
'unit' => 'u0'
25+
},
26+
'p1' => {
27+
'encl' => '-',
28+
'model' => 'ST3320620AS',
29+
'phy' => 1,
30+
'size' => '298.09 GB',
31+
'status' => 'OK',
32+
'type' => 'SATA',
33+
'unit' => 'u0'
34+
},
35+
'p10' => {
36+
'encl' => '-',
37+
'model' => 'ST3320620AS',
38+
'phy' => 10,
39+
'size' => '298.09 GB',
40+
'status' => 'VERIFYING',
41+
'type' => 'SATA',
42+
'unit' => 'u1'
43+
},
44+
'p11' => {
45+
'encl' => '-',
46+
'model' => 'ST3320620AS',
47+
'phy' => 11,
48+
'size' => '298.09 GB',
49+
'status' => 'VERIFYING',
50+
'type' => 'SATA',
51+
'unit' => 'u2'
52+
},
53+
'p2' => {
54+
'encl' => '-',
55+
'model' => 'ST3320620AS',
56+
'phy' => 2,
57+
'size' => '298.09 GB',
58+
'status' => 'OK',
59+
'type' => 'SATA',
60+
'unit' => 'u0'
61+
},
62+
'p3' => {
63+
'encl' => '-',
64+
'model' => 'ST3320620AS',
65+
'phy' => 3,
66+
'size' => '298.09 GB',
67+
'status' => 'OK',
68+
'type' => 'SATA',
69+
'unit' => 'u0'
70+
},
71+
'p4' => {
72+
'encl' => '-',
73+
'model' => 'ST3320620AS',
74+
'phy' => 4,
75+
'size' => '298.09 GB',
76+
'status' => 'OK',
77+
'type' => 'SATA',
78+
'unit' => 'u0'
79+
},
80+
'p5' => {
81+
'encl' => '-',
82+
'model' => 'ST3320620AS',
83+
'phy' => 5,
84+
'size' => '298.09 GB',
85+
'status' => 'OK',
86+
'type' => 'SATA',
87+
'unit' => 'u0'
88+
},
89+
'p6' => {
90+
'encl' => '-',
91+
'model' => 'ST3320620AS',
92+
'phy' => 6,
93+
'size' => '298.09 GB',
94+
'status' => 'OK',
95+
'type' => 'SATA',
96+
'unit' => 'u0'
97+
},
98+
'p7' => {
99+
'encl' => '-',
100+
'model' => 'ST3320620AS',
101+
'phy' => 7,
102+
'size' => '298.09 GB',
103+
'status' => 'OK',
104+
'type' => 'SATA',
105+
'unit' => 'u0'
106+
},
107+
'p8' => {
108+
'encl' => '-',
109+
'model' => 'ST3320620AS',
110+
'phy' => 8,
111+
'size' => '298.09 GB',
112+
'status' => 'OK',
113+
'type' => 'SATA',
114+
'unit' => 'u0'
115+
},
116+
'p9' => {
117+
'encl' => '-',
118+
'model' => 'ST3320620AS',
119+
'phy' => 9,
120+
'size' => '298.09 GB',
121+
'status' => 'OK',
122+
'type' => 'SATA',
123+
'unit' => 'u0'
124+
}
125+
},
126+
'model' => '9650SE-16ML',
127+
'optimal' => 1,
128+
'ports' => 16,
129+
'rrate' => 1,
130+
'units' => 3,
131+
'unitstatus' => {
132+
'u0' => {
133+
'avrify' => 'ON',
134+
'cache' => 'W',
135+
'rebuild_percent' => '-',
136+
'size' => '1490.06',
137+
'status' => 'VERIFYING',
138+
'strip' => '64K',
139+
'type' => 'RAID-10',
140+
'vim_percent' => '25%'
141+
},
142+
'u1' => {
143+
'avrify' => 'ON',
144+
'cache' => '-',
145+
'rebuild_percent' => '-',
146+
'size' => '298.082',
147+
'status' => 'VERIFY-PAUSED',
148+
'strip' => '-',
149+
'type' => 'SPARE',
150+
'vim_percent' => '0%'
151+
},
152+
'u2' => {
153+
'avrify' => 'ON',
154+
'cache' => '-',
155+
'rebuild_percent' => '-',
156+
'size' => '298.082',
157+
'status' => 'VERIFY-PAUSED',
158+
'strip' => '-',
159+
'type' => 'SPARE',
160+
'vim_percent' => '0%'
161+
}
162+
},
163+
'vrate' => 1
164+
}
165+
};

0 commit comments

Comments
 (0)