From c2cae82d496ae3aff34dd246d83552308f000277 Mon Sep 17 00:00:00 2001 From: Jonathan Colon Date: Sun, 22 Feb 2026 13:29:51 -0400 Subject: [PATCH] ## [0.1.2] - Unreleased ### Added - Add initial support for diagrams using the Diagrammer module - Add Export-AbrDiagram function to handle diagram exports - Generate a Process Hierarchy Diagram in Invoke-AsBuiltReport.System.Resources - Add initial support for charts - Generate Memory Usage and CPU Usage charts in Invoke-AsBuiltReport.System.Resources ### Changed - Increase module dependencies: - AsBuiltReport.Core minimum version increased to 1.6.2 - Diagrammer.Core minimum version increased to 0.2.38 - AsBuiltReport.Chart minimum version increased to 0.2.0 --- AsBuiltReport.System.Resources.psd1 | 10 ++++++- CHANGELOG.md | 9 ++++++ Language/ar-SA/SystemResources.psd1 | 22 +++++++------- Language/cs-CZ/SystemResources.psd1 | 10 +++++++ Language/da-DK/SystemResources.psd1 | 21 +++++++------ Language/de-DE/SystemResources.psd1 | 21 +++++++------ Language/el-GR/SystemResources.psd1 | 21 +++++++------ Language/en-GB/SystemResources.psd1 | 10 +++++++ Language/en-US/SystemResources.psd1 | 22 +++++++------- Language/es-ES/SystemResources.psd1 | 21 +++++++------ Language/fi-FI/SystemResources.psd1 | 10 +++++++ Language/fr-FR/SystemResources.psd1 | 10 +++++++ Language/he-IL/SystemResources.psd1 | 10 +++++++ Language/hi-IN/SystemResources.psd1 | 10 +++++++ Language/hu-HU/SystemResources.psd1 | 10 +++++++ Language/it-IT/SystemResources.psd1 | 10 +++++++ Language/ja-JP/SystemResources.psd1 | 10 +++++++ Language/ko-KR/SystemResources.psd1 | 10 +++++++ Language/nb-NO/SystemResources.psd1 | 10 +++++++ Language/nl-NL/SystemResources.psd1 | 10 +++++++ Language/pl-PL/SystemResources.psd1 | 10 +++++++ Language/pt-PT/SystemResources.psd1 | 10 +++++++ Language/ru-RU/SystemResources.psd1 | 10 +++++++ Language/sv-SE/SystemResources.psd1 | 10 +++++++ Language/th-TH/SystemResources.psd1 | 10 +++++++ Language/tr-TR/SystemResources.psd1 | 10 +++++++ Language/vi-VN/SystemResources.psd1 | 10 +++++++ Language/zh-CN/SystemResources.psd1 | 10 +++++++ Language/zh-Hans/SystemResources.psd1 | 10 +++++++ Language/zh-Hant/SystemResources.psd1 | 10 +++++++ Src/Private/Export-AbrDiagram.ps1 | 2 +- Src/Private/Get-AbrProcessDiagram.ps1 | 1 - Src/Private/Get-AbrProcessInfo.ps1 | 30 +++++++++++++++++++ .../Invoke-AsBuiltReport.System.Resources.ps1 | 12 +------- 34 files changed, 330 insertions(+), 82 deletions(-) diff --git a/AsBuiltReport.System.Resources.psd1 b/AsBuiltReport.System.Resources.psd1 index 4290eef..ef0a682 100644 --- a/AsBuiltReport.System.Resources.psd1 +++ b/AsBuiltReport.System.Resources.psd1 @@ -27,7 +27,7 @@ # CompanyName = 'Unknown' # Copyright statement for this module - Copyright = '(c) 2025 AsBuiltReport. All rights reserved.' + Copyright = '(c) 2026 AsBuiltReport. All rights reserved.' # Description of the functionality provided by this module Description = 'A PowerShell module to generate an as built report on the configuration of System Resources.' @@ -56,6 +56,14 @@ @{ ModuleName = 'AsBuiltReport.Core'; ModuleVersion = '1.6.2' + }, + @{ + ModuleName = 'AsBuiltReport.Chart'; + ModuleVersion = '0.2.0' + }, + @{ + ModuleName = 'Diagrammer.Core'; + ModuleVersion = '0.2.38' } ) diff --git a/CHANGELOG.md b/CHANGELOG.md index dde6f14..3a8e6ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add initial support for diagrams using the Diagrammer module - Add Export-AbrDiagram function to handle diagram exports - Generate a Process Hierarchy Diagram in Invoke-AsBuiltReport.System.Resources +- Add initial support for charts + - Generate Memory Usage and CPU Usage charts in Invoke-AsBuiltReport.System.Resources + +### Changed + +- Increase module dependencies: + - AsBuiltReport.Core minimum version increased to 1.6.2 + - Diagrammer.Core minimum version increased to 0.2.38 + - AsBuiltReport.Chart minimum version increased to 0.2.0 ## [0.1.1] - 2025-10-11 diff --git a/Language/ar-SA/SystemResources.psd1 b/Language/ar-SA/SystemResources.psd1 index b89e772..5f200d5 100644 --- a/Language/ar-SA/SystemResources.psd1 +++ b/Language/ar-SA/SystemResources.psd1 @@ -1,11 +1,5 @@ # culture = 'ar-SA' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = مخطط تسلسل العمليات - Unable = غير قادر على إنشاء مخطط تسلسل العمليات. -'@ - # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} تم تعيين InfoLevel على {1}. @@ -32,6 +26,16 @@ Company = الشركة Product = المنتج Unknown = غير معروف + + Generating = توليد مخطط العمليات. + Label = تسلسل العمليات + MainDiagramLabel = مخطط تسلسل العمليات + Unable = غير قادر على توليد مخطط تسلسل العمليات. + MEMUsage = استخدام الذاكرة + CPUUsage = استخدام وحدة المعالجة المركزية + Processes = العمليات + MEMUsageChart = استخدام الذاكرة - مخطط + CPUUsageChart = استخدام وحدة المعالجة المركزية - مخطط '@ # Get-AbrTimeZone @@ -80,11 +84,5 @@ Yes = نعم No = لا Unknown = غير معروف -'@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} تم تعيين InfoLevel على {1}. - Generating = جاري إنشاء مخطط تسلسل العمليات. - Label = مخطط تسلسل العمليات '@ } diff --git a/Language/cs-CZ/SystemResources.psd1 b/Language/cs-CZ/SystemResources.psd1 index a47b34c..c431369 100644 --- a/Language/cs-CZ/SystemResources.psd1 +++ b/Language/cs-CZ/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Společnost Product = Produkt Unknown = Neznámý + + Generating = Generování diagramu procesů. + Label = Hierarchie procesů + MainDiagramLabel = Diagram hierarchie procesů + Unable = Nelze vygenerovat diagram hierarchie procesů. + MEMUsage = Použití paměti + CPUUsage = Použití CPU + Processes = Procesy + MEMUsageChart = Použití paměti - Graf + CPUUsageChart = Použití CPU - Graf '@ # Get-AbrTimeZone diff --git a/Language/da-DK/SystemResources.psd1 b/Language/da-DK/SystemResources.psd1 index d6b318d..773a2b9 100644 --- a/Language/da-DK/SystemResources.psd1 +++ b/Language/da-DK/SystemResources.psd1 @@ -1,10 +1,5 @@ # culture = 'da-DK' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = Proceshierarki Diagram - Unable = Kan ikke generere Proceshierarki Diagram. -'@ # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} InfoLevel indstillet til {1}. @@ -31,6 +26,16 @@ Company = Virksomhed Product = Produkt Unknown = Ukendt + + Generating = Genererer procesdiagram. + Label = Proceshierarki + MainDiagramLabel = Proceshierarkidiagram + Unable = Kan ikke generere proceshierarkidiagrammet. + MEMUsage = Brug af hukommelse + CPUUsage = Brug af CPU + Processes = Processer + MEMUsageChart = Brug af hukommelse - Diagram + CPUUsageChart = Brug af CPU - Diagram '@ # Get-AbrTimeZone @@ -79,11 +84,5 @@ Yes = Ja No = Nej Unknown = Ukendt -'@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} InfoLevel indstillet til {1}. - Generating = Genererer procesdiagram. - Label = Proceshierarki '@ } diff --git a/Language/de-DE/SystemResources.psd1 b/Language/de-DE/SystemResources.psd1 index 8d7582b..8240c83 100644 --- a/Language/de-DE/SystemResources.psd1 +++ b/Language/de-DE/SystemResources.psd1 @@ -1,10 +1,5 @@ # culture = 'de-DE' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = Prozesshierarchie Diagramm - Unable = Das Prozesshierarchie Diagramm kann nicht generiert werden. -'@ # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} InfoLevel auf {1} gesetzt. @@ -31,6 +26,16 @@ Company = Unternehmen Product = Produkt Unknown = Unbekannt + + Generating = Generieren des Prozessdiagramms. + Label = Prozesshierarchie + MainDiagramLabel = Prozesshierarchiediagramm + Unable = Unfähig, das Prozesshierarchiediagramm zu generieren. + MEMUsage = Speichernutzung + CPUUsage = CPU-Auslastung + Processes = Prozesse + MEMUsageChart = Speichernutzung - Diagramm + CPUUsageChart = CPU-Auslastung - Diagramm '@ # Get-AbrTimeZone @@ -79,11 +84,5 @@ Yes = Ja No = Nein Unknown = Unbekannt -'@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} InfoLevel auf {1} gesetzt. - Generating = Generiere Prozessdiagramm. - Label = Prozesshierarchie '@ } diff --git a/Language/el-GR/SystemResources.psd1 b/Language/el-GR/SystemResources.psd1 index 70622e6..aab5567 100644 --- a/Language/el-GR/SystemResources.psd1 +++ b/Language/el-GR/SystemResources.psd1 @@ -1,10 +1,5 @@ # culture = 'el-GR' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = Διάγραμμα Ιεραρχίας Διαδικασιών - Unable = Δεν είναι δυνατή η δημιουργία του Διαγράμματος Ιεραρχίας Διαδικασιών. -'@ # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} InfoLevel ορίστηκε σε {1}. @@ -31,6 +26,16 @@ Company = Εταιρεία Product = Προϊόν Unknown = Άγνωστο + + Generating = Δημιουργία διαγράμματος διεργασιών. + Label = Ιεραρχία διεργασιών + MainDiagramLabel = Διάγραμμα ιεραρχίας διεργασιών + Unable = Αδυναμία δημιουργίας διαγράμματος ιεραρχίας διεργασιών. + MEMUsage = Χρήση μνήμης + CPUUsage = Χρήση CPU + Processes = Διεργασίες + MEMUsageChart = Χρήση μνήμης - Διάγραμμα + CPUUsageChart = Χρήση CPU - Διάγραμμα '@ # Get-AbrTimeZone @@ -79,11 +84,5 @@ Yes = Ναι No = Όχι Unknown = Άγνωστο -'@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} InfoLevel ορίστηκε σε {1}. - Generating = Δημιουργία διαγράμματος διεργασιών. - Label = Ιεραρχία διεργασιών '@ } diff --git a/Language/en-GB/SystemResources.psd1 b/Language/en-GB/SystemResources.psd1 index 3716b45..6f2a47f 100644 --- a/Language/en-GB/SystemResources.psd1 +++ b/Language/en-GB/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Company Product = Product Unknown = Unknown + + Generating = Generating Process Diagram. + Label = Process Hierarchy + MainDiagramLabel = Process Hierarchy Diagram + Unable = Unable to generate the Process Hierarchy Diagram. + MEMUsage = Memory Usage + CPUUsage = CPU Usage + Processes = Processes + MEMUsageChart = Memory Usage - Chart + CPUUsageChart = CPU Usage - Chart '@ # Get-AbrTimeZone diff --git a/Language/en-US/SystemResources.psd1 b/Language/en-US/SystemResources.psd1 index cc6ead3..e16fb01 100644 --- a/Language/en-US/SystemResources.psd1 +++ b/Language/en-US/SystemResources.psd1 @@ -1,10 +1,5 @@ # culture = 'en-US' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = Process Hierarchy Diagram - Unable = Unable to generate the Process Hierarchy Diagram. -'@ # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} InfoLevel set at {1}. @@ -31,6 +26,16 @@ Company = Company Product = Product Unknown = Unknown + + Generating = Generating Process Diagram. + Label = Process Hierarchy + MainDiagramLabel = Process Hierarchy Diagram + Unable = Unable to generate the Process Hierarchy Diagram. + MEMUsage = Memory Usage + CPUUsage = CPU Usage + Processes = Processes + MEMUsageChart = Memory Usage - Chart + CPUUsageChart = CPU Usage - Chart '@ # Get-AbrTimeZone @@ -80,11 +85,4 @@ No = No Unknown = Unknown '@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} InfoLevel set at {1}. - Generating = Generating Process Diagram. - Label = Process Hierarchy -'@ - } \ No newline at end of file diff --git a/Language/es-ES/SystemResources.psd1 b/Language/es-ES/SystemResources.psd1 index 5d0f951..f989a83 100644 --- a/Language/es-ES/SystemResources.psd1 +++ b/Language/es-ES/SystemResources.psd1 @@ -1,10 +1,5 @@ # culture = 'es-ES' @{ - # Invoke-AsBuiltReport.System.Resources - InvokeAsBuiltReportSystemResources = ConvertFrom-StringData @' - MainDiagramLabel = Diagrama de Jerarquía de Procesos - Unable = No se puede generar el Diagrama de Jerarquía de Procesos. -'@ # Get-AbrDate GetAbrDate = ConvertFrom-StringData @' InfoLevel = {0} InfoLevel configurado en {1}. @@ -31,6 +26,16 @@ Company = Compañía Product = Producto Unknown = Desconocido + + Generating = Generando Diagrama de Procesos. + Label = Jerarquía de Procesos + MainDiagramLabel = Diagrama de Jerarquía de Procesos + Unable = No se puede generar el Diagrama de Jerarquía de Procesos. + MEMUsage = Uso de Memoria + CPUUsage = Uso de CPU + Processes = Procesos + MEMUsageChart = Uso de Memoria - Gráfico + CPUUsageChart = Uso de CPU - Gráfico '@ # Get-AbrTimeZone @@ -79,11 +84,5 @@ Yes = Sí No = No Unknown = Desconocido -'@ - # Get-AbrProcessDiagram - GetAbrProcessDiagram = ConvertFrom-StringData @' - InfoLevel = {0} InfoLevel configurado en {1}. - Generating = Generando Diagrama de Procesos. - Label = Jerarquía de Procesos '@ } diff --git a/Language/fi-FI/SystemResources.psd1 b/Language/fi-FI/SystemResources.psd1 index e4151d3..d67063d 100644 --- a/Language/fi-FI/SystemResources.psd1 +++ b/Language/fi-FI/SystemResources.psd1 @@ -31,6 +31,16 @@ Company = Yritys Product = Tuote Unknown = Tuntematon + + Generating = Luodaan prosessikaaviota. + Label = Prosessihierarkia + MainDiagramLabel = Prosessihierarkia Kaavio + Unable = Prosessihierarkia Kaaviota ei voida luoda. + MEMUsage = Muistin käyttö + CPUUsage = CPU:n käyttö + Processes = Prosessit + MEMUsageChart = Muistin käyttö - Kaavio + CPUUsageChart = CPU:n käyttö - Kaavio '@ # Get-AbrTimeZone diff --git a/Language/fr-FR/SystemResources.psd1 b/Language/fr-FR/SystemResources.psd1 index b7044dd..f6f4d3b 100644 --- a/Language/fr-FR/SystemResources.psd1 +++ b/Language/fr-FR/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Société Product = Produit Unknown = Inconnu + + Generating = Génération du diagramme des processus. + Label = Hiérarchie des processus + MainDiagramLabel = Diagramme de la hiérarchie des processus + Unable = Impossible de générer le diagramme de la hiérarchie des processus. + MEMUsage = Utilisation de la mémoire + CPUUsage = Utilisation du CPU + Processes = Processus + MEMUsageChart = Utilisation de la mémoire - Diagramme + CPUUsageChart = Utilisation du CPU - Diagramme '@ # Get-AbrTimeZone diff --git a/Language/he-IL/SystemResources.psd1 b/Language/he-IL/SystemResources.psd1 index 019e82b..307697e 100644 --- a/Language/he-IL/SystemResources.psd1 +++ b/Language/he-IL/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = חברה Product = מוצר Unknown = לא ידוע + + Generating = יצירת דיאגרמת תהליכים. + Label = היררכיית תהליכים + MainDiagramLabel = דיאגרמת היררכיית תהליכים + Unable = לא ניתן ליצור את דיאגרמת היררכיית התהליכים. + MEMUsage = שימוש בזיכרון + CPUUsage = שימוש ב-CPU + Processes = תהליכים + MEMUsageChart = שימוש בזיכרון - דיאגרמה + CPUUsageChart = שימוש ב-CPU - דיאגרמה '@ # Get-AbrTimeZone diff --git a/Language/hi-IN/SystemResources.psd1 b/Language/hi-IN/SystemResources.psd1 index a1160bd..fd025a1 100644 --- a/Language/hi-IN/SystemResources.psd1 +++ b/Language/hi-IN/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = कंपनी Product = उत्पाद Unknown = अज्ञात + + Generating = प्रक्रिया आरेख बनाना। + Label = प्रक्रिया पदानुक्रम + MainDiagramLabel = प्रक्रिया पदानुक्रम आरेख + Unable = प्रक्रिया पदानुक्रम आरेख बनाने में असमर्थ। + MEMUsage = मेमोरी उपयोग + CPUUsage = CPU उपयोग + Processes = प्रक्रियाएं + MEMUsageChart = मेमोरी उपयोग - चार्ट + CPUUsageChart = CPU उपयोग - चार्ट '@ # Get-AbrTimeZone diff --git a/Language/hu-HU/SystemResources.psd1 b/Language/hu-HU/SystemResources.psd1 index 372dff5..bf7f2bb 100644 --- a/Language/hu-HU/SystemResources.psd1 +++ b/Language/hu-HU/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Cég Product = Termék Unknown = Ismeretlen + + Generating = Folyamatdiagram generálása. + Label = Folyamat hierarchia + MainDiagramLabel = Folyamat hierarchia diagram + Unable = Nem lehet generálni a folyamat hierarchia diagramot. + MEMUsage = Memória használat + CPUUsage = CPU használat + Processes = Folyamatok + MEMUsageChart = Memória használat - Diagram + CPUUsageChart = CPU használat - Diagram '@ # Get-AbrTimeZone diff --git a/Language/it-IT/SystemResources.psd1 b/Language/it-IT/SystemResources.psd1 index e0ae1bd..ed208d9 100644 --- a/Language/it-IT/SystemResources.psd1 +++ b/Language/it-IT/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Azienda Product = Prodotto Unknown = Sconosciuto + + Generating = Generazione del diagramma dei processi. + Label = Gerarchia dei processi + MainDiagramLabel = Diagramma della gerarchia dei processi + Unable = Impossibile generare il diagramma della gerarchia dei processi. + MEMUsage = Uso di Memoria + CPUUsage = Uso di CPU + Processes = Processi + MEMUsageChart = Uso di Memoria - Grafico + CPUUsageChart = Uso di CPU - Grafico '@ # Get-AbrTimeZone diff --git a/Language/ja-JP/SystemResources.psd1 b/Language/ja-JP/SystemResources.psd1 index 02e79a6..f1d0eb5 100644 --- a/Language/ja-JP/SystemResources.psd1 +++ b/Language/ja-JP/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = 会社 Product = 製品 Unknown = 不明 + + Generating = プロセス図を生成しています。 + Label = プロセス階層 + MainDiagramLabel = プロセス階層図 + Unable = プロセス階層図を生成できません。 + MEMUsage = メモリ使用量 + CPUUsage = CPU使用量 + Processes = プロセス + MEMUsageChart = メモリ使用量 - チャート + CPUUsageChart = CPU使用量 - チャート '@ # Get-AbrTimeZone diff --git a/Language/ko-KR/SystemResources.psd1 b/Language/ko-KR/SystemResources.psd1 index faee330..766d1b9 100644 --- a/Language/ko-KR/SystemResources.psd1 +++ b/Language/ko-KR/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = 회사 Product = 제품 Unknown = 알 수 없음 + + Generating = 프로세스 다이어그램 생성 중. + Label = 프로세스 계층 + MainDiagramLabel = 프로세스 계층 다이어그램 + Unable = 프로세스 계층 다이어그램을 생성할 수 없습니다. + MEMUsage = 메모리 사용량 + CPUUsage = CPU 사용량 + Processes = 프로세스 + MEMUsageChart = 메모리 사용량 - 차트 + CPUUsageChart = CPU 사용량 - 차트 '@ # Get-AbrTimeZone diff --git a/Language/nb-NO/SystemResources.psd1 b/Language/nb-NO/SystemResources.psd1 index a625d65..a2ff1fc 100644 --- a/Language/nb-NO/SystemResources.psd1 +++ b/Language/nb-NO/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Selskap Product = Produkt Unknown = Ukjent + + Generating = Genererer prosessdiagram. + Label = Prosesshierarki + MainDiagramLabel = Prosesshierarkidiagram + Unable = Kan ikke generere prosesshierarkidiagrammet. + MEMUsage = Minnebruk + CPUUsage = CPU-bruk + Processes = Prosesser + MEMUsageChart = Minnebruk - Diagram + CPUUsageChart = CPU-bruk - Diagram '@ # Get-AbrTimeZone diff --git a/Language/nl-NL/SystemResources.psd1 b/Language/nl-NL/SystemResources.psd1 index 9970e1d..ecb0b6b 100644 --- a/Language/nl-NL/SystemResources.psd1 +++ b/Language/nl-NL/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Bedrijf Product = Product Unknown = Onbekend + + Generating = Genereren van procesdiagram. + Label = Proceshiërarchie + MainDiagramLabel = Proceshiërarchiediagram + Unable = Kan het proceshiërarchiediagram niet genereren. + MEMUsage = Geheugen gebruik + CPUUsage = CPU gebruik + Processes = Processen + MEMUsageChart = Geheugen gebruik - Diagram + CPUUsageChart = CPU gebruik - Diagram '@ # Get-AbrTimeZone diff --git a/Language/pl-PL/SystemResources.psd1 b/Language/pl-PL/SystemResources.psd1 index 98b99bc..ea37127 100644 --- a/Language/pl-PL/SystemResources.psd1 +++ b/Language/pl-PL/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Firma Product = Produkt Unknown = Nieznany + + Generating = Generowanie diagramu procesów. + Label = Hierarchia procesów + MainDiagramLabel = Diagram hierarchii procesów + Unable = Nie można wygenerować diagramu hierarchii procesów. + MEMUsage = Użycie pamięci + CPUUsage = Użycie CPU + Processes = Procesy + MEMUsageChart = Wykres użycia pamięci + CPUUsageChart = Wykres użycia CPU '@ # Get-AbrTimeZone diff --git a/Language/pt-PT/SystemResources.psd1 b/Language/pt-PT/SystemResources.psd1 index f75794c..f04f14f 100644 --- a/Language/pt-PT/SystemResources.psd1 +++ b/Language/pt-PT/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Empresa Product = Produto Unknown = Desconhecido + + Generating = Gerando diagrama de processos. + Label = Hierarquia de Processos + MainDiagramLabel = Diagrama da Hierarquia de Processos + Unable = Não é possível gerar o Diagrama da Hierarquia de Processos. + MEMUsage = Uso de Memória + CPUUsage = Uso de CPU + Processes = Processos + MEMUsageChart = Uso de Memória - Gráfico + CPUUsageChart = Uso de CPU - Gráfico '@ # Get-AbrTimeZone diff --git a/Language/ru-RU/SystemResources.psd1 b/Language/ru-RU/SystemResources.psd1 index 57fd1a2..485fd57 100644 --- a/Language/ru-RU/SystemResources.psd1 +++ b/Language/ru-RU/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Компания Product = Продукт Unknown = Неизвестно + + Generating = Генерация диаграммы процессов. + Label = Иерархия процессов + MainDiagramLabel = Диаграмма иерархии процессов + Unable = Не удалось сгенерировать диаграмму иерархии процессов. + MEMUsage = Использование памяти + CPUUsage = Использование CPU + Processes = Процессы + MEMUsageChart = Использование памяти - Диаграмма + CPUUsageChart = Использование CPU - Диаграмма '@ # Get-AbrTimeZone diff --git a/Language/sv-SE/SystemResources.psd1 b/Language/sv-SE/SystemResources.psd1 index e2cb388..ec0b4a2 100644 --- a/Language/sv-SE/SystemResources.psd1 +++ b/Language/sv-SE/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Företag Product = Produkt Unknown = Okänd + + Generating = Genererar processdiagram. + Label = Processhierarki + MainDiagramLabel = Processhierarkidiagram + Unable = Kan inte generera processhierarkidiagrammet. + MEMUsage = Användning av minne + CPUUsage = Användning av CPU + Processes = Processer + MEMUsageChart = Användning av minne - Diagram + CPUUsageChart = Användning av CPU - Diagram '@ # Get-AbrTimeZone diff --git a/Language/th-TH/SystemResources.psd1 b/Language/th-TH/SystemResources.psd1 index ee43c67..bf50d27 100644 --- a/Language/th-TH/SystemResources.psd1 +++ b/Language/th-TH/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = บริษัท Product = ผลิตภัณฑ์ Unknown = ไม่ทราบ + + Generating = กำลังสร้างแผนภาพกระบวนการ + Label = ลำดับชั้นของกระบวนการ + MainDiagramLabel = แผนภาพลำดับชั้นของกระบวนการ + Unable = ไม่สามารถสร้างแผนภาพลำดับชั้นของกระบวนการได้ + MEMUsage = การใช้หน่วยความจำ + CPUUsage = การใช้ CPU + Processes = กระบวนการ + MEMUsageChart = การใช้หน่วยความจำ - แผนภาพ + CPUUsageChart = การใช้ CPU - แผนภาพ '@ # Get-AbrTimeZone diff --git a/Language/tr-TR/SystemResources.psd1 b/Language/tr-TR/SystemResources.psd1 index b816156..b8339b2 100644 --- a/Language/tr-TR/SystemResources.psd1 +++ b/Language/tr-TR/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Şirket Product = Ürün Unknown = Bilinmiyor + + Generating = İşlem Diyagramı Oluşturuluyor. + Label = İşlem Hiyerarşisi + MainDiagramLabel = İşlem Hiyerarşi Diyagramı + Unable = İşlem Hiyerarşi Diyagramı oluşturulamadı. + MEMUsage = Bellek Kullanımı + CPUUsage = CPU Kullanımı + Processes = İşlemler + MEMUsageChart = Bellek Kullanımı - Diyagram + CPUUsageChart = CPU Kullanımı - Diyagram '@ # Get-AbrTimeZone diff --git a/Language/vi-VN/SystemResources.psd1 b/Language/vi-VN/SystemResources.psd1 index 19667f3..16e4451 100644 --- a/Language/vi-VN/SystemResources.psd1 +++ b/Language/vi-VN/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = Công ty Product = Sản phẩm Unknown = Không rõ + + Generating = Đang tạo sơ đồ tiến trình. + Label = Cấu trúc tiến trình + MainDiagramLabel = Sơ đồ cấu trúc tiến trình + Unable = Không thể tạo sơ đồ cấu trúc tiến trình. + MEMUsage = Sử dụng bộ nhớ + CPUUsage = Sử dụng CPU + Processes = Tiến trình + MEMUsageChart = Sử dụng bộ nhớ - Biểu đồ + CPUUsageChart = Sử dụng CPU - Biểu đồ '@ # Get-AbrTimeZone diff --git a/Language/zh-CN/SystemResources.psd1 b/Language/zh-CN/SystemResources.psd1 index d186f49..5ae89b7 100644 --- a/Language/zh-CN/SystemResources.psd1 +++ b/Language/zh-CN/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = 公司 Product = 产品 Unknown = 未知 + + Generating = 正在生成进程图。 + Label = 进程层次结构 + MainDiagramLabel = 进程层次结构图 + Unable = 无法生成进程层次结构图。 + MEMUsage = 内存使用情况 + CPUUsage = CPU 使用情况 + Processes = 进程 + MEMUsageChart = 内存使用情况 - 图表 + CPUUsageChart = CPU 使用情况 - 图表 '@ # Get-AbrTimeZone diff --git a/Language/zh-Hans/SystemResources.psd1 b/Language/zh-Hans/SystemResources.psd1 index 949f039..f4d468b 100644 --- a/Language/zh-Hans/SystemResources.psd1 +++ b/Language/zh-Hans/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = 公司 Product = 产品 Unknown = 未知 + + Generating = 正在生成进程图。 + Label = 进程层次结构 + MainDiagramLabel = 进程层次结构图 + Unable = 无法生成进程层次结构图。 + MEMUsage = 内存使用情况 + CPUUsage = CPU 使用情况 + Processes = 进程 + MEMUsageChart = 内存使用情况 - 图表 + CPUUsageChart = CPU 使用情况 - 图表 '@ # Get-AbrTimeZone diff --git a/Language/zh-Hant/SystemResources.psd1 b/Language/zh-Hant/SystemResources.psd1 index c8bfa2b..66eb62b 100644 --- a/Language/zh-Hant/SystemResources.psd1 +++ b/Language/zh-Hant/SystemResources.psd1 @@ -27,6 +27,16 @@ Company = 公司 Product = 產品 Unknown = 未知 + + Generating = 正在生成進程圖。 + Label = 進程層次結構 + MainDiagramLabel = 進程層次結構圖 + Unable = 無法生成進程層次結構圖。 + MEMUsage = 記憶體使用情況 + CPUUsage = CPU 使用情況 + Processes = 處理程序 + MEMUsageChart = 記憶體使用情況 - 圖表 + CPUUsageChart = CPU 使用情況 - 圖表 '@ # Get-AbrTimeZone diff --git a/Src/Private/Export-AbrDiagram.ps1 b/Src/Private/Export-AbrDiagram.ps1 index d997057..c7f6f27 100644 --- a/Src/Private/Export-AbrDiagram.ps1 +++ b/Src/Private/Export-AbrDiagram.ps1 @@ -116,7 +116,7 @@ function Export-AbrDiagram { $Diagram = New-Diagrammer @DiagramParams -InputObject $Graph if ($Diagram) { $BestAspectRatio = Get-DiaBestImageAspectRatio -GraphObj $Diagram -MaxWidth 600 - Section -Style Heading2 $MainDiagramLabel { + Section -Style Heading3 $MainDiagramLabel { Image -Base64 $Diagram -Text "$MainDiagramLabel Diagram" -Width $BestAspectRatio.Width -Height $BestAspectRatio.Height -Align Center } } diff --git a/Src/Private/Get-AbrProcessDiagram.ps1 b/Src/Private/Get-AbrProcessDiagram.ps1 index 44e6b85..a238256 100644 --- a/Src/Private/Get-AbrProcessDiagram.ps1 +++ b/Src/Private/Get-AbrProcessDiagram.ps1 @@ -19,7 +19,6 @@ function Get-AbrProcessDiagram { ) begin { - $reportTranslate = $reportTranslate.GetAbrProcessDiagram Write-PScriboMessage ($($reportTranslate.InfoLevel) -f 'ProcessInfo', $($InfoLevel.ProcessInfo)) Write-PScriboMessage $($reportTranslate.Generating) # Used for DiagramDebug diff --git a/Src/Private/Get-AbrProcessInfo.ps1 b/Src/Private/Get-AbrProcessInfo.ps1 index 2ad4403..5077894 100644 --- a/Src/Private/Get-AbrProcessInfo.ps1 +++ b/Src/Private/Get-AbrProcessInfo.ps1 @@ -81,6 +81,36 @@ function Get-AbrProcessInfo { } $SystemProcessInfo | Table @TableParams } + try { + $Chart = New-BarChart -Values $SystemProcessInfo.$($reportTranslate.CPU) -Labels $SystemProcessInfo.$($reportTranslate.Name) -Title $reportTranslate.CPUUsage -EnableLegend -LegendOrientation Horizontal -LegendAlignment UpperCenter -Width 600 -Height 600 -Format base64 -LabelYAxis $($reportTranslate.CPU) -LabelXAxis $($reportTranslate.Processes) -TitleFontSize 20 -TitleFontBold -AreaOrientation Vertical -EnableCustomColorPalette -CustomColorPalette @('#395879', '#59779a', '#7b98bc', '#9dbae0', '#c0ddff') -AxesMarginsTop 0.5 + if ($Chart) { + Section -Style Heading3 $reportTranslate.CPUUsageChart { + Image -Text $reportTranslate.CPUUsageChart -Align 'Center' -Percent 70 -Base64 $Chart + } + } + } catch { + Write-PScriboMessage -IsWarning $_.Exception.Message + } + try { + $Chart = New-BarChart -Values $SystemProcessInfo.$($reportTranslate.Memory) -Labels $SystemProcessInfo.$($reportTranslate.Name) -Title $reportTranslate.MEMUsage -EnableLegend -LegendOrientation Horizontal -LegendAlignment UpperCenter -Width 600 -Height 600 -Format base64 -LabelYAxis $($reportTranslate.Memory) -LabelXAxis $($reportTranslate.Processes) -TitleFontSize 20 -TitleFontBold -AreaOrientation Vertical -EnableCustomColorPalette -CustomColorPalette @('#395879', '#59779a', '#7b98bc', '#9dbae0', '#c0ddff') -AxesMarginsTop 0.5 + if ($Chart) { + Section -Style Heading3 $reportTranslate.MEMUsageChart { + Image -Text $reportTranslate.MEMUsageChart -Align 'Center' -Percent 70 -Base64 $Chart + } + } + } catch { + Write-PScriboMessage -IsWarning $_.Exception.Message + } + try { + $ProcessDiagram = Get-AbrProcessDiagram + if ($ProcessDiagram) { + Export-AbrDiagram -DiagramObject $ProcessDiagram -MainDiagramLabel $reportTranslate.MainDiagramLabel -FileName 'AsBuiltReport.System.Resources.Cluster' + } else { + Write-PScriboMessage -IsWarning $reportTranslate.Unable + } + } catch { + Write-PScriboMessage -IsWarning $($_.Exception.Message) + } } } } diff --git a/Src/Public/Invoke-AsBuiltReport.System.Resources.ps1 b/Src/Public/Invoke-AsBuiltReport.System.Resources.ps1 index 88e9dcd..7c26fa1 100644 --- a/Src/Public/Invoke-AsBuiltReport.System.Resources.ps1 +++ b/Src/Public/Invoke-AsBuiltReport.System.Resources.ps1 @@ -33,14 +33,10 @@ function Invoke-AsBuiltReport.System.Resources { $InfoLevel = $ReportConfig.InfoLevel $Options = $ReportConfig.Options - # Import Translated Strings - $LocalizedData = $reportTranslate.InvokeAsBuiltReportSystemResources - # Used to set values to TitleCase where required $TextInfo = (Get-Culture).TextInfo - # Update/rename the $System variable and build out your code within the ForEach loop. The ForEach loop enables AsBuiltReport to generate an as built configuration against multiple defined targets. - + # Used to set diagrams icon images $script:Images = @{ 'AsBuiltReport_LOGO' = 'AsBuiltReport_Logo.png' 'AsBuiltReport_Signature' = 'AsBuiltReport_Signature.png' @@ -55,12 +51,6 @@ function Invoke-AsBuiltReport.System.Resources { Get-AbrUptime Get-AbrPSHost Get-AbrProcessInfo - $ProcessDiagram = Get-AbrProcessDiagram - if ($ProcessDiagram) { - Export-AbrDiagram -DiagramObject $ProcessDiagram -MainDiagramLabel $LocalizedData.MainDiagramLabel -FileName 'AsBuiltReport.System.Resources.Cluster' - } else { - Write-PScriboMessage -IsWarning $LocalizedData.Unable - } } }