proxsync 2.0.1__tar.gz → 2.0.2__tar.gz

{proxsync-2.0.1/proxsync.egg-info → proxsync-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.1
+Version: 2.0.2
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.1 → proxsync-2.0.2/proxsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.1
+Version: 2.0.2
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.1 → proxsync-2.0.2}/proxsync.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ pve_sync_plugin/migrations/0010_pvedriftevent.py
 pve_sync_plugin/migrations/0011_pveclusterconfig_notify_on_sync.py
 pve_sync_plugin/migrations/0012_pvedriftevent_tags_and_index_renames.py
 pve_sync_plugin/migrations/0013_pluginsettings_log_retention.py
+pve_sync_plugin/migrations/0014_vmprovisioninglog.py
 pve_sync_plugin/migrations/__init__.py
 pve_sync_plugin/sync/__init__.py
 pve_sync_plugin/sync/config_bridge.py
@@ -58,6 +59,8 @@ pve_sync_plugin/templates/pve_sync/pvedriftevent.html
 pve_sync_plugin/templates/pve_sync/pvesyncjob.html
 pve_sync_plugin/templates/pve_sync/pvewebhookevent.html
 pve_sync_plugin/templates/pve_sync/settings.html
+pve_sync_plugin/templates/pve_sync/vm_provisioning_combined.html
+pve_sync_plugin/templates/pve_sync/vm_provisioning_log.html
 pve_sync_plugin/templates/pve_sync/inc/vm_sync_button.html
 pve_sync_plugin/templatetags/__init__.py
 pve_sync_plugin/templatetags/pve_sync_tags.py

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync.py

@@ -119,6 +119,7 @@ class OptimizedPVEToNetBoxSync:
             'vms_by_node': {},
             'pools': {},
             'node_networks': {},
+            'failed_nodes': set(),  # nodes where VM API call failed — skip cleanup for these
         }
 
         self.error_log = []
@@ -361,6 +362,7 @@ class OptimizedPVEToNetBoxSync:
             except Exception as e:
                 print(f"  加載節點 {node_name} 的虛擬機失敗: {e}")
                 self.pve_cache['vms_by_node'][node_name] = []
+                self.pve_cache['failed_nodes'].add(node_name.lower())
         elapsed = time.time() - start_time
         print(f"✓ PVE 數據加載完成，耗時 {elapsed:.2f} 秒")
         print(f"  節點: {len(self.pve_cache['nodes'])} 個")
@@ -1124,40 +1126,114 @@ class OptimizedPVEToNetBoxSync:
         self.send_telegram_notification(new_msg)
         self._write_drift_event(vm_name, vm_id, 'vm_created', 'vmid', '', str(vm_id), notified=True)
 
-    def detect_deleted_vms(self, seen_vmids: set):
-        """比對先前已知 vmid 與本次同步的 vmid，偵測被刪除的 VM。"""
-        if not self.enhanced_mode or not self.state_db:
-            return
-        if not self._known_vmids:
-            return
-        deleted_vmids = set(self._known_vmids.keys()) - seen_vmids
-        if not deleted_vmids:
+    def detect_deleted_vms(self, seen_vmids: set, cluster_id: int = None):
+        """偵測並清理 NetBox 中已從 PVE 刪除的 VM（含 IP）。"""
+
+        # ── 1. 舊有：drift 通知（依賴 state_db）──
+        if self.enhanced_mode and self.state_db and self._known_vmids:
+            deleted_vmids = set(self._known_vmids.keys()) - seen_vmids
+            for vmid in deleted_vmids:
+                info = self._known_vmids[vmid]
+                vm_name = info.get('vm_name') or f"VM-{vmid}"
+                node_name = info.get('node') or 'unknown'
+                try:
+                    from pve_sync_plugin.models import PveDriftEvent
+                    if PveDriftEvent.objects.filter(
+                        vmid=vmid, cluster_name=self.cluster_name, drift_type='vm_deleted'
+                    ).exists():
+                        continue
+                except Exception:
+                    pass
+                print(f"🗑️ VM {vm_name} 刪除偵測 (ID: {vmid}, 上次節點: {node_name})")
+                self.stats['config_drifts_detected'] += 1
+                del_msg = (
+                    f"🗑️ <b>VM 刪除偵測</b>\n\n"
+                    f"🖥️ 名稱: <b>{vm_name}</b> (ID: {vmid})\n"
+                    f"🔀 叢集: {self.cluster_name}\n"
+                    f"📌 上次節點: <code>{node_name}</code>\n"
+                    f"📅 時間: {time.strftime('%Y-%m-%d %H:%M:%S')}\n\n"
+                    f"⚠️ 此 VM 已從 Proxmox 中移除。"
+                )
+                self.send_telegram_notification(del_msg)
+                self._write_drift_event(vm_name, vmid, 'vm_deleted', 'vmid', str(vmid), '', notified=True)
+
+        # ── 2. 主動清理：刪除 NetBox 中已不存在於 PVE 的 VM 及其 IP ──
+        if not cluster_id:
             return
-        for vmid in deleted_vmids:
-            info = self._known_vmids[vmid]
-            vm_name = info.get('vm_name') or f"VM-{vmid}"
-            node_name = info.get('node') or 'unknown'
-            # 避免重複通知：若已有此 vmid 的 vm_deleted 記錄則跳過
-            try:
-                from pve_sync_plugin.models import PveDriftEvent
-                if PveDriftEvent.objects.filter(
-                    vmid=vmid, cluster_name=self.cluster_name, drift_type='vm_deleted'
-                ).exists():
-                    continue
-            except Exception:
-                pass
-            print(f"🗑️ VM {vm_name} 刪除偵測 (ID: {vmid}, 上次節點: {node_name})")
-            self.stats['config_drifts_detected'] += 1
-            del_msg = (
-                f"🗑️ <b>VM 刪除偵測</b>\n\n"
-                f"🖥️ 名稱: <b>{vm_name}</b> (ID: {vmid})\n"
-                f"🔀 叢集: {self.cluster_name}\n"
-                f"📌 上次節點: <code>{node_name}</code>\n"
-                f"📅 時間: {time.strftime('%Y-%m-%d %H:%M:%S')}\n\n"
-                f"⚠️ 此 VM 已從 Proxmox 中移除。"
+
+        failed_nodes = self.pve_cache.get('failed_nodes', set())
+        if failed_nodes:
+            print(f"⚠️ 節點 API 失敗，跳過其 VM 清理: {failed_nodes}")
+
+        try:
+            from django.contrib.contenttypes.models import ContentType
+            from virtualization.models import VirtualMachine, VMInterface
+            from ipam.models import IPAddress
+
+            seen_serials = {str(v) for v in seen_vmids}
+            stale_vms = list(
+                VirtualMachine.objects
+                .filter(cluster_id=cluster_id)
+                .exclude(serial='')
+                .exclude(serial__isnull=True)
+                .exclude(serial__in=seen_serials)
+                .select_related('device')
             )
-            self.send_telegram_notification(del_msg)
-            self._write_drift_event(vm_name, vmid, 'vm_deleted', 'vmid', str(vmid), '', notified=True)
+
+            if not stale_vms:
+                return
+
+            from pve_sync_plugin.models import PveDriftEvent
+
+            vm_ct = ContentType.objects.get_for_model(VMInterface)
+            for vm in stale_vms:
+                device_name = vm.device.name.lower() if vm.device else None
+                if device_name and device_name in failed_nodes:
+                    print(f"  ⏭️ 跳過 {vm.name} (VMID {vm.serial})：節點 {vm.device.name} API 失敗")
+                    continue
+
+                vm_name_str = vm.name
+                vmid_int = int(vm.serial)
+
+                iface_ids = list(
+                    VMInterface.objects.filter(virtual_machine=vm).values_list('id', flat=True)
+                )
+                ip_deleted = 0
+                if iface_ids:
+                    ip_deleted, _ = IPAddress.objects.filter(
+                        assigned_object_type=vm_ct,
+                        assigned_object_id__in=iface_ids,
+                    ).delete()
+
+                vm.delete()
+                print(f"  🗑️ 已刪除 VM {vm_name_str} (VMID {vmid_int}) 及 {ip_deleted} 個 IP")
+                self.stats['config_drifts_detected'] += 1
+
+                # 寫入漂移事件（避免與 section 1 重複）
+                already_logged = PveDriftEvent.objects.filter(
+                    vmid=vmid_int,
+                    cluster_name=self.cluster_name,
+                    drift_type='vm_deleted',
+                ).exists()
+                if not already_logged:
+                    self._write_drift_event(
+                        vm_name_str, vmid_int, 'vm_deleted', 'vmid',
+                        str(vmid_int), '', notified=False,
+                    )
+                    del_msg = (
+                        f"🗑️ <b>VM 已從 NetBox 清除</b>\n\n"
+                        f"🖥️ 名稱: <b>{vm_name_str}</b> (VMID: {vmid_int})\n"
+                        f"🔀 叢集: {self.cluster_name}\n"
+                        f"🧹 已清除 IP 記錄: {ip_deleted} 個\n"
+                        f"📅 時間: {time.strftime('%Y-%m-%d %H:%M:%S')}\n\n"
+                        f"⚠️ 此 VM 已從 Proxmox 刪除，NetBox 記錄已自動移除。"
+                    )
+                    self.send_telegram_notification(del_msg)
+
+        except Exception as exc:
+            import traceback
+            print(f"⚠️ 清理孤兒 VM 失敗: {exc}")
+            traceback.print_exc()
 
     def detect_config_drift(self, vm_id: int, vm_name: str, vm_config: Dict[str, Any],
                             current_tags: List[str], network_interfaces: List[Dict] = None,
@@ -1698,8 +1774,8 @@ class OptimizedPVEToNetBoxSync:
                 seen_vmids.add(int(vm['vmid']))
                 if self.process_virtual_machine(vm, device, cluster, force=node_is_new):
                     success_count += 1
-        # 偵測本次同步消失的 VM（已從 PVE 刪除）
-        self.detect_deleted_vms(seen_vmids)
+        # 偵測並清理本次同步消失的 VM（已從 PVE 刪除）
+        self.detect_deleted_vms(seen_vmids, cluster_id=cluster['id'])
         print(f"\n虛擬機同步完成: {success_count}/{total_count} 個虛擬機")
         return success_count > 0, success_count, total_count
 

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/api/serializers.py

@@ -10,6 +10,7 @@ from pve_sync_plugin.models import (
     PvePluginSettings,
     PveSyncJob,
     PveWebhookEvent,
+    VmProvisioningLog,
 )
 
 
@@ -159,3 +160,20 @@ class PvePluginSettingsSerializer(NetBoxModelSerializer):
             "enable_backup_sync",
         ]
         # Never expose secrets via API
+
+
+class VmProvisioningLogSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:pve_sync_plugin-api:vmprovisioninglog-detail",
+    )
+
+    class Meta:
+        model = VmProvisioningLog
+        fields = [
+            "id", "url", "display",
+            "vm_name", "vmid", "cluster_name", "node", "os_type",
+            "cpu", "ram_gb", "disk_gb",
+            "management_ip", "management_gw", "internet_ip", "internet_gw",
+            "status", "notes", "checklist",
+            "created", "last_updated",
+        ]

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/api/urls.py

@@ -9,6 +9,7 @@ from netbox.api.routers import NetBoxRouter
 from pve_sync_plugin import views as plugin_views
 
 from . import views as api_views
+from .views import VmProvisioningLogViewSet
 
 app_name = "pve_sync_plugin-api"
 
@@ -20,6 +21,7 @@ router.register("events", api_views.PveWebhookEventViewSet)
 router.register("clusters", api_views.PveClusterConfigViewSet)
 router.register("backup-status", api_views.PveBackupStatusViewSet)
 router.register("settings", api_views.PvePluginSettingsViewSet)
+router.register("provisioning", api_views.VmProvisioningLogViewSet)
 
 urlpatterns = [
     path("webhook/", plugin_views.webhook_receiver, name="webhook"),

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/api/views.py

@@ -18,6 +18,7 @@ from pve_sync_plugin.models import (
     PvePluginSettings,
     PveSyncJob,
     PveWebhookEvent,
+    VmProvisioningLog,
 )
 
 from .serializers import (
@@ -26,6 +27,7 @@ from .serializers import (
     PvePluginSettingsSerializer,
     PveSyncJobSerializer,
     PveWebhookEventSerializer,
+    VmProvisioningLogSerializer,
 )
 
 
@@ -92,3 +94,8 @@ class PveBackupStatusViewSet(NetBoxModelViewSet):
 class PvePluginSettingsViewSet(NetBoxModelViewSet):
     queryset = PvePluginSettings.objects.all()
     serializer_class = PvePluginSettingsSerializer
+
+
+class VmProvisioningLogViewSet(NetBoxModelViewSet):
+    queryset = VmProvisioningLog.objects.order_by("-created")
+    serializer_class = VmProvisioningLogSerializer

proxsync-2.0.2/pve_sync_plugin/migrations/0014_vmprovisioninglog.py

@@ -0,0 +1,41 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pve_sync_plugin", "0013_pluginsettings_log_retention"),
+        ("extras", "0138_customfieldchoiceset_choice_colors"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="VmProvisioningLog",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ("created", models.DateTimeField(auto_now_add=True, null=True)),
+                ("last_updated", models.DateTimeField(auto_now=True, null=True)),
+                ("custom_field_data", models.JSONField(blank=True, default=dict, encoder=None)),
+                ("vm_name",       models.CharField(max_length=100, verbose_name="VM 名稱")),
+                ("vmid",          models.IntegerField(blank=True, null=True, verbose_name="VMID")),
+                ("cluster_name",  models.CharField(blank=True, max_length=100, verbose_name="叢集")),
+                ("node",          models.CharField(blank=True, max_length=100, verbose_name="節點")),
+                ("os_type",       models.CharField(blank=True, max_length=50,  verbose_name="作業系統")),
+                ("cpu",           models.IntegerField(blank=True, null=True,   verbose_name="CPU")),
+                ("ram_gb",        models.IntegerField(blank=True, null=True,   verbose_name="記憶體 (GB)")),
+                ("disk_gb",       models.IntegerField(blank=True, null=True,   verbose_name="磁碟 (GB)")),
+                ("management_ip", models.CharField(blank=True, max_length=50,  verbose_name="Management IP")),
+                ("management_gw", models.CharField(blank=True, max_length=50,  verbose_name="Management 閘道")),
+                ("internet_ip",   models.CharField(blank=True, max_length=50,  verbose_name="Internet IP")),
+                ("internet_gw",   models.CharField(blank=True, max_length=50,  verbose_name="Internet 閘道")),
+                ("status",        models.CharField(
+                    choices=[("planning", "規劃中"), ("in_progress", "部署中"), ("completed", "完成")],
+                    default="planning", max_length=20, verbose_name="狀態",
+                )),
+                ("notes",         models.TextField(blank=True, verbose_name="備註")),
+                ("checklist",     models.JSONField(blank=True, default=dict, verbose_name="清單狀態")),
+            ],
+            options={"ordering": ["-created"], "verbose_name": "VM Provisioning Log"},
+        ),
+    ]

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/models.py

@@ -463,3 +463,54 @@ class PbsServerConfig(NetBoxModel):
             host = host.split('://', 1)[1]
         host = host.split(':')[0]
         return host
+
+
+
+class VmProvisioningLog(NetBoxModel):
+    """Planning record created in the VM Provisioning Planner before PVE sync."""
+
+    STATUS_CHOICES = [
+        ("planning",     "規劃中"),
+        ("in_progress",  "部署中"),
+        ("completed",    "完成"),
+    ]
+
+    vm_name          = models.CharField(max_length=100, verbose_name="VM 名稱")
+    vmid             = models.IntegerField(null=True, blank=True, verbose_name="VMID")
+    cluster_name     = models.CharField(max_length=100, blank=True, verbose_name="叢集")
+    node             = models.CharField(max_length=100, blank=True, verbose_name="節點")
+    os_type          = models.CharField(max_length=50,  blank=True, verbose_name="作業系統")
+    cpu              = models.IntegerField(null=True, blank=True, verbose_name="CPU")
+    ram_gb           = models.IntegerField(null=True, blank=True, verbose_name="記憶體 (GB)")
+    disk_gb          = models.IntegerField(null=True, blank=True, verbose_name="磁碟 (GB)")
+    management_ip    = models.CharField(max_length=50,  blank=True, verbose_name="Management IP")
+    management_gw    = models.CharField(max_length=50,  blank=True, verbose_name="Management 閘道")
+    internet_ip      = models.CharField(max_length=50,  blank=True, verbose_name="Internet IP")
+    internet_gw      = models.CharField(max_length=50,  blank=True, verbose_name="Internet 閘道")
+    status           = models.CharField(max_length=20, default="planning",
+                                        choices=STATUS_CHOICES, verbose_name="狀態")
+    notes            = models.TextField(blank=True, verbose_name="備註")
+    checklist        = models.JSONField(default=dict, blank=True, verbose_name="清單狀態")
+
+    class Meta:
+        ordering = ["-created"]
+        verbose_name = "VM Provisioning Log"
+
+    def __str__(self):
+        vmid_str = f" (VMID {self.vmid})" if self.vmid else ""
+        return f"{self.vm_name}{vmid_str}"
+
+    def get_absolute_url(self):
+        return reverse("plugins:pve_sync_plugin:vmprovisioninglog", args=[self.pk])
+
+    @property
+    def status_badge(self):
+        return {"planning": "info", "in_progress": "warning", "completed": "success"}.get(
+            self.status, "secondary"
+        )
+
+    QEMU_GA_ITEMS = [
+        ("chk_qemu_options", "在 VM Options 啟用 QEMU Guest Agent"),
+        ("chk_qemu_install", "安裝 qemu-guest-agent 套件"),
+        ("chk_qemu_enable",  "啟用並啟動 qemu-guest-agent 服務"),
+    ]

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/navigation.py

@@ -70,6 +70,11 @@ pbs_item = PluginMenuItem(
 )
 
 
+vm_provisioning_item = PluginMenuItem(
+    link="plugins:pve_sync_plugin:vmprovisioninglog_list",
+    link_text="VM 佈建",
+)
+
 menu = PluginMenu(
     label="Proxmox Sync",
     groups=(
@@ -85,6 +90,10 @@ menu = PluginMenu(
             "Data Protection",
             (backup_status_item,),
         ),
+        (
+            "VM Operations",
+            (vm_provisioning_item,),
+        ),
         (
             "Configuration",
             (clusters_item, pbs_item, settings_item),

{proxsync-2.0.1 → proxsync-2.0.2}/pve_sync_plugin/tables.py

@@ -11,6 +11,7 @@ from .models import (
     PveDriftEvent,
     PveSyncJob,
     PveWebhookEvent,
+    VmProvisioningLog,
 )
 
 
@@ -276,3 +277,25 @@ class PveBackupStatusTable(NetBoxTable):
             "last_backup",
             "backup_age_days",
         )
+
+
+# ---------------------------------------------------------------------------
+# VmProvisioningLog
+# ---------------------------------------------------------------------------
+
+class VmProvisioningLogTable(NetBoxTable):
+    vm_name       = tables.Column(linkify=True, verbose_name="VM 名稱")
+    vmid          = tables.Column(verbose_name="VMID")
+    cluster_name  = tables.Column(verbose_name="叢集")
+    node          = tables.Column(verbose_name="節點")
+    status        = columns.ChoiceFieldColumn(verbose_name="狀態")
+    management_ip = tables.Column(verbose_name="Management IP")
+    internet_ip   = tables.Column(verbose_name="Internet IP")
+    actions       = columns.ActionsColumn(actions=("delete",))
+
+    class Meta(NetBoxTable.Meta):
+        model = VmProvisioningLog
+        fields = ("pk", "vm_name", "vmid", "cluster_name", "node", "status",
+                  "management_ip", "internet_ip", "created")
+        default_columns = ("vm_name", "vmid", "cluster_name", "node", "status",
+                           "management_ip", "internet_ip")