argus-alm 0.15.9__tar.gz → 0.15.10__tar.gz

{argus_alm-0.15.9 → argus_alm-0.15.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-alm
-Version: 0.15.9
+Version: 0.15.10
 Summary: Argus
 Author-email: Alexey Kartashov <alexey.kartashov@scylladb.com>, Łukasz Sójka <lukasz.sojka@scylladb.com>
 License-Expression: Apache-2.0
@@ -24,6 +24,7 @@ Requires-Dist: python-jenkins>=1.7.0; extra == "web-backend"
 Requires-Dist: python-slugify~=6.1.1; extra == "web-backend"
 Requires-Dist: pygithub>=2.6.1; extra == "web-backend"
 Requires-Dist: boto3~=1.38.9; extra == "web-backend"
+Requires-Dist: jira>=3.10.5; extra == "web-backend"
 Requires-Dist: prometheus-flask-exporter>=0.23.2; extra == "web-backend"
 Provides-Extra: docker-image
 Requires-Dist: supervisor~=4.2.4; extra == "docker-image"

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.15.9'
-__version_tuple__ = version_tuple = (0, 15, 9)
+__version__ = version = '0.15.10'
+__version_tuple__ = version_tuple = (0, 15, 10)
 
-__commit_id__ = commit_id = 'g18aee71c2'
+__commit_id__ = commit_id = 'gfb79cf01d'

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/client/base.py

@@ -5,6 +5,8 @@ from typing import Any, Type
 from uuid import UUID
 
 import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 from argus.common.enums import TestStatus
 from argus.client.generic_result import GenericResultTable
@@ -33,11 +35,30 @@ class ArgusClient:
         FETCH_RESULTS = "/testrun/$type/$id/fetch_results"
         FINALIZE = "/testrun/$type/$id/finalize"
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
         self._auth_token = auth_token
         self._base_url = base_url
         self._api_ver = api_version
+        self._timeout = timeout
         self.session = requests.Session()
+
+        # Configure retry strategy
+        retry_strategy = Retry(
+            total=max_retries,
+            connect=max_retries,
+            read=max_retries,
+            status=0,
+            backoff_factor=1,
+            status_forcelist=(),
+            allowed_methods=["GET"],
+        )
+
+        # Mount adapter with retry strategy for both http and https
+        adapter = HTTPAdapter(max_retries=retry_strategy)
+        self.session.mount("http://", adapter)
+        self.session.mount("https://", adapter)
+
         if extra_headers:
             self.session.headers.update(extra_headers)
 
@@ -101,7 +122,8 @@ class ArgusClient:
         response = self.session.get(
             url=url,
             params=params,
-            headers=self.request_headers
+            headers=self.request_headers,
+            timeout=self._timeout
         )
         LOGGER.debug("GET Response: %s %s", response.status_code, response.url)
 
@@ -124,6 +146,7 @@ class ArgusClient:
             params=params,
             json=body,
             headers=self.request_headers,
+            timeout=self._timeout
         )
         LOGGER.debug("POST Response: %s %s", response.status_code, response.url)
 

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/client/driver_matrix_tests/client.py

@@ -12,8 +12,10 @@ class ArgusDriverMatrixClient(ArgusClient):
         SUBMIT_DRIVER_FAILURE = "/driver_matrix/result/fail"
         SUBMIT_ENV = "/driver_matrix/env/submit"
 
-    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
         self.run_id = run_id
 
     def submit_driver_matrix_run(self, job_name: str, job_url: str) -> None:

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/client/generic/client.py

@@ -12,8 +12,10 @@ class ArgusGenericClient(ArgusClient):
     class Routes(ArgusClient.Routes):
         TRIGGER_JOBS = "/planning/plan/trigger"
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 180, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
 
     def submit_generic_run(self, build_id: str, run_id: str, started_by: str, build_url: str, sub_type: str = None, scylla_version: str | None = None):
         request_body = {

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/client/sct/client.py

@@ -30,8 +30,10 @@ class ArgusSCTClient(ArgusClient):
         SUBMIT_JUNIT_REPORT = "/sct/$id/junit/submit"
         SUBMIT_EMAIL = "/testrun/report/email"
 
-    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
         self.run_id = run_id
 
     def submit_sct_run(self, job_name: str, job_url: str, started_by: str, commit_id: str,

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus/client/sirenada/client.py

@@ -45,9 +45,11 @@ class ArgusSirenadaClient(ArgusClient):
         "skipped": "skipped"
     }
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
         self.results_path: Path | None = None
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
 
     def _verify_required_files_exist(self, results_path: Path):
         assert (results_path / self._junit_xml_filename).exists(), "Missing jUnit XML results file!"

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus_alm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-alm
-Version: 0.15.9
+Version: 0.15.10
 Summary: Argus
 Author-email: Alexey Kartashov <alexey.kartashov@scylladb.com>, Łukasz Sójka <lukasz.sojka@scylladb.com>
 License-Expression: Apache-2.0
@@ -24,6 +24,7 @@ Requires-Dist: python-jenkins>=1.7.0; extra == "web-backend"
 Requires-Dist: python-slugify~=6.1.1; extra == "web-backend"
 Requires-Dist: pygithub>=2.6.1; extra == "web-backend"
 Requires-Dist: boto3~=1.38.9; extra == "web-backend"
+Requires-Dist: jira>=3.10.5; extra == "web-backend"
 Requires-Dist: prometheus-flask-exporter>=0.23.2; extra == "web-backend"
 Provides-Extra: docker-image
 Requires-Dist: supervisor~=4.2.4; extra == "docker-image"

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus_alm.egg-info/SOURCES.txt

@@ -148,8 +148,9 @@ frontend/Discussion/MarkedMentionExtension.js
 frontend/Discussion/MentionSelector.svelte
 frontend/Discussion/UserProfile.svelte
 frontend/Github/GithubIssue.svelte
-frontend/Github/GithubIssues.svelte
-frontend/Github/GithubIssuesCopyModal.svelte
+frontend/Github/Issues.svelte
+frontend/Github/IssuesCopyModal.svelte
+frontend/Jira/JiraIssue.svelte
 frontend/Profile/JobsList.svelte
 frontend/Profile/Login.svelte
 frontend/Profile/Notification.svelte
@@ -401,6 +402,7 @@ templates/email/partials/cloud.html.j2
 templates/email/partials/custom_html.html.j2
 templates/email/partials/custom_table.html.j2
 templates/email/partials/events.html.j2
+templates/email/partials/generic_results.html.j2
 templates/email/partials/header.html.j2
 templates/email/partials/logs.html.j2
 templates/email/partials/main.html.j2

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus_alm.egg-info/requires.txt

@@ -33,4 +33,5 @@ python-jenkins>=1.7.0
 python-slugify~=6.1.1
 pygithub>=2.6.1
 boto3~=1.38.9
+jira>=3.10.5
 prometheus-flask-exporter>=0.23.2

{argus_alm-0.15.9 → argus_alm-0.15.10}/argus_web.example.yaml

@@ -50,6 +50,14 @@ GITHUB_REQUIRED_ORGANIZATIONS:
   # at least one is required for user to successfully authenticate
   - myorg
   - otherorg
+
+# JIRA Server address
+JIRA_SERVER: https://your.jira.instance
+# Email of the service user
+JIRA_EMAIL: user@your.jira.instance
+# API Token of the service user
+JIRA_TOKEN: base64Token
+
 JENKINS_URL: https://your_jenkins_hostname
 JENKINS_USER: user
 JENKINS_API_TOKEN_NAME: Optional

{argus_alm-0.15.9 → argus_alm-0.15.10}/dev-db/export_data.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from collections import defaultdict
 
 from argus.backend.models.web import ArgusRelease, ArgusTest, ArgusGroup
-from argus.backend.plugins.sct.testrun import SCTTestRun
+from argus.backend.plugins.sct.testrun import SCTTestRun, SCTEvent
 from argus.backend.db import ScyllaCluster
 from argus.backend.util.encoders import ArgusJSONEncoder
 from argus.backend.models.result import (
@@ -12,10 +12,11 @@ from argus.backend.models.result import (
     ArgusBestResultData,
     ArgusGraphView,
 )
+from argus.backend.models.github_issue import GithubIssue, IssueLink
 
 db = ScyllaCluster.get()
 
-release_name = "scylla-enterprise"  # change name here
+release_name = "scylla-2025.4"  # change name here
 dest = Path(__file__).parent / "sample_data" / release_name
 dest.mkdir(parents=True, exist_ok=True)
 release = ArgusRelease.get(name=release_name)
@@ -77,3 +78,20 @@ for run in SCTTestRun.filter(release_id=release.id).all():
     for partition_key, results in result_data_by_partition.items():
         print(f"Saving generic result data for partition {partition_key}")
         (dest / f"generic_result_data_{partition_key}.json").write_text(json.dumps(results, cls=ArgusJSONEncoder))
+    # Export SCTEvent for each run
+    events = list(SCTEvent.filter(run_id=run.id).allow_filtering().all())
+    if events:
+        print(f"Saving {len(events)} SCT events for run {run.id}")
+        (dest / f"sct_event_{run.id}.json").write_text(json.dumps(events, cls=ArgusJSONEncoder))
+
+    # Export IssueLink for each run
+    issue_links = list(IssueLink.filter(run_id=run.id).allow_filtering().all())
+    if issue_links:
+        print(f"Saving {len(issue_links)} issue links for run {run.id}")
+        (dest / f"issue_link_{run.id}.json").write_text(json.dumps(issue_links, cls=ArgusJSONEncoder))
+
+print("getting github issues data (full table)")
+all_issues = list(GithubIssue.all())
+if all_issues:
+    print(f"Saving {len(all_issues)} GitHub issues")
+    (dest / "github_issues.json").write_text(json.dumps(all_issues, cls=ArgusJSONEncoder))

{argus_alm-0.15.9 → argus_alm-0.15.10}/dev-db/import_data.py

@@ -9,7 +9,7 @@ db = ScyllaCluster.get()
 if "127.0.0.10" in Config.CONFIG.get("SCYLLA_CONTACT_POINTS"):
     raise Exception("This script should not be run on local DB!")
 
-release_name = "scylla-enterprise"  # change name here
+release_name = "scylla-2025.4"  # change name here
 dest = Path(__file__).parent / "sample_data" / release_name
 
 print("importing releases")
@@ -90,3 +90,36 @@ for file in dest.glob("generic_result_data_*.json"):
             print(
                 f"Saved generic result data for run {result_data['run_id']}, test {result_data['test_id']}, name {result_data['name']}"
             )
+
+print("importing SCT events")
+statement = db.prepare("INSERT INTO sct_event JSON ?")
+for file in dest.glob("sct_event_*.json"):
+    with file.open(mode="rt", encoding="utf-8") as src:
+        events = json.loads(src.read())
+        for event in events:
+            event_raw = json.dumps(event)
+            db.session.execute(statement, parameters=(event_raw,))
+        run_id = file.stem.replace("sct_event_", "")
+        print(f"Saved {len(events)} SCT events for run {run_id}")
+
+print("importing issue links")
+statement = db.prepare("INSERT INTO issue_link JSON ?")
+for file in dest.glob("issue_link_*.json"):
+    with file.open(mode="rt", encoding="utf-8") as src:
+        issue_links = json.loads(src.read())
+        for issue_link in issue_links:
+            issue_link_raw = json.dumps(issue_link)
+            db.session.execute(statement, parameters=(issue_link_raw,))
+        run_id = file.stem.replace("issue_link_", "")
+        print(f"Saved {len(issue_links)} issue links for run {run_id}")
+
+print("importing GitHub issues (full table)")
+github_issues_file = dest / "github_issues.json"
+if github_issues_file.exists():
+    statement = db.prepare("INSERT INTO github_issue JSON ?")
+    with github_issues_file.open(mode="rt", encoding="utf-8") as src:
+        github_issues = json.loads(src.read())
+        for github_issue in github_issues:
+            github_issue_raw = json.dumps(github_issue)
+            db.session.execute(statement, parameters=(github_issue_raw,))
+        print(f"Saved {len(github_issues)} GitHub issues")

{argus_alm-0.15.9 → argus_alm-0.15.10}/docs/api_usage.md

@@ -161,6 +161,7 @@ Supported sections are:
 | logs| List of links to the log files stored on S3 for this run |
 | cloud| Contains active remaining resources running at the end the test. Table |
 | nemesis| Table of nemeses in the run with their status and durations |
+| generic_results| Generic Result API results, formatted as tables |
 | events| Event block of most recent events sorted by timestamp |
 | screenshots| Grafana screenshot gallery |
 | custom_table| Custom table element. Can be used to display arbitrary tables. HTML in cells is **not** supported |
@@ -181,6 +182,13 @@ The `section` block can be provided as empty array to use the default template.
 |amount_per_severity| number | Amount of events per severity to display (default 10)|
 |severity_filter| string[] | Names of severities to include in the email (default [CRITICAL, ERROR]). Available severities: CRITICAL, ERROR, WARNING, NORMAL, DEBUG  (case-sensitive)|
 
+###### Generic Results
+
+|Option|Type|Description|
+|------|----|-----------|
+|table_filter| string[] | Array of regexes to filter tables by. Default: [] - all tables will be shown|
+|section_name| string | Heading value for the results tables|
+
 ###### Nemesis
 
 |Option|Type|Description|

{argus_alm-0.15.9 → argus_alm-0.15.10}/docs/dev-setup.md

@@ -3,11 +3,10 @@
 Minimal local dev setup with one db node (adjust accordingly if needed more nodes)
 
 ## Prerequisites
-1. Python >=3.10.0 (system-wide or pyenv)
-2. NodeJS >=16 (with npm)
-3. Yarn (can be installed globally with `npm -g install yarn`)
-4. uv (https://docs.astral.sh/uv/getting-started/installation/)
-5. docker-compose
+1. NodeJS >=16 (with npm)
+2. Yarn (can be installed globally with `npm -g install yarn`)
+3. uv (https://docs.astral.sh/uv/getting-started/installation/)
+4. docker-compose
 
 ## Installing argus dependencies
 ```bash

{argus_alm-0.15.9 → argus_alm-0.15.10}/docs/generic_results.md

@@ -38,6 +38,9 @@ Generic results are stored in Argus database and can be accessed via Argus API a
 To send generic results to Argus, you need to create `ResultTable` class basing on `GenericResultTable` available in Argus Client library
 and send it using `ArgusClient` class (or it's child class like `ArgusSCTClient`).
 
+Note: Argus client requests use a 60s timeout by default. `ArgusGenericClient` defaults to 180s to accommodate larger payloads. Only GET
+requests are retried, and only on timeouts; POST submissions surface timeouts to the caller so clients can handle retries explicitly.
+
 Child class of `GenericResultTable` needs to define `Meta` class with `name` and `description` fields. It also needs to define `Columns`
 field that will describe available columns details for given result: as a list of `ColumnMetadata` objects. Each `ColumnMetadata` object
 needs to have `name`, `unit` and `type` and optionally `higher_is_better` fields. `type` field can be one of `ResultType` enum values.

{argus_alm-0.15.9 → argus_alm-0.15.10}/frontend/Github/GithubIssue.svelte

@@ -14,16 +14,16 @@
     import { sendMessage } from "../Stores/AlertStore";
     import { userList } from "../Stores/UserlistSubscriber";
     import { timestampToISODate } from "../Common/DateUtils";
-    import { apiMethodCall } from "../Common/ApiUtils";
-    import { determineLuma } from "../Common/TextUtils";
     import { stateEncoder } from "../Common/StateManagement";
+    import type { GithubSubtype, Link, TestRun } from './Issues.svelte';
+    import { getUser } from '../Common/UserUtils';
 
     const dispatch = createEventDispatcher();
     let users = $state({});
     run_1(() => {
         users = $userList;
     });
-    let githubToken;
+
     const IssueColorMap = {
         open: "issue-open",
         closed: "issue-closed",
@@ -35,8 +35,8 @@
     };
 
     interface Props {
-        issue?: any;
-        runId: any;
+        issue?: GithubSubtype;
+        runId: string;
         deleteEnabled?: boolean;
         aggregated?: boolean;
     }
@@ -44,14 +44,16 @@
     let {
         issue = $bindable({
         id: "",
-        number: -1,
-        state: "unknown",
+        subtype: "github",
+        number: "-1",
+        state: "open",
         owner: "nobody",
         repo: "no-repo",
         title: "NO ISSUE",
         links: [],
         labels: [],
         type: "issues",
+        assignees: [],
         url: "https://github.com/",
         user_id: "",
         added_on: "Mon, 1 Jan 1970 9:00:00 GMT",
@@ -64,9 +66,11 @@
     let deleting = $state(false);
     let showRuns = $state(false);
 
-    let resolvedRuns;
+    let resolvedRuns: {
+        [key: string]: TestRun,
+    };
 
-    const resolveRuns = async function(runs) {
+    const resolveRuns = async function(links: Link[]) {
         if (resolvedRuns) return resolvedRuns;
         let response = await fetch("/api/v1/get_runs_by_test_id_run_id",
             {
@@ -74,7 +78,7 @@
                 headers: {
                     "Content-Type": "application/json",
                 },
-                body: JSON.stringify(runs.map(v => [v.test_id, v.run_id]))
+                body: JSON.stringify(links.map(v => [v.test_id, v.run_id]))
             }
         );
 
@@ -86,7 +90,7 @@
         return data.response.runs;
     };
 
-    const resolveFirstUserForAggregation = function(issue) {
+    const resolveFirstUserForAggregation = function(issue: GithubSubtype) {
         if (!issue.links) return {
             id: issue.user_id,
             date: issue.added_on,
@@ -129,10 +133,10 @@
                 throw apiJson;
             }
         } catch (error) {
-            if (error?.status === "error") {
+            if ((error as {status: string, response: { arguments: string[] }})?.status === "error") {
                 sendMessage(
                     "error",
-                    `Unable to delete an issue.\nAPI Response: ${error.response.arguments[0]}`,
+                    `Unable to delete an issue.\nAPI Response: ${(error as {status: string, response: { arguments: string[] }}).response.arguments[0]}`,
                     "GithubIssue::delete"
                 );
             } else {
@@ -182,7 +186,7 @@
                         class="text-muted d-flex align-items-center"
                         title={new Date(issue.added_on).toISOString()}
                     >
-                        <div>Added by <span class="fw-bold">@{users?.[resolveFirstUserForAggregation(issue).id]?.username ?? "ghost"}</span> on {timestampToISODate(new Date(resolveFirstUserForAggregation(issue).date))}</div>
+                        <div>Added by <span class="fw-bold">@{ getUser(resolveFirstUserForAggregation(issue).id, users).username }</span> on {timestampToISODate(new Date(resolveFirstUserForAggregation(issue).date))}</div>
                         {#if deleteEnabled && !aggregated}
                             <div class="ms-2 text-muted">
                                 {#if deleting}
@@ -190,6 +194,7 @@
                                     class="btn btn-sm btn-danger"
                                     title="Please wait"
                                     type="button"
+                                    aria-label="progress spinner"
                                 >
                                     <span class="spinner-border spinner-border-sm"></span>
                                 </button>
@@ -233,7 +238,7 @@
                             onclick={() => {
                                 showRuns = false;
                             }}
-                        ></button>
+                        >X</button>
                     </div>
                 </div>
                 <div>