diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/fixtures/lib/gitlab/metrics/dashboard/schemas | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
| download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/fixtures/lib/gitlab/metrics/dashboard/schemas')
3 files changed, 2 insertions, 4 deletions
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json index 038f5ac5d4e..b23b0ea15d2 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json @@ -10,8 +10,8 @@ ], "properties": { "id": { "type": "string" }, - "query_range": { "type": "string" }, - "query": { "type": "string" }, + "query_range": { "type": ["string", "number"] }, + "query": { "type": ["string", "number"] }, "unit": { "type": "string" }, "label": { "type": "string" }, "track": { "type": "string" }, diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json index d16fcd40359..71c0981d9ec 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json @@ -6,7 +6,6 @@ ], "properties": { "group": { "type": "string" }, - "priority": { "type": "number" }, "panels": { "type": "array", "items": { "$ref": "panels.json" } diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json index 20595cc0d73..b4809a85101 100644 --- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json +++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json @@ -12,7 +12,6 @@ "y_label": { "type": "string" }, "y_axis": { "$ref": "axis.json" }, "max_value": { "type": "number" }, - "weight": { "type": "number" }, "metrics": { "type": "array", "items": { "$ref": "metrics.json" } |