From 6ed96bb07236994991ab62384566307ccb9f24fb Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 01:34:24 +0100 Subject: [PATCH 1/7] Use `--concurrency=1` as default value --- CHANGES.rst | 1 + grafana_wtf/commands.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index c578f91..8689a7e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ grafana-wtf changelog in progress =========== +- Started using ``--concurrency=1`` as default value. Thank you, @IgorOhrimenko. 2025-12-03 0.23.4 ================= diff --git a/grafana_wtf/commands.py b/grafana_wtf/commands.py index d2c04cf..5c895c7 100644 --- a/grafana_wtf/commands.py +++ b/grafana_wtf/commands.py @@ -53,7 +53,7 @@ def run(): --format= Output format. One of textual, tabular, json, yaml. --cache-ttl= Time-to-live for the request cache in seconds. [default: 3600] --drop-cache Drop cache before requesting resources - --concurrency= Run multiple requests in parallel. [default: 0] + --concurrency= Run multiple requests in parallel. [default: 1] --dry-run Dry-run mode for the `replace` subcommand. --verbose Enable verbose mode --version Show version information From 73ae808be74a1425caa8d9a4fd4e34aa58d2822a Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 01:34:44 +0100 Subject: [PATCH 2/7] Improve fetch_dashboard vs. fetch_dashboards --- grafana_wtf/core.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index a666d30..03640df 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -252,7 +252,8 @@ def handle_grafana_error(self, ex): def fetch_dashboard(self, dashboard_info): log.debug(f'Fetching dashboard "{dashboard_info["title"]}" ({dashboard_info["uid"]})') dashboard = self.grafana.dashboard.get_dashboard(dashboard_info["uid"]) - self.data.dashboards.append(dashboard) + if dashboard_info.get("type") != "dash-folder": + self.data.dashboards.append(dashboard) if self.taqadum is not None: self.taqadum.update(1) @@ -260,8 +261,6 @@ def fetch_dashboards(self): log.info("Fetching dashboards one by one") results = self.data.dashboard_list for dashboard_info in results: - if dashboard_info.get("type") == "dash-folder": - continue self.fetch_dashboard(dashboard_info) def fetch_dashboards_parallel(self): From d837cd51282ebc7418ebbd24a3d31d7f31e6c64b Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 02:02:37 +0100 Subject: [PATCH 3/7] Use `GrafanaEngine.concurrency = 0` as default --- grafana_wtf/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index 03640df..5778c1a 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -50,7 +50,7 @@ def __init__(self, grafana_url, grafana_token=None): self.grafana_url = grafana_url self.grafana_token = grafana_token - self.concurrency = 5 + self.concurrency = 0 self.grafana = self.grafana_client_factory( self.grafana_url, grafana_token=self.grafana_token From d06200bef10d0a135cc7731709d3429687108ba8 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 02:03:04 +0100 Subject: [PATCH 4/7] Set `concurrency = 0` if user selects `concurrency = 1` --- grafana_wtf/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index 5778c1a..eedeb60 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -95,7 +95,9 @@ def clear_cache(self): log.info("Clearing cache") requests_cache.clear() - def enable_concurrency(self, concurrency): + def enable_concurrency(self, concurrency: int): + if concurrency == 1: + concurrency = 0 self.concurrency = concurrency @classmethod From dfdea75a3f27acc1bfd4aee338870348ef10843e Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 02:11:35 +0100 Subject: [PATCH 5/7] Revert "Improve fetch_dashboard vs. fetch_dashboards" This reverts commit 73ae808be74a1425caa8d9a4fd4e34aa58d2822a. --- grafana_wtf/core.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index eedeb60..f54bc86 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -254,8 +254,7 @@ def handle_grafana_error(self, ex): def fetch_dashboard(self, dashboard_info): log.debug(f'Fetching dashboard "{dashboard_info["title"]}" ({dashboard_info["uid"]})') dashboard = self.grafana.dashboard.get_dashboard(dashboard_info["uid"]) - if dashboard_info.get("type") != "dash-folder": - self.data.dashboards.append(dashboard) + self.data.dashboards.append(dashboard) if self.taqadum is not None: self.taqadum.update(1) @@ -263,6 +262,8 @@ def fetch_dashboards(self): log.info("Fetching dashboards one by one") results = self.data.dashboard_list for dashboard_info in results: + if dashboard_info.get("type") == "dash-folder": + continue self.fetch_dashboard(dashboard_info) def fetch_dashboards_parallel(self): From 89d90e64060d44249c1cf237527787d1e9de0440 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 02:14:25 +0100 Subject: [PATCH 6/7] Revert "Use `--concurrency=1` as default value" This reverts commit 6ed96bb07236994991ab62384566307ccb9f24fb. --- CHANGES.rst | 1 - grafana_wtf/commands.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8689a7e..c578f91 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,6 @@ grafana-wtf changelog in progress =========== -- Started using ``--concurrency=1`` as default value. Thank you, @IgorOhrimenko. 2025-12-03 0.23.4 ================= diff --git a/grafana_wtf/commands.py b/grafana_wtf/commands.py index 5c895c7..d2c04cf 100644 --- a/grafana_wtf/commands.py +++ b/grafana_wtf/commands.py @@ -53,7 +53,7 @@ def run(): --format= Output format. One of textual, tabular, json, yaml. --cache-ttl= Time-to-live for the request cache in seconds. [default: 3600] --drop-cache Drop cache before requesting resources - --concurrency= Run multiple requests in parallel. [default: 1] + --concurrency= Run multiple requests in parallel. [default: 0] --dry-run Dry-run mode for the `replace` subcommand. --verbose Enable verbose mode --version Show version information From 28cf63ef01c652c1e8755b730a8435a692ebca09 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 5 Dec 2025 02:15:04 +0100 Subject: [PATCH 7/7] Update changelog --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index c578f91..91ca480 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,7 @@ grafana-wtf changelog in progress =========== +- Masked problematic ``--concurrency=1`` setting 2025-12-03 0.23.4 =================