From d543bb242f0d459c19726290bf426f6c627aced3 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 15 Jun 2022 12:13:14 +0300 Subject: [PATCH] Grafana 9: Sync `release-v9.0.0` branch to `v9.0.x` (#50844) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Docs: Manual backport of alert list panel docs rewrite (#50512) * Updating migration docs to include most relevant breaking changes (#50356) (#50515) (cherry picked from commit cd01eb541a83fc0a1f222dbb917ff1dc25c44c46) Co-authored-by: Timur Olzhabayev * ReleaseNotes: Updated changelog and release notes for 9.0.0-beta2 (#50398) (#50521) Co-authored-by: Timur Olzhabayev (cherry picked from commit a6943cb399afeaac74be81269c1716e0952eb114) * Alerting: Fix force_migration when alerting is disabled (#50431) (#50481) (#50565) This pull request fixes a bug where force_migration must be set to true when both unified and legacy alerting is disabled. (cherry picked from commit c312188cb21a8c9043a27eaddae61742c7f6a705) * [release-v9.0.0] Grafana UI: Fix nonexistent indexof module for plugin tests (#50573) * Grafana UI: Fix nonexistent indexof module for plugin tests (#50529) * fix(grafana-ui): prevent module resolution failure where component-indexof appears as indexof * chore(grafana-ui): update comment explaining need for alias plugin (cherry picked from commit 6a4906ef7eedee975a1a928e2284a981dff77ef0) * chore: refresh yarn.lock Co-authored-by: Jack Westbrook * [release-v9.0.0] Grafana UI: Put back production build in rollup config (#50581) * Grafana UI: Put back production build in rollup config (#50575) (cherry picked from commit 2d1ab276360133233eb47b7e0590ba26d9c31933) * chore: refresh yarn.lock Co-authored-by: Jack Westbrook * [release-v9.0.0] Alerting: use "find" to wait for expression editor to load (#50604) Co-authored-by: Gilles De Mey * Docs: Backport 49739 to v9.0.x (#50123) (#50614) Signed-off-by: Jack Baldry Signed-off-by: Jack Baldry (cherry picked from commit 49b20ad76c7081ab130f2c6d45d2a49803915281) Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Alerting: improve provisioning docs (#50347) (#50619) * Alerting: improve provisioning docs * add new provisioning page * add api docs * fix formatting and add better descriptions * fix typo (cherry picked from commit 862f51216b402de1ecd72dac03c2a53e75654bd8) Co-authored-by: Jean-Philippe Quéméner * Backport docs changes for Grafana Alerting (#50620) * doc fix (#50624) (#50627) (cherry picked from commit 336c9fd5131be531dcfa53ad09349e088e30cdc2) Co-authored-by: Ieva * RBAC: Inheritance permission migration should handle empty managed roles (#50611) (#50622) * Make inheritance permission migration more robust * Better fix * Add more tests to the migration * Add removed test case * Add test case for empty role in empty org * Handling the role.ID 0 case with a log Co-authored-by: Jguer Co-authored-by: Jguer (cherry picked from commit 307a0d4538584dc6357964da4d2a2b1ab574f4e0) Co-authored-by: Gabriel MABILLE * "Release: Updated versions in package to 9.0.0" (#369) Co-authored-by: Gilles De Mey Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: Timur Olzhabayev Co-authored-by: Jack Westbrook Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Jean-Philippe Quéméner Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com> Co-authored-by: Ieva Co-authored-by: Gabriel MABILLE --- pkg/services/ngalert/api/tooling/post.json | 5 ++--- pkg/services/ngalert/api/tooling/spec.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json index d539a8486db..e15573d1d96 100644 --- a/pkg/services/ngalert/api/tooling/post.json +++ b/pkg/services/ngalert/api/tooling/post.json @@ -3650,12 +3650,11 @@ "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" }, "gettableSilences": { + "description": "GettableSilences gettable silences", "items": { "$ref": "#/definitions/gettableSilence" }, - "type": "array", - "x-go-name": "GettableSilences", - "x-go-package": "github.com/prometheus/alertmanager/api/v2/models" + "type": "array" }, "labelSet": { "additionalProperties": { diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json index ddeefda9cb3..16e5c821136 100644 --- a/pkg/services/ngalert/api/tooling/spec.json +++ b/pkg/services/ngalert/api/tooling/spec.json @@ -6010,12 +6010,11 @@ "$ref": "#/definitions/gettableSilence" }, "gettableSilences": { + "description": "GettableSilences gettable silences", "type": "array", "items": { "$ref": "#/definitions/gettableSilence" }, - "x-go-name": "GettableSilences", - "x-go-package": "github.com/prometheus/alertmanager/api/v2/models", "$ref": "#/definitions/gettableSilences" }, "labelSet": {