cortexapps-cli 1.23.0__tar.gz → 1.25.0__tar.gz

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cortexapps-cli
-Version: 1.23.0
+Version: 1.25.0
 Summary: Command Line Interface for cortexapps
 License: MIT
 License-File: LICENSE

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/catalog.py

@@ -65,149 +65,50 @@ class CatalogCommandOptions:
         typer.Option("--types", "-t", help="Filter the response to specific types of entities. By default, this includes services, resources, and domains. Corresponds to the x-cortex-type field in the Entity Descriptor.", show_default=False)
     ]
 
-@app.command(name="list")
-def catalog_list(
-    ctx: typer.Context,
-    include_archived: CatalogCommandOptions.include_archived = False,
-    hierarchy_depth: CatalogCommandOptions.hierarchy_depth = 'full',
-    groups: CatalogCommandOptions.groups = None,
-    owners: CatalogCommandOptions.owners = None,
-    include_hierarchy_fields: CatalogCommandOptions.include_hierarchy_fields = None,
-    include_nested_fields: CatalogCommandOptions.include_nested_fields = None,
-    include_owners: CatalogCommandOptions.include_owners = False,
-    include_links: CatalogCommandOptions.include_links = False,
-    include_metadata: CatalogCommandOptions.include_metadata = False,
-    git_repositories: CatalogCommandOptions.git_repositories = None,
-    types: CatalogCommandOptions.types = None,
-    page: ListCommandOptions.page = None,
-    page_size: ListCommandOptions.page_size = 250,
-    table_output: ListCommandOptions.table_output = False,
-    csv_output: ListCommandOptions.csv_output = False,
-    columns: ListCommandOptions.columns = [],
-    no_headers: ListCommandOptions.no_headers = False,
-    filters: ListCommandOptions.filters = [],
-    sort: ListCommandOptions.sort = [],
-    _print: CommandOptions._print = True,
-):
-    """
-    List entities in the catalog
-    """
-    client = ctx.obj["client"]
-
-    if (table_output or csv_output) and not ctx.params.get('columns'):
-        ctx.params['columns'] = [
-            "ID=id",
-            "Tag=tag",
-            "Name=name",
-            "Type=type",
-            "Git Repository=git.repository",
-        ]
-
-    params = {
-        "includeArchived": include_archived,
-        "hierarchyDepth": hierarchy_depth,
-        "groups": groups,
-        "owners": owners,
-        "includeHierarchyFields": include_hierarchy_fields,
-        "includeNestedFields": include_nested_fields,
-        "includeOwners": include_owners,
-        "includeLinks": include_links,
-        "includeMetadata": include_metadata,
-        "page": page,
-        "pageSize": page_size,
-        "gitRepositories": git_repositories,
-        "types": types,
-    }
-
-    # remove any params that are None
-    params = {k: v for k, v in params.items() if v is not None}
-
-    # for keys that can have multiple values, remove whitespace around comma and split on comma
-    for key in ['groups', 'owners', 'gitRepositories', 'types']:
-        if key in params:
-            params[key] = [x.strip() for x in params[key].split(',')]
-
-    if page is None:
-        # if page is not specified, we want to fetch all pages
-        r = client.fetch("api/v1/catalog", params=params)
-    else:
-        # if page is specified, we want to fetch only that page
-        r = client.get("api/v1/catalog", params=params)
-
-    if _print:
-        data = r
-        print_output_with_context(ctx, data)
-    else:
-        return(r)
-
 @app.command()
-def details(
+def archive(
     ctx: typer.Context,
-    hierarchy_depth: CatalogCommandOptions.hierarchy_depth = 'full',
-    include_hierarchy_fields: CatalogCommandOptions.include_hierarchy_fields = None,
     tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
-    table_output: ListCommandOptions.table_output = False,
-    csv_output: ListCommandOptions.csv_output = False,
-    no_headers: ListCommandOptions.no_headers = False,
-    columns: ListCommandOptions.columns = [],
-    filters: ListCommandOptions.filters = [],
 ):
     """
-    Get details for a specific entity in the catalog
+    Archive an entity
     """
     client = ctx.obj["client"]
 
-    if table_output and csv_output:
-        raise typer.BadParameter("Only one of --table and --csv can be specified")
-
-    if (table_output or csv_output) and not ctx.params.get('columns'):
-        ctx.params['columns'] = [
-            "ID=id",
-            "Tag=tag",
-            "Name=name",
-            "Type=type",
-            "Git Repository=git.repository",
-        ]
-
-    output_format = "table" if table_output else "csv" if csv_output else "json"
-
-    params = {
-        "hierarchyDepth": hierarchy_depth,
-        "includeHierarchyFields": include_hierarchy_fields
-    }
-
-    # remove any params that are None
-    params = {k: v for k, v in params.items() if v is not None}
-
-    r = client.get("api/v1/catalog/" + tag, params=params)
-
-    data = r if output_format == 'json' else [r]
-    print_output_with_context(ctx, data)
+    r = client.put("api/v1/catalog/" + tag + "/archive")
 
 @app.command()
-def archive(
+def aws(
     ctx: typer.Context,
     tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
 ):
     """
-    Archive an entity
+    Get AWS resource details for an entity
     """
     client = ctx.obj["client"]
 
-    r = client.put("api/v1/catalog/" + tag + "/archive")
+    r = client.get("api/v1/catalog/" + tag + "/aws")
+    print_output_with_context(ctx, r)
 
 @app.command()
-def unarchive(
+def create(
     ctx: typer.Context,
-    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
+    file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help=" File containing YAML content of entity; can be passed as stdin with -, example: -f-")] = None,
+    dry_run: CatalogCommandOptions.dry_run = False,
+    _print: CommandOptions._print = True,
 ):
     """
-    Unarchive an entity
+    Create entity
     """
     client = ctx.obj["client"]
 
-    r = client.put("api/v1/catalog/" + tag + "/unarchive")
-    print_output_with_context(ctx, r)
+    params = {
+        "dryRun": dry_run
+    }
+
+    r = client.post("api/v1/open-api", data=file_input.read(), params=params, content_type="application/openapi;charset=UTF-8")
+    if _print:
+        print_output_with_context(ctx, r)
 
 @app.command()
 def delete(
@@ -239,7 +140,6 @@ def delete_by_type(
 
     client.delete("api/v1/catalog", params=params)
 
-
 @app.command()
 def descriptor(
     ctx: typer.Context,
@@ -270,48 +170,166 @@ def descriptor(
            print_output_with_context(ctx, r)
 
 @app.command()
-def create(
+def details(
     ctx: typer.Context,
-    file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help=" File containing YAML content of entity; can be passed as stdin with -, example: -f-")] = None,
-    dry_run: CatalogCommandOptions.dry_run = False,
-    _print: CommandOptions._print = True,
+    hierarchy_depth: CatalogCommandOptions.hierarchy_depth = 'full',
+    include_hierarchy_fields: CatalogCommandOptions.include_hierarchy_fields = None,
+    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
+    table_output: ListCommandOptions.table_output = False,
+    csv_output: ListCommandOptions.csv_output = False,
+    no_headers: ListCommandOptions.no_headers = False,
+    columns: ListCommandOptions.columns = [],
+    filters: ListCommandOptions.filters = [],
 ):
     """
-    Create entity
+    Get details for a specific entity in the catalog
     """
     client = ctx.obj["client"]
 
+    if table_output and csv_output:
+        raise typer.BadParameter("Only one of --table and --csv can be specified")
+
+    if (table_output or csv_output) and not ctx.params.get('columns'):
+        ctx.params['columns'] = [
+            "ID=id",
+            "Tag=tag",
+            "Name=name",
+            "Type=type",
+            "Git Repository=git.repository",
+        ]
+
+    output_format = "table" if table_output else "csv" if csv_output else "json"
+
     params = {
-        "dryRun": dry_run
+        "hierarchyDepth": hierarchy_depth,
+        "includeHierarchyFields": include_hierarchy_fields
     }
 
-    r = client.post("api/v1/open-api", data=file_input.read(), params=params, content_type="application/openapi;charset=UTF-8")
-    if _print:
-        print_output_with_context(ctx, r)
+    # remove any params that are None
+    params = {k: v for k, v in params.items() if v is not None}
+
+    r = client.get("api/v1/catalog/" + tag, params=params)
+
+    data = r if output_format == 'json' else [r]
+    print_output_with_context(ctx, data)
 
 @app.command()
-def patch(
+def gitops_log(
     ctx: typer.Context,
-    file_input: Annotated[typer.FileText, typer.Option(..., "--file", "-f", help=" File containing YAML content of entity; can be passed as stdin with -, example: -f-")] = None,
-    delete_marker_value = typer.Option("__delete__", "--delete-marker-value", "-dmv", help="Delete keys with this value from the merged yaml, defaults to __delete__, if any values match this, they will not be included in merged YAML. For example my_value: __delete__ will remove my_value from the merged YAML."),
-    dry_run: CatalogCommandOptions.dry_run = False,
-    append_arrays: CatalogCommandOptions.append_arrays = False,
-    fail_if_not_exist: CatalogCommandOptions.fail_if_not_exist = False,
+    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
 ):
     """
-    Creates or updates an entity. If the YAML refers to an entity that already exists (as referenced by the x-cortex-tag), this API will merge the specified changes into the existing entity
+    Retrieve most recent GitOps log for entity
+    """
+    client = ctx.obj["client"]
+
+    r = client.get("api/v1/catalog/" + tag + "/gitops-logs")
+    print_output_with_context(ctx, r)
+
+@app.command()
+def k8s(
+    ctx: typer.Context,
+    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
+    table_output: ListCommandOptions.table_output = False,
+    csv_output: ListCommandOptions.csv_output = False,
+    no_headers: ListCommandOptions.no_headers = False,
+    columns: ListCommandOptions.columns = [],
+    filters: ListCommandOptions.filters = [],
+):
+    """
+    Get Kubernetes resource details for an entity
+    """
+    client = ctx.obj["client"]
+
+    if table_output and csv_output:
+        raise typer.BadParameter("Only one of --table and --csv can be specified")
+
+    if (table_output or csv_output) and not ctx.params.get('columns'):
+        ctx.params['columns'] = [
+            "Namespace=namespace",
+            "Name=name",
+            "Cluster=cluster",
+            "Type=type",
+            "Last Updated=lastUpdated",
+        ]
+
+    r = client.get("api/v1/catalog/" + tag + "/k8s")
+    print_output_with_context(ctx, r)
+
+@app.command(name="list")
+def catalog_list(
+    ctx: typer.Context,
+    include_archived: CatalogCommandOptions.include_archived = False,
+    hierarchy_depth: CatalogCommandOptions.hierarchy_depth = 'full',
+    groups: CatalogCommandOptions.groups = None,
+    owners: CatalogCommandOptions.owners = None,
+    include_hierarchy_fields: CatalogCommandOptions.include_hierarchy_fields = None,
+    include_nested_fields: CatalogCommandOptions.include_nested_fields = None,
+    include_owners: CatalogCommandOptions.include_owners = False,
+    include_links: CatalogCommandOptions.include_links = False,
+    include_metadata: CatalogCommandOptions.include_metadata = False,
+    git_repositories: CatalogCommandOptions.git_repositories = None,
+    types: CatalogCommandOptions.types = None,
+    page: ListCommandOptions.page = None,
+    page_size: ListCommandOptions.page_size = 250,
+    table_output: ListCommandOptions.table_output = False,
+    csv_output: ListCommandOptions.csv_output = False,
+    columns: ListCommandOptions.columns = [],
+    no_headers: ListCommandOptions.no_headers = False,
+    filters: ListCommandOptions.filters = [],
+    sort: ListCommandOptions.sort = [],
+    _print: CommandOptions._print = True,
+):
+    """
+    List entities in the catalog
     """
     client = ctx.obj["client"]
 
+    if (table_output or csv_output) and not ctx.params.get('columns'):
+        ctx.params['columns'] = [
+            "ID=id",
+            "Tag=tag",
+            "Name=name",
+            "Type=type",
+            "Git Repository=git.repository",
+        ]
+
     params = {
-        "dryRun":dry_run,
-        "appendArrays": append_arrays,
-        "deleteMarkerValue": delete_marker_value,
-        "failIfEntityDoesNotExist": fail_if_not_exist
+        "includeArchived": include_archived,
+        "hierarchyDepth": hierarchy_depth,
+        "groups": groups,
+        "owners": owners,
+        "includeHierarchyFields": include_hierarchy_fields,
+        "includeNestedFields": include_nested_fields,
+        "includeOwners": include_owners,
+        "includeLinks": include_links,
+        "includeMetadata": include_metadata,
+        "page": page,
+        "pageSize": page_size,
+        "gitRepositories": git_repositories,
+        "types": types,
     }
 
-    r = client.patch("api/v1/open-api", data=file_input.read(), params=params, content_type="application/openapi;charset=UTF-8")
-    print_output_with_context(ctx, r)
+    # remove any params that are None
+    params = {k: v for k, v in params.items() if v is not None}
+
+    # for keys that can have multiple values, remove whitespace around comma and split on comma
+    for key in ['groups', 'owners', 'gitRepositories', 'types']:
+        if key in params:
+            params[key] = [x.strip() for x in params[key].split(',')]
+
+    if page is None:
+        # if page is not specified, we want to fetch all pages
+        r = client.fetch("api/v1/catalog", params=params)
+    else:
+        # if page is specified, we want to fetch only that page
+        r = client.get("api/v1/catalog", params=params)
+
+    if _print:
+        data = r
+        print_output_with_context(ctx, data)
+    else:
+        return(r)
 
 @app.command()
 def list_descriptors(
@@ -339,16 +357,27 @@ def list_descriptors(
         return(r)
 
 @app.command()
-def gitops_log(
+def patch(
     ctx: typer.Context,
-    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
+    file_input: Annotated[typer.FileText, typer.Option(..., "--file", "-f", help=" File containing YAML content of entity; can be passed as stdin with -, example: -f-")] = None,
+    delete_marker_value = typer.Option("__delete__", "--delete-marker-value", "-dmv", help="Delete keys with this value from the merged yaml, defaults to __delete__, if any values match this, they will not be included in merged YAML. For example my_value: __delete__ will remove my_value from the merged YAML."),
+    dry_run: CatalogCommandOptions.dry_run = False,
+    append_arrays: CatalogCommandOptions.append_arrays = False,
+    fail_if_not_exist: CatalogCommandOptions.fail_if_not_exist = False,
 ):
     """
-    Retrieve most recent GitOps log for entity
+    Creates or updates an entity. If the YAML refers to an entity that already exists (as referenced by the x-cortex-tag), this API will merge the specified changes into the existing entity
     """
     client = ctx.obj["client"]
 
-    r = client.get("api/v1/catalog/" + tag + "/gitops-logs")
+    params = {
+        "dryRun":dry_run,
+        "appendArrays": append_arrays,
+        "deleteMarkerValue": delete_marker_value,
+        "failIfEntityDoesNotExist": fail_if_not_exist
+    }
+
+    r = client.patch("api/v1/open-api", data=file_input.read(), params=params, content_type="application/openapi;charset=UTF-8")
     print_output_with_context(ctx, r)
 
 @app.command()
@@ -363,3 +392,16 @@ def scorecard_scores(
 
     r = client.get("api/v1/catalog/" + tag + "/scorecards")
     print_output_with_context(ctx, r)
+
+@app.command()
+def unarchive(
+    ctx: typer.Context,
+    tag: str = typer.Option(..., "--tag", "-t", help="The tag (x-cortex-tag) or unique, auto-generated identifier for the entity."),
+):
+    """
+    Unarchive an entity
+    """
+    client = ctx.obj["client"]
+
+    r = client.put("api/v1/catalog/" + tag + "/unarchive")
+    print_output_with_context(ctx, r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/entity_types.py

@@ -100,6 +100,7 @@ def update(
     ctx: typer.Context,
     file_input: Annotated[typer.FileText, typer.Option("--file", "-f", help=" File containing custom entity definition; can be passed as stdin with -, example: -f-")] = None,
     entity_type: str = typer.Option(..., "--type", "-t", help="The entity type"),
+    _print: CommandOptions._print = True,
 ):
     """
     Update entity type
@@ -108,7 +109,11 @@ def update(
     client = ctx.obj["client"]
     data = json.loads("".join([line for line in file_input]))
 
-    r = client.update("api/v1/catalog/definitions/" + entity_type, data=data)
+    r = client.put("api/v1/catalog/definitions/" + entity_type, data=data)
+    if _print:
+        print_output_with_context(ctx, r)
+    else:
+        return(r)
 
 @app.command()
 def get(

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/aws.py

@@ -146,7 +146,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/aws/configurations/validate" + accountId)
+    r = client.post("api/v1/aws/configurations/validate/" + accountId)
     print_json(data=r)
 
 @app.command()
@@ -159,7 +159,7 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/aws/configurations")
+    r = client.post("api/v1/aws/configurations/all/validate")
     print_json(data=r)
 
 @app.command()

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/azure_devops.py

@@ -157,7 +157,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/azure-devops/configurations/validate" + alias)
+    r = client.post("api/v1/azure-devops/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -170,5 +170,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/azure-devops/configurations")
+    r = client.post("api/v1/azure-devops/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/azure_resources.py

@@ -183,7 +183,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/azure-resources/configurations/validate" + alias)
+    r = client.post("api/v1/azure-resources/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -196,7 +196,7 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/azure-resources/configurations")
+    r = client.post("api/v1/azure-resources/configuration/validate")
     print_json(data=r)
 
 @app.command()

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/circleci.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/circleci/configurations/validate" + alias)
+    r = client.post("api/v1/circleci/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/circleci/configurations")
+    r = client.post("api/v1/circleci/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/coralogix.py

@@ -162,7 +162,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/coralogix/configurations/validate" + alias)
+    r = client.post("api/v1/coralogix/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -175,5 +175,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/coralogix/configurations")
+    r = client.post("api/v1/coralogix/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/datadog.py

@@ -161,7 +161,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/datadog/configurations/validate" + alias)
+    r = client.post("api/v1/datadog/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -174,5 +174,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/datadog/configurations")
+    r = client.post("api/v1/datadog/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/gitlab.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/gitlab/configurations/validate" + alias)
+    r = client.post("api/v1/gitlab/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/gitlab/configurations")
+    r = client.post("api/v1/gitlab/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/incidentio.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/incidentio/configurations/validate" + alias)
+    r = client.post("api/v1/incidentio/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/incidentio/configurations")
+    r = client.post("api/v1/incidentio/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/launchdarkly.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/launchdarkly/configurations/validate" + alias)
+    r = client.post("api/v1/launchdarkly/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/launchdarkly/configurations")
+    r = client.post("api/v1/launchdarkly/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/pagerduty.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/pagerduty/configurations/validate" + alias)
+    r = client.post("api/v1/pagerduty/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/pagerduty/configurations")
+    r = client.post("api/v1/pagerduty/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/prometheus.py

@@ -159,7 +159,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/prometheus/configurations/validate" + alias)
+    r = client.post("api/v1/prometheus/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -172,5 +172,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/prometheus/configurations")
+    r = client.post("api/v1/prometheus/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/commands/integrations_commands/sonarqube.py

@@ -153,7 +153,7 @@ def validate(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/sonarqube/configurations/validate" + alias)
+    r = client.post("api/v1/sonarqube/configuration/validate/" + alias)
     print_json(data=r)
 
 @app.command()
@@ -166,5 +166,5 @@ def validate_all(
 
     client = ctx.obj["client"]
 
-    r = client.post("api/v1/sonarqube/configurations")
+    r = client.post("api/v1/sonarqube/configuration/validate")
     print_json(data=r)

{cortexapps_cli-1.23.0 → cortexapps_cli-1.25.0}/cortexapps_cli/cortex_client.py

@@ -147,7 +147,12 @@ class CortexClient:
         self.rate_limiter.acquire()
 
         start_time = time.time()
-        response = self.session.request(method, url, params=params, headers=req_headers, data=req_data)
+        try:
+            response = self.session.request(method, url, params=params, headers=req_headers, data=req_data)
+        except requests.exceptions.ConnectionError as e:
+            print(f'[red][bold]Connection error[/bold][/red]: Could not connect to {url}')
+            print(f'  [dim]{e}[/dim]')
+            raise typer.Exit(code=1)
         duration = time.time() - start_time
 
         # Log slow requests or non-200 responses (likely retries happened)