From 23c06cfce92c3cb318ade8642230553c7b5ddbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Thu, 7 Jul 2022 13:19:08 +0100 Subject: [PATCH 01/13] FB --- ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci.yml b/ci.yml index e69de29bb2d1..8cf916b4e160 100644 --- a/ci.yml +++ b/ci.yml @@ -0,0 +1,7 @@ +deps: + - name: grafana + branch: PMM-10091-g9-unified-alerting + - name: pmm + branch: alerting-poc + - name: pmm-managed + branch: alerting-poc From b501ba69ec4074d3eb2bb89f687efc863b3d321c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Thu, 7 Jul 2022 15:00:27 +0100 Subject: [PATCH 02/13] uncheck deps temporarily --- ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.py b/ci.py index 8313529f4364..6bfbf5c915e6 100644 --- a/ci.py +++ b/ci.py @@ -317,7 +317,7 @@ def main(): builder.create_fb_branch(args.prepare, args.global_repo) sys.exit(0) - builder.check_deps() + # builder.check_deps() builder.get_deps() From c36941184f42cbc9fe50b491b33e1cb36da57fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Thu, 7 Jul 2022 16:00:26 +0100 Subject: [PATCH 03/13] FB --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 8cf916b4e160..211fb910ed09 100644 --- a/ci.yml +++ b/ci.yml @@ -2,6 +2,6 @@ deps: - name: grafana branch: PMM-10091-g9-unified-alerting - name: pmm - branch: alerting-poc + branch: alerting-poc-fabio-g9 - name: pmm-managed branch: alerting-poc From a9a2ea1304fe841b9e918c2a2f1b58c8b59ea5a5 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Thu, 14 Jul 2022 19:05:13 +0200 Subject: [PATCH 04/13] Update FB --- ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci.yml b/ci.yml index 211fb910ed09..9d0b7e5daad6 100644 --- a/ci.yml +++ b/ci.yml @@ -2,6 +2,4 @@ deps: - name: grafana branch: PMM-10091-g9-unified-alerting - name: pmm - branch: alerting-poc-fabio-g9 - - name: pmm-managed branch: alerting-poc From f191953b6632e63682aa5d0af1d675d191ab36e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Wed, 27 Jul 2022 12:32:55 +0100 Subject: [PATCH 05/13] FB --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 9d0b7e5daad6..1b2ef8ac5ab0 100644 --- a/ci.yml +++ b/ci.yml @@ -1,5 +1,5 @@ deps: - name: grafana - branch: PMM-10091-g9-unified-alerting + branch: PMM-10344-g9-unified-alerting - name: pmm branch: alerting-poc From 7ea7c3546a20ff4fdbf07c832d674ca536ed7b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Wed, 27 Jul 2022 13:31:44 +0100 Subject: [PATCH 06/13] FB --- ci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.py b/ci.py index 6bfbf5c915e6..8313529f4364 100644 --- a/ci.py +++ b/ci.py @@ -317,7 +317,7 @@ def main(): builder.create_fb_branch(args.prepare, args.global_repo) sys.exit(0) - # builder.check_deps() + builder.check_deps() builder.get_deps() From dbd5144acaec52cb6cc4547fc4a5586a27eebbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Thu, 18 Aug 2022 00:01:22 +0100 Subject: [PATCH 07/13] add pmm-update --- ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci.yml b/ci.yml index 1b2ef8ac5ab0..be90c672dc23 100644 --- a/ci.yml +++ b/ci.yml @@ -3,3 +3,5 @@ deps: branch: PMM-10344-g9-unified-alerting - name: pmm branch: alerting-poc + - name: pmm-update + branch: grafana-9 From 508253139502090319d88f1bf5afdc3c792c31ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Fri, 26 Aug 2022 16:28:53 +0100 Subject: [PATCH 08/13] deps: grafana-dashboards --- ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci.yml b/ci.yml index be90c672dc23..87f3d55d2e2a 100644 --- a/ci.yml +++ b/ci.yml @@ -5,3 +5,5 @@ deps: branch: alerting-poc - name: pmm-update branch: grafana-9 + - name: grafana-dashboards + branch: grafana-9 From 7e6b4bfdffc23769c0b4044fc9698934d6a8024e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Sun, 28 Aug 2022 12:39:24 +0100 Subject: [PATCH 09/13] deps: no grafana-dashboards --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 87f3d55d2e2a..32dc009e5623 100644 --- a/ci.yml +++ b/ci.yml @@ -2,7 +2,7 @@ deps: - name: grafana branch: PMM-10344-g9-unified-alerting - name: pmm - branch: alerting-poc + branch: no-grafana-dashboards - name: pmm-update branch: grafana-9 - name: grafana-dashboards From 638926991846e609af9fa6aeee8d287d2ed9c85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Mon, 29 Aug 2022 00:27:02 +0100 Subject: [PATCH 10/13] deps: back to alerting poc --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 32dc009e5623..87f3d55d2e2a 100644 --- a/ci.yml +++ b/ci.yml @@ -2,7 +2,7 @@ deps: - name: grafana branch: PMM-10344-g9-unified-alerting - name: pmm - branch: no-grafana-dashboards + branch: alerting-poc - name: pmm-update branch: grafana-9 - name: grafana-dashboards From 9a3988de8b1e1bacb58dfffd963f264779b4421f Mon Sep 17 00:00:00 2001 From: Vasyl Yurkovych <59879559+yurkovychv@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:00:36 +0300 Subject: [PATCH 11/13] Update ci.yml --- ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci.yml b/ci.yml index 87f3d55d2e2a..3c525c530fbd 100644 --- a/ci.yml +++ b/ci.yml @@ -7,3 +7,5 @@ deps: branch: grafana-9 - name: grafana-dashboards branch: grafana-9 + - name: pmm-ui-tests + branch: PMM-10622-grafana-9 From 70cf9adaefb22c8b18b79a6103574274d15ab862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Thu, 1 Sep 2022 17:03:42 +0100 Subject: [PATCH 12/13] deps: new alerting --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 3c525c530fbd..a19460811b31 100644 --- a/ci.yml +++ b/ci.yml @@ -2,7 +2,7 @@ deps: - name: grafana branch: PMM-10344-g9-unified-alerting - name: pmm - branch: alerting-poc + branch: PMM-10452-alerting - name: pmm-update branch: grafana-9 - name: grafana-dashboards From 8efdb98e2f901b1ee01a01153685c446a45cf6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Silva?= Date: Mon, 5 Sep 2022 10:28:29 +0100 Subject: [PATCH 13/13] FB --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index a19460811b31..697831e6effc 100644 --- a/ci.yml +++ b/ci.yml @@ -6,6 +6,6 @@ deps: - name: pmm-update branch: grafana-9 - name: grafana-dashboards - branch: grafana-9 + branch: fix-tooltip - name: pmm-ui-tests branch: PMM-10622-grafana-9