proxsync 2.0.2__tar.gz → 2.0.4__tar.gz

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

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

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

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

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

@@ -47,6 +47,8 @@ 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/0015_pvevmtasklog.py
+pve_sync_plugin/migrations/0016_pvevmtasklog_status_textfield.py
 pve_sync_plugin/migrations/__init__.py
 pve_sync_plugin/sync/__init__.py
 pve_sync_plugin/sync/config_bridge.py
@@ -57,11 +59,13 @@ pve_sync_plugin/templates/pve_sync/pvebackupstatus.html
 pve_sync_plugin/templates/pve_sync/pveclusterconfig.html
 pve_sync_plugin/templates/pve_sync/pvedriftevent.html
 pve_sync_plugin/templates/pve_sync/pvesyncjob.html
+pve_sync_plugin/templates/pve_sync/pvevmtasklog_list.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/templates/pve_sync/inc/vm_task_log_panel.html
 pve_sync_plugin/templatetags/__init__.py
 pve_sync_plugin/templatetags/pve_sync_tags.py
 tests/test_plugin_contracts.py

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

@@ -1235,6 +1235,145 @@ class OptimizedPVEToNetBoxSync:
             print(f"⚠️ 清理孤兒 VM 失敗: {exc}")
             traceback.print_exc()
 
+    def _apply_log_retention(self):
+        """依 PvePluginSettings.log_retention_days 清理過期記錄。"""
+        try:
+            import datetime as _dt
+            from django.utils import timezone
+            from pve_sync_plugin.models import PveDriftEvent, PvePluginSettings, PveVmTaskLog
+            days = PvePluginSettings.load().log_retention_days
+            if not days:
+                return
+            cutoff = timezone.now() - _dt.timedelta(days=days)
+            d_del, _ = PveDriftEvent.objects.filter(created__lt=cutoff).delete()
+            t_del, _ = PveVmTaskLog.objects.filter(start_time__lt=cutoff).delete()
+            if d_del or t_del:
+                print(f"  🧹 Log 清理：刪除 {d_del} 筆漂移事件、{t_del} 筆操作記錄（>{days} 天）")
+        except Exception as exc:
+            print(f"  ⚠️ Log 清理失敗: {exc}")
+
+    def sync_vm_tasks(self):
+        """從 PVE 各節點抓取 VM 操作記錄（建立/刪除/Clone/遷移）並同步到 NetBox。"""
+        try:
+            from django.utils import timezone
+            from pve_sync_plugin.models import PveVmTaskLog
+        except ImportError:
+            return
+
+        VM_TASK_TYPES = {
+            "qmcreate", "qmdestroy", "qmclone", "qmmigrate", "qmrestore",
+            "qmstart", "qmstop", "qmshutdown", "qmreboot",
+        }
+        NOTIFY_TYPES  = {"qmdestroy", "qmclone", "qmrestore", "qmshutdown", "qmstop"}
+        TASK_LABELS   = {
+            "qmcreate":   "🆕 VM 建立",
+            "qmdestroy":  "🗑️ VM 刪除",
+            "qmclone":    "📋 VM Clone",
+            "qmmigrate":  "🔀 VM 遷移",
+            "qmrestore":  "♻️ VM 還原",
+            "qmstart":    "▶️ VM 開機",
+            "qmstop":     "⏹️ VM 強制關機",
+            "qmshutdown": "🔽 VM 正常關機",
+            "qmreboot":   "🔄 VM 重新開機",
+        }
+
+        # 從 NetBox cache 建立 vmid → vm_name 對照
+        vmid_to_name: dict = {}
+        for key, vm in self.nb_cache.get("virtual_machines_by_serial", {}).items():
+            try:
+                vmid_to_name[int(vm.serial)] = vm.name
+            except (ValueError, TypeError, AttributeError):
+                pass
+
+        # 只通知最近 2 小時內的操作（避免首次匯入時大量通知）
+        notify_cutoff = time.time() - 7200
+
+        # 從上次已存記錄的最新時間起算（+1 秒避免邊界重複）；首次則抓 30 天
+        latest = PveVmTaskLog.objects.filter(
+            cluster_name=self.cluster_name
+        ).order_by("-start_time").values_list("start_time", flat=True).first()
+        if latest:
+            import calendar
+            since_ts = int(calendar.timegm(latest.utctimetuple())) + 1
+        else:
+            since_ts = int(time.time()) - 30 * 86400
+        new_count = 0
+
+        for node_name in self.pve_cache.get("vms_by_node", {}):
+            try:
+                tasks = self.pve_api.nodes(node_name).tasks.get(since=since_ts, limit=1000)
+            except Exception as exc:
+                print(f"  ⚠️ 無法取得節點 {node_name} 的操作記錄: {exc}")
+                continue
+
+            for task in tasks:
+                if task.get("type") not in VM_TASK_TYPES:
+                    continue
+
+                upid = task.get("upid", "")
+                if not upid:
+                    continue
+
+                vmid_str = task.get("id", "")
+                try:
+                    vmid = int(vmid_str)
+                except (ValueError, TypeError):
+                    continue
+
+                # UPID 去重
+                if PveVmTaskLog.objects.filter(upid=upid).exists():
+                    continue
+
+                task_type = task.get("type")
+                operator  = task.get("user", "unknown")
+                start_ts  = task.get("starttime")
+                end_ts    = task.get("endtime")
+                status    = task.get("status", "") or ""
+                vm_name   = vmid_to_name.get(vmid, f"VM-{vmid}")
+
+                import datetime as _dt
+                _utc = _dt.timezone.utc
+                start_dt = _dt.datetime.fromtimestamp(start_ts, tz=_utc) if start_ts else timezone.now()
+                end_dt   = _dt.datetime.fromtimestamp(end_ts,   tz=_utc) if end_ts   else None
+
+                log = PveVmTaskLog.objects.create(
+                    upid=upid,
+                    vmid=vmid,
+                    vm_name=vm_name,
+                    cluster_name=self.cluster_name,
+                    node=node_name,
+                    task_type=task_type,
+                    operator=operator,
+                    start_time=start_dt,
+                    end_time=end_dt,
+                    status=status,
+                    notified_telegram=False,
+                )
+                new_count += 1
+
+                # Telegram 通知（僅近期且已完成的操作）
+                should_notify = (
+                    task_type in NOTIFY_TYPES
+                    and status == "OK"
+                    and start_ts and start_ts >= notify_cutoff
+                )
+                if should_notify:
+                    label = TASK_LABELS.get(task_type, task_type)
+                    msg = (
+                        f"{label}\n\n"
+                        f"🖥️ VM: <b>{vm_name}</b> (VMID: {vmid})\n"
+                        f"👤 操作者: <code>{operator}</code>\n"
+                        f"📌 節點: <code>{node_name}</code>\n"
+                        f"🔀 叢集: {self.cluster_name}\n"
+                        f"📅 時間: {start_dt.strftime('%Y-%m-%d %H:%M:%S')}"
+                    )
+                    self.send_telegram_notification(msg)
+                    log.notified_telegram = True
+                    log.save(update_fields=["notified_telegram"])
+
+        if new_count > 0:
+            print(f"  📋 新增 {new_count} 筆 VM 操作記錄")
+
     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,
                             current_node: str = None) -> List[Dict]:
@@ -1576,14 +1715,18 @@ class OptimizedPVEToNetBoxSync:
                     # 但 state_db 仍有舊 hash 導致增量跳過。強制往下完整同步。
                     print(f"  ⚠️  VM {original_vm_name} 不在 NetBox 中，忽略增量記錄強制建立")
                 else:
-                    # VM 存在；確保 device 關聯指向正確節點
+                    # VM 存在；確保 device 關聯、cluster 關聯、電源狀態都是最新的
                     current_device_id = getattr(getattr(cached_vm, 'device', None), 'id', None)
                     current_cluster_id = getattr(getattr(cached_vm, 'cluster', None), 'id', None)
+                    current_status = getattr(getattr(cached_vm, 'status', None), 'value', None) \
+                                     or str(getattr(cached_vm, 'status', ''))
                     fix = {}
                     if current_device_id != device.id:
                         fix['device'] = device.id
                     if current_cluster_id != cluster['id']:
                         fix['cluster'] = cluster['id']
+                    if current_status != status:
+                        fix['status'] = status
                     if fix:
                         try:
                             cached_vm.update(fix)
@@ -1591,6 +1734,8 @@ class OptimizedPVEToNetBoxSync:
                                 print(f"  ✓ VM {original_vm_name} 叢集關聯已修正: → {cluster['name']}")
                             if 'device' in fix:
                                 print(f"  ✓ VM {original_vm_name} 設備關聯已修正: → {device.name}")
+                            if 'status' in fix:
+                                print(f"  ✓ VM {original_vm_name} 電源狀態更新: {current_status} → {status}")
                         except Exception as e:
                             print(f"  ✗ 更新 VM {original_vm_name} 關聯失敗: {e}")
                     print(f"  ℹ️  VM {original_vm_name} 無配置變更，跳過同步")
@@ -1809,6 +1954,9 @@ class OptimizedPVEToNetBoxSync:
             print("\n" + "=" * 50)
             print("✓ 節點同步成功")
             vms_success, success_count, total_count = self.sync_pve_virtual_machines(devices, cluster)
+            print("\n同步 VM 操作記錄...")
+            self.sync_vm_tasks()
+            self._apply_log_retention()
             elapsed = time.time() - start_time
             self.stats['elapsed_time'] = elapsed
             self.stats['total_vms'] = total_count

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

@@ -9,6 +9,7 @@ from pve_sync_plugin.models import (
     PveClusterConfig,
     PvePluginSettings,
     PveSyncJob,
+    PveVmTaskLog,
     PveWebhookEvent,
     VmProvisioningLog,
 )
@@ -177,3 +178,19 @@ class VmProvisioningLogSerializer(NetBoxModelSerializer):
             "status", "notes", "checklist",
             "created", "last_updated",
         ]
+
+
+class PveVmTaskLogSerializer(NetBoxModelSerializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name="plugins-api:pve_sync_plugin-api:pvevmtasklog-detail",
+    )
+
+    class Meta:
+        model = PveVmTaskLog
+        fields = [
+            "id", "url", "display",
+            "upid", "vmid", "vm_name", "cluster_name", "node",
+            "task_type", "operator", "start_time", "end_time",
+            "status", "notified_telegram",
+            "created", "last_updated",
+        ]

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

@@ -9,7 +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
+from .views import PveVmTaskLogViewSet, VmProvisioningLogViewSet
 
 app_name = "pve_sync_plugin-api"
 
@@ -22,6 +22,7 @@ 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)
+router.register("task-logs", api_views.PveVmTaskLogViewSet)
 
 urlpatterns = [
     path("webhook/", plugin_views.webhook_receiver, name="webhook"),

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

@@ -17,6 +17,7 @@ from pve_sync_plugin.models import (
     PveClusterConfig,
     PvePluginSettings,
     PveSyncJob,
+    PveVmTaskLog,
     PveWebhookEvent,
     VmProvisioningLog,
 )
@@ -26,6 +27,7 @@ from .serializers import (
     PveClusterConfigSerializer,
     PvePluginSettingsSerializer,
     PveSyncJobSerializer,
+    PveVmTaskLogSerializer,
     PveWebhookEventSerializer,
     VmProvisioningLogSerializer,
 )
@@ -99,3 +101,8 @@ class PvePluginSettingsViewSet(NetBoxModelViewSet):
 class VmProvisioningLogViewSet(NetBoxModelViewSet):
     queryset = VmProvisioningLog.objects.order_by("-created")
     serializer_class = VmProvisioningLogSerializer
+
+
+class PveVmTaskLogViewSet(NetBoxModelViewSet):
+    queryset = PveVmTaskLog.objects.order_by("-start_time")
+    serializer_class = PveVmTaskLogSerializer

{proxsync-2.0.2 → proxsync-2.0.4}/pve_sync_plugin/choices.py

@@ -45,6 +45,19 @@ class SyncScheduleChoices(models.TextChoices):
     WEEKLY = "weekly", "Weekly"
 
 
+class VmTaskTypeChoices(models.TextChoices):
+    CREATE   = "qmcreate",   "建立 VM"
+    DESTROY  = "qmdestroy",  "刪除 VM"
+    CLONE    = "qmclone",    "Clone VM"
+    MIGRATE  = "qmmigrate",  "遷移 VM"
+    RESTORE  = "qmrestore",  "還原 VM"
+    BACKUP   = "vzdump",     "備份 VM"
+    START    = "qmstart",    "開機"
+    STOP     = "qmstop",     "強制關機"
+    SHUTDOWN = "qmshutdown", "正常關機"
+    REBOOT   = "qmreboot",   "重新開機"
+
+
 class DriftTypeChoices(models.TextChoices):
     HARDWARE = "hardware", "硬體配置變更"
     MIGRATION = "migration", "VM 遷移"

{proxsync-2.0.2 → proxsync-2.0.4}/pve_sync_plugin/filtersets.py

@@ -10,6 +10,7 @@ from .choices import (
     SyncJobStatusChoices,
     SyncJobTriggerChoices,
     SyncScheduleChoices,
+    VmTaskTypeChoices,
     WebhookEventChoices,
 )
 from .models import (
@@ -18,6 +19,7 @@ from .models import (
     PveClusterConfig,
     PveDriftEvent,
     PveSyncJob,
+    PveVmTaskLog,
     PveWebhookEvent,
 )
 
@@ -120,6 +122,29 @@ class PveDriftEventFilterSet(NetBoxModelFilterSet):
         return queryset.filter(vm_name__icontains=value) | queryset.filter(cluster_name__icontains=value)
 
 
+class PveVmTaskLogFilterSet(NetBoxModelFilterSet):
+    """Filter VM task logs by type, operator, cluster, and VM."""
+
+    task_type    = django_filters.MultipleChoiceFilter(choices=VmTaskTypeChoices.choices)
+    vmid         = django_filters.NumberFilter()
+    cluster_name = django_filters.CharFilter(lookup_expr="icontains")
+    operator     = django_filters.CharFilter(lookup_expr="icontains")
+    node         = django_filters.CharFilter(lookup_expr="icontains")
+
+    class Meta:
+        model = PveVmTaskLog
+        fields = ["id", "vmid", "task_type", "cluster_name", "operator", "node"]
+
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        return (
+            queryset.filter(vm_name__icontains=value)
+            | queryset.filter(operator__icontains=value)
+            | queryset.filter(cluster_name__icontains=value)
+        )
+
+
 class PveBackupStatusFilterSet(NetBoxModelFilterSet):
     """Filter backup statuses by state."""
 

proxsync-2.0.4/pve_sync_plugin/migrations/0015_pvevmtasklog.py

@@ -0,0 +1,55 @@
+# Generated by Django 6.0.5 on 2026-06-22 16:57
+
+import netbox.models.deletion
+import taggit.managers
+import utilities.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0138_customfieldchoiceset_choice_colors'),
+        ('pve_sync_plugin', '0014_vmprovisioninglog'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vmprovisioninglog',
+            name='tags',
+            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
+        ),
+        migrations.AlterField(
+            model_name='vmprovisioninglog',
+            name='custom_field_data',
+            field=models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder),
+        ),
+        migrations.CreateModel(
+            name='PveVmTaskLog',
+            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=utilities.json.CustomFieldJSONEncoder)),
+                ('upid', models.CharField(max_length=300, unique=True)),
+                ('vmid', models.IntegerField()),
+                ('vm_name', models.CharField(blank=True, max_length=200)),
+                ('cluster_name', models.CharField(max_length=100)),
+                ('node', models.CharField(max_length=100)),
+                ('task_type', models.CharField(max_length=30)),
+                ('operator', models.CharField(max_length=200)),
+                ('start_time', models.DateTimeField()),
+                ('end_time', models.DateTimeField(blank=True, null=True)),
+                ('status', models.CharField(blank=True, max_length=50)),
+                ('notified_telegram', models.BooleanField(default=False)),
+                ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')),
+            ],
+            options={
+                'verbose_name': 'VM Task Log',
+                'verbose_name_plural': 'VM Task Logs',
+                'ordering': ['-start_time'],
+                'indexes': [models.Index(fields=['vmid', 'cluster_name'], name='pve_sync_pl_vmid_00b115_idx'), models.Index(fields=['task_type'], name='pve_sync_pl_task_ty_0f86cb_idx'), models.Index(fields=['operator'], name='pve_sync_pl_operato_6b34b5_idx'), models.Index(fields=['start_time'], name='pve_sync_pl_start_t_dac39f_idx')],
+            },
+            bases=(netbox.models.deletion.DeleteMixin, models.Model),
+        ),
+    ]

proxsync-2.0.4/pve_sync_plugin/migrations/0016_pvevmtasklog_status_textfield.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.5 on 2026-06-23 00:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pve_sync_plugin', '0015_pvevmtasklog'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pvevmtasklog',
+            name='status',
+            field=models.TextField(blank=True),
+        ),
+    ]

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

@@ -12,6 +12,7 @@ from .choices import (
     SyncJobStatusChoices,
     SyncJobTriggerChoices,
     SyncScheduleChoices,
+    VmTaskTypeChoices,
     WebhookEventChoices,
 )
 
@@ -514,3 +515,59 @@ class VmProvisioningLog(NetBoxModel):
         ("chk_qemu_install", "安裝 qemu-guest-agent 套件"),
         ("chk_qemu_enable",  "啟用並啟動 qemu-guest-agent 服務"),
     ]
+
+
+class PveVmTaskLog(NetBoxModel):
+    """Records VM lifecycle operations fetched from PVE task history."""
+
+    upid         = models.CharField(max_length=300, unique=True, verbose_name="UPID")
+    vmid         = models.IntegerField(verbose_name="VM ID")
+    vm_name      = models.CharField(max_length=200, blank=True, verbose_name="VM 名稱")
+    cluster_name = models.CharField(max_length=100, verbose_name="叢集")
+    node         = models.CharField(max_length=100, verbose_name="節點")
+    task_type    = models.CharField(max_length=30, choices=VmTaskTypeChoices, verbose_name="操作類型")
+    operator     = models.CharField(max_length=200, verbose_name="操作者")
+    start_time   = models.DateTimeField(verbose_name="開始時間")
+    end_time     = models.DateTimeField(null=True, blank=True, verbose_name="結束時間")
+    status       = models.TextField(blank=True, verbose_name="狀態")
+    notified_telegram = models.BooleanField(default=False, verbose_name="已通知")
+
+    NOTIFY_TYPES = {"qmdestroy", "qmclone", "qmrestore"}
+
+    TASK_ICONS = {
+        "qmcreate":   ("mdi mdi-plus-circle",   "success"),
+        "qmdestroy":  ("mdi mdi-delete",         "danger"),
+        "qmclone":    ("mdi mdi-content-copy",   "info"),
+        "qmmigrate":  ("mdi mdi-transfer",       "warning"),
+        "qmrestore":  ("mdi mdi-restore",        "primary"),
+        "vzdump":     ("mdi mdi-backup-restore", "secondary"),
+        "qmstart":    ("mdi mdi-play-circle",    "success"),
+        "qmstop":     ("mdi mdi-stop-circle",    "danger"),
+        "qmshutdown": ("mdi mdi-power",          "warning"),
+        "qmreboot":   ("mdi mdi-restart",        "info"),
+    }
+
+    class Meta:
+        ordering = ["-start_time"]
+        indexes = [
+            models.Index(fields=["vmid", "cluster_name"]),
+            models.Index(fields=["task_type"]),
+            models.Index(fields=["operator"]),
+            models.Index(fields=["start_time"]),
+        ]
+        verbose_name = "VM Task Log"
+        verbose_name_plural = "VM Task Logs"
+
+    def __str__(self):
+        return f"{self.get_task_type_display()} — {self.vm_name} (VMID {self.vmid}) by {self.operator}"
+
+    def get_absolute_url(self):
+        return reverse("plugins:pve_sync_plugin:pvevmtasklog_list")
+
+    @property
+    def task_icon(self):
+        return self.TASK_ICONS.get(self.task_type, ("mdi mdi-history", "secondary"))
+
+    @property
+    def status_ok(self):
+        return self.status == "OK"

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

@@ -75,6 +75,11 @@ vm_provisioning_item = PluginMenuItem(
     link_text="VM 佈建",
 )
 
+vm_task_log_item = PluginMenuItem(
+    link="plugins:pve_sync_plugin:pvevmtasklog_list",
+    link_text="VM 操作記錄",
+)
+
 menu = PluginMenu(
     label="Proxmox Sync",
     groups=(
@@ -92,7 +97,7 @@ menu = PluginMenu(
         ),
         (
             "VM Operations",
-            (vm_provisioning_item,),
+            (vm_provisioning_item, vm_task_log_item),
         ),
         (
             "Configuration",

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

@@ -10,6 +10,7 @@ from .models import (
     PveClusterConfig,
     PveDriftEvent,
     PveSyncJob,
+    PveVmTaskLog,
     PveWebhookEvent,
     VmProvisioningLog,
 )
@@ -299,3 +300,27 @@ class VmProvisioningLogTable(NetBoxTable):
                   "management_ip", "internet_ip", "created")
         default_columns = ("vm_name", "vmid", "cluster_name", "node", "status",
                            "management_ip", "internet_ip")
+
+
+# ---------------------------------------------------------------------------
+# PveVmTaskLog
+# ---------------------------------------------------------------------------
+
+class PveVmTaskLogTable(NetBoxTable):
+    vm_name      = tables.Column(verbose_name="VM 名稱")
+    vmid         = tables.Column(verbose_name="VM ID")
+    cluster_name = tables.Column(verbose_name="叢集")
+    node         = tables.Column(verbose_name="節點")
+    task_type    = columns.ChoiceFieldColumn(verbose_name="操作類型")
+    operator     = tables.Column(verbose_name="操作者")
+    start_time   = columns.DateTimeColumn(verbose_name="時間")
+    status       = tables.Column(verbose_name="結果")
+    notified_telegram = columns.BooleanColumn(verbose_name="已通知")
+    actions      = columns.ActionsColumn(actions=("delete",))
+
+    class Meta(NetBoxTable.Meta):
+        model = PveVmTaskLog
+        fields = ("pk", "vm_name", "vmid", "cluster_name", "node",
+                  "task_type", "operator", "start_time", "status", "notified_telegram")
+        default_columns = ("vm_name", "vmid", "cluster_name", "node",
+                           "task_type", "operator", "start_time", "status")

{proxsync-2.0.2 → proxsync-2.0.4}/pve_sync_plugin/template_content.py

@@ -2,7 +2,7 @@
 
 from netbox.plugins import PluginTemplateExtension
 
-from .models import PveClusterConfig, PveSyncJob
+from .models import PveClusterConfig, PveSyncJob, PveVmTaskLog
 
 
 class VirtualMachineSyncButton(PluginTemplateExtension):
@@ -41,4 +41,37 @@ class VirtualMachineSyncButton(PluginTemplateExtension):
         )
 
 
-template_extensions = [VirtualMachineSyncButton]
+class VmTaskLogPanel(PluginTemplateExtension):
+    """Inject a VM operation history panel into NetBox VM detail pages."""
+
+    models = ["virtualization.virtualmachine"]
+
+    def full_width_page(self):
+        vm = self.context["object"]
+
+        if not vm.serial:
+            return ""
+
+        try:
+            vmid = int(vm.serial)
+        except (ValueError, TypeError):
+            return ""
+
+        qs = PveVmTaskLog.objects.filter(vmid=vmid)
+        cluster_config = None
+        if vm.cluster_id:
+            cluster_config = PveClusterConfig.objects.filter(
+                netbox_cluster_id=vm.cluster_id, enabled=True,
+            ).first()
+        if cluster_config:
+            qs = qs.filter(cluster_name=cluster_config.name)
+
+        task_logs = qs.order_by("-start_time")[:30]
+
+        return self.render(
+            "pve_sync/inc/vm_task_log_panel.html",
+            extra_context={"task_logs": task_logs, "vmid": vmid},
+        )
+
+
+template_extensions = [VirtualMachineSyncButton, VmTaskLogPanel]

proxsync-2.0.4/pve_sync_plugin/templates/pve_sync/inc/vm_task_log_panel.html

@@ -0,0 +1,57 @@
+{% load helpers %}
+
+<div class="card mt-3">
+  <div class="card-header d-flex justify-content-between align-items-center">
+    <h5 class="mb-0"><i class="mdi mdi-history me-2"></i>PVE 操作記錄</h5>
+    <a href="{% url 'plugins:pve_sync_plugin:pvevmtasklog_list' %}?vmid={{ vmid }}"
+       class="btn btn-sm btn-outline-secondary">查看全部</a>
+  </div>
+  <div class="card-body p-0">
+    {% if task_logs %}
+    <table class="table table-hover table-sm mb-0">
+      <thead class="table-secondary">
+        <tr>
+          <th>操作類型</th>
+          <th>操作者</th>
+          <th>節點</th>
+          <th>時間</th>
+          <th>結果</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for log in task_logs %}
+        <tr>
+          <td>
+            {% with log.task_icon as icon %}
+            <i class="{{ icon.0 }} text-{{ icon.1 }} me-1"></i>
+            {{ log.get_task_type_display }}
+            {% endwith %}
+          </td>
+          <td><code>{{ log.operator }}</code></td>
+          <td>{{ log.node }}</td>
+          <td>
+            <span title="{{ log.start_time }}">
+              {{ log.start_time|date:"Y-m-d H:i:s" }}
+            </span>
+          </td>
+          <td>
+            {% if log.status_ok %}
+              <span class="badge bg-success">OK</span>
+            {% elif log.status %}
+              <span class="badge bg-danger" title="{{ log.status }}">ERROR</span>
+            {% else %}
+              <span class="badge bg-secondary">—</span>
+            {% endif %}
+          </td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% else %}
+    <div class="text-center text-muted py-4">
+      <i class="mdi mdi-history mdi-48px d-block mb-2"></i>
+      尚無操作記錄（下次同步後自動載入）
+    </div>
+    {% endif %}
+  </div>
+</div>

proxsync-2.0.4/pve_sync_plugin/templates/pve_sync/pvevmtasklog_list.html

@@ -0,0 +1,10 @@
+{% extends 'generic/object_list.html' %}
+{% load helpers %}
+
+{% block title %}VM 操作記錄{% endblock %}
+
+{% block extra_controls %}
+<div class="d-flex gap-2 align-items-center">
+  <span class="text-muted small">由 PVE Task History API 自動同步</span>
+</div>
+{% endblock %}

{proxsync-2.0.2 → proxsync-2.0.4}/pve_sync_plugin/urls.py

@@ -10,7 +10,7 @@ from django.urls import path
 from netbox.views.generic import ObjectChangeLogView
 
 from . import views
-from .models import PbsServerConfig, PveBackupStatus, PveClusterConfig, PveDriftEvent, PveSyncJob, PveWebhookEvent, VmProvisioningLog
+from .models import PbsServerConfig, PveBackupStatus, PveClusterConfig, PveDriftEvent, PveSyncJob, PveVmTaskLog, PveWebhookEvent, VmProvisioningLog
 
 app_name = "pve_sync_plugin"
 
@@ -181,6 +181,13 @@ urlpatterns = [
         kwargs={"model": PveDriftEvent},
     ),
 
+    # --- PveVmTaskLog ---
+    path("task-logs/", views.PveVmTaskLogListView.as_view(), name="pvevmtasklog_list"),
+    path("task-logs/<int:pk>/delete/", views.PveVmTaskLogDeleteView.as_view(), name="pvevmtasklog_delete"),
+    path("task-logs/delete/", views.PveVmTaskLogBulkDeleteView.as_view(), name="pvevmtasklog_bulk_delete"),
+    path("task-logs/<int:pk>/changelog/", ObjectChangeLogView.as_view(),
+         name="pvevmtasklog_changelog", kwargs={"model": PveVmTaskLog}),
+
     # IP probe APIs (used by provisioning form)
     path("provisioning/free-ips/<int:range_id>/", views.VmPlannerFreeIpsApi.as_view(), name="vm-planner-free-ips"),
     path("provisioning/check-ip/", views.VmPlannerCheckIpApi.as_view(), name="vm-planner-check-ip"),

{proxsync-2.0.2 → proxsync-2.0.4}/pve_sync_plugin/views.py

@@ -30,6 +30,7 @@ from .filtersets import (
     PveClusterConfigFilterSet,
     PveDriftEventFilterSet,
     PveSyncJobFilterSet,
+    PveVmTaskLogFilterSet,
     PveWebhookEventFilterSet,
 )
 from .forms import (
@@ -49,6 +50,7 @@ from .models import (
     PveDriftEvent,
     PvePluginSettings,
     PveSyncJob,
+    PveVmTaskLog,
     PveWebhookEvent,
     VmProvisioningLog,
 )
@@ -58,6 +60,7 @@ from .tables import (
     PveClusterConfigTable,
     PveDriftEventTable,
     PveSyncJobTable,
+    PveVmTaskLogTable,
     PveWebhookEventTable,
     VmProvisioningLogTable,
 )
@@ -342,6 +345,26 @@ class PveDriftEventBulkDeleteView(generic.BulkDeleteView):
     table = PveDriftEventTable
 
 
+# ============================================================================
+# PveVmTaskLog — read-only list from PVE task history
+# ============================================================================
+
+class PveVmTaskLogListView(generic.ObjectListView):
+    queryset = PveVmTaskLog.objects.order_by("-start_time")
+    table = PveVmTaskLogTable
+    filterset = PveVmTaskLogFilterSet
+    template_name = "pve_sync/pvevmtasklog_list.html"
+
+
+class PveVmTaskLogDeleteView(generic.ObjectDeleteView):
+    queryset = PveVmTaskLog.objects.all()
+
+
+class PveVmTaskLogBulkDeleteView(generic.BulkDeleteView):
+    queryset = PveVmTaskLog.objects.all()
+    table = PveVmTaskLogTable
+
+
 # ============================================================================
 # Plugin Settings (singleton)
 # ============================================================================
@@ -645,13 +668,12 @@ class VmPlannerCheckIpApi(PermissionRequiredMixin, View):
         ip_str = str(ip_obj)
 
         # ── 1. IPAM check (authoritative) ──
-        # An IP can be stored as any prefix length (e.g. /16, /24, /32).
-        # Compare only the host part to find any existing allocation.
-        ipam_entry = None
-        for addr in NetBoxIPAddress.objects.all().values_list("address", flat=True):
-            if str(addr.ip) == ip_str:
-                ipam_entry = str(addr)   # e.g. "172.17.202.11/16"
-                break
+        # Filter by host bits using __net_host_contained: finds any /N record
+        # whose host address matches ip_str, without a full table scan.
+        ipam_qs = NetBoxIPAddress.objects.filter(
+            address__net_host_contained=ip_str
+        ).values_list("address", flat=True).first()
+        ipam_entry = str(ipam_qs) if ipam_qs else None
 
         if ipam_entry:
             return JsonResponse({

{proxsync-2.0.2 → proxsync-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "proxsync"
-version = "2.0.2"
+version = "2.0.4"
 description = "NetBox plugin for Proxmox VE inventory synchronization"
 readme = "README.md"
 requires-python = ">=3.10"