qontract-reconcile 0.10.2.dev129__tar.gz → 0.10.2.dev131__tar.gz

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev129
+Version: 0.10.2.dev131
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/glitchtip/integration.py

@@ -144,13 +144,6 @@ def get_glitchtip_projects(query_func: Callable) -> list[GlitchtipProjectV1]:
     glitchtip_projects = (
         glitchtip_project_query(query_func=query_func).glitchtip_projects or []
     )
-    for project in glitchtip_projects:
-        # either org.owners or project.app must be set
-        if not project.organization.owners and not project.app:
-            raise ValueError(
-                f"Either owners in organization {project.organization.name} or app must be set for project {project.name}"
-            )
-
     return glitchtip_projects
 
 

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/gql_definitions/glitchtip/glitchtip_project.py

@@ -98,9 +98,17 @@ query Projects {
         }
       }
     }
-    # for glitchtip access revalidation
     app {
+    # for glitchtip access revalidation
       path
+      # for the qontract-cli glitchtip subcommands
+      escalationPolicy {
+        channels {
+          jiraBoard {
+            name
+          }
+        }
+      }
     }
   }
 }
@@ -176,8 +184,21 @@ class NamespaceV1(ConfiguredBaseModel):
     cluster: ClusterV1 = Field(..., alias="cluster")
 
 
+class JiraBoardV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+
+
+class AppEscalationPolicyChannelsV1(ConfiguredBaseModel):
+    jira_board: list[JiraBoardV1] = Field(..., alias="jiraBoard")
+
+
+class AppEscalationPolicyV1(ConfiguredBaseModel):
+    channels: AppEscalationPolicyChannelsV1 = Field(..., alias="channels")
+
+
 class AppV1(ConfiguredBaseModel):
     path: str = Field(..., alias="path")
+    escalation_policy: AppEscalationPolicyV1 = Field(..., alias="escalationPolicy")
 
 
 class GlitchtipProjectV1(ConfiguredBaseModel):
@@ -188,7 +209,7 @@ class GlitchtipProjectV1(ConfiguredBaseModel):
     teams: list[GlitchtipTeamV1] = Field(..., alias="teams")
     organization: GlitchtipProjectV1_GlitchtipOrganizationV1 = Field(..., alias="organization")
     namespaces: list[NamespaceV1] = Field(..., alias="namespaces")
-    app: Optional[AppV1] = Field(..., alias="app")
+    app: AppV1 = Field(..., alias="app")
 
 
 class ProjectsQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/gql_definitions/introspection.json

@@ -23719,9 +23719,13 @@
                             "description": null,
                             "args": [],
                             "type": {
-                                "kind": "OBJECT",
-                                "name": "App_v1",
-                                "ofType": null
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "OBJECT",
+                                    "name": "App_v1",
+                                    "ofType": null
+                                }
                             },
                             "isDeprecated": false,
                             "deprecationReason": null

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/utils/glitchtip/client.py

@@ -1,8 +1,11 @@
+from datetime import datetime
+
 from reconcile.utils.glitchtip.models import (
     Organization,
     Project,
     ProjectAlert,
     ProjectKey,
+    ProjectStatistics,
     Team,
     User,
 )
@@ -57,6 +60,40 @@ class GlitchtipClient(ApiBase):
             )
         ]
 
+    def all_projects(self) -> list[Project]:
+        """List all projects."""
+        return [
+            Project(**r) for r in self._list("/api/0/projects/", params={"limit": 100})
+        ]
+
+    def project_statistics(
+        self,
+        organization_slug: str,
+        project_pk: int,
+        start: datetime,
+        end: datetime,
+    ) -> ProjectStatistics:
+        """Get project statistics."""
+        field = "sum(quantity)"
+        timeseries = self._get(
+            f"/api/0/organizations/{organization_slug}/stats_v2/",
+            params={
+                "category": "error",
+                "interval": "1h",
+                "field": field,
+                "start": start.isoformat(),
+                "end": end.isoformat(),
+                "project": [project_pk],
+            },
+        )
+        return ProjectStatistics(
+            start=start,
+            end=end,
+            events=sum(
+                i for i in timeseries["groups"][0]["series"][field] if i is not None
+            ),
+        )
+
     def create_project(
         self, organization_slug: str, team_slug: str, name: str, platform: str | None
     ) -> Project:

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/utils/glitchtip/models.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import re
 from collections.abc import MutableMapping
+from datetime import datetime
 from enum import Enum
 from typing import Any
 
@@ -152,6 +153,7 @@ class Project(BaseModel):
     teams: list[Team] = []
     alerts: list[ProjectAlert] = []
     event_throttle_rate: int = Field(0, alias="eventThrottleRate")
+    organization: Organization | None = None
 
     class Config:
         allow_population_by_field_name = True
@@ -185,6 +187,12 @@ class Project(BaseModel):
         return hash(self.slug)
 
 
+class ProjectStatistics(BaseModel):
+    start: datetime
+    end: datetime
+    events: int = 0
+
+
 class Organization(BaseModel):
     pk: int | None = Field(None, alias="id")
     name: str
@@ -210,3 +218,6 @@ class Organization(BaseModel):
 
     def __hash__(self) -> int:
         return hash(self.name)
+
+
+Project.update_forward_refs()

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/reconcile/utils/rest_api_base.py

@@ -74,8 +74,10 @@ class ApiBase:
     def cleanup(self) -> None:
         self.session.close()
 
-    def _get(self, url: str) -> dict[str, Any]:
-        response = self.session.get(urljoin(self.host, url), timeout=self.read_timeout)
+    def _get(self, url: str, params: dict | None = None) -> dict[str, Any]:
+        response = self.session.get(
+            urljoin(self.host, url), params=params, timeout=self.read_timeout
+        )
         response.raise_for_status()
         try:
             return response.json()

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/tools/cli_commands/erv2.py

@@ -222,7 +222,7 @@ class Erv2Cli:
             raise
 
     def enter_shell(self, credentials: Path) -> None:
-        """Run the CDKTF container and enter the shell."""
+        """Run the ERv2 container and enter the shell."""
         input_file = self.temp / "input.json"
         input_file.write_text(self.input_data)
 
@@ -242,6 +242,8 @@ class Erv2Cli:
                     f"{credentials!s}:/credentials:Z",
                     "-e",
                     "AWS_SHARED_CREDENTIALS_FILE=/credentials",
+                    "-e",
+                    "WORK=/tmp/work",
                     "--entrypoint",
                     "/bin/bash",
                     self.image,

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/tools/glitchtip_access_revalidation.py

@@ -64,7 +64,7 @@ def main(
         glitchtip_project_query(query_func=gql.get_api().query).glitchtip_projects or []
     )
 
-    apps = {project.app.path for project in glitchtip_projects if project.app}
+    apps = {project.app.path for project in glitchtip_projects}
 
     notification = Notification(
         notification_type="Action Required",

{qontract_reconcile-0.10.2.dev129 → qontract_reconcile-0.10.2.dev131}/tools/qontract_cli.py

@@ -10,7 +10,7 @@ import sys
 import tempfile
 import textwrap
 from collections import defaultdict
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Iterable, Mapping
 from datetime import (
     UTC,
     datetime,
@@ -83,6 +83,12 @@ from reconcile.gql_definitions.common.app_interface_vault_settings import (
 )
 from reconcile.gql_definitions.common.clusters import ClusterSpecROSAV1
 from reconcile.gql_definitions.fragments.aus_organization import AUSOCMOrganization
+from reconcile.gql_definitions.glitchtip.glitchtip_instance import (
+    query as glitchtip_instance_query,
+)
+from reconcile.gql_definitions.glitchtip.glitchtip_project import (
+    query as glitchtip_project_query,
+)
 from reconcile.gql_definitions.integrations import integrations as integrations_gql
 from reconcile.gql_definitions.maintenance import maintenances as maintenances_gql
 from reconcile.jenkins_job_builder import init_jjb
@@ -133,6 +139,8 @@ from reconcile.utils.gitlab_api import (
     MRState,
     MRStatus,
 )
+from reconcile.utils.glitchtip.client import GlitchtipClient
+from reconcile.utils.glitchtip.models import Project, ProjectStatistics
 from reconcile.utils.gql import GqlApiSingleton
 from reconcile.utils.jjb_client import JJB
 from reconcile.utils.keycloak import (
@@ -156,6 +164,7 @@ from reconcile.utils.ocm import OCM_PRODUCT_ROSA, OCMMap
 from reconcile.utils.ocm.upgrades import get_upgrade_policies
 from reconcile.utils.ocm_base_client import init_ocm_base_client
 from reconcile.utils.output import print_output
+from reconcile.utils.rest_api_base import BearerTokenAuth
 from reconcile.utils.saasherder.models import TargetSpec
 from reconcile.utils.saasherder.saasherder import SaasHerder
 from reconcile.utils.secret_reader import (
@@ -4635,5 +4644,140 @@ def log_group_usage(ctx: click.Context, aws_account: str) -> None:
     print_output(ctx.obj["options"], results, columns)
 
 
+@root.group()
+@click.option(
+    "--instance",
+    required=True,
+    help="Glitchtip Instance Name",
+    default="glitchtip-production",
+)
+@click.pass_context
+def glitchtip(ctx: click.Context, instance: str) -> None:
+    """Glitchtip commands"""
+
+    gqlapi = gql.get_api()
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+    for glitchtip_instance in (
+        glitchtip_instance_query(query_func=gqlapi.query).instances or []
+    ):
+        if glitchtip_instance.name.lower() == instance.lower():
+            ctx.obj["client"] = GlitchtipClient(
+                host=glitchtip_instance.console_url,
+                auth=BearerTokenAuth(
+                    secret_reader.read_secret(glitchtip_instance.automation_token)
+                ),
+                read_timeout=glitchtip_instance.read_timeout,
+                max_retries=glitchtip_instance.max_retries,
+            )
+    if "client" not in ctx.obj:
+        print(f"Glitchtip instance {instance} not found")
+        sys.exit(1)
+
+
+@glitchtip.command()
+@click.option(
+    "--id",
+    "ids",
+    type=int,
+    help="Glitchtip Project ID. Can be specified multiple times.",
+    multiple=True,
+)
+@click.option(
+    "--name",
+    "names",
+    help="Glitchtip Project Name. Can be specified multiple times.",
+    multiple=True,
+)
+@click.pass_context
+def projects(ctx: click.Context, ids: Iterable[int], names: Iterable[str]) -> None:
+    """Display Glitchtip project information
+
+    This command will display the project metadata for the specified project IDs or names.
+    If no IDs or names are provided, all projects will be displayed.
+    """
+    console = Console()
+    table = Table("ID", "Organization", "Name", "Throttle Rate")
+    glitchtip_client: GlitchtipClient = ctx.obj["client"]
+    with glitchtip_client as client:
+        for project in client.all_projects():
+            if (
+                (ids or names)
+                and (project.pk and project.pk not in ids)
+                and (project.name not in names)
+            ):
+                continue
+
+            assert project.organization  # make mypy happy
+
+            table.add_row(
+                str(project.pk),
+                project.organization.name,
+                project.name,
+                str(project.event_throttle_rate),
+            )
+    console.print(table)
+
+
+@glitchtip.command()
+@click.option(
+    "--top",
+    type=int,
+    help="Display the top N projects with the most events in the last 24 hours",
+    default=10,
+)
+@click.pass_context
+def top_talkers(ctx: click.Context, top: int) -> None:
+    """Get the projects with the most events in the last 24 hours."""
+    console = Console()
+    table = Table("ID", "Organization", "Name", "Jira Board", "# Events in last 24h")
+
+    glitchtip_client: GlitchtipClient = ctx.obj["client"]
+    stats: list[tuple[Project, ProjectStatistics]] = []
+    app_interface_glitchtip_projects = {
+        p.name: p
+        for p in glitchtip_project_query(
+            query_func=gql.get_api().query
+        ).glitchtip_projects
+        or []
+    }
+
+    with glitchtip_client as client:
+        for project in client.all_projects():
+            assert project.organization  # make mypy happy
+            assert project.pk  # make mypy happy
+
+            stat = client.project_statistics(
+                organization_slug=project.organization.slug,
+                project_pk=project.pk,
+                start=datetime.now(tz=UTC) - timedelta(hours=24),
+                end=datetime.now(tz=UTC),
+            )
+            stats.append((project, stat))
+
+    # sort by event count
+    stats.sort(key=lambda x: x[1].events, reverse=True)
+
+    for project, stat in stats[:top]:
+        assert project.organization  # make mypy happy
+        assert project.pk  # make mypy happy
+
+        jira_boards = [
+            board.name
+            for board in app_interface_glitchtip_projects[
+                project.name
+            ].app.escalation_policy.channels.jira_board
+        ]
+
+        table.add_row(
+            str(project.pk),
+            project.organization.name,
+            project.name,
+            ", ".join(jira_boards),
+            str(stat.events),
+        )
+    console.print(table)
+
+
 if __name__ == "__main__":
     root()  # pylint: disable=no-value-for-parameter