nginx-lens 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

commands/analyze.py

@@ -1,20 +1,19 @@
 import typer
 from rich.console import Console
-from rich.panel import Panel
-from rich.tree import Tree
+from rich.table import Table
 from analyzer.conflicts import find_location_conflicts
 from analyzer.duplicates import find_duplicate_directives
 from analyzer.empty_blocks import find_empty_blocks
-from parser.nginx_parser import parse_nginx_config
 from analyzer.warnings import find_warnings
 from analyzer.unused import find_unused_variables
+from parser.nginx_parser import parse_nginx_config
 
 app = typer.Typer()
 console = Console()
 
 def analyze(config_path: str = typer.Argument(..., help="Путь к nginx.conf")):
     """
-    Анализирует конфигурацию Nginx на типовые проблемы.
+    Анализирует конфигурацию Nginx на типовые проблемы. Выводит таблицу issue_type/issue_description.
     """
     tree = parse_nginx_config(config_path)
     conflicts = find_location_conflicts(tree)
@@ -23,48 +22,29 @@ def analyze(config_path: str = typer.Argument(..., help="Путь к nginx.conf"
     warnings = find_warnings(tree)
     unused_vars = find_unused_variables(tree)
 
-    root = Tree("[bold blue]Анализ конфигурации Nginx[/bold blue]")
-
-    if conflicts:
-        node = root.add("[red]Конфликты location-ов[/red]")
-        for c in conflicts:
-            node.add(f"[yellow]server[/yellow]: {c['server'].get('arg', '')} [magenta]location[/magenta]: [bold]{c['location1']}[/bold] ↔ [bold]{c['location2']}[/bold]")
-    else:
-        root.add("[green]Нет конфликтов location-ов[/green]")
-
-    if dups:
-        node = root.add("[red]Дублирующиеся директивы[/red]")
-        for d in dups:
-            node.add(f"[yellow]{d['directive']}[/yellow] ([italic]{d['args']}[/italic]) — {d['count']} раз в блоке [cyan]{d['block'].get('block', d['block'])}[/cyan]")
-    else:
-        root.add("[green]Нет дублирующихся директив[/green]")
-
-    if empties:
-        node = root.add("[red]Пустые блоки[/red]")
-        for e in empties:
-            node.add(f"[yellow]{e['block']}[/yellow] [italic]{e['arg'] or ''}[/italic]")
-    else:
-        root.add("[green]Нет пустых блоков[/green]")
-
-    if warnings:
-        node = root.add("[bold yellow]Потенциальные проблемы[/bold yellow]")
-        for w in warnings:
-            if w['type'] == 'proxy_pass_no_scheme':
-                node.add(f"[yellow]proxy_pass[/yellow] без схемы: [italic]{w['value']}[/italic]")
-            elif w['type'] == 'autoindex_on':
-                node.add(f"[yellow]autoindex on[/yellow] в блоке [cyan]{w['context'].get('block','')}[/cyan]")
-            elif w['type'] == 'if_block':
-                node.add(f"[yellow]Директива if[/yellow] внутри блока [cyan]{w['context'].get('block','')}[/cyan]")
-            elif w['type'] == 'server_tokens_on':
-                node.add(f"[yellow]server_tokens on[/yellow] в блоке [cyan]{w['context'].get('block','')}[/cyan]")
+    table = Table(show_header=True, header_style="bold blue")
+    table.add_column("issue_type")
+    table.add_column("issue_description")
+
+    for c in conflicts:
+        table.add_row("location_conflict", f"server: {c['server'].get('arg', '')} location: {c['location1']} ↔ {c['location2']}")
+    for d in dups:
+        table.add_row("duplicate_directive", f"{d['directive']} ({d['args']}) — {d['count']} раз в блоке {d['block'].get('block', d['block'])}")
+    for e in empties:
+        table.add_row("empty_block", f"{e['block']} {e['arg'] or ''}")
+    for w in warnings:
+        if w['type'] == 'proxy_pass_no_scheme':
+            table.add_row("proxy_pass_no_scheme", f"proxy_pass без схемы: {w['value']}")
+        elif w['type'] == 'autoindex_on':
+            table.add_row("autoindex_on", f"autoindex on в блоке {w['context'].get('block','')}")
+        elif w['type'] == 'if_block':
+            table.add_row("if_block", f"директива if внутри блока {w['context'].get('block','')}")
+        elif w['type'] == 'server_tokens_on':
+            table.add_row("server_tokens_on", f"server_tokens on в блоке {w['context'].get('block','')}")
+    for v in unused_vars:
+        table.add_row("unused_variable", v['name'])
+
+    if table.row_count == 0:
+        console.print("[green]Проблем не найдено[/green]")
     else:
-        root.add("[green]Нет потенциальных проблем[/green]")
-
-    if unused_vars:
-        node = root.add("[bold magenta]Неиспользуемые переменные[/bold magenta]")
-        for v in unused_vars:
-            node.add(f"[magenta]{v['name']}[/magenta]")
-    else:
-        root.add("[green]Нет неиспользуемых переменных[/green]")
-
-    console.print(root) 
+        console.print(table) 

commands/diff.py

@@ -1,7 +1,6 @@
 import typer
 from rich.console import Console
-from rich.tree import Tree
-from rich.text import Text
+from rich.table import Table
 from analyzer.diff import diff_trees
 from parser.nginx_parser import parse_nginx_config
 
@@ -13,7 +12,7 @@ def diff(
     config2: str = typer.Argument(..., help="Второй nginx.conf")
 ):
     """
-    Сравнивает две конфигурации Nginx и выводит отличия.
+    Сравнивает две конфигурации Nginx и выводит отличия side-by-side.
     """
     tree1 = parse_nginx_config(config1)
     tree2 = parse_nginx_config(config2)
@@ -21,15 +20,17 @@ def diff(
     if not diffs:
         console.print("[green]Конфигурации идентичны[/green]")
         return
-    root = Tree("[bold blue]Diff nginx.conf[/bold blue]")
+    table = Table(show_header=True, header_style="bold blue")
+    table.add_column("Config 1", style="red")
+    table.add_column("Config 2", style="green")
     for d in diffs:
         path = "/".join(d['path'])
         if d['type'] == 'added':
-            root.add(f"[green]+ {path}[/green]")
+            table.add_row("", f"+ {path}")
         elif d['type'] == 'removed':
-            root.add(f"[red]- {path}[/red]")
+            table.add_row(f"- {path}", "")
         elif d['type'] == 'changed':
-            node = root.add(f"[yellow]! {path}[/yellow]")
-            node.add(f"[red]- {d['value1']}[/red]")
-            node.add(f"[green]+ {d['value2']}[/green]")
-    console.print(root) 
+            v1 = str(d['value1'])
+            v2 = str(d['value2'])
+            table.add_row(f"! {path}\n{v1}", f"! {path}\n{v2}")
+    console.print(table) 

commands/route.py

@@ -1,30 +1,43 @@
 import typer
 from rich.console import Console
-from rich.panel import Panel
+from rich.table import Table
 from analyzer.route import find_route
 from parser.nginx_parser import parse_nginx_config
+from upstream_checker.checker import check_upstreams
 
 app = typer.Typer()
 console = Console()
 
 def route(
     config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
-    url: str = typer.Argument(..., help="URL для маршрутизации (например, http://host/path)")
+    url: str = typer.Argument(..., help="URL для маршрутизации (например, http://host/path)"),
+    timeout: float = typer.Option(2.0, help="Таймаут проверки (сек)"),
+    retries: int = typer.Option(1, help="Количество попыток")
 ):
     """
-    Показывает, какой server/location обслуживает указанный URL.
+    Показывает, какой server/location обслуживает указанный URL и статус upstream-ов (таблица).
     """
     tree = parse_nginx_config(config_path)
     res = find_route(tree, url)
     if not res:
-        console.print(Panel(f"Не найден подходящий server для {url}", style="red"))
+        console.print("[red]Не найден подходящий server для {url}[/red]")
         return
     server = res['server']
     location = res['location']
     proxy_pass = res['proxy_pass']
-    text = f"[bold]Server:[/bold] {server.get('arg','') or '[no arg]'}\n"
-    if location:
-        text += f"[bold]Location:[/bold] {location.get('arg','')}\n"
+    table = Table(show_header=True, header_style="bold blue")
+    table.add_column("upstream_name")
+    table.add_column("upstream_status")
+    # Проверяем upstream если есть proxy_pass
     if proxy_pass:
-        text += f"[bold]proxy_pass:[/bold] {proxy_pass}\n"
-    console.print(Panel(text, title="Route", style="green")) 
+        upstreams = tree.get_upstreams()
+        for name, servers in upstreams.items():
+            if name in proxy_pass:
+                results = check_upstreams({name: servers}, timeout=timeout, retries=retries)
+                for srv in results[name]:
+                    status = "Healthy" if srv["healthy"] else "Unhealthy"
+                    color = "green" if srv["healthy"] else "red"
+                    table.add_row(srv["address"], f"[{color}]{status}[/{color}]")
+    else:
+        table.add_row("-", "-")
+    console.print(table) 

{nginx_lens-0.1.0.dist-info → nginx_lens-0.1.1.dist-info}/METADATA

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

{nginx_lens-0.1.0.dist-info → nginx_lens-0.1.1.dist-info}/RECORD

@@ -8,11 +8,11 @@ analyzer/route.py,sha256=2xxQooQEsfn10tzGCZUoP32T0OnTMnPB6qRgBR6not8,2345
 analyzer/unused.py,sha256=Ixzv0bPsw9IafblVwLiAOgugdg2dGu1MJDtuoqzPZiY,1066
 analyzer/warnings.py,sha256=eg50TfbE1pJBR6fGUEByqKm5Km1AQBiIy284DOidacI,1244
 commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-commands/analyze.py,sha256=pRL3-ZkI2nwXMdvXsBrh__MWTd9u0NFNRaiM5x8SSX0,3280
+commands/analyze.py,sha256=rEOM2h8Ds3S4kcrT5ZPxj6pki912xkihycybJGcERbg,2350
 commands/cli.py,sha256=A47d3vdTDPHRZlRKs02PtxOFdPHjecpXTZyGhQ34r_w,490
-commands/diff.py,sha256=yA_znERefmtcWuusdX7XUqCqRftA6hFWsYRVedc97ig,1237
+commands/diff.py,sha256=BqrBzZJcD7XJWU0HdNos31yANvbwEWR1ZHaVowCoeV0,1282
 commands/health.py,sha256=2QdjIVattoaksW7BrjM2_vqqB18_t7ILeBvKVjaxTdM,1008
-commands/route.py,sha256=jqGKRcocjNhGAN6LQ1PvqcNaNKG_Nn437l9ZeHaD-FA,1132
+commands/route.py,sha256=wiNkovPBPnpMau6sWQryOPaP5D8TFOT3s4Ua3XwplLg,1861
 commands/tree.py,sha256=H8kFYueo6mcN82MSgIzAH6Usq9u7sYo2WlY0p8rlN_A,1669
 exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
@@ -21,8 +21,8 @@ parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=JqZ3clNy4Nf-bmbsx_rJUL7EgRoB79b87eEu_isMeqg,3577
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upstream_checker/checker.py,sha256=9-6CMUTN7gXUACP8EwX722QogfujZyV-WWWUeM3a79k,455
-nginx_lens-0.1.0.dist-info/METADATA,sha256=YaK62hPH-fHD66tS3qvGVHJsc7HkAEbz5xxnvWQVAVA,476
-nginx_lens-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.1.0.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.1.0.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.1.0.dist-info/RECORD,,
+nginx_lens-0.1.1.dist-info/METADATA,sha256=kyCiTNE9IVC5AO9ZVrBQN5xRmCbkOndGz3ofO0R3zlE,476
+nginx_lens-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.1.1.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.1.1.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.1.1.dist-info/RECORD,,