Skip to content

Commit

Permalink
Merge pull request #299 from Icinga:fix/inventory_support
Browse files Browse the repository at this point in the history
Fix: Inventory module integration

Fixes integration with inventory module, cause by new isolation feature.
  • Loading branch information
LordHepipud authored Apr 27, 2022
2 parents 0a2b39c + 4886a94 commit 2a63d32
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 12 deletions.
1 change: 1 addition & 0 deletions doc/31-Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic

* [#283](https://github.com/Icinga/icinga-powershell-plugins/pull/283) Fixes random `Add-Type` exceptions during runtime compilation by replacing it with `Add-IcingaAddTypeLib`
* [#286](https://github.com/Icinga/icinga-powershell-plugins/issues/286) Fixes `Invoke-IcingaCheckHTTPStatus` which is not returning the request time, in case the target website is not providing content
* [#299](https://github.com/Icinga/icinga-powershell-plugins/pull/299) Fixes integration with `Inventory` module

### Enhancements

Expand Down
13 changes: 12 additions & 1 deletion icinga-powershell-plugins.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,20 @@
'Invoke-IcingaCheckPartitionSpace',
'Invoke-IcingaCheckUsedPartitionSpace',
'Invoke-IcingaCheckUsers',
'Get-IcingaBios',
'Get-IcingaCPUs',
'Get-IcingaCPUCount',
'Get-IcingaPhysicalDiskInfo',
'Get-IcingaMemoryPerformanceCounter'
'Get-IcingaDiskInformation',
'Get-IcingaDiskPartitions',
'Get-IcingaMemoryPerformanceCounter',
'Get-IcingaMemory',
'Get-IcingaProcessData',
'Get-IcingaUpdatesHotfix',
'Get-IcingaUpdatesInstalled',
'Get-IcingaWindowsUpdatesPending',
'Get-IcingaUsers',
'Get-IcingaWindows'
)
CmdletsToExport = @(
)
Expand Down
2 changes: 1 addition & 1 deletion provider/bios/Icinga_ProviderBios.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaBios()
function Global:Get-IcingaBios()
{
<# Collects the most important BIOS informations,
e.g. name, version, manufacturer#>
Expand Down
2 changes: 1 addition & 1 deletion provider/cpu/Icinga_ProviderCpu.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaCPUs()
function Global:Get-IcingaCPUs()
{
<# Collects the most important CPU informations,
e.g. name, version, manufacturer#>
Expand Down
4 changes: 2 additions & 2 deletions provider/disks/Icinga_ProviderDisks.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaDiskInformation()
function Global:Get-IcingaDiskInformation()
{
<# Fetches the information for other more specific Get-IcingaDisk-functions
e.g. Get-IcingaDiskModel; Get-IcingaDiskManufacturer.
Expand Down Expand Up @@ -32,7 +32,7 @@ function Get-IcingaDiskInformation()

return $DiskData;
}
function Get-IcingaDiskPartitions()
function Global:Get-IcingaDiskPartitions()
{
param(
$Disk
Expand Down
2 changes: 1 addition & 1 deletion provider/memory/Icinga_ProviderMemory.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaMemory()
function Global:Get-IcingaMemory()
{
<# Collects the most important Memory informations,
e.g. name, version, manufacturer#>
Expand Down
2 changes: 1 addition & 1 deletion provider/private/process/Icinga_ProviderProcess.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function Add-IcingaProcessPerfData()
}
}

function Get-IcingaProcessData {
function Global:Get-IcingaProcessData {

param (
[array]$Process = @()
Expand Down
2 changes: 1 addition & 1 deletion provider/private/updates/Get-IcingaUpdatesHotfix.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaUpdatesHotfix()
function Global:Get-IcingaUpdatesHotfix()
{
[hashtable]$HotfixInfo = @{ };
[hashtable]$HotfixNameCache = @{ };
Expand Down
2 changes: 1 addition & 1 deletion provider/private/updates/Get-IcingaUpdatesInstalled.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaUpdatesInstalled()
function Global:Get-IcingaUpdatesInstalled()
{

# Fetch all informations about installed updates and add them
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaWindowsUpdatesPending()
function Global:Get-IcingaWindowsUpdatesPending()
{
param (
[array]$UpdateFilter = @()
Expand Down
2 changes: 1 addition & 1 deletion provider/private/users/Get-IcingaUsers.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaUsers()
function Global:Get-IcingaUsers()
{
param (
[array]$Username
Expand Down
2 changes: 1 addition & 1 deletion provider/private/windows/Icinga_ProviderWindows.psm1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function Get-IcingaWindows()
function Global:Get-IcingaWindows()
{
$WindowsInformations = Get-IcingaWindowsInformation Win32_OperatingSystem;

Expand Down

0 comments on commit 2a63d32

Please sign in to comment.