diff --git a/app/routers/qualys.py b/app/routers/qualys.py index cb34438..ece9e26 100644 --- a/app/routers/qualys.py +++ b/app/routers/qualys.py @@ -452,13 +452,13 @@ async def qualys_agents_page(request: Request, db=Depends(get_db)): # Serveurs en prod sans agent Qualys no_agent = db.execute(text(""" - SELECT s.hostname, s.os_family, d.name as domain, e.name as env, z.name as zone + SELECT s.hostname, s.os_family, s.etat, d.name as domain, e.name as env, z.name as zone FROM servers s LEFT JOIN domain_environments de ON s.domain_env_id = de.id LEFT JOIN domains d ON de.domain_id = d.id LEFT JOIN environments e ON de.environment_id = e.id LEFT JOIN zones z ON s.zone_id = z.id - WHERE s.etat = 'en_production' + WHERE s.etat NOT IN ('decommissionne') AND NOT EXISTS (SELECT 1 FROM qualys_assets qa WHERE LOWER(qa.hostname) = LOWER(s.hostname)) ORDER BY s.hostname """)).fetchall() diff --git a/app/templates/qualys_agents.html b/app/templates/qualys_agents.html index 96a2e82..3c21d72 100644 --- a/app/templates/qualys_agents.html +++ b/app/templates/qualys_agents.html @@ -94,6 +94,7 @@ Domaine Env Zone + État {% for s in no_agent_servers %} @@ -103,6 +104,7 @@ {{ s.domain or '-' }} {{ s.env or '-' }} {% if s.zone == 'DMZ' %}DMZ{% else %}{{ s.zone or '-' }}{% endif %} + {{ (s.etat or '-')[:8] }} {% endfor %}