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

fix sccm plugin

This commit is contained in:
Colin Gagnaire 2019-06-03 17:36:59 +02:00
parent 4714685f55
commit 9fcba83eb2
4 changed files with 37 additions and 11 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(); $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->{global}->{LinkStatus} = $map_link_status{$decoded->{LinkStatus}};
$self->{sites}->{$decoded->{Site1}} = { $self->{sites}->{$decoded->{Site1}} = {

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

@ -161,6 +161,7 @@ sub manage_selection {
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
if (ref($decoded) eq "ARRAY") {
foreach my $site (@{$decoded}) { foreach my $site (@{$decoded}) {
$self->{sites}->{$site->{SiteCode}} = { $self->{sites}->{$site->{SiteCode}} = {
display => $site->{SiteCode}, display => $site->{SiteCode},
@ -171,6 +172,21 @@ sub manage_selection {
SecondarySiteCMUpdateStatus => $site->{SecondarySiteCMUpdateStatus}, 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; 1;

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

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

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

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