From 34c001c761ecdc06e3ea34e150966e88dba653fe Mon Sep 17 00:00:00 2001 From: Crited Date: Mon, 22 Jul 2019 15:59:47 +0200 Subject: [PATCH] Changed Import-Module to fit with Import-ModuleLib Concept --- icinga-module-windows.psm1 | 2 -- lib/provider/bios/Icinga_ProviderBios.psm1 | 2 +- lib/provider/cpu/Icinga_ProviderCpu.psm1 | 2 +- lib/provider/disks/Icinga_ProviderDisks.psm1 | 2 +- lib/provider/memory/Icinga_ProviderMemory.psm1 | 2 +- lib/provider/process/Icinga_ProviderProcess.psm1 | 3 ++- lib/provider/windows/Icinga_ProviderWindows.psm1 | 3 +-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/icinga-module-windows.psm1 b/icinga-module-windows.psm1 index 70c3552..3d84e5e 100644 --- a/icinga-module-windows.psm1 +++ b/icinga-module-windows.psm1 @@ -9,8 +9,6 @@ #> -$global:IncludeDir = "$PSScriptRoot\lib"; - function Install-Icinga() { [string]$command = Get-Icinga-Command('setup'); diff --git a/lib/provider/bios/Icinga_ProviderBios.psm1 b/lib/provider/bios/Icinga_ProviderBios.psm1 index 41eeb87..76e6a73 100644 --- a/lib/provider/bios/Icinga_ProviderBios.psm1 +++ b/lib/provider/bios/Icinga_ProviderBios.psm1 @@ -1,4 +1,4 @@ -Import-Module $IncludeDir\provider\enums; +Import-IcingaLib provider\enums; function Get-IcingaBios() { <# Collects the most important BIOS informations, diff --git a/lib/provider/cpu/Icinga_ProviderCpu.psm1 b/lib/provider/cpu/Icinga_ProviderCpu.psm1 index 9324ba8..6dac6c8 100644 --- a/lib/provider/cpu/Icinga_ProviderCpu.psm1 +++ b/lib/provider/cpu/Icinga_ProviderCpu.psm1 @@ -1,4 +1,4 @@ -Import-Module $IncludeDir\provider\enums; +Import-IcingaLib provider\enums; function Get-IcingaCPUs() { <# Collects the most important CPU informations, diff --git a/lib/provider/disks/Icinga_ProviderDisks.psm1 b/lib/provider/disks/Icinga_ProviderDisks.psm1 index 74dab9e..b03a8b6 100644 --- a/lib/provider/disks/Icinga_ProviderDisks.psm1 +++ b/lib/provider/disks/Icinga_ProviderDisks.psm1 @@ -1,4 +1,4 @@ -Import-Module $IncludeDir\provider\enums; +Import-IcingaLib provider\enums; function Get-IcingaDiskInformation() { diff --git a/lib/provider/memory/Icinga_ProviderMemory.psm1 b/lib/provider/memory/Icinga_ProviderMemory.psm1 index 89e544d..f9abcd0 100644 --- a/lib/provider/memory/Icinga_ProviderMemory.psm1 +++ b/lib/provider/memory/Icinga_ProviderMemory.psm1 @@ -1,4 +1,4 @@ -Import-Module $IncludeDir\provider\enums\Icinga_ProviderEnums; +Import-IcingaLib provider\enums; function Get-IcingaMemory () { <# Collects the most important Memory informations, diff --git a/lib/provider/process/Icinga_ProviderProcess.psm1 b/lib/provider/process/Icinga_ProviderProcess.psm1 index 729138b..c86c6ee 100644 --- a/lib/provider/process/Icinga_ProviderProcess.psm1 +++ b/lib/provider/process/Icinga_ProviderProcess.psm1 @@ -1,4 +1,5 @@ -Import-Module $IncludeDir\provider\cpu; +Import-IcingaLib provider\enums; +Import-IcingaLib provider\cpu; function Add-IcingaProcessPerfData() { diff --git a/lib/provider/windows/Icinga_ProviderWindows.psm1 b/lib/provider/windows/Icinga_ProviderWindows.psm1 index 57b1a88..d0d5d6d 100644 --- a/lib/provider/windows/Icinga_ProviderWindows.psm1 +++ b/lib/provider/windows/Icinga_ProviderWindows.psm1 @@ -1,5 +1,4 @@ -Import-Module $IncludeDir\provider\enums\Icinga_ProviderEnums; - +Import-IcingaLib provider\enums; function Get-IcingaWindows() {