added gunicorn and updated to the last version of server monitorizare

Server_Monitorizare_v2/app/web/main.py

@@ -34,7 +34,7 @@ def devices():
         with get_db().get_session() as session:
             devices = session.query(Device).order_by(Device.last_seen.desc()).all()
 
-            # Get log count per device
+            # Log count per device
             device_log_counts = {}
             for device in devices:
                 log_count = session.query(LogEntry).filter_by(device_id=device.id).count()
@@ -42,14 +42,22 @@ def devices():
 
             pending_count = session.query(WMTUpdateRequest).filter_by(status='pending').count()
 
+            # Pending approval requests mapped by mac_address for per-device badge
+            pending_requests = session.query(WMTUpdateRequest).filter_by(status='pending').all()
+            pending_by_mac = {}
+            for req in pending_requests:
+                pending_by_mac[req.mac_address] = pending_by_mac.get(req.mac_address, 0) + 1
+
             return render_template('device_management.html',
                                  devices=devices,
                                  device_log_counts=device_log_counts,
-                                 pending_count=pending_count)
+                                 pending_count=pending_count,
+                                 pending_by_mac=pending_by_mac)
     except Exception as e:
         logging.error(f"Error loading devices: {e}")
         flash(f'Error loading devices: {e}', 'error')
-        return render_template('device_management.html', devices=[], device_log_counts={}, pending_count=0)
+        return render_template('device_management.html', devices=[], device_log_counts={},
+                               pending_count=0, pending_by_mac={})
 
 @main_bp.route('/device/<int:device_id>')
 def device_detail(device_id):
@@ -516,7 +524,18 @@ def admin():
         logging.error(f'Admin inventory stats error: {e}')
         stats['inventory_hosts'] = '?'
         stats['inventory_groups_yaml'] = '?'
-    return render_template('admin.html', stats=stats)
+    # Pass registered devices for per-device delete UI
+    devices = []
+    try:
+        with get_db().get_session() as session:
+            devices = [
+                {'id': d.id, 'hostname': d.hostname, 'nume_masa': d.nume_masa,
+                 'mac_address': d.mac_address, 'device_ip': d.device_ip}
+                for d in session.query(Device).order_by(Device.nume_masa).all()
+            ]
+    except Exception as e:
+        logging.error(f'Admin device list error: {e}')
+    return render_template('admin.html', stats=stats, devices=devices)
 
 
 @main_bp.route('/admin/clear/logs', methods=['POST'])
@@ -532,9 +551,43 @@ def admin_clear_logs():
         return jsonify({'success': False, 'error': str(e)}), 500
 
 
+@main_bp.route('/admin/clear/device-logs', methods=['POST'])
+def admin_clear_device_logs():
+    """Delete all log entries from the database (devices stay intact)."""
+    try:
+        with get_db().get_session() as session:
+            count = session.query(LogEntry).delete()
+            session.commit()
+        return jsonify({'success': True, 'deleted': count})
+    except Exception as e:
+        logging.error(f'Admin clear device logs error: {e}')
+        return jsonify({'success': False, 'error': str(e)}), 500
+
+
+@main_bp.route('/admin/delete/device/<int:device_id>', methods=['POST'])
+def admin_delete_device(device_id):
+    """Delete a single registered device and its log entries."""
+    try:
+        with get_db().get_session() as session:
+            device = session.query(Device).filter_by(id=device_id).first()
+            if not device:
+                return jsonify({'success': False, 'error': 'Device not found'}), 404
+            name = device.nume_masa or device.hostname
+            session.execute(text('DELETE FROM device_inventory_groups WHERE device_id = :id'), {'id': device_id})
+            session.query(LogEntry).filter_by(device_id=device_id).delete()
+            session.query(WMTUpdateRequest).filter_by(device_id=device_id).delete()
+            session.delete(device)
+            session.commit()
+        logging.info(f'Admin deleted device {device_id} ({name})')
+        return jsonify({'success': True, 'name': name})
+    except Exception as e:
+        logging.error(f'Admin delete device {device_id} error: {e}')
+        return jsonify({'success': False, 'error': str(e)}), 500
+
+
 @main_bp.route('/admin/clear/devices', methods=['POST'])
 def admin_clear_devices():
-    """Delete all devices (and their log entries) from the database."""
+    """Delete ALL devices (and their log entries) from the database."""
     try:
         with get_db().get_session() as session:
             session.execute(text('DELETE FROM device_inventory_groups'))