Revision ea2027b6
Diverses corrections + seuils pour les HLS
Définit les seuils warning/critical pour les HLS de sorte que chaque HLS
représente effectivement le pire état parmi ses dépendances.
Change-Id: Iac6093a2c41c3cb27ec158aaea6af6b86b10e788
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/2401
Tested-by: Build system <qa@vigilo-dev.si.c-s.fr>
Reviewed-by: Francois POIROTTE <francois.poirotte@c-s.fr>
src/plugins/vigilo/inc/hls.class.php | ||
---|---|---|
1 | 1 |
<?php |
2 | 2 |
|
3 |
class PluginVigiloAbstractMonitoredItem extends VigiloXml
|
|
3 |
class PluginVigiloHls extends VigiloXml
|
|
4 | 4 |
{ |
5 | 5 |
protected $name; |
6 | 6 |
protected $hlsHost; |
... | ... | |
16 | 16 |
$this->hlsServices = new VigiloHlservice( |
17 | 17 |
"services:$name", |
18 | 18 |
VigiloHlservice::OPERATOR_AND, |
19 |
self::MESSAGE |
|
19 |
self::MESSAGE, |
|
20 |
1, // Seuil warning |
|
21 |
0 // Seuil critical |
|
20 | 22 |
); |
21 | 23 |
$nbServices = 0; |
22 | 24 |
foreach ($host->getTests() as $test) { |
23 | 25 |
foreach ($test->getNagiosNames() as $service) { |
24 |
$this->hlsServices[] = new VigiloDepends($name, $service); |
|
26 |
$this->hlsServices[] = new VigiloDepends($name, $service, 2, 1);
|
|
25 | 27 |
$nbServices++; |
26 | 28 |
} |
27 | 29 |
} |
... | ... | |
30 | 32 |
$this->hlsHost = new VigiloHlservice( |
31 | 33 |
"machine:$name", |
32 | 34 |
VigiloHlservice::OPERATOR_AND, |
33 |
self::MESSAGE |
|
35 |
self::MESSAGE, |
|
36 |
1, // Seuil warning |
|
37 |
0 // Seuil critical |
|
34 | 38 |
); |
35 |
$this->hlsHost[] = new VigiloDepends($host);
|
|
36 |
$this->hlsHost[] = new VigiloDepends(null, "services:$name"); |
|
39 |
$this->hlsHost[] = new VigiloDepends($name, null, 2);
|
|
40 |
$this->hlsHost[] = new VigiloDepends(null, "services:$name", 2, 1);
|
|
37 | 41 |
$this->name = $name; |
38 | 42 |
} |
39 | 43 |
|
... | ... | |
44 | 48 |
|
45 | 49 |
public function __toString() |
46 | 50 |
{ |
47 |
return "<?xml version="1.0"?><hlservices>{$this->hlsHost}{$this->hlsServices}</hlservices>";
|
|
51 |
return "<?xml version=\"1.0\"?><hlservices>{$this->hlsHost}{$this->hlsServices}</hlservices>";
|
|
48 | 52 |
} |
49 | 53 |
} |
Also available in: Unified diff