tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/centreon/centreon-plugins

This commit is contained in:
garnier-quentin 2019-06-03 18:04:58 +02:00
parent 39f2b6bdf8 16bbc678dd
commit b4a46f4b0d
5 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sccm/local/mode/databasereplicationstatus.pm
View File

@ -199,6 +199,10 @@ sub manage_selection {
$self->{output}->option_exit();
}
if (!defined($decoded->{LinkStatus})) {
$self->{output}->add_option_msg(short_msg => "No database replication");
$self->{output}->option_exit();
}
$self->{global}->{LinkStatus} = $map_link_status{$decoded->{LinkStatus}};
$self->{sites}->{$decoded->{Site1}} = {

32
apps/sccm/local/mode/sitestatus.pm
View File

@ -161,16 +161,32 @@ sub manage_selection {
$self->{output}->option_exit();
}
foreach my $site (@{$decoded}) {
$self->{sites}->{$site->{SiteCode}} = {
display => $site->{SiteCode},
SiteName => $site->{SiteName},
Type => $map_type{$site->{Type}},
Mode => $map_mode{$site->{Mode}},
Status => $map_status{$site->{Status}},
SecondarySiteCMUpdateStatus => $site->{SecondarySiteCMUpdateStatus},
if (ref($decoded) eq "ARRAY") {
foreach my $site (@{$decoded}) {
$self->{sites}->{$site->{SiteCode}} = {
display => $site->{SiteCode},
SiteName => $site->{SiteName},
Type => $map_type{$site->{Type}},
Mode => $map_mode{$site->{Mode}},
Status => $map_status{$site->{Status}},
SecondarySiteCMUpdateStatus => $site->{SecondarySiteCMUpdateStatus},
};
}
} else {
$self->{sites}->{$decoded->{SiteCode}} = {
display => $decoded->{SiteCode},
SiteName => $decoded->{SiteName},
Type => $map_type{$decoded->{Type}},
Mode => $map_mode{$decoded->{Mode}},
Status => $map_status{$decoded->{Status}},
SecondarySiteCMUpdateStatus => $decoded->{SecondarySiteCMUpdateStatus},
};
}
if (scalar(keys %{$self->{sites}}) <= 0) {
$self->{output}->add_option_msg(short_msg => "No sites found.");
$self->{output}->option_exit();
}
}
1;

5
centreon/common/powershell/sccm/databasereplicationstatus.pm
View File

@ -44,7 +44,10 @@ $ProgressPreference = "SilentlyContinue"
Try {
$ErrorActionPreference = "Stop"
$module = ${env:ProgramFiles(x86)} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
$module = ${env:ProgramFiles} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
If (-Not (Test-Path $module)) {
$module = ${env:ProgramFiles(x86)} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
}
Import-Module $module
New-PSDrive -Name SCCMDrive -PSProvider "AdminUI.PS.Provider\CMSite" -Root $env:COMPUTERNAME -Description "SCCM Site" | Out-Null

5
centreon/common/powershell/sccm/sitestatus.pm
View File

@ -44,7 +44,10 @@ $ProgressPreference = "SilentlyContinue"
Try {
$ErrorActionPreference = "Stop"
$module = ${env:ProgramFiles(x86)} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
$module = ${env:ProgramFiles} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
If (-Not (Test-Path $module)) {
$module = ${env:ProgramFiles(x86)} + "\Microsoft Configuration Manager\AdminConsole\bin\ConfigurationManager.psd1"
}
Import-Module $module
New-PSDrive -Name SCCMDrive -PSProvider "AdminUI.PS.Provider\CMSite" -Root $env:COMPUTERNAME -Description "SCCM Site" | Out-Null

8
cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm
View File

@ -320,17 +320,17 @@ Filter on a specific type (Must be a PromQL filter, Default: 'mode=~".*"')
=item B<--warning-*>
Threshold warning.
Can be: 'node-idle', 'node-wait', 'node-irq', 'node-nice',
Can be: 'node-idle', 'node-wait', 'node-interrupt', 'node-nice',
'node-softirq', 'node-steal', 'node-system', 'node-user',
'cpu-idle', 'cpu-wait', 'cpu-irq', 'cpu-nice', 'cpu-softirq',
'cpu-idle', 'cpu-wait', 'cpu-interrupt', 'cpu-nice', 'cpu-softirq',
'cpu-steal', 'cpu-system', 'cpu-user'.
=item B<--critical-*>
Threshold critical.
Can be: 'node-idle', 'node-wait', 'node-irq', 'node-nice',
Can be: 'node-idle', 'node-wait', 'node-interrupt', 'node-nice',
'node-softirq', 'node-steal', 'node-system', 'node-user',
'cpu-idle', 'cpu-wait', 'cpu-irq', 'cpu-nice', 'cpu-softirq',
'cpu-idle', 'cpu-wait', 'cpu-interrupt', 'cpu-nice', 'cpu-softirq',
'cpu-steal', 'cpu-system', 'cpu-user'.
=item B<--extra-filter>