From 888d27442ceaaf0bd0cc6024bfc9ac2272358408 Mon Sep 17 00:00:00 2001 From: UserIsMH Date: Mon, 9 Jun 2025 04:09:59 +0200 Subject: [PATCH] Ressource-Pool --- .claude/settings.local.json | 4 +- JOURNAL.md | 479 ++++++- ...ocker_20250609_040937_encrypted.sql.gz.enc | 1 + v2_adminpanel/app.py | 1118 ++++++++++++++++- v2_adminpanel/create_resource_tables.sql | 94 ++ v2_adminpanel/init.sql | 77 ++ v2_adminpanel/migrate_existing_licenses.sql | 263 ++++ v2_adminpanel/templates/add_resources.html | 431 +++++++ v2_adminpanel/templates/base.html | 22 +- v2_adminpanel/templates/batch_form.html | 161 +++ v2_adminpanel/templates/dashboard.html | 61 + v2_adminpanel/templates/index.html | 129 ++ v2_adminpanel/templates/resource_history.html | 365 ++++++ v2_adminpanel/templates/resource_metrics.html | 559 +++++++++ v2_adminpanel/templates/resource_report.html | 212 ++++ v2_adminpanel/templates/resources.html | 600 +++++++++ v2_adminpanel/test_data_resources.sql | 321 +++++ 17 files changed, 4874 insertions(+), 23 deletions(-) create mode 100644 backups/backup_v2docker_20250609_040937_encrypted.sql.gz.enc create mode 100644 v2_adminpanel/create_resource_tables.sql create mode 100644 v2_adminpanel/migrate_existing_licenses.sql create mode 100644 v2_adminpanel/templates/add_resources.html create mode 100644 v2_adminpanel/templates/resource_history.html create mode 100644 v2_adminpanel/templates/resource_metrics.html create mode 100644 v2_adminpanel/templates/resource_report.html create mode 100644 v2_adminpanel/templates/resources.html create mode 100644 v2_adminpanel/test_data_resources.sql diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 6640087..f52b77a 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -49,7 +49,9 @@ "Bash(openssl x509:*)", "Bash(cat:*)", "Bash(openssl dhparam:*)", - "Bash(rg:*)" + "Bash(rg:*)", + "Bash(docker cp:*)", + "Bash(docker-compose:*)" ], "deny": [] } diff --git a/JOURNAL.md b/JOURNAL.md index 6307e19..ebac7ad 100644 --- a/JOURNAL.md +++ b/JOURNAL.md @@ -1033,7 +1033,7 @@ Die Session-Daten werden erst gefüllt, wenn der License Server API implementier - ✅ Audit-Log-Integration - ✅ Navigation aktualisiert -## 2025-01-06: Implementierung Searchable Dropdown für Kundenauswahl +## 2025-06-06: Implementierung Searchable Dropdown für Kundenauswahl **Problem:** - Bei der Lizenzerstellung wurde immer ein neuer Kunde angelegt @@ -1068,7 +1068,7 @@ Die Session-Daten werden erst gefüllt, wenn der License Server API implementier - ✅ E-Mail-Duplikate werden verhindert - ✅ Sowohl Einzellizenz als auch Batch unterstützt -## 2025-01-06: Automatische Ablaufdatum-Berechnung +## 2025-06-06: Automatische Ablaufdatum-Berechnung **Problem:** - Manuelles Eingeben von Start- und Enddatum war umständlich @@ -1099,7 +1099,7 @@ Die Session-Daten werden erst gefüllt, wenn der License Server API implementier - ✅ Backend validiert die Berechnung - ✅ Standardwert (1 Jahr) voreingestellt -## 2025-01-06: Bugfix - created_at für licenses Tabelle +## 2025-06-06: Bugfix - created_at für licenses Tabelle **Problem:** - Batch-Generierung schlug fehl mit "Fehler bei der Batch-Generierung!" @@ -1125,7 +1125,7 @@ Die Session-Daten werden erst gefüllt, wenn der License Server API implementier - ✅ Batch-Generierung funktioniert wieder - ✅ Konsistente Zeitstempel für Audit-Zwecke -## 2025-01-06: Status "Deaktiviert" für manuell abgeschaltete Lizenzen +## 2025-06-06: Status "Deaktiviert" für manuell abgeschaltete Lizenzen **Problem:** - Dashboard zeigte nur "aktiv" und "abgelaufen" als Status @@ -1490,7 +1490,7 @@ ALTER TABLE login_attempts ALTER COLUMN blocked_until TYPE TIMESTAMP WITH TIME Z - ✅ Weitere Klicks: Toggle zwischen ASC/DESC - ✅ Sortierung funktioniert korrekt mit Pagination und Filtern -### 2025-01-08: Port 8443 geschlossen - API nur noch über Nginx +### 2025-06-09: Port 8443 geschlossen - API nur noch über Nginx **Problem:** - Doppelte Verfügbarkeit des License Servers (Port 8443 + Nginx) machte keinen Sinn @@ -1522,7 +1522,7 @@ ALTER TABLE login_attempts ALTER COLUMN blocked_until TYPE TIMESTAMP WITH TIME Z - ✅ API nur noch über Nginx Reverse Proxy erreichbar - ✅ Sicherheit erhöht durch zentrale Verwaltung -### 2025-01-08: Live-Filtering implementiert +### 2025-06-09: Live-Filtering implementiert **Problem:** - Benutzer mussten immer auf "Filter anwenden" klicken @@ -1565,4 +1565,469 @@ ALTER TABLE login_attempts ALTER COLUMN blocked_until TYPE TIMESTAMP WITH TIME Z **Status:** - ✅ Live-Filtering auf allen Hauptseiten implementiert - ✅ Debouncing verhindert zu viele Server-Requests -- ✅ Zurücksetzen-Button bleibt für schnelles Löschen aller Filter \ No newline at end of file +- ✅ Zurücksetzen-Button bleibt für schnelles Löschen aller Filter + +### 2025-06-09: Resource Pool System implementiert (Phase 1 & 2) + +**Ziel:** +Ein Pool-System für Domains, IPv4-Adressen und Telefonnummern, wobei bei jeder Lizenzerstellung 1-10 Ressourcen pro Typ zugewiesen werden. Ressourcen haben 3 Status: available, allocated, quarantine. + +**Phase 1 - Datenbank-Schema (✅ Abgeschlossen):** +1. **Neue Tabellen erstellt:** + - `resource_pools` - Haupttabelle für alle Ressourcen + - `resource_history` - Vollständige Historie aller Aktionen + - `resource_metrics` - Performance-Tracking und ROI-Berechnung + - `license_resources` - Zuordnung zwischen Lizenzen und Ressourcen + +2. **Erweiterte licenses Tabelle:** + - `domain_count`, `ipv4_count`, `phone_count` Spalten hinzugefügt + - Constraints: 0-10 pro Resource-Typ + +3. **Indizes für Performance:** + - Status, Type, Allocated License, Quarantine Date + +**Phase 2 - Backend-Implementierung (✅ Abgeschlossen):** +1. **Resource Management Routes:** + - `/resources` - Hauptübersicht mit Statistiken + - `/resources/add` - Bulk-Import von Ressourcen + - `/resources/quarantine/` - Ressourcen sperren + - `/resources/release` - Quarantäne aufheben + - `/resources/history/` - Komplette Historie + - `/resources/metrics` - Performance Dashboard + - `/resources/report` - Report-Generator + +2. **API-Endpunkte:** + - `/api/resources/allocate` - Ressourcen-Zuweisung + - `/api/resources/check-availability` - Verfügbarkeit prüfen + +3. **Integration in Lizenzerstellung:** + - `create_license()` erweitert um Resource-Allocation + - `batch_licenses()` mit Ressourcen-Prüfung für gesamten Batch + - Transaktionale Sicherheit bei Zuweisung + +4. **Dashboard-Integration:** + - Resource-Statistiken in Dashboard eingebaut + - Warning-Level basierend auf Verfügbarkeit + +5. **Navigation erweitert:** + - Resources-Link in Navbar hinzugefügt + +**Was noch zu tun ist:** + +### Phase 3 - UI-Komponenten (🔄 Ausstehend): +1. **Templates erstellen:** + - `resources.html` - Hauptübersicht mit Drag&Drop + - `add_resources.html` - Formular für Bulk-Import + - `resource_history.html` - Historie-Anzeige + - `resource_metrics.html` - Performance Dashboard + +2. **Formulare erweitern:** + - `index.html` - Resource-Dropdowns hinzufügen + - `batch_form.html` - Resource-Dropdowns hinzufügen + +3. **Dashboard-Widget:** + - Resource Pool Statistik mit Ampelsystem + - Warnung bei niedrigem Bestand + +### Phase 4 - Erweiterte Features (🔄 Ausstehend): +1. **Quarantäne-Workflow:** + - Gründe: abuse, defect, maintenance, blacklisted, expired + - Automatische Tests vor Freigabe + - Genehmigungsprozess + +2. **Performance-Metrics:** + - Täglicher Cronjob für Metriken + - ROI-Berechnung + - Issue-Tracking + +3. **Report-Generator:** + - Auslastungsreport + - Performance-Report + - Compliance-Report + +### Phase 5 - Backup erweitern (🔄 Ausstehend): +- Neue Tabellen in Backup einbeziehen: + - resource_pools + - resource_history + - resource_metrics + - license_resources + +### Phase 6 - Testing & Migration (🔄 Ausstehend): +1. **Test-Daten generieren:** + - 500 Test-Domains + - 200 Test-IPs + - 100 Test-Telefonnummern + +2. **Migrations-Script:** + - Bestehende Lizenzen auf default resource_count setzen + +### Phase 7 - Dokumentation (🔄 Ausstehend): +- API-Dokumentation für License Server +- Admin-Handbuch für Resource Management + +**Technische Details:** +- 3-Status-System: available/allocated/quarantine +- Transaktionale Ressourcen-Zuweisung mit FOR UPDATE Lock +- Vollständige Historie mit IP-Tracking +- Drag&Drop UI für Resource-Management geplant +- Automatische Warnung bei < 50 verfügbaren Ressourcen + +**Status:** +- ✅ Datenbank-Schema komplett +- ✅ Backend-Routen implementiert +- ✅ Integration in Lizenzerstellung +- ❌ UI-Templates fehlen noch +- ❌ Erweiterte Features ausstehend +- ❌ Testing und Migration offen + +### 2025-06-09: Resource Pool System UI-Implementierung (Phase 3 & 4) + +**Phase 3 - UI-Komponenten (✅ Abgeschlossen):** + +1. **Neue Templates erstellt:** + - `resources.html` - Hauptübersicht mit Statistiken, Filter, Live-Suche, Pagination + - `add_resources.html` - Bulk-Import Formular mit Validierung + - `resource_history.html` - Timeline-Ansicht der Historie mit Details + - `resource_metrics.html` - Performance Dashboard mit Charts + - `resource_report.html` - Report-Generator UI + +2. **Erweiterte Formulare:** + - `index.html` - Resource-Count Dropdowns (0-10) mit Live-Verfügbarkeitsprüfung + - `batch_form.html` - Resource-Count mit Batch-Berechnung (zeigt Gesamtbedarf) + +3. **Dashboard-Widget:** + - Resource Pool Statistik mit Ampelsystem implementiert + - Zeigt verfügbare/zugeteilte/quarantäne Ressourcen + - Warnung bei niedrigem Bestand (<50) + - Fortschrittsbalken für visuelle Darstellung + +4. **Backend-Anpassungen:** + - `resource_history` Route korrigiert für Object-Style Template-Zugriff + - `resources_metrics` Route vollständig implementiert mit Charts-Daten + - `resources_report` Route erweitert für Template-Anzeige und Downloads + - Dashboard erweitert um Resource-Statistiken + +**Phase 4 - Erweiterte Features (✅ Teilweise):** +1. **Report-Generator:** + - Template für Report-Auswahl erstellt + - 4 Report-Typen: Usage, Performance, Compliance, Inventory + - Export als Excel, CSV oder PDF-Vorschau + - Zeitraum-Auswahl mit Validierung + +**Technische Details der Implementierung:** +- Live-Filtering ohne Reload durch JavaScript +- AJAX-basierte Verfügbarkeitsprüfung +- Bootstrap 5 für konsistentes Design +- Chart.js für Metriken-Visualisierung +- Responsives Design für alle Templates +- Copy-to-Clipboard für Resource-Werte +- Modal-Dialoge für Quarantäne-Aktionen + +**Was noch fehlt:** + +### Phase 5 - Backup erweitern (🔄 Ausstehend): +- Resource-Tabellen in pg_dump einbeziehen: + - resource_pools + - resource_history + - resource_metrics + - license_resources + +### Phase 6 - Testing & Migration (🔄 Ausstehend): +1. **Test-Daten generieren:** + - Script für 500 Test-Domains + - 200 Test-IPv4-Adressen + - 100 Test-Telefonnummern + - Realistische Verteilung über Status + +2. **Migrations-Script:** + - Bestehende Lizenzen auf Default resource_count setzen + - UPDATE licenses SET domain_count=1, ipv4_count=1, phone_count=1 WHERE ... + +### Phase 7 - Dokumentation (🔄 Ausstehend): +- API-Dokumentation für Resource-Endpunkte +- Admin-Handbuch für Resource Management +- Troubleshooting-Guide + +**Offene Punkte für Produktion:** +1. Drag&Drop für Resource-Verwaltung (Nice-to-have) +2. Automatische Quarantäne-Aufhebung nach Zeitablauf +3. E-Mail-Benachrichtigungen bei niedrigem Bestand +4. API für externe Resource-Prüfung +5. Bulk-Delete für Ressourcen +6. Resource-Import aus CSV/Excel + +### 2025-06-09: Resource Pool System finalisiert + +**Problem:** +- Resource Pool System war nur teilweise implementiert +- UI-Templates waren vorhanden, aber nicht dokumentiert +- Test-Daten und Migration fehlten +- Backup-Integration unklar + +**Analyse und Lösung:** +1. **Status-Überprüfung durchgeführt:** + - Alle 5 UI-Templates existierten bereits (resources.html, add_resources.html, etc.) + - Resource-Dropdowns waren bereits in index.html und batch_form.html integriert + - Dashboard-Widget war bereits implementiert + - Backup-System inkludiert bereits alle Tabellen (pg_dump ohne -t Parameter) + +2. **Fehlende Komponenten erstellt:** + - Test-Daten Script: `test_data_resources.sql` + - 500 Test-Domains (400 verfügbar, 50 zugeteilt, 50 in Quarantäne) + - 200 Test-IPv4-Adressen (150 verfügbar, 30 zugeteilt, 20 in Quarantäne) + - 100 Test-Telefonnummern (70 verfügbar, 20 zugeteilt, 10 in Quarantäne) + - Resource History und Metrics für realistische Daten + + - Migration Script: `migrate_existing_licenses.sql` + - Setzt Default Resource Counts (Vollversion: 2, Testversion: 1, Inaktiv: 0) + - Weist automatisch verfügbare Ressourcen zu + - Erstellt Audit-Log Einträge + - Gibt detaillierten Migrationsbericht aus + +**Neue Dateien:** +- `v2_adminpanel/test_data_resources.sql` - Testdaten für Resource Pool +- `v2_adminpanel/migrate_existing_licenses.sql` - Migration für bestehende Lizenzen + +**Status:** +- ✅ Resource Pool System vollständig implementiert und dokumentiert +- ✅ Alle UI-Komponenten vorhanden und funktionsfähig +- ✅ Integration in Lizenz-Formulare abgeschlossen +- ✅ Dashboard-Widget zeigt Resource-Statistiken +- ✅ Backup-System inkludiert Resource-Tabellen +- ✅ Test-Daten und Migration bereitgestellt + +**Nächste Schritte:** +1. Test-Daten einspielen: `psql -U adminuser -d meinedatenbank -f test_data_resources.sql` +2. Migration ausführen: `psql -U adminuser -d meinedatenbank -f migrate_existing_licenses.sql` +3. License Server API implementieren (Hauptaufgabe) + +### 2025-06-09: Bugfix - Resource Pool Tabellen fehlten + +**Problem:** +- Admin Panel zeigte "Internal Server Error" +- Dashboard Route versuchte auf `resource_pools` Tabelle zuzugreifen +- Tabelle existierte nicht in der Datenbank + +**Ursache:** +- Bei bereits existierender Datenbank wird init.sql nicht erneut ausgeführt +- Resource Pool Tabellen wurden erst später zum init.sql hinzugefügt +- Docker Container verwendeten noch die alte Datenbankstruktur + +**Lösung:** +1. Separates Script `create_resource_tables.sql` erstellt +2. Script manuell in der Datenbank ausgeführt +3. Alle 4 Resource-Tabellen erfolgreich erstellt: + - resource_pools + - resource_history + - resource_metrics + - license_resources + +**Status:** +- ✅ Admin Panel funktioniert wieder +- ✅ Dashboard zeigt Resource Pool Statistiken +- ✅ Alle Resource-Funktionen verfügbar + +**Empfehlung für Neuinstallationen:** +- Bei frischer Installation funktioniert alles automatisch +- Bei bestehenden Installationen: `create_resource_tables.sql` ausführen + +### 2025-06-09: Navigation vereinfacht + +**Änderung:** +- Navigationspunkte aus der schwarzen Navbar entfernt +- Links zu Lizenzen, Kunden, Ressourcen, Sessions, Backups und Log entfernt + +**Grund:** +- Cleaner Look mit nur Logo, Timer und Logout +- Alle Funktionen sind weiterhin über das Dashboard erreichbar +- Bessere Übersichtlichkeit und weniger Ablenkung + +**Geänderte Datei:** +- `v2_adminpanel/templates/base.html` - Navbar-Links auskommentiert + +**Status:** +- ✅ Navbar zeigt nur noch Logo, Session-Timer und Logout +- ✅ Navigation erfolgt über Dashboard und Buttons auf den jeweiligen Seiten +- ✅ Alle Funktionen bleiben erreichbar + +### 2025-06-09: Bugfix - Resource Report Einrückungsfehler + +**Problem:** +- Resource Report Route zeigte "Internal Server Error" +- UnboundLocalError: `report_type` wurde verwendet bevor es definiert war + +**Ursache:** +- Fehlerhafte Einrückung in der `resources_report()` Funktion +- `elif` und `else` Blöcke waren falsch eingerückt +- Variablen wurden außerhalb ihres Gültigkeitsbereichs verwendet + +**Lösung:** +- Korrekte Einrückung für alle Conditional-Blöcke wiederhergestellt +- Alle Report-Typen (usage, performance, compliance, inventory) richtig strukturiert +- Excel und CSV Export-Code korrekt eingerückt + +**Geänderte Datei:** +- `v2_adminpanel/app.py` - resources_report() Funktion korrigiert + +**Status:** +- ✅ Resource Report funktioniert wieder +- ✅ Alle 4 Report-Typen verfügbar +- ✅ Export als Excel und CSV möglich + +--- + +## Zusammenfassung der heutigen Arbeiten (2025-06-09) + +### 1. Resource Pool System Finalisierung +- **Ausgangslage**: Resource Pool war nur teilweise dokumentiert +- **Überraschung**: UI-Templates waren bereits vorhanden (nicht dokumentiert) +- **Ergänzt**: + - Test-Daten Script (`test_data_resources.sql`) + - Migration Script (`migrate_existing_licenses.sql`) +- **Status**: ✅ Vollständig implementiert + +### 2. Database Migration Bug +- **Problem**: Admin Panel zeigte "Internal Server Error" +- **Ursache**: Resource Pool Tabellen fehlten in bestehender DB +- **Lösung**: Separates Script `create_resource_tables.sql` erstellt +- **Status**: ✅ Behoben + +### 3. UI Cleanup +- **Änderung**: Navigation aus Navbar entfernt +- **Effekt**: Cleaner Look, Navigation nur über Dashboard +- **Status**: ✅ Implementiert + +### 4. Resource Report Bug +- **Problem**: Einrückungsfehler in `resources_report()` Funktion +- **Lösung**: Korrekte Einrückung wiederhergestellt +- **Status**: ✅ Behoben + +### Neue Dateien erstellt heute: +1. `v2_adminpanel/test_data_resources.sql` - 800 Test-Ressourcen + +### 2025-06-09: Bugfix - Resource Quarantäne Modal + +**Problem:** +- Quarantäne-Button funktionierte nicht +- Modal öffnete sich nicht beim Klick + +**Ursache:** +- Bootstrap 5 vs Bootstrap 4 API-Inkompatibilität +- Modal wurde mit Bootstrap 4 Syntax (`modal.modal('show')`) aufgerufen +- jQuery wurde nach Bootstrap geladen + +**Lösung:** +1. **JavaScript angepasst:** + - Von jQuery Modal-API zu nativer Bootstrap 5 Modal-API gewechselt + - `new bootstrap.Modal(element).show()` statt `$(element).modal('show')` + +2. **HTML-Struktur aktualisiert:** + - Modal-Close-Button: `data-bs-dismiss="modal"` statt `data-dismiss="modal"` + - `btn-close` Klasse statt custom close button + - Form-Klassen: `mb-3` statt `form-group`, `form-select` statt `form-control` für Select + +3. **Script-Reihenfolge korrigiert:** + - jQuery vor Bootstrap laden für korrekte Initialisierung + +**Geänderte Dateien:** +- `v2_adminpanel/templates/resources.html` +- `v2_adminpanel/templates/base.html` + +**Status:** ✅ Behoben + +### 2025-06-09: Resource Pool UI Redesign + +**Ziel:** +- Komplettes Redesign des Resource Pool Managements für bessere Benutzerfreundlichkeit +- Konsistentes Design mit dem Rest der Anwendung + +**Durchgeführte Änderungen:** + +1. **resources.html - Hauptübersicht:** + - Moderne Statistik-Karten mit Hover-Effekten + - Farbcodierte Progress-Bars mit Tooltips + - Verbesserte Tabelle mit Icons und Status-Badges + - Live-Filter mit sofortiger Suche + - Überarbeitete Quarantäne-Modal für Bootstrap 5 + - Responsive Design mit Grid-Layout + +2. **add_resources.html - Ressourcen hinzufügen:** + - 3-Schritt Wizard-ähnliches Interface + - Visueller Ressourcentyp-Selector mit Icons + - Live-Validierung mit Echtzeit-Feedback + - Statistik-Anzeige (Gültig/Duplikate/Ungültig) + - Formatierte Beispiele mit Erklärungen + - Verbesserte Fehlerbehandlung + +3. **resource_history.html - Historie:** + - Zentrierte Resource-Anzeige mit großen Icons + - Info-Grid Layout für Details + - Modernisierte Timeline mit Hover-Effekten + - Farbcodierte Action-Icons + - Verbesserte Darstellung von Details + +4. **resource_metrics.html - Metriken:** + - Dashboard-Style Metrik-Karten mit Icon-Badges + - Modernisierte Charts mit besseren Farben + - Performance-Tabellen mit Progress-Bars + - Trend-Indikatoren für Performance + - Responsives Grid-Layout + +**Design-Verbesserungen:** +- Konsistente Emoji-Icons für bessere visuelle Kommunikation +- Einheitliche Farbgebung (Blau/Lila/Grün für Ressourcentypen) +- Card-basiertes Layout mit Schatten und Hover-Effekten +- Bootstrap 5 kompatible Komponenten +- Verbesserte Typografie und Spacing + +**Technische Details:** +- Bootstrap 5 Modal-API statt jQuery +- CSS Grid für responsive Layouts +- Moderne Chart.js Konfiguration +- Optimierte JavaScript-Validierung + +**Geänderte Dateien:** +- `v2_adminpanel/templates/resources.html` +- `v2_adminpanel/templates/add_resources.html` +- `v2_adminpanel/templates/resource_history.html` +- `v2_adminpanel/templates/resource_metrics.html` + +**Status:** ✅ Abgeschlossen + +### 2025-06-09: Zusammenfassung der heutigen Arbeiten + +**Durchgeführte Aufgaben:** + +1. **Quarantäne-Funktion repariert:** + - Bootstrap 5 Modal-API implementiert + - data-bs-dismiss statt data-dismiss + - jQuery vor Bootstrap laden + +2. **Resource Pool UI komplett überarbeitet:** + - Alle 4 Templates modernisiert (resources, add_resources, resource_history, resource_metrics) + - Konsistentes Design mit Emoji-Icons + - Einheitliche Farbgebung (Blau/Lila/Grün) + - Bootstrap 5 kompatible Komponenten + - Responsive Grid-Layouts + +**Aktuelle Projekt-Status:** +- ✅ Admin Panel voll funktionsfähig +- ✅ Resource Pool Management mit modernem UI +- ✅ PostgreSQL mit allen Tabellen +- ✅ Nginx Reverse Proxy mit SSL +- ❌ Lizenzserver noch nicht implementiert (nur Platzhalter) + +**Nächste Schritte:** +- Lizenzserver implementieren +- API-Endpunkte für Lizenzvalidierung +- Heartbeat-System für Sessions +- Versionsprüfung implementieren +1. `v2_adminpanel/templates/base.html` - Navigation entfernt +2. `v2_adminpanel/app.py` - Resource Report Einrückung korrigiert +3. `JOURNAL.md` - Alle Änderungen dokumentiert + +### Offene Hauptaufgabe: +- **License Server API** - Noch komplett zu implementieren + - `/api/version` - Versionscheck + - `/api/validate` - Lizenzvalidierung + - `/api/heartbeat` - Session-Management \ No newline at end of file diff --git a/backups/backup_v2docker_20250609_040937_encrypted.sql.gz.enc b/backups/backup_v2docker_20250609_040937_encrypted.sql.gz.enc new file mode 100644 index 0000000..45212c6 --- /dev/null +++ b/backups/backup_v2docker_20250609_040937_encrypted.sql.gz.enc @@ -0,0 +1 @@ +gAAAAABoRkJhj4mu2gRgiKyvMAcJDJ3-Luok2EOHoP61EH9n9yx72v5DMioVBkWHW0bFq6h_PKN6Jo0XjnB8CoIrh3pJRTwpDTgtIV62SAcPXzeM90k2HZYIGGxpfL1hi64867Ah812KDPbq-OYiMfqBng9k-AcuYZRd1FsB7SYQkmnNkT58e_aroFTOYe3O8WcC_SliW-Jp_Tfli8iHxuONgP5lfsYDZaxeZDo8zEeJlWdVV5GgtLVrMAVIrKQzIe0f1DGhMBi2HQk7juhgNU80lj0TjMYhHge9yeUtu-rzGKOgvnKfD0JJsQQ2C2xXZeyyxj3oIReB5RRP8c_d5neeXlZ0AAeZ4LoI8HZnuC04PZ7RiBMZ-grn-KjAm6pHRyqnY1WoCtZ_ZZvHVkmZTQ7dZUgy6Giy2lRfG_LvSzYiWfk2DPq5dAEZM-92LwezZCHap3BkH8oEnnF6B32cFq2YulhIW2cOGxDAZvx5DtG9umUuHc5rkRRPDCWbDPJdY8SpI7l3SklJSmGzup-fOh837ybzmlPLzXoZc7FDEGeFzJl3a82eIAFctUh1v8XcEZXmfqmzBX4-bv6cPfOaTbEEryQD1i6y4spI0XfLJPZg-2GgtBo7joDOHvOk2yC2s-vufh5H___PsR0WJ0MclkAhXzrd0xd7ho_2tzs45CbQLyuBs21qeN-OeaD6_uXpnm2kP3T-8epkyoeK5Dm9M73uPD8XHsiA854aCB22ozCdNDFCa73LxmbWyq8IvATtSWeyrvSuOicYX2pK0TdGA8OQJQ0IJkvoOOwXmUEJQsQs4LeJTqPoxW8YMMh6ftAawdGOf4r8MSUSD1KcyNDdSAckG3diE9ZeY95Wh5GaE_mPSIFqGKd-CN3ria0fqYrDOtra6xghQVozACFoqMEsko8eSjNQ_FB_BmtW7TNOEB4YBeqrvzg66fopYyaLG9rNde20xgkwu3RmSQxq7SAL7lQVRvJVT36cYSPYTidnQ33Liz81V_IHjYx9KFDeDWJcy3BrJITB7Amu-6iw7h7kGryEP7wkfyuGc5691NhVCpbbYJVs1BGuoQSzYWgWFZFt0fZFrlV6yKMS8bSNpE3kmpNwPt686emFMkMFnYXp8fyiGyEp3s-32R0DPjFj-RCceSYJyKqD8WXNOWgOLqd_WWgUu4JLomCdTLadB7b_xvdXTsvxgOlTgvDk4i1vOmMOsEeRSDNnsX3sHrFbPXMRMny71x71xx-lQvHM7TXc-y7iQq80-36_Z6XCBayJaLhT9ozC9LZ99C5ApfWV8Udt7rq3pxbZELGFuiIaS0vMYtAOFkMdbHxR_4u57eFW1enjJW6Vuwbe7PSNkoVCvCyUSSPFvPcV7rSjc4SvGUjinycOBxuGx0u68mZpuSTThZBnGPEDr6CwwR98wRxZ0Ux_m_1VvNDNW-msEbn5OzOv9OGT2OXIgrzdVezKPwA1Plh6i9iRgnlxRoDf5Sn0kf7eVy1G77m_bed5Js-BXU47sTxq2sh-vph3yGDpizLglYHjtazSawP5mdzLJZR_2JZgDpEzs0BTaHOYqv3hf9dA9rcBr7phdtDgEnM_6xVk5GiOuCkCq0dbjI9bNmDUMV7hQE7cKcbizvUQq4Z_SU5Y5O6EWwkChmm9FxkFjem30jHvXq4zgED2b32yFZ_D_cgwcVQSF2fTgGVOxuBDQYlXsJgE8ctW0K-4nK0clPTCJ3-R_r0XujGdjiSANgFPK6ZRlAUfhTiekk2WnrSe_xlrF_ao_sbi99K91Uqcq1mXP_NQHRcnEF9vvIDXrGti0FhzWR5sA2lq0msJUzGobmIRBW_xwsmpMTnfGHWh0kBAIrSJ4vVV5QxlxljLxnkBsw0io8CyhSOp0BUUpbwD3Jj6J6KGLyYY51wT4-IaqyykHJR9fdV0pPvJTSEYOSuDFUAL9KKtKsZCe_8QBgPRVsLdzGa7WSLCXe2KH3XzNoKjS2FzF7aU1glz_UhQXsUdpB6EeQXWNzHFuIzHdxZ7Mn8isRcgG7NjbI24Ea6SsINthjGsmnYn9wG6ZaXfTobAT3XM-ObtnT03Cp3czh9n0sYHoAdDo8G1Wgrg3ziWzVKzjVsDogvrd8WPWMjts2ceFzadU-gNFEsqmazhbM7XS_hLtl_Utt7te9J3nKJZuooSlR_qSzBlF6oLL5sesPRzeY2VkPawkM8sw-D-dXIZk71O4t70UaZHKyGYaDOd85_fzbvMmTmcO9H5_vgxSFmk0jbeDjhp_Gi1v4IVU82N_E4_H4kUz-8uIqWJN39ZpqKYpM9ItVRlwWaFLYcVMzsP1EwYtT6nMAUgLJe6FllmYVBOGDjWK8UEuBwIOpHhLZZt2mMzPSju1ASswapyF0ZTZzo4kEkD-gu3qKgzNEnEDEF9OXqMd8k2EMzBWYMOxny0nA_Yc1KahcdUr0r3hlvVf-hgZYvFRaVutZdUtvIH83BSvXdW1KaC5I0T9SxqEnQraBwiko-azDXSG98OUW5FqNREWnUZEERnkvDY0CzLw91vzFluJw_0v1Vzb1q06cBWHysWDUQuRR-9cmHXhef4qu6ggzqQGwJwEoTxyWO3Y7GEt3OZeK2SS6nKX1dj--ELPYUsPuJRy1AVmQYK__fPm801vlEO9EaOUgW_J24LaE7mQFkvvQN693zH7q1RshLZNyyZX0HgbSRmayk7l1n6UVHri18VeKRNmv3MY528FFka_Q-nwO0cQoAA-JhdAjX9blQC6BdwSsQfBKsq-oxBzaZjnprPu_wP4OM1GPBBLClVZIvF2zzGdbjcgpewYvBRS7Y56c7zVtWPJHH9r5mMQCqX07zJwHXW6BOtVAuqGOJ2THL4J2Jx4_AR_Us0NCVn46HGQ-P7Du4eaICnUxgAx3qaHr7Jci0yJ4FigYNTDDBxUCVe9vh1cGNChXX7n9bXSAxc1pDVxOESykRbrO7nQLn5Y5YxjMM-_eCgz9KafJck39mpPUAS-IFER38y4-fPtA62nNhZGla2NxUIKE9xaWfke6chp3sQxv6qMCa72vrVemev-W9HWqlXwI-4f4yBIj-hJSDFPpiKap7YlTTmFsuWvIKX8kBN6HdP1Wc7OggRvjHcrWxBnKL5MMDSnKw7BHHNb_buzpByTEjB8VFkmSYuFpDvMsx025uKBgP8Bnvg3OenXMSwWJDVLieXhVaiBXm_KBS5z7z70lw2oRPqWGCrE4v3-4LYHKleFdneCpjsjcg9V8zBjtGC8cQVrmjIozutxgAfTBpYrYM7L4pG-3ySV9hEivbzzrpry7szKErtdXBgmbFxauw6ZSRKHepoza7SQdE-CTzFeWcjIACzXI749aRz1-7PKmLAaDM9lkC8VZ9qDoQDfxgdzDSQ-6LEXtx7TwyT_Db7QQ9dRXbP7uMIewpfetU_6nAvtyxqd3Bf1aJLian0WQ3wb1QmCq_6zKp104W9Lz9JouKpiyezTh-Pxz71noyfp3O7sdXAIOMfgp4x7YfNscbLIQ2Jw7vRimqfHe7PLqWPIBSV93rOI-NSOzdMXTsdoKZxY-5LQJ4dNrMlaAHEqdSPSdFW0Av4VforkYqhiDXWen1VyVRjcf2X-haJ0rDQrsl-ztci_7sXP4YajGYRidOFv3JL1L5utNJJzcDeSaAUwVz32Pjl6rlFzxqJgVZg2Vaud2Ildh946ea90BoLptCtx9lSC8ju9e5caGJGAwMa_JjCZT-bjEXNeva9I85KSLTXghSwtJvure03G3orNINjhHS0G3asxI6SnhHnCro2wKne6rCOQ4spZWof87-CCKThqbgbSvk6_-oWEvt_m8uzpSft3_jQF4JivGcTdQ5U0zZj0PBoqUdUzVBUImrQUip3FNFbNej-V18gAcvN2xeNN1EMYW0WzTwvEgox75xpT5JySauknJt71pTAXgIrW14y5luxp07R8iNDNW-9-bPTu7eHkO9JL005cN-fQ7lEyStDd33o3lRqww01hIPRnxhAZBLhVG2QnwWsoNa5ufTVPJQ4y6dAOZhZIVyjzu57JcvbCz3QOQ4uu1aluDogAqTifTvznUR2OOTobYcNFhjuBVyLED7CQ-spM7BKiaIGOAT6VaJeoYP7H4HsI7Crsl5eWheiOJvVKYC5tqYVBOZ5-B8CGGUt2pKiIDqgZ-unUBpNXmhwcNgz1vb3WvgAE-Ci5dxAlmpGQJycYZbQdjeQa5azXn7H2IUKvtwLD-0_-ajTXGW9RxM_Y5NhG7OC8Jm2kPTnHvxBAc3N1bs6gecJ4YpJvpVicz79-0xNwvsBBjbJrRCXByMpMxYXfoSxXLaD0eCtrDjg_Y_Jb1PD4SSiiy7nOWrci9kKRbyAKUhOiONE1yUvi1NO4mfExsDMVJnqHLcZoXdKXrSggYQE-jxmAESzW9-oGBZdO1UeXvYgyKmPHrF_4ICEr7BFWZwYYuI9xbWfTkBT_uxQcQGqyYCBGtssQ1kBUCroZpPW19rUwG5UehoUE_u3tZPse9ooXkKewiHg3emftc_8S3AIpzviy2K3LyAcAoJfjokrlXp8uWmRxd9UYWSUnltgEqwJqCStYs9I40meoz1Hw7DlPHIJRMLJyw8RRJfAIeBmS4F6gBFKhqHenyUKwIwuijGYAXDXMuhVHpF2OSBNhocLkOZ26_ZcgUbNYvQFdk1WfSeMnhzcwOiCaerY8xWydzW3_llUm6HxB9WNo4-M97wOxnfqtwO-4oHRckBSmRtH0SblCjcydxA2b36NZgcrAozbRmaoALe_vhwb-Zb7Rm1o398WQPDy559krsxIX764jdpgWbFahQ8zYGvI_mYKMpGUeCeenPODRMKujQwOwz_6oEjdVphpJH8tNsRePBQIhk9qNtWTnKJlr2oIcRZ573cH5gHZVXlm1DQ5eL_BaF2e6g6mQ8PScgS2PAxEa0O7BibRAZcertq42UykPrb55-mRs8W8NTW0CxzYwwyyWivZ4xN35GWiNKGLERsLenP_xV4UMz8xiVFNeqUt_pDHi4fDYhnWQFabmXL98wUMsBGfTsE4ATJ24vBHBf4HN1vNDSASXVrMM_7pOukI5Wo-GQSUrnZeSgYCZLqyvWFKa8rO7nXkdIZeLzjDdr9XtuA3mKKIAWfZaqS8LTCiTBxqD4vuv--3WVTCXDzBBA4gZIiRU1g0gKZjC2pBssBNoA-UbnKQxkemKdCLPN15wSnXEQJ-Otgp0DElyK9qEpZJ7Vxsncks6Ckmo_9I9tbXKbcfeq-XuXbT_6iDl3zZjE_0aqCEguwIruBfdnAvENIFJ1WF04hetKVXN5XX1xSiXqD_jGKFgPspGFugNDvmqilT0dKTK1losxhTkjmqNVoZLS3kXdsDh1p6WF3nFgCUtfsoq8HYQayoMaLkuChi2U4LIHBvEroj6YwREkq63hNSEe870wI8USlFlORq-DqArndJgXwgvQOnUCFp6nQmqlnSomJqApZBavcSb6WL0c7SPQzW6-dKycjxflBhEonIXWo-_MEIW8P-f2iHizzc7kf9xDY_YTQ2UoWOLFFubSJqGmDAydD45lNbKkWqFx2OwVBEJUe-1A_q9Imr4MoqZCWfJESYAENKGm9cdnoxAdtJVWRox9HzfyR4Zrqr30QN29YiXY7JlQEqdTguu5TVkuMVKqRMQz88pzvGiUUk_07qz51K2hNZ7JdzUVr9zCykO5gzjV0zILurI69mLX4ZkbuJxQEGSw-laMuCy80-kBtTZWCetFUqc1zR-UJW2xqYnJtW1B04VTtgeoCnw2udIkX00Vsw3odfnBn_cGSA_qC_flcQB2SuQ4dpRPYAc2fGCvJerIbLVkEKZXTS36zhv8Ze9_7paxh8fVJNGbfD22UYzQp0Fj09fGnmJWanVAe9gMQiO-BujQdFsIgaDOXqxx4URfk1h2qzO29lieN3z2RKOTqSjdxMJ47mCehwMDlViS5uRbIREN-l0g61br4_FMQrFxFbN-7RIQLkvG_JHgmlQgbal3uGVG1dKmHCr5y1TZL80a3_IP4DFTxnpiY0sqQ15b950q-tR00DNhaB0m5j7HQaoX6cYIoTri-qzOjVjw_cSaibP_6DVgyhG_J51qNiugd68sgS66DHr2KLhmTEbVxGY42CtMoavK31lGW6_Q9ZeCGNdMI9Er5IYbCKmV6pqL1wlmXMQyaZfqRfPj0_zheR_Rhbm0nvMs0LkONMqEugAiE4yJIrb39XKQVjlSepkQt1-uUersz1M7c4drcI1aSSYi65d0IUq3fjtzfn9vloq98aN6Hm7G5R9coz4ajZJaHalAslihDk_mdTWjg7kk_Mti0tgmkwthLmIczZZNLMQLVNOYFc6ur482iRTDtvvg_1WpP_BzgeLJjkgK4yUkW78-AHRLUhD1EO35lYPyrfJEGjKLbRFqi5NfCjsozAJpARYzjEXMEfOTsolZxfyocC6o3k-fK6vCcoZj0DbPxtyykfU9rHNj1XZsTbxpx01E_3N68-ZP8Q5ZqwwCVohihRX9hieDv1GKvuZU4TUgYFVoVF7bNxs_5R-aV4C9U53mfuAkU5Ovs79HGUmFWKp2BKHTymrswahYCoaOaw4V3t_zNk5CQ4MtwYu4rHGTiQFMuzOU8zJ_4V2Y5klCD9h0vaRj2SlJoyKutMpcRlD65UCrz7ArxX80mBFbOuy5s6rnoMSHQqNLmct_9DoqqYl-pqHYN1pqnIo9ivAVNa6u5h1ivnaeyMfx5dLn98CVDATY_V6XR7tb4-CVFlzEswEll9u1wWRdiJsRJ8vNF9hW-vb6K4455kin3yvTP2IZsWkhxxNCgOm1sHu408_hJUdsvleGMAJHLMmohbmmNbzitmP3IU_0I_rTKnt6Q7oHgNaN0_Eiu9POmn28FuzdJ9TFMnXGbz8m6kXPkbCCMlxv1JL4-eK7Kv8AswW5k1tGFUPTtVJMyS_oQunfSCP1BidNA3FEDFmMVh5WUmh28k8J7DSFmH51CQYPVxbldgAUDGZZ29buADVHTjoTiBScUG_d5bD4CAQLcp-NCEsnn7gTxFpmP2DBaXlHvt32h2FzctmMsQ6Ea02jltA6iXghKQszRcHPki3esedxlD1wOAi_8huPEY27m-h73iVS0oJsk5LaHBj9Uol1-X84MBS13vWaxzXOJ48f18iC3fYNu9zAzDH0TKscKfPyas20o5jtJ56OJKLwKt4FLPMpym80cjEJOlopQjuexpOws0VlnK9Mn0QlejAUcBLft0tmiAW_-_Iwz8U6tQdyPMzY-9UmSW2v_H5qLUvDUToMhlyqZ-SxXzXlp99GyOr1WsTHQ5lwEMHH8f9gp4nDQ8KAQl1FK39mLgfCZK6r8rW_cxTXvSR5weLP1gGsav-mrpo2HTBe2kW0b5GFiC5wcewRS_ZlqjQ14FFj-WfrXQ-BzbgY7Yz6DeujFTKnJP4LHtsspIT3qLk7HWr-QZsF-DhiEpEU60t0zVT0zVhx0zE0_8slLweokpsFBJ9aD2mBRaiCCuBT68KGP9Yt8nLFJz2i5dLX0dWyr5cxrjZ_mYfZTamDmBMx9v7ieJQEUfz9cMo52Jdu-mIj8173S9cU-XZBiETywXoWJf4JQeV_y_66VF1vFgOuCatKnhgkaWj3mgPwZPnwDqVJE8iSbKr9HtKLy_eeLpHg3ij2MhV18cHMwO_BAQWcSTGw3dqPyKwr8KAIQ7fRv2iHsqFSVuaKXsiuMTzgAp07elz3jubgHS6RMIC2-pycwGBsL-J8rtAnApof589-dabr60qFPPLUR8T3dyRfI5i5zvK-uW4UCbLGRRRcSQ4YB99v63neDBH889zyE24pRYGbkxwk8AXSrrCyAAqDaQZG_9Wk7mrnpiTsbuUkE7Z1ORA4XHBcMgCy-tGpn1TjnKtwRw7RgKMulvgWAyGTPUenSPJz0JeqfzAF0hZ80hxULnBtXpBIMPi0uKwJLjLj7au2aAMSF3JOwk7l4kK-EXKNkPT-do1v97myVp8Waj-4ZtuPafObmfVA5s-1ZSfeDh9eEH6WzgG-_ZcrNKY-B2bg3Iv4oDKXB0vxZXwZS99tiLWOzmxHH8eZYhWKmuRLMGaKV1l0vzVmOjUftLv8M6hBbk9LOX7CMbO5zoweN3s3xMV0b--Ye3aTIpKW-UG1Zkoha3tteM6h5nhHYf4D-HC67-oqYmcxDlIyGQbZ_XI32ozEdVID9IppqrxTsnZu5zce4C6zSFelC_yarPmbyDda5mL5jvjWiolu48eydKSV6M2bajE0bMOsdAlTeecplqTnHiy1pXwawdkc5Hf_7tZLy3rOwwHkMe1C1PPXt5lz5KoHMFZtBtta0cwmN4tMZA_PTaDvSVZvXMGZeV-dFaLZ2R6M5w0x5qr3X7xBxlSM-xAUmkWJwrdyu1JM1IOmRtkXxtUbRNubvBGvMrEWOIWXHpKLp8qTUzX69-bJa205xOAMcdovo9CYE9wbAD5FagUthYfQCRnphEw0QvkDG_ijvhbb-FQSYQ7GCU5I3WiwnDQ4Co-uBKme0mUSp0PMZXr1XWVkP1dkTuZvrAPUkG634RVdr5H2S-9lxkIXZb8XmxIwhBnnyLwNrcqV8w5EJF1fTbu4RTb97LQnRzPJyeVC5oLcBmTXKHZ22B-GHnBJBLlh7h9dh-kSgKKOB6nPs_gnu_nPp6dyq5-b9x3oWNAAqqsvyyeS2d078u9hHow3hSUfg2CsgCg1BTjqGlCFaqDc1MoT2fXLOXG3vgbnnwNqRKSzK3qcisT0270dnjdg3EVy3mv8SnBOx-IUSjw37diV33kT8uoJJ2Til3l8gQiyDOShDO4MlvBMSdqBRUxzY4Owa1L_fWCPDVBX_HS6SY3Ft1zJr-0F9BHS0zeWOIA-sjrU1y-Njuadchz1K_a-KiPSzrplBsZoWEppOa6XfRESPuPtv7LOog3MsPrjRomEwieqJtLqmIuVmvQYfEjDQIOsO_w_s3yHrBGxQBspAHYmV0p-o2flcI9Fe0-AvCWKI5FHbVImC9RVtdyWSyELPiOMfJSJzfG82PxTH-bYiueNEBY1PY65v_Dkl4f1TguuuxztpH0Djpgbkj94VDqbhYxl-24OomtpeaYiMMkLTTPWFDjSx5Qbl2pITJVPapawPGr77tMxCR59kbtDaVKI43os1g9An9NXHOtqbd6Y2TOTRHPOUEfOEwvHPmo9NZ0sWUrKS-HggxnjqJ4VLOrDgJIqFl-ZROjDcqIl3YRLKjXr-t6GL5fgWEKS1W_We04Bhp4qTOc9UfH3vwpqnWDVu5h30TkY-UlmTJDOlYwwPrGXo3Wkt3edD_eNDkepVBqdwtdPKbT6YB5p11CrW6_xCl6at8Y7hSgP_vygcL8ES2IZsCyMkws6khM-6qltnJdJytfW-WJvMjQvH9V8Ou4tOqA1zkZ25z48y1y2XrVmMo1lkHVcK1wXeRe4udiUXa3sxewhRQs2s-8qQyJ4euCvI9SE5hmBCtzafU9KZR2zJsgo7EsdmeTR8MZY_kCXWGROXW9P2KBj_qMar-OyVGjXaf9PLth67Z9h_v4VJGeCfA3jav9DM13XtL7qBhyPxb3_gP8xjjcXPGx0COCs_TWt51ck0gNSqyKrRX4K5JsyxGt1h3_ghXUqibdcjes02T_qkqlatQI1PJ-RGrIXK1BLtbUEctbM4OUT1iX0H3UAhsPObB9zvbaunGO3GqLbzEAE-WFHIoUac_RDd0wjfYTIctG1PqNZJ6s5EwWak35W8zJF-lxJ_LidZ99aYKEV7VamYAhwDhD-GOkI0KYu1TgJxcGQQ2YOw5WGOp2O-SOTqvB6xHMEGcHfkRZ4DexCx-JIuazA0uuQI= \ No newline at end of file diff --git a/v2_adminpanel/app.py b/v2_adminpanel/app.py index 2bf5324..29ab6e9 100644 --- a/v2_adminpanel/app.py +++ b/v2_adminpanel/app.py @@ -992,6 +992,39 @@ def dashboard(): security_level = 'success' security_level_text = 'NORMAL' + # Resource Pool Statistiken + cur.execute(""" + SELECT + resource_type, + COUNT(*) FILTER (WHERE status = 'available') as available, + COUNT(*) FILTER (WHERE status = 'allocated') as allocated, + COUNT(*) FILTER (WHERE status = 'quarantine') as quarantine, + COUNT(*) as total + FROM resource_pools + GROUP BY resource_type + """) + + resource_stats = {} + resource_warning = None + + for row in cur.fetchall(): + available_percent = round((row[1] / row[4] * 100) if row[4] > 0 else 0, 1) + resource_stats[row[0]] = { + 'available': row[1], + 'allocated': row[2], + 'quarantine': row[3], + 'total': row[4], + 'available_percent': available_percent, + 'warning_level': 'danger' if row[1] < 50 else 'warning' if row[1] < 100 else 'success' + } + + # Warnung bei niedrigem Bestand + if row[1] < 50: + if not resource_warning: + resource_warning = f"Niedriger Bestand bei {row[0].upper()}: nur noch {row[1]} verfügbar!" + else: + resource_warning += f" | {row[0].upper()}: {row[1]}" + cur.close() conn.close() @@ -1013,10 +1046,15 @@ def dashboard(): 'failed_attempts_today': failed_attempts_today, 'recent_security_events': recent_security_events, 'security_level': security_level, - 'security_level_text': security_level_text + 'security_level_text': security_level_text, + 'resource_stats': resource_stats } - return render_template("dashboard.html", stats=stats, username=session.get('username')) + return render_template("dashboard.html", + stats=stats, + resource_stats=resource_stats, + resource_warning=resource_warning, + username=session.get('username')) @app.route("/create", methods=["GET", "POST"]) @login_required @@ -1051,6 +1089,11 @@ def create_license(): if not validate_license_key(license_key): flash('Ungültiges License Key Format! Erwartet: AF-YYYYMMFT-XXXX-YYYY-ZZZZ', 'error') return redirect(url_for('create_license')) + + # Resource counts + domain_count = int(request.form.get("domain_count", 1)) + ipv4_count = int(request.form.get("ipv4_count", 1)) + phone_count = int(request.form.get("phone_count", 1)) conn = get_connection() cur = conn.cursor() @@ -1097,11 +1140,111 @@ def create_license(): # Lizenz hinzufügen cur.execute(""" - INSERT INTO licenses (license_key, customer_id, license_type, valid_from, valid_until, is_active) - VALUES (%s, %s, %s, %s, %s, TRUE) + INSERT INTO licenses (license_key, customer_id, license_type, valid_from, valid_until, is_active, + domain_count, ipv4_count, phone_count) + VALUES (%s, %s, %s, %s, %s, TRUE, %s, %s, %s) RETURNING id - """, (license_key, customer_id, license_type, valid_from, valid_until)) + """, (license_key, customer_id, license_type, valid_from, valid_until, + domain_count, ipv4_count, phone_count)) license_id = cur.fetchone()[0] + + # Ressourcen zuweisen + try: + # Prüfe Verfügbarkeit + cur.execute(""" + SELECT + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'domain' AND status = 'available') as domains, + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'ipv4' AND status = 'available') as ipv4s, + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'phone' AND status = 'available') as phones + """) + available = cur.fetchone() + + if available[0] < domain_count: + raise ValueError(f"Nicht genügend Domains verfügbar (benötigt: {domain_count}, verfügbar: {available[0]})") + if available[1] < ipv4_count: + raise ValueError(f"Nicht genügend IPv4-Adressen verfügbar (benötigt: {ipv4_count}, verfügbar: {available[1]})") + if available[2] < phone_count: + raise ValueError(f"Nicht genügend Telefonnummern verfügbar (benötigt: {phone_count}, verfügbar: {available[2]})") + + # Domains zuweisen + if domain_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'domain' AND status = 'available' + LIMIT %s FOR UPDATE + """, (domain_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + + # IPv4s zuweisen + if ipv4_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'ipv4' AND status = 'available' + LIMIT %s FOR UPDATE + """, (ipv4_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + + # Telefonnummern zuweisen + if phone_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'phone' AND status = 'available' + LIMIT %s FOR UPDATE + """, (phone_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + + except ValueError as e: + conn.rollback() + flash(str(e), 'error') + return redirect(url_for('create_license')) conn.commit() @@ -1161,6 +1304,11 @@ def batch_licenses(): end_date = end_date - timedelta(days=1) valid_until = end_date.strftime("%Y-%m-%d") + # Resource counts + domain_count = int(request.form.get("domain_count", 1)) + ipv4_count = int(request.form.get("ipv4_count", 1)) + phone_count = int(request.form.get("phone_count", 1)) + # Sicherheitslimit if quantity < 1 or quantity > 100: flash('Anzahl muss zwischen 1 und 100 liegen!', 'error') @@ -1209,6 +1357,29 @@ def batch_licenses(): name = customer_data[0] email = customer_data[1] + # Prüfe Ressourcen-Verfügbarkeit für gesamten Batch + total_domains_needed = domain_count * quantity + total_ipv4s_needed = ipv4_count * quantity + total_phones_needed = phone_count * quantity + + cur.execute(""" + SELECT + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'domain' AND status = 'available') as domains, + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'ipv4' AND status = 'available') as ipv4s, + (SELECT COUNT(*) FROM resource_pools WHERE resource_type = 'phone' AND status = 'available') as phones + """) + available = cur.fetchone() + + if available[0] < total_domains_needed: + flash(f"Nicht genügend Domains verfügbar (benötigt: {total_domains_needed}, verfügbar: {available[0]})", 'error') + return redirect(url_for('batch_licenses')) + if available[1] < total_ipv4s_needed: + flash(f"Nicht genügend IPv4-Adressen verfügbar (benötigt: {total_ipv4s_needed}, verfügbar: {available[1]})", 'error') + return redirect(url_for('batch_licenses')) + if available[2] < total_phones_needed: + flash(f"Nicht genügend Telefonnummern verfügbar (benötigt: {total_phones_needed}, verfügbar: {available[2]})", 'error') + return redirect(url_for('batch_licenses')) + # Lizenzen generieren und speichern generated_licenses = [] for i in range(quantity): @@ -1224,12 +1395,90 @@ def batch_licenses(): # Lizenz einfügen cur.execute(""" INSERT INTO licenses (license_key, customer_id, license_type, - valid_from, valid_until, is_active) - VALUES (%s, %s, %s, %s, %s, true) + valid_from, valid_until, is_active, + domain_count, ipv4_count, phone_count) + VALUES (%s, %s, %s, %s, %s, true, %s, %s, %s) RETURNING id - """, (license_key, customer_id, license_type, valid_from, valid_until)) + """, (license_key, customer_id, license_type, valid_from, valid_until, + domain_count, ipv4_count, phone_count)) license_id = cur.fetchone()[0] + # Ressourcen für diese Lizenz zuweisen + # Domains + if domain_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'domain' AND status = 'available' + LIMIT %s FOR UPDATE + """, (domain_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + + # IPv4s + if ipv4_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'ipv4' AND status = 'available' + LIMIT %s FOR UPDATE + """, (ipv4_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + + # Telefonnummern + if phone_count > 0: + cur.execute(""" + SELECT id FROM resource_pools + WHERE resource_type = 'phone' AND status = 'available' + LIMIT %s FOR UPDATE + """, (phone_count,)) + for (resource_id,) in cur.fetchall(): + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], resource_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, resource_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (resource_id, license_id, session['username'], request.remote_addr)) + generated_licenses.append({ 'id': license_id, 'key': license_key, @@ -2431,5 +2680,858 @@ def bulk_delete_licenses(): except Exception as e: return jsonify({'success': False, 'message': str(e)}), 500 +# ===================== RESOURCE POOL MANAGEMENT ===================== + +@app.route('/resources') +@login_required +def resources(): + """Resource Pool Hauptübersicht""" + conn = get_connection() + cur = conn.cursor() + + # Statistiken abrufen + cur.execute(""" + SELECT + resource_type, + COUNT(*) FILTER (WHERE status = 'available') as available, + COUNT(*) FILTER (WHERE status = 'allocated') as allocated, + COUNT(*) FILTER (WHERE status = 'quarantine') as quarantine, + COUNT(*) as total + FROM resource_pools + GROUP BY resource_type + """) + + stats = {} + for row in cur.fetchall(): + stats[row[0]] = { + 'available': row[1], + 'allocated': row[2], + 'quarantine': row[3], + 'total': row[4], + 'available_percent': round((row[1] / row[4] * 100) if row[4] > 0 else 0, 1) + } + + # Letzte Aktivitäten + cur.execute(""" + SELECT + rh.action, + rh.action_by, + rh.action_at, + rp.resource_type, + rp.resource_value, + rh.details + FROM resource_history rh + JOIN resource_pools rp ON rh.resource_id = rp.id + ORDER BY rh.action_at DESC + LIMIT 10 + """) + recent_activities = cur.fetchall() + + # Ressourcen-Liste mit Pagination + page = request.args.get('page', 1, type=int) + per_page = 50 + offset = (page - 1) * per_page + + resource_type = request.args.get('type', '') + status_filter = request.args.get('status', '') + search = request.args.get('search', '') + + # Base Query + query = """ + SELECT + rp.id, + rp.resource_type, + rp.resource_value, + rp.status, + rp.allocated_to_license, + l.license_key, + c.name as customer_name, + rp.status_changed_at, + rp.quarantine_reason, + rp.quarantine_until + FROM resource_pools rp + LEFT JOIN licenses l ON rp.allocated_to_license = l.id + LEFT JOIN customers c ON l.customer_id = c.id + WHERE 1=1 + """ + params = [] + + if resource_type: + query += " AND rp.resource_type = %s" + params.append(resource_type) + + if status_filter: + query += " AND rp.status = %s" + params.append(status_filter) + + if search: + query += " AND rp.resource_value ILIKE %s" + params.append(f'%{search}%') + + # Count total + count_query = f"SELECT COUNT(*) FROM ({query}) as cnt" + cur.execute(count_query, params) + total = cur.fetchone()[0] + total_pages = (total + per_page - 1) // per_page + + # Get paginated results + query += " ORDER BY rp.id DESC LIMIT %s OFFSET %s" + params.extend([per_page, offset]) + + cur.execute(query, params) + resources = cur.fetchall() + + cur.close() + conn.close() + + return render_template('resources.html', + stats=stats, + resources=resources, + recent_activities=recent_activities, + page=page, + total_pages=total_pages, + total=total, + resource_type=resource_type, + status_filter=status_filter, + search=search, + datetime=datetime, + timedelta=timedelta) + +@app.route('/resources/add', methods=['GET', 'POST']) +@login_required +def add_resources(): + """Ressourcen zum Pool hinzufügen""" + if request.method == 'POST': + resource_type = request.form.get('resource_type') + resources_text = request.form.get('resources_text', '') + + # Parse resources (one per line) + resources = [r.strip() for r in resources_text.split('\n') if r.strip()] + + if not resources: + flash('Keine Ressourcen angegeben', 'error') + return redirect(url_for('add_resources')) + + conn = get_connection() + cur = conn.cursor() + + added = 0 + duplicates = 0 + + for resource_value in resources: + try: + cur.execute(""" + INSERT INTO resource_pools (resource_type, resource_value, status_changed_by) + VALUES (%s, %s, %s) + ON CONFLICT (resource_type, resource_value) DO NOTHING + """, (resource_type, resource_value, session['username'])) + + if cur.rowcount > 0: + added += 1 + # Get the inserted ID + cur.execute("SELECT id FROM resource_pools WHERE resource_type = %s AND resource_value = %s", + (resource_type, resource_value)) + resource_id = cur.fetchone()[0] + + # Log in history + cur.execute(""" + INSERT INTO resource_history (resource_id, action, action_by, ip_address) + VALUES (%s, 'created', %s, %s) + """, (resource_id, session['username'], request.remote_addr)) + else: + duplicates += 1 + + except Exception as e: + app.logger.error(f"Error adding resource {resource_value}: {e}") + + conn.commit() + cur.close() + conn.close() + + log_audit('CREATE', 'resource_pool', None, + new_values={'type': resource_type, 'added': added, 'duplicates': duplicates}, + additional_info=f"{added} Ressourcen hinzugefügt, {duplicates} Duplikate übersprungen") + + flash(f'{added} Ressourcen hinzugefügt, {duplicates} Duplikate übersprungen', 'success') + return redirect(url_for('resources')) + + return render_template('add_resources.html') + +@app.route('/resources/quarantine/', methods=['POST']) +@login_required +def quarantine_resource(resource_id): + """Ressource in Quarantäne setzen""" + reason = request.form.get('reason', 'review') + until_date = request.form.get('until_date') + notes = request.form.get('notes', '') + + conn = get_connection() + cur = conn.cursor() + + # Get current resource info + cur.execute("SELECT resource_type, resource_value, status FROM resource_pools WHERE id = %s", (resource_id,)) + resource = cur.fetchone() + + if not resource: + flash('Ressource nicht gefunden', 'error') + return redirect(url_for('resources')) + + old_status = resource[2] + + # Update resource + cur.execute(""" + UPDATE resource_pools + SET status = 'quarantine', + quarantine_reason = %s, + quarantine_until = %s, + notes = %s, + status_changed_at = CURRENT_TIMESTAMP, + status_changed_by = %s + WHERE id = %s + """, (reason, until_date if until_date else None, notes, session['username'], resource_id)) + + # Log in history + cur.execute(""" + INSERT INTO resource_history (resource_id, action, action_by, ip_address, details) + VALUES (%s, 'quarantined', %s, %s, %s) + """, (resource_id, session['username'], request.remote_addr, + Json({'reason': reason, 'until': until_date, 'notes': notes, 'old_status': old_status}))) + + conn.commit() + cur.close() + conn.close() + + log_audit('UPDATE', 'resource', resource_id, + old_values={'status': old_status}, + new_values={'status': 'quarantine', 'reason': reason}, + additional_info=f"Ressource {resource[0]}: {resource[1]} in Quarantäne") + + flash('Ressource in Quarantäne gesetzt', 'success') + return redirect(url_for('resources')) + +@app.route('/resources/release', methods=['POST']) +@login_required +def release_resources(): + """Ressourcen aus Quarantäne freigeben""" + resource_ids = request.form.getlist('resource_ids') + + if not resource_ids: + flash('Keine Ressourcen ausgewählt', 'error') + return redirect(url_for('resources')) + + conn = get_connection() + cur = conn.cursor() + + released = 0 + for resource_id in resource_ids: + cur.execute(""" + UPDATE resource_pools + SET status = 'available', + quarantine_reason = NULL, + quarantine_until = NULL, + allocated_to_license = NULL, + status_changed_at = CURRENT_TIMESTAMP, + status_changed_by = %s + WHERE id = %s AND status = 'quarantine' + """, (session['username'], resource_id)) + + if cur.rowcount > 0: + released += 1 + # Log in history + cur.execute(""" + INSERT INTO resource_history (resource_id, action, action_by, ip_address) + VALUES (%s, 'released', %s, %s) + """, (resource_id, session['username'], request.remote_addr)) + + conn.commit() + cur.close() + conn.close() + + log_audit('UPDATE', 'resource_pool', None, + new_values={'released': released}, + additional_info=f"{released} Ressourcen aus Quarantäne freigegeben") + + flash(f'{released} Ressourcen freigegeben', 'success') + return redirect(url_for('resources')) + +@app.route('/api/resources/allocate', methods=['POST']) +@login_required +def allocate_resources_api(): + """API für Ressourcen-Zuweisung bei Lizenzerstellung""" + data = request.json + license_id = data.get('license_id') + domain_count = data.get('domain_count', 1) + ipv4_count = data.get('ipv4_count', 1) + phone_count = data.get('phone_count', 1) + + conn = get_connection() + cur = conn.cursor() + + try: + allocated = {'domains': [], 'ipv4s': [], 'phones': []} + + # Allocate domains + if domain_count > 0: + cur.execute(""" + SELECT id, resource_value FROM resource_pools + WHERE resource_type = 'domain' AND status = 'available' + LIMIT %s FOR UPDATE + """, (domain_count,)) + domains = cur.fetchall() + + if len(domains) < domain_count: + raise ValueError(f"Nicht genügend Domains verfügbar (benötigt: {domain_count}, verfügbar: {len(domains)})") + + for domain_id, domain_value in domains: + # Update resource status + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, + status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], domain_id)) + + # Create assignment + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, domain_id, session['username'])) + + # Log history + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (domain_id, license_id, session['username'], request.remote_addr)) + + allocated['domains'].append(domain_value) + + # Allocate IPv4s (similar logic) + if ipv4_count > 0: + cur.execute(""" + SELECT id, resource_value FROM resource_pools + WHERE resource_type = 'ipv4' AND status = 'available' + LIMIT %s FOR UPDATE + """, (ipv4_count,)) + ipv4s = cur.fetchall() + + if len(ipv4s) < ipv4_count: + raise ValueError(f"Nicht genügend IPv4-Adressen verfügbar") + + for ipv4_id, ipv4_value in ipv4s: + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, + status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], ipv4_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, ipv4_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (ipv4_id, license_id, session['username'], request.remote_addr)) + + allocated['ipv4s'].append(ipv4_value) + + # Allocate phones (similar logic) + if phone_count > 0: + cur.execute(""" + SELECT id, resource_value FROM resource_pools + WHERE resource_type = 'phone' AND status = 'available' + LIMIT %s FOR UPDATE + """, (phone_count,)) + phones = cur.fetchall() + + if len(phones) < phone_count: + raise ValueError(f"Nicht genügend Telefonnummern verfügbar") + + for phone_id, phone_value in phones: + cur.execute(""" + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = %s, + status_changed_at = CURRENT_TIMESTAMP, + status_changed_by = %s + WHERE id = %s + """, (license_id, session['username'], phone_id)) + + cur.execute(""" + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (%s, %s, %s) + """, (license_id, phone_id, session['username'])) + + cur.execute(""" + INSERT INTO resource_history (resource_id, license_id, action, action_by, ip_address) + VALUES (%s, %s, 'allocated', %s, %s) + """, (phone_id, license_id, session['username'], request.remote_addr)) + + allocated['phones'].append(phone_value) + + # Update license resource counts + cur.execute(""" + UPDATE licenses + SET domain_count = %s, + ipv4_count = %s, + phone_count = %s + WHERE id = %s + """, (domain_count, ipv4_count, phone_count, license_id)) + + conn.commit() + cur.close() + conn.close() + + return jsonify({ + 'success': True, + 'allocated': allocated + }) + + except Exception as e: + conn.rollback() + cur.close() + conn.close() + return jsonify({ + 'success': False, + 'error': str(e) + }), 400 + +@app.route('/api/resources/check-availability', methods=['GET']) +@login_required +def check_resource_availability(): + """Prüft verfügbare Ressourcen""" + conn = get_connection() + cur = conn.cursor() + + cur.execute(""" + SELECT + resource_type, + COUNT(*) as available + FROM resource_pools + WHERE status = 'available' + GROUP BY resource_type + """) + + availability = {} + for row in cur.fetchall(): + availability[row[0]] = row[1] + + cur.close() + conn.close() + + return jsonify(availability) + +@app.route('/resources/history/') +@login_required +def resource_history(resource_id): + """Zeigt die komplette Historie einer Ressource""" + conn = get_connection() + cur = conn.cursor() + + # Get complete resource info using named columns + cur.execute(""" + SELECT id, resource_type, resource_value, status, allocated_to_license, + status_changed_at, status_changed_by, quarantine_reason, + quarantine_until, created_at, notes + FROM resource_pools + WHERE id = %s + """, (resource_id,)) + row = cur.fetchone() + + if not row: + flash('Ressource nicht gefunden', 'error') + return redirect(url_for('resources')) + + # Create resource object with named attributes + resource = { + 'id': row[0], + 'resource_type': row[1], + 'resource_value': row[2], + 'status': row[3], + 'allocated_to_license': row[4], + 'status_changed_at': row[5], + 'status_changed_by': row[6], + 'quarantine_reason': row[7], + 'quarantine_until': row[8], + 'created_at': row[9], + 'notes': row[10] + } + + # Get license info if allocated + license_info = None + if resource['allocated_to_license']: + cur.execute("SELECT license_key FROM licenses WHERE id = %s", + (resource['allocated_to_license'],)) + lic = cur.fetchone() + if lic: + license_info = {'license_key': lic[0]} + + # Get history with named columns + cur.execute(""" + SELECT + rh.action, + rh.action_by, + rh.action_at, + rh.details, + rh.license_id, + rh.ip_address + FROM resource_history rh + WHERE rh.resource_id = %s + ORDER BY rh.action_at DESC + """, (resource_id,)) + + history = [] + for row in cur.fetchall(): + history.append({ + 'action': row[0], + 'action_by': row[1], + 'action_at': row[2], + 'details': row[3], + 'license_id': row[4], + 'ip_address': row[5] + }) + + cur.close() + conn.close() + + # Convert to object-like for template + class ResourceObj: + def __init__(self, data): + for key, value in data.items(): + setattr(self, key, value) + + resource_obj = ResourceObj(resource) + history_objs = [ResourceObj(h) for h in history] + + return render_template('resource_history.html', + resource=resource_obj, + license_info=license_info, + history=history_objs) + +@app.route('/resources/metrics') +@login_required +def resources_metrics(): + """Dashboard für Resource Metrics und Reports""" + conn = get_connection() + cur = conn.cursor() + + # Overall stats with fallback values + cur.execute(""" + SELECT + COUNT(DISTINCT resource_id) as total_resources, + COALESCE(AVG(performance_score), 0) as avg_performance, + COALESCE(SUM(cost), 0) as total_cost, + COALESCE(SUM(revenue), 0) as total_revenue, + COALESCE(SUM(issues_count), 0) as total_issues + FROM resource_metrics + WHERE metric_date >= CURRENT_DATE - INTERVAL '30 days' + """) + row = cur.fetchone() + + # Calculate ROI + roi = 0 + if row[2] > 0: # if total_cost > 0 + roi = row[3] / row[2] # revenue / cost + + stats = { + 'total_resources': row[0] or 0, + 'avg_performance': row[1] or 0, + 'total_cost': row[2] or 0, + 'total_revenue': row[3] or 0, + 'total_issues': row[4] or 0, + 'roi': roi + } + + # Performance by type + cur.execute(""" + SELECT + rp.resource_type, + COALESCE(AVG(rm.performance_score), 0) as avg_score, + COUNT(DISTINCT rp.id) as resource_count + FROM resource_pools rp + LEFT JOIN resource_metrics rm ON rp.id = rm.resource_id + AND rm.metric_date >= CURRENT_DATE - INTERVAL '30 days' + GROUP BY rp.resource_type + ORDER BY rp.resource_type + """) + performance_by_type = cur.fetchall() + + # Utilization data + cur.execute(""" + SELECT + resource_type, + COUNT(*) FILTER (WHERE status = 'allocated') as allocated, + COUNT(*) as total, + ROUND(COUNT(*) FILTER (WHERE status = 'allocated') * 100.0 / COUNT(*), 1) as allocated_percent + FROM resource_pools + GROUP BY resource_type + """) + utilization_rows = cur.fetchall() + utilization_data = [ + { + 'type': row[0].upper(), + 'allocated': row[1], + 'total': row[2], + 'allocated_percent': row[3] + } + for row in utilization_rows + ] + + # Top performing resources + cur.execute(""" + SELECT + rp.id, + rp.resource_type, + rp.resource_value, + COALESCE(AVG(rm.performance_score), 0) as avg_score, + COALESCE(SUM(rm.revenue), 0) as total_revenue, + COALESCE(SUM(rm.cost), 1) as total_cost, + CASE + WHEN COALESCE(SUM(rm.cost), 0) = 0 THEN 0 + ELSE COALESCE(SUM(rm.revenue), 0) / COALESCE(SUM(rm.cost), 1) + END as roi + FROM resource_pools rp + LEFT JOIN resource_metrics rm ON rp.id = rm.resource_id + AND rm.metric_date >= CURRENT_DATE - INTERVAL '30 days' + WHERE rp.status != 'quarantine' + GROUP BY rp.id, rp.resource_type, rp.resource_value + HAVING AVG(rm.performance_score) IS NOT NULL + ORDER BY avg_score DESC + LIMIT 10 + """) + top_rows = cur.fetchall() + top_performers = [ + { + 'id': row[0], + 'resource_type': row[1], + 'resource_value': row[2], + 'avg_score': row[3], + 'roi': row[6] + } + for row in top_rows + ] + + # Resources with issues + cur.execute(""" + SELECT + rp.id, + rp.resource_type, + rp.resource_value, + rp.status, + COALESCE(SUM(rm.issues_count), 0) as total_issues + FROM resource_pools rp + LEFT JOIN resource_metrics rm ON rp.id = rm.resource_id + AND rm.metric_date >= CURRENT_DATE - INTERVAL '30 days' + WHERE rm.issues_count > 0 OR rp.status = 'quarantine' + GROUP BY rp.id, rp.resource_type, rp.resource_value, rp.status + HAVING SUM(rm.issues_count) > 0 + ORDER BY total_issues DESC + LIMIT 10 + """) + problem_rows = cur.fetchall() + problem_resources = [ + { + 'id': row[0], + 'resource_type': row[1], + 'resource_value': row[2], + 'status': row[3], + 'total_issues': row[4] + } + for row in problem_rows + ] + + # Daily metrics for trend chart (last 30 days) + cur.execute(""" + SELECT + metric_date, + COALESCE(AVG(performance_score), 0) as avg_performance, + COALESCE(SUM(issues_count), 0) as total_issues + FROM resource_metrics + WHERE metric_date >= CURRENT_DATE - INTERVAL '30 days' + GROUP BY metric_date + ORDER BY metric_date + """) + daily_rows = cur.fetchall() + daily_metrics = [ + { + 'date': row[0].strftime('%d.%m'), + 'performance': float(row[1]), + 'issues': int(row[2]) + } + for row in daily_rows + ] + + cur.close() + conn.close() + + return render_template('resource_metrics.html', + stats=stats, + performance_by_type=performance_by_type, + utilization_data=utilization_data, + top_performers=top_performers, + problem_resources=problem_resources, + daily_metrics=daily_metrics) + +@app.route('/resources/report', methods=['GET']) +@login_required +def resources_report(): + """Generiert Ressourcen-Reports oder zeigt Report-Formular""" + # Prüfe ob Download angefordert wurde + if request.args.get('download') == 'true': + report_type = request.args.get('type', 'usage') + format_type = request.args.get('format', 'excel') + date_from = request.args.get('from', (datetime.now(ZoneInfo("Europe/Berlin")) - timedelta(days=30)).strftime('%Y-%m-%d')) + date_to = request.args.get('to', datetime.now(ZoneInfo("Europe/Berlin")).strftime('%Y-%m-%d')) + + conn = get_connection() + cur = conn.cursor() + + if report_type == 'usage': + # Auslastungsreport + query = """ + SELECT + rp.resource_type, + rp.resource_value, + rp.status, + COUNT(DISTINCT rh.license_id) as unique_licenses, + COUNT(rh.id) as total_allocations, + MIN(rh.action_at) as first_used, + MAX(rh.action_at) as last_used + FROM resource_pools rp + LEFT JOIN resource_history rh ON rp.id = rh.resource_id + AND rh.action = 'allocated' + AND rh.action_at BETWEEN %s AND %s + GROUP BY rp.id, rp.resource_type, rp.resource_value, rp.status + ORDER BY rp.resource_type, total_allocations DESC + """ + cur.execute(query, (date_from, date_to)) + columns = ['Typ', 'Ressource', 'Status', 'Unique Lizenzen', 'Gesamt Zuweisungen', 'Erste Nutzung', 'Letzte Nutzung'] + + elif report_type == 'performance': + # Performance-Report + query = """ + SELECT + rp.resource_type, + rp.resource_value, + AVG(rm.performance_score) as avg_performance, + SUM(rm.usage_count) as total_usage, + SUM(rm.revenue) as total_revenue, + SUM(rm.cost) as total_cost, + SUM(rm.revenue - rm.cost) as profit, + SUM(rm.issues_count) as total_issues + FROM resource_pools rp + JOIN resource_metrics rm ON rp.id = rm.resource_id + WHERE rm.metric_date BETWEEN %s AND %s + GROUP BY rp.id, rp.resource_type, rp.resource_value + ORDER BY profit DESC + """ + cur.execute(query, (date_from, date_to)) + columns = ['Typ', 'Ressource', 'Durchschn. Performance', 'Gesamt Nutzung', 'Umsatz', 'Kosten', 'Gewinn', 'Issues'] + + elif report_type == 'compliance': + # Compliance-Report + query = """ + SELECT + rh.action_at, + rh.action, + rh.action_by, + rp.resource_type, + rp.resource_value, + l.license_key, + c.name as customer_name, + rh.ip_address + FROM resource_history rh + JOIN resource_pools rp ON rh.resource_id = rp.id + LEFT JOIN licenses l ON rh.license_id = l.id + LEFT JOIN customers c ON l.customer_id = c.id + WHERE rh.action_at BETWEEN %s AND %s + ORDER BY rh.action_at DESC + """ + cur.execute(query, (date_from, date_to)) + columns = ['Zeit', 'Aktion', 'Von', 'Typ', 'Ressource', 'Lizenz', 'Kunde', 'IP-Adresse'] + + else: # inventory report + # Inventar-Report + query = """ + SELECT + resource_type, + COUNT(*) FILTER (WHERE status = 'available') as available, + COUNT(*) FILTER (WHERE status = 'allocated') as allocated, + COUNT(*) FILTER (WHERE status = 'quarantine') as quarantine, + COUNT(*) as total + FROM resource_pools + GROUP BY resource_type + ORDER BY resource_type + """ + cur.execute(query) + columns = ['Typ', 'Verfügbar', 'Zugeteilt', 'Quarantäne', 'Gesamt'] + + # Convert to DataFrame + data = cur.fetchall() + df = pd.DataFrame(data, columns=columns) + + cur.close() + conn.close() + + # Generate file + timestamp = datetime.now(ZoneInfo("Europe/Berlin")).strftime('%Y%m%d_%H%M%S') + filename = f"resource_report_{report_type}_{timestamp}" + + if format_type == 'excel': + output = io.BytesIO() + with pd.ExcelWriter(output, engine='openpyxl') as writer: + df.to_excel(writer, sheet_name='Report', index=False) + + # Auto-adjust columns width + worksheet = writer.sheets['Report'] + for column in worksheet.columns: + max_length = 0 + column = [cell for cell in column] + for cell in column: + try: + if len(str(cell.value)) > max_length: + max_length = len(str(cell.value)) + except: + pass + adjusted_width = (max_length + 2) + worksheet.column_dimensions[column[0].column_letter].width = adjusted_width + + output.seek(0) + + log_audit('EXPORT', 'resource_report', None, + new_values={'type': report_type, 'format': 'excel', 'rows': len(df)}, + additional_info=f"Resource Report {report_type} exportiert") + + return send_file(output, + mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + as_attachment=True, + download_name=f'{filename}.xlsx') + + else: # CSV + output = io.StringIO() + df.to_csv(output, index=False, sep=';', encoding='utf-8-sig') + output.seek(0) + + log_audit('EXPORT', 'resource_report', None, + new_values={'type': report_type, 'format': 'csv', 'rows': len(df)}, + additional_info=f"Resource Report {report_type} exportiert") + + return send_file(io.BytesIO(output.getvalue().encode('utf-8-sig')), + mimetype='text/csv', + as_attachment=True, + download_name=f'{filename}.csv') + + # Wenn kein Download, zeige Report-Formular + return render_template('resource_report.html', + datetime=datetime, + timedelta=timedelta, + username=session.get('username')) + if __name__ == "__main__": app.run(host="0.0.0.0", port=5000) diff --git a/v2_adminpanel/create_resource_tables.sql b/v2_adminpanel/create_resource_tables.sql new file mode 100644 index 0000000..ef2e915 --- /dev/null +++ b/v2_adminpanel/create_resource_tables.sql @@ -0,0 +1,94 @@ +-- Erstelle die fehlenden Resource Pool Tabellen +-- Nur ausführen wenn die Tabellen noch nicht existieren + +-- Resource Pool Haupttabelle +CREATE TABLE IF NOT EXISTS resource_pools ( + id SERIAL PRIMARY KEY, + resource_type VARCHAR(20) NOT NULL CHECK (resource_type IN ('domain', 'ipv4', 'phone')), + resource_value VARCHAR(255) NOT NULL, + status VARCHAR(20) DEFAULT 'available' CHECK (status IN ('available', 'allocated', 'quarantine')), + allocated_to_license INTEGER REFERENCES licenses(id) ON DELETE SET NULL, + status_changed_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + status_changed_by VARCHAR(50), + quarantine_reason VARCHAR(100) CHECK (quarantine_reason IN ('abuse', 'defect', 'maintenance', 'blacklisted', 'expired', 'review', NULL)), + quarantine_until TIMESTAMP WITH TIME ZONE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + notes TEXT, + UNIQUE(resource_type, resource_value) +); + +-- Historie für Resource-Aktionen +CREATE TABLE IF NOT EXISTS resource_history ( + id SERIAL PRIMARY KEY, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + license_id INTEGER REFERENCES licenses(id) ON DELETE SET NULL, + action VARCHAR(50) NOT NULL CHECK (action IN ('allocated', 'deallocated', 'quarantined', 'released', 'created', 'deleted')), + action_by VARCHAR(50) NOT NULL, + action_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + details JSONB, + ip_address TEXT +); + +-- Metriken für Resource Performance +CREATE TABLE IF NOT EXISTS resource_metrics ( + id SERIAL PRIMARY KEY, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + metric_date DATE NOT NULL, + usage_count INTEGER DEFAULT 0, + performance_score DECIMAL(5,2) DEFAULT 0.00, + cost DECIMAL(10,2) DEFAULT 0.00, + revenue DECIMAL(10,2) DEFAULT 0.00, + issues_count INTEGER DEFAULT 0, + availability_percent DECIMAL(5,2) DEFAULT 100.00, + UNIQUE(resource_id, metric_date) +); + +-- Zuordnungstabelle zwischen Lizenzen und Ressourcen +CREATE TABLE IF NOT EXISTS license_resources ( + id SERIAL PRIMARY KEY, + license_id INTEGER REFERENCES licenses(id) ON DELETE CASCADE, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + assigned_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + assigned_by VARCHAR(50), + is_active BOOLEAN DEFAULT TRUE, + UNIQUE(license_id, resource_id) +); + +-- Erweiterung der licenses Tabelle um Resource-Counts +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.columns + WHERE table_name = 'licenses' AND column_name = 'domain_count') THEN + ALTER TABLE licenses + ADD COLUMN domain_count INTEGER DEFAULT 1 CHECK (domain_count >= 0 AND domain_count <= 10), + ADD COLUMN ipv4_count INTEGER DEFAULT 1 CHECK (ipv4_count >= 0 AND ipv4_count <= 10), + ADD COLUMN phone_count INTEGER DEFAULT 1 CHECK (phone_count >= 0 AND phone_count <= 10); + END IF; +END $$; + +-- Indizes für Performance +CREATE INDEX IF NOT EXISTS idx_resource_status ON resource_pools(status); +CREATE INDEX IF NOT EXISTS idx_resource_type_status ON resource_pools(resource_type, status); +CREATE INDEX IF NOT EXISTS idx_resource_allocated ON resource_pools(allocated_to_license) WHERE allocated_to_license IS NOT NULL; +CREATE INDEX IF NOT EXISTS idx_resource_quarantine ON resource_pools(quarantine_until) WHERE status = 'quarantine'; +CREATE INDEX IF NOT EXISTS idx_resource_history_date ON resource_history(action_at DESC); +CREATE INDEX IF NOT EXISTS idx_resource_history_resource ON resource_history(resource_id); +CREATE INDEX IF NOT EXISTS idx_resource_metrics_date ON resource_metrics(metric_date DESC); +CREATE INDEX IF NOT EXISTS idx_license_resources_active ON license_resources(license_id) WHERE is_active = TRUE; + +-- Prüfe ob Tabellen erfolgreich erstellt wurden +DO $$ +DECLARE + table_count INT; +BEGIN + SELECT COUNT(*) INTO table_count + FROM information_schema.tables + WHERE table_schema = 'public' + AND table_name IN ('resource_pools', 'resource_history', 'resource_metrics', 'license_resources'); + + IF table_count = 4 THEN + RAISE NOTICE 'Alle 4 Resource-Tabellen wurden erfolgreich erstellt!'; + ELSE + RAISE WARNING 'Nur % von 4 Tabellen wurden erstellt!', table_count; + END IF; +END $$; \ No newline at end of file diff --git a/v2_adminpanel/init.sql b/v2_adminpanel/init.sql index de93763..6890685 100644 --- a/v2_adminpanel/init.sql +++ b/v2_adminpanel/init.sql @@ -102,3 +102,80 @@ BEGIN UPDATE licenses SET created_at = valid_from WHERE created_at IS NULL; END IF; END $$; + +-- ===================== RESOURCE POOL SYSTEM ===================== + +-- Haupttabelle für den Resource Pool +CREATE TABLE IF NOT EXISTS resource_pools ( + id SERIAL PRIMARY KEY, + resource_type VARCHAR(20) NOT NULL CHECK (resource_type IN ('domain', 'ipv4', 'phone')), + resource_value VARCHAR(255) NOT NULL, + status VARCHAR(20) DEFAULT 'available' CHECK (status IN ('available', 'allocated', 'quarantine')), + allocated_to_license INTEGER REFERENCES licenses(id) ON DELETE SET NULL, + status_changed_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + status_changed_by VARCHAR(50), + quarantine_reason VARCHAR(100) CHECK (quarantine_reason IN ('abuse', 'defect', 'maintenance', 'blacklisted', 'expired', 'review', NULL)), + quarantine_until TIMESTAMP WITH TIME ZONE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + notes TEXT, + UNIQUE(resource_type, resource_value) +); + +-- Resource History für vollständige Nachverfolgbarkeit +CREATE TABLE IF NOT EXISTS resource_history ( + id SERIAL PRIMARY KEY, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + license_id INTEGER REFERENCES licenses(id) ON DELETE SET NULL, + action VARCHAR(50) NOT NULL CHECK (action IN ('allocated', 'deallocated', 'quarantined', 'released', 'created', 'deleted')), + action_by VARCHAR(50) NOT NULL, + action_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + details JSONB, + ip_address TEXT +); + +-- Resource Metrics für Performance-Tracking und ROI +CREATE TABLE IF NOT EXISTS resource_metrics ( + id SERIAL PRIMARY KEY, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + metric_date DATE NOT NULL, + usage_count INTEGER DEFAULT 0, + performance_score DECIMAL(5,2) DEFAULT 0.00, + cost DECIMAL(10,2) DEFAULT 0.00, + revenue DECIMAL(10,2) DEFAULT 0.00, + issues_count INTEGER DEFAULT 0, + availability_percent DECIMAL(5,2) DEFAULT 100.00, + UNIQUE(resource_id, metric_date) +); + +-- Zuordnungstabelle zwischen Lizenzen und Ressourcen +CREATE TABLE IF NOT EXISTS license_resources ( + id SERIAL PRIMARY KEY, + license_id INTEGER REFERENCES licenses(id) ON DELETE CASCADE, + resource_id INTEGER REFERENCES resource_pools(id) ON DELETE CASCADE, + assigned_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + assigned_by VARCHAR(50), + is_active BOOLEAN DEFAULT TRUE, + UNIQUE(license_id, resource_id) +); + +-- Erweiterung der licenses Tabelle um Resource-Counts +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.columns + WHERE table_name = 'licenses' AND column_name = 'domain_count') THEN + ALTER TABLE licenses + ADD COLUMN domain_count INTEGER DEFAULT 1 CHECK (domain_count >= 0 AND domain_count <= 10), + ADD COLUMN ipv4_count INTEGER DEFAULT 1 CHECK (ipv4_count >= 0 AND ipv4_count <= 10), + ADD COLUMN phone_count INTEGER DEFAULT 1 CHECK (phone_count >= 0 AND phone_count <= 10); + END IF; +END $$; + +-- Indizes für Performance +CREATE INDEX IF NOT EXISTS idx_resource_status ON resource_pools(status); +CREATE INDEX IF NOT EXISTS idx_resource_type_status ON resource_pools(resource_type, status); +CREATE INDEX IF NOT EXISTS idx_resource_allocated ON resource_pools(allocated_to_license) WHERE allocated_to_license IS NOT NULL; +CREATE INDEX IF NOT EXISTS idx_resource_quarantine ON resource_pools(quarantine_until) WHERE status = 'quarantine'; +CREATE INDEX IF NOT EXISTS idx_resource_history_date ON resource_history(action_at DESC); +CREATE INDEX IF NOT EXISTS idx_resource_history_resource ON resource_history(resource_id); +CREATE INDEX IF NOT EXISTS idx_resource_metrics_date ON resource_metrics(metric_date DESC); +CREATE INDEX IF NOT EXISTS idx_license_resources_active ON license_resources(license_id) WHERE is_active = TRUE; diff --git a/v2_adminpanel/migrate_existing_licenses.sql b/v2_adminpanel/migrate_existing_licenses.sql new file mode 100644 index 0000000..c8a041f --- /dev/null +++ b/v2_adminpanel/migrate_existing_licenses.sql @@ -0,0 +1,263 @@ +-- Migration Script für bestehende Lizenzen +-- Setzt Default-Werte für Resource Counts +-- Stand: 2025-06-09 + +-- ==================================== +-- Prüfe ob Migration notwendig ist +-- ==================================== +DO $$ +DECLARE + licenses_without_resources INT; + total_licenses INT; +BEGIN + -- Zähle Lizenzen ohne Resource-Count Werte + SELECT COUNT(*) INTO licenses_without_resources + FROM licenses + WHERE domain_count IS NULL + OR ipv4_count IS NULL + OR phone_count IS NULL; + + SELECT COUNT(*) INTO total_licenses FROM licenses; + + IF licenses_without_resources > 0 THEN + RAISE NOTICE 'Migration notwendig für % von % Lizenzen', licenses_without_resources, total_licenses; + ELSE + RAISE NOTICE 'Keine Migration notwendig - alle Lizenzen haben bereits Resource Counts'; + RETURN; + END IF; +END $$; + +-- ==================================== +-- Setze Default Resource Counts +-- ==================================== + +-- Vollversionen erhalten standardmäßig je 2 Ressourcen +UPDATE licenses +SET domain_count = COALESCE(domain_count, 2), + ipv4_count = COALESCE(ipv4_count, 2), + phone_count = COALESCE(phone_count, 2) +WHERE license_type = 'full' + AND (domain_count IS NULL OR ipv4_count IS NULL OR phone_count IS NULL); + +-- Testversionen erhalten standardmäßig je 1 Ressource +UPDATE licenses +SET domain_count = COALESCE(domain_count, 1), + ipv4_count = COALESCE(ipv4_count, 1), + phone_count = COALESCE(phone_count, 1) +WHERE license_type = 'test' + AND (domain_count IS NULL OR ipv4_count IS NULL OR phone_count IS NULL); + +-- Inaktive Lizenzen erhalten 0 Ressourcen +UPDATE licenses +SET domain_count = COALESCE(domain_count, 0), + ipv4_count = COALESCE(ipv4_count, 0), + phone_count = COALESCE(phone_count, 0) +WHERE is_active = FALSE + AND (domain_count IS NULL OR ipv4_count IS NULL OR phone_count IS NULL); + +-- ==================================== +-- Erstelle Resource-Zuweisungen für bestehende aktive Lizenzen +-- ==================================== +DO $$ +DECLARE + license_rec RECORD; + resource_rec RECORD; + resources_assigned INT := 0; + resources_needed INT; +BEGIN + -- Durchlaufe alle aktiven Lizenzen mit Resource Counts > 0 + FOR license_rec IN + SELECT id, domain_count, ipv4_count, phone_count + FROM licenses + WHERE is_active = TRUE + AND (domain_count > 0 OR ipv4_count > 0 OR phone_count > 0) + ORDER BY created_at + LOOP + -- Domains zuweisen + resources_needed := license_rec.domain_count; + FOR i IN 1..resources_needed LOOP + -- Finde eine verfügbare Domain + SELECT id INTO resource_rec + FROM resource_pools + WHERE resource_type = 'domain' + AND status = 'available' + ORDER BY RANDOM() + LIMIT 1; + + IF resource_rec.id IS NOT NULL THEN + -- Weise Resource zu + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = license_rec.id, + status_changed_at = NOW(), + status_changed_by = 'migration' + WHERE id = resource_rec.id; + + -- Erstelle Zuordnung + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (license_rec.id, resource_rec.id, 'migration'); + + -- Historie eintragen + INSERT INTO resource_history (resource_id, license_id, action, action_by, details) + VALUES (resource_rec.id, license_rec.id, 'allocated', 'migration', + '{"reason": "Migration bestehender Lizenzen"}'::jsonb); + + resources_assigned := resources_assigned + 1; + END IF; + END LOOP; + + -- IPv4-Adressen zuweisen + resources_needed := license_rec.ipv4_count; + FOR i IN 1..resources_needed LOOP + SELECT id INTO resource_rec + FROM resource_pools + WHERE resource_type = 'ipv4' + AND status = 'available' + ORDER BY RANDOM() + LIMIT 1; + + IF resource_rec.id IS NOT NULL THEN + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = license_rec.id, + status_changed_at = NOW(), + status_changed_by = 'migration' + WHERE id = resource_rec.id; + + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (license_rec.id, resource_rec.id, 'migration'); + + INSERT INTO resource_history (resource_id, license_id, action, action_by, details) + VALUES (resource_rec.id, license_rec.id, 'allocated', 'migration', + '{"reason": "Migration bestehender Lizenzen"}'::jsonb); + + resources_assigned := resources_assigned + 1; + END IF; + END LOOP; + + -- Telefonnummern zuweisen + resources_needed := license_rec.phone_count; + FOR i IN 1..resources_needed LOOP + SELECT id INTO resource_rec + FROM resource_pools + WHERE resource_type = 'phone' + AND status = 'available' + ORDER BY RANDOM() + LIMIT 1; + + IF resource_rec.id IS NOT NULL THEN + UPDATE resource_pools + SET status = 'allocated', + allocated_to_license = license_rec.id, + status_changed_at = NOW(), + status_changed_by = 'migration' + WHERE id = resource_rec.id; + + INSERT INTO license_resources (license_id, resource_id, assigned_by) + VALUES (license_rec.id, resource_rec.id, 'migration'); + + INSERT INTO resource_history (resource_id, license_id, action, action_by, details) + VALUES (resource_rec.id, license_rec.id, 'allocated', 'migration', + '{"reason": "Migration bestehender Lizenzen"}'::jsonb); + + resources_assigned := resources_assigned + 1; + END IF; + END LOOP; + END LOOP; + + RAISE NOTICE 'Migration abgeschlossen: % Ressourcen wurden zugewiesen', resources_assigned; +END $$; + +-- ==================================== +-- Abschlussbericht +-- ==================================== +DO $$ +DECLARE + v_total_licenses INT; + v_licenses_with_resources INT; + v_total_resources_assigned INT; + v_domains_assigned INT; + v_ipv4_assigned INT; + v_phones_assigned INT; +BEGIN + -- Statistiken sammeln + SELECT COUNT(*) INTO v_total_licenses FROM licenses; + + SELECT COUNT(*) INTO v_licenses_with_resources + FROM licenses + WHERE id IN (SELECT DISTINCT license_id FROM license_resources WHERE is_active = TRUE); + + SELECT COUNT(*) INTO v_total_resources_assigned + FROM license_resources + WHERE is_active = TRUE; + + SELECT COUNT(*) INTO v_domains_assigned + FROM resource_pools + WHERE resource_type = 'domain' AND status = 'allocated'; + + SELECT COUNT(*) INTO v_ipv4_assigned + FROM resource_pools + WHERE resource_type = 'ipv4' AND status = 'allocated'; + + SELECT COUNT(*) INTO v_phones_assigned + FROM resource_pools + WHERE resource_type = 'phone' AND status = 'allocated'; + + -- Bericht ausgeben + RAISE NOTICE ''; + RAISE NOTICE '========================================'; + RAISE NOTICE 'MIGRATION ABGESCHLOSSEN'; + RAISE NOTICE '========================================'; + RAISE NOTICE 'Lizenzen gesamt: %', v_total_licenses; + RAISE NOTICE 'Lizenzen mit Ressourcen: %', v_licenses_with_resources; + RAISE NOTICE ''; + RAISE NOTICE 'Zugewiesene Ressourcen:'; + RAISE NOTICE '- Domains: %', v_domains_assigned; + RAISE NOTICE '- IPv4-Adressen: %', v_ipv4_assigned; + RAISE NOTICE '- Telefonnummern: %', v_phones_assigned; + RAISE NOTICE '- Gesamt: %', v_total_resources_assigned; + RAISE NOTICE '========================================'; + + -- Warnungen ausgeben + IF EXISTS ( + SELECT 1 FROM licenses l + WHERE l.is_active = TRUE + AND (l.domain_count > 0 OR l.ipv4_count > 0 OR l.phone_count > 0) + AND NOT EXISTS ( + SELECT 1 FROM license_resources lr + WHERE lr.license_id = l.id AND lr.is_active = TRUE + ) + ) THEN + RAISE WARNING 'ACHTUNG: Einige aktive Lizenzen konnten keine Ressourcen erhalten (möglicherweise nicht genug verfügbar)'; + + -- Liste betroffene Lizenzen auf + FOR v_total_licenses IN + SELECT l.id FROM licenses l + WHERE l.is_active = TRUE + AND (l.domain_count > 0 OR l.ipv4_count > 0 OR l.phone_count > 0) + AND NOT EXISTS ( + SELECT 1 FROM license_resources lr + WHERE lr.license_id = l.id AND lr.is_active = TRUE + ) + LOOP + RAISE WARNING 'Lizenz ID % hat keine Ressourcen erhalten', v_total_licenses; + END LOOP; + END IF; +END $$; + +-- ==================================== +-- Audit Log Eintrag für Migration +-- ==================================== +INSERT INTO audit_log ( + timestamp, + username, + action, + entity_type, + additional_info +) VALUES ( + NOW(), + 'system', + 'MIGRATION', + 'licenses', + 'Resource Pool Migration für bestehende Lizenzen durchgeführt' +); \ No newline at end of file diff --git a/v2_adminpanel/templates/add_resources.html b/v2_adminpanel/templates/add_resources.html new file mode 100644 index 0000000..098857a --- /dev/null +++ b/v2_adminpanel/templates/add_resources.html @@ -0,0 +1,431 @@ +{% extends "base.html" %} + +{% block title %}Ressourcen hinzufügen{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+
+
+ +
+
+

Ressourcen hinzufügen

+

Fügen Sie neue Domains, IPs oder Telefonnummern zum Pool hinzu

+
+ + ← Zurück zur Übersicht + +
+ +
+ +
+
+
1️⃣ Ressourcentyp wählen
+
+
+ +
+
+
🌐
+
Domain
+ Webseiten-Adressen +
+
+
🖥️
+
IPv4
+ IP-Adressen +
+
+
📱
+
Telefon
+ Telefonnummern +
+
+
+
+ + +
+
+
2️⃣ Ressourcen eingeben
+
+
+
+ + +
+ + Geben Sie jede Ressource in eine neue Zeile ein. Duplikate werden automatisch übersprungen. +
+
+ + +
+
📊 Live-Vorschau
+
+
+
0
+
Gültig
+
+
+
0
+
Duplikate
+
+
+
0
+
Ungültig
+
+
+ +
+
+
+ + +
+
+
💡 Format-Beispiele
+
+
+
+
+
+
+
+ 🌐 Domains +
+ 
example.com
+test-domain.net
+meine-seite.de
+subdomain.example.org
+my-website.io
+
+ + Format: Ohne http(s)://
+ Erlaubt: Buchstaben, Zahlen, Punkt, Bindestrich + +
+
+
+
+
+
+
+
+ 🖥️ IPv4-Adressen +
+ 
192.168.1.10
+192.168.1.11
+10.0.0.1
+172.16.0.5
+8.8.8.8
+
+ + Format: xxx.xxx.xxx.xxx
+ Bereich: 0-255 pro Oktett + +
+
+
+
+
+
+
+
+ 📱 Telefonnummern +
+ 
+491701234567
++493012345678
++33123456789
++441234567890
++12125551234
+
+ + Format: Mit Ländervorwahl
+ Start: Immer mit + + +
+
+
+
+
+
+
+ + +
+ + +
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/v2_adminpanel/templates/base.html b/v2_adminpanel/templates/base.html index 6d1a7bb..26f6d38 100644 --- a/v2_adminpanel/templates/base.html +++ b/v2_adminpanel/templates/base.html @@ -220,15 +220,23 @@ -