proxsync 2.0.3__tar.gz → 2.0.5__tar.gz

{proxsync-2.0.3/proxsync.egg-info → proxsync-2.0.5}/PKG-INFO

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

{proxsync-2.0.3 → proxsync-2.0.5/proxsync.egg-info}/PKG-INFO

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

{proxsync-2.0.3 → proxsync-2.0.5}/pve_sync.py

@@ -1084,6 +1084,11 @@ class OptimizedPVEToNetBoxSync:
                 disks[key] = m.group(1) if m else val_str[:80]
         return disks
 
+    @staticmethod
+    def _norm_desc(s) -> str:
+        """Normalize description: unify line endings, strip whitespace."""
+        return (s or '').replace('\r\n', '\n').replace('\r', '\n').strip()
+
     def _write_drift_event(self, vm_name: str, vmid: int, drift_type: str,
                            field_name: str, old_value: str, new_value: str,
                            notified: bool = False):
@@ -1235,6 +1240,23 @@ 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:
@@ -1271,7 +1293,15 @@ class OptimizedPVEToNetBoxSync:
         # 只通知最近 2 小時內的操作（避免首次匯入時大量通知）
         notify_cutoff = time.time() - 7200
 
-        since_ts = int(time.time()) - 30 * 86400  # 抓最近 30 天
+        # 從上次已存記錄的最新時間起算（+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", {}):
@@ -1436,8 +1466,8 @@ class OptimizedPVEToNetBoxSync:
                     self._write_drift_event(vm_name, vm_id, 'disk_change', k, old_v, new_v, notified=True)
 
         # VM 描述變更偵測
-        current_desc = (vm_config.get('description') or '').strip()[:500]
-        old_desc = (last_config.get('description') or '').strip()
+        current_desc = self._norm_desc(vm_config.get('description'))[:500]
+        old_desc = self._norm_desc(last_config.get('description'))
         if old_desc and old_desc != current_desc:
             self.stats['config_drifts_detected'] += 1
             print(f"📝 VM {vm_name} 描述變更")
@@ -1724,7 +1754,7 @@ class OptimizedPVEToNetBoxSync:
                                 vm_id=int(vm_id), cluster_name=self.cluster_name, config_hash=config_hash,
                                 memory=memory, vcpus=vcpus_save, tags=tag_names,
                                 node=node_name, primary_ip=cur_ip, vm_name=original_vm_name,
-                                description=(vm_config.get('description') or '').strip()[:500],
+                                description=self._norm_desc(vm_config.get('description'))[:500],
                                 disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                             )
                         except Exception as _snap_err:
@@ -1781,7 +1811,7 @@ class OptimizedPVEToNetBoxSync:
                 update_data = {
                     'name': vm_name, 'cluster': cluster['id'], 'device': device.id, 'role': role_id,
                     'vcpus': vcpus, 'memory': int(vm_config.get('memory', 0)), 'status': status,
-                    'description': (vm_config.get('description') or '')[:200], 'platform': platform_id,
+                    'description': self._norm_desc(vm_config.get('description'))[:200], 'platform': platform_id,
                     'start_on_boot': boot_choice
                 }
                 if tag_ids:
@@ -1800,7 +1830,7 @@ class OptimizedPVEToNetBoxSync:
                 vm_data_dict = {
                     'serial': vm_id, 'name': vm_name, 'cluster': cluster['id'], 'device': device.id,
                     'role': role_id, 'vcpus': vcpus, 'memory': int(vm_config.get('memory', 0)),
-                    'status': status, 'description': (vm_config.get('description') or '')[:200],
+                    'status': status, 'description': self._norm_desc(vm_config.get('description'))[:200],
                     'platform': platform_id, 'start_on_boot': boot_choice
                 }
                 if tag_ids:
@@ -1837,7 +1867,7 @@ class OptimizedPVEToNetBoxSync:
                     vm_id=int(vm_id), cluster_name=self.cluster_name, config_hash=config_hash,
                     memory=memory, vcpus=vcpus_save, tags=tag_names,
                     node=node_name, primary_ip=primary_ip_str, vm_name=original_vm_name,
-                    description=(vm_config.get('description') or '').strip()[:500],
+                    description=self._norm_desc(vm_config.get('description'))[:500],
                     disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                 )
             return True
@@ -1862,7 +1892,7 @@ class OptimizedPVEToNetBoxSync:
                             node=node_name,
                             primary_ip=_ip,
                             vm_name=original_vm_name,
-                            description=(vm_config.get('description') or '').strip()[:500],
+                            description=self._norm_desc(vm_config.get('description'))[:500],
                             disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                         )
                 except Exception:
@@ -1931,6 +1961,7 @@ class OptimizedPVEToNetBoxSync:
             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.3 → proxsync-2.0.5}/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.3 → proxsync-2.0.5}/pve_sync_plugin/views.py

@@ -30,6 +30,7 @@ from .filtersets import (
     PveClusterConfigFilterSet,
     PveDriftEventFilterSet,
     PveSyncJobFilterSet,
+    PveVmTaskLogFilterSet,
     PveWebhookEventFilterSet,
 )
 from .forms import (
@@ -351,6 +352,7 @@ class PveDriftEventBulkDeleteView(generic.BulkDeleteView):
 class PveVmTaskLogListView(generic.ObjectListView):
     queryset = PveVmTaskLog.objects.order_by("-start_time")
     table = PveVmTaskLogTable
+    filterset = PveVmTaskLogFilterSet
     template_name = "pve_sync/pvevmtasklog_list.html"
 
 
@@ -666,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.3 → proxsync-2.0.5}/pyproject.toml

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

{proxsync-2.0.3 → proxsync-2.0.5}/state_db.py

@@ -154,7 +154,7 @@ class StateDB:
             with sqlite3.connect(self.db_path) as conn:
                 conn.execute(
                     """
-                    INSERT INTO vm_config_history
+                    INSERT OR REPLACE INTO vm_config_history
                     (vm_id, cluster_name, config_hash, memory, vcpus, tags_json,
                      node, primary_ip, vm_name, description, disk_summary)
                     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -507,7 +507,7 @@ def compute_config_hash(vm_config: Dict[str, Any], tags: List[str], network_inte
         'ostype': vm_config.get('ostype', ''),
         'cores': vm_config.get('cores', 1),
         'sockets': vm_config.get('sockets', 1),
-        'description': vm_config.get('description', '')[:200],  # 限制长度
+        'description': (vm_config.get('description') or '').replace('\r\n', '\n').replace('\r', '\n').strip()[:200],
         'tags': sorted(tags),  # 排序以确保一致性
         'networks': net_config  # 添加网络接口配置
     }