nginx-lens 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

commands/cli.py

@@ -9,6 +9,7 @@ from commands.include import include_tree
 from commands.graph import graph
 from commands.logs import logs
 from commands.syntax import syntax
+from commands.resolve import resolve
 
 app = typer.Typer(help="nginx-lens — анализ и диагностика конфигураций Nginx")
 console = Console()
@@ -22,6 +23,7 @@ app.command()(include_tree)
 app.command()(graph)
 app.command()(logs)
 app.command()(syntax)
+app.command()(resolve)
 
 if __name__ == "__main__":
     app() 

commands/health.py

@@ -1,7 +1,7 @@
 import typer
 from rich.console import Console
 from rich.table import Table
-from upstream_checker.checker import check_upstreams
+from upstream_checker.checker import check_upstreams, resolve_upstreams
 from parser.nginx_parser import parse_nginx_config
 
 app = typer.Typer()
@@ -12,6 +12,7 @@ def health(
     timeout: float = typer.Option(2.0, help="Таймаут проверки (сек)"),
     retries: int = typer.Option(1, help="Количество попыток"),
     mode: str = typer.Option("tcp", help="Режим проверки: tcp или http", case_sensitive=False),
+    resolve: bool = typer.Option(False, "--resolve", "-r", help="Показать резолвленные IP-адреса"),
 ):
     """
     Проверяет доступность upstream-серверов, определённых в nginx.conf. Выводит таблицу.
@@ -19,6 +20,7 @@ def health(
     Пример:
         nginx-lens health /etc/nginx/nginx.conf
         nginx-lens health /etc/nginx/nginx.conf --timeout 5 --retries 3 --mode http
+        nginx-lens health /etc/nginx/nginx.conf --resolve
     """
     try:
         tree = parse_nginx_config(config_path)
@@ -31,15 +33,38 @@ def health(
 
     upstreams = tree.get_upstreams()
     results = check_upstreams(upstreams, timeout=timeout, retries=retries, mode=mode.lower())
+    
+    # Если нужно показать резолвленные IP-адреса
+    resolved_info = {}
+    if resolve:
+        resolved_info = resolve_upstreams(upstreams)
 
     table = Table(show_header=True, header_style="bold blue")
-    table.add_column("upstream_name")
-    table.add_column("upstream_status")
+    table.add_column("Address")
+    table.add_column("Status")
+    if resolve:
+        table.add_column("Resolved IP")
 
     for name, servers in results.items():
         for srv in servers:
             status = "Healthy" if srv["healthy"] else "Unhealthy"
             color = "green" if srv["healthy"] else "red"
-            table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
+            
+            if resolve:
+                resolved_list = []
+                if name in resolved_info:
+                    for resolved_srv in resolved_info[name]:
+                        if resolved_srv["address"] == srv["address"]:
+                            resolved_list = resolved_srv["resolved"]
+                            break
+                
+                if resolved_list:
+                    # Показываем все IP-адреса через запятую
+                    resolved_str = ", ".join(resolved_list)
+                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]", f"[green]{resolved_str}[/green]")
+                else:
+                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]", "[yellow]Failed to resolve[/yellow]")
+            else:
+                table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
 
     console.print(table)

commands/resolve.py

@@ -0,0 +1,52 @@
+import typer
+from rich.console import Console
+from rich.table import Table
+from upstream_checker.checker import resolve_upstreams
+from parser.nginx_parser import parse_nginx_config
+
+app = typer.Typer()
+console = Console()
+
+def resolve(
+    config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
+):
+    """
+    Резолвит DNS имена upstream-серверов в IP-адреса.
+
+    Пример:
+        nginx-lens resolve /etc/nginx/nginx.conf
+    """
+    try:
+        tree = parse_nginx_config(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
+        return
+
+    upstreams = tree.get_upstreams()
+    if not upstreams:
+        console.print("[yellow]Не найдено ни одного upstream в конфигурации.[/yellow]")
+        return
+    
+    results = resolve_upstreams(upstreams)
+
+    table = Table(show_header=True, header_style="bold blue")
+    table.add_column("Upstream Name")
+    table.add_column("Address")
+    table.add_column("Resolved IP")
+
+    for name, servers in results.items():
+        for idx, srv in enumerate(servers):
+            upstream_name = name if idx == 0 else ""
+            resolved_list = srv["resolved"]
+            if resolved_list:
+                # Показываем все IP-адреса через запятую
+                resolved_str = ", ".join(resolved_list)
+                table.add_row(upstream_name, srv["address"], f"[green]{resolved_str}[/green]")
+            else:
+                table.add_row(upstream_name, srv["address"], "[red]Failed to resolve[/red]")
+
+    console.print(table)
+

{nginx_lens-0.2.3.dist-info → nginx_lens-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.2.3
+Version: 0.3.1
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com

{nginx_lens-0.2.3.dist-info → nginx_lens-0.3.1.dist-info}/RECORD

@@ -12,12 +12,13 @@ analyzer/unused.py,sha256=Ixzv0bPsw9IafblVwLiAOgugdg2dGu1MJDtuoqzPZiY,1066
 analyzer/warnings.py,sha256=zC36QMvegA2eQPvZ-P1eysrX_kXHx5A1MUKHKKNvG5c,5784
 commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
-commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
+commands/cli.py,sha256=brzp6xDDWIrm7ibaoT4x94hgAdBB2DVWniXoK8dRylE,782
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
 commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
-commands/health.py,sha256=EV2M2Gt_LnA8WI_0gOBlRYr2u-fxpjq6FBd-tlQOSuI,1830
+commands/health.py,sha256=ZGc42Ak4xoZt9r9DJ_84AvgQ8yXCO-CzWppvsOww1Yo,3086
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
+commands/resolve.py,sha256=hdbvB88bgivNt1v5LMyhf--2mwfI_IUXyi4b1IUB62A,1841
 commands/route.py,sha256=-x_71u6ENl3iO-oxK3bdE8v5eZKf4xRCydeUyXMFVrY,3163
 commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
@@ -25,13 +26,13 @@ exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
 exporter/markdown.py,sha256=_0mXQIhurGEZ0dO-eq9DbsuKNrgEDIblgtL3DAgYNo8,724
-nginx_lens-0.2.3.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.3.1.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=Sa9FtGAkvTqNzoehBvgLUWPJHLLIZYWH9ugSHW50X8s,3699
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upstream_checker/checker.py,sha256=5aTU3-ejUlEOKX9lYxD8PuGTBYyQENwiDknSh168lFE,2336
-nginx_lens-0.2.3.dist-info/METADATA,sha256=ue5Bb9dQNf6RSCxxS7k718glb6-ujAY8yqLlTU7b27w,520
-nginx_lens-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.2.3.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.2.3.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.2.3.dist-info/RECORD,,
+upstream_checker/checker.py,sha256=Th49U6OF-egTH145XOyrfIUUHtygBJiOtqqD9ZT1lKo,5261
+nginx_lens-0.3.1.dist-info/METADATA,sha256=Z-8Ke06GaHt1iVb4zvhX5G3RiJMHwW7bdHRuwKi9Wd8,520
+nginx_lens-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.3.1.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.3.1.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.3.1.dist-info/RECORD,,

upstream_checker/checker.py

@@ -49,6 +49,91 @@ def check_http(address: str, timeout: float, retries: int) -> bool:
     return False
 
 
+def resolve_address(address: str) -> List[str]:
+    """
+    Резолвит адрес upstream сервера в IP-адреса.
+    
+    Args:
+        address: Адрес в формате "host:port" или "host:port параметры"
+        
+    Returns:
+        Список IP-адресов в формате "ip:port" или пустой список, если резолвинг не удался
+    """
+    try:
+        host_port = address.split()[0]
+        
+        if ":" not in host_port:
+            return []
+            
+        parts = host_port.rsplit(":", 1)
+        if len(parts) != 2:
+            return []
+        host, port = parts
+        
+        # Если это уже IPv4 адрес, возвращаем как есть
+        try:
+            socket.inet_aton(host)
+            return [host_port]
+        except socket.error:
+            pass
+        
+        # Проверяем IPv6 (в квадратных скобках)
+        if host.startswith("[") and host.endswith("]"):
+            ipv6_host = host[1:-1]
+            try:
+                socket.inet_pton(socket.AF_INET6, ipv6_host)
+                return [host_port]
+            except (socket.error, OSError):
+                pass
+        
+        # Пытаемся резолвить DNS имя - получаем все IP-адреса
+        try:
+            # gethostbyname_ex возвращает (hostname, aliaslist, ipaddrlist)
+            _, _, ipaddrlist = socket.gethostbyname_ex(host)
+            # Фильтруем только IPv4 адреса (IPv6 обрабатываются отдельно)
+            resolved_ips = []
+            for ip in ipaddrlist:
+                try:
+                    # Проверяем, что это IPv4
+                    socket.inet_aton(ip)
+                    resolved_ips.append(f"{ip}:{port}")
+                except socket.error:
+                    pass
+            return resolved_ips if resolved_ips else []
+        except (socket.gaierror, OSError):
+            return []
+    except (ValueError, IndexError, AttributeError):
+        return []
+
+
+def resolve_upstreams(
+    upstreams: Dict[str, List[str]]
+) -> Dict[str, List[dict]]:
+    """
+    Резолвит DNS имена upstream-серверов в IP-адреса.
+    
+    Возвращает:
+    {
+        "backend": [
+            {"address": "example.com:8080", "resolved": ["192.168.1.1:8080", "192.168.1.2:8080"]},
+            {"address": "127.0.0.1:8080", "resolved": ["127.0.0.1:8080"]},
+            {"address": "badhost:80", "resolved": []},
+            ...
+        ]
+    }
+    """
+    results = {}
+    for name, servers in upstreams.items():
+        results[name] = []
+        for srv in servers:
+            resolved = resolve_address(srv)
+            results[name].append({
+                "address": srv,
+                "resolved": resolved
+            })
+    return results
+
+
 def check_upstreams(
     upstreams: Dict[str, List[str]],
     timeout: float = 2.0,