Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cfc97c0d
Commit
cfc97c0d
authored
Jun 05, 2020
by
Kirstie Cook
Committed by
Oswaldo Ferreira
Jun 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add templating and links keys to json schema
Add templating and links keys to dashboard fixture
parent
46f5d7e4
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
65 additions
and
2 deletions
+65
-2
doc/user/project/integrations/prometheus.md
doc/user/project/integrations/prometheus.md
+1
-1
spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
...ixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
+13
-0
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
...tures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
+3
-1
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
.../fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
+9
-0
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
...ures/lib/gitlab/metrics/dashboard/schemas/templating.json
+8
-0
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
.../metrics/dashboard/schemas/text_variable_full_syntax.json
+12
-0
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
...tlab/metrics/dashboard/schemas/text_variable_options.json
+7
-0
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
...tures/lib/gitlab/metrics/dashboard/schemas/variables.json
+12
-0
No files found.
doc/user/project/integrations/prometheus.md
View file @
cfc97c0d
...
@@ -385,7 +385,7 @@ The following tables outline the details of expected properties.
...
@@ -385,7 +385,7 @@ The following tables outline the details of expected properties.
| Property | Type | Required | Description |
| Property | Type | Required | Description |
| -------- | ---- | -------- | ----------- |
| -------- | ---- | -------- | ----------- |
|
`variables`
| hash |
no
| Variables can be defined here. |
|
`variables`
| hash |
yes
| Variables can be defined here. |
Read the documentation on
[
templating
](
#templating-variables-for-metrics-dashboards
)
.
Read the documentation on
[
templating
](
#templating-variables-for-metrics-dashboards
)
.
...
...
spec/fixtures/lib/gitlab/metrics/dashboard/sample_dashboard.yml
View file @
cfc97c0d
dashboard
:
'
Test
Dashboard'
dashboard
:
'
Test
Dashboard'
priority
:
1
priority
:
1
links
:
-
title
:
Link
1
url
:
https://gitlab.com
-
title
:
Link
2
url
:
https://docs.gitlab.com
templating
:
variables
:
text_variable_full_syntax
:
label
:
'
Variable
1'
type
:
text
options
:
default_value
:
'
default'
text_variable_simple_syntax
:
'
default
value'
panel_groups
:
panel_groups
:
-
group
:
Group A
-
group
:
Group A
priority
:
1
priority
:
1
...
...
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
View file @
cfc97c0d
...
@@ -11,7 +11,9 @@
...
@@ -11,7 +11,9 @@
"panel_groups"
:
{
"panel_groups"
:
{
"type"
:
"array"
,
"type"
:
"array"
,
"items"
:
{
"$ref"
:
"spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json"
}
"items"
:
{
"$ref"
:
"spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json"
}
}
},
"templating"
:
{
"$ref"
:
"spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json"
},
"links"
:
{
"$ref"
:
"spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json"
}
},
},
"additionalProperties"
:
false
"additionalProperties"
:
false
}
}
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json
0 → 100644
View file @
cfc97c0d
{
"type"
:
"array"
,
"required"
:
[
"url"
],
"properties"
:
{
"url"
:
{
"type"
:
"string"
},
"title"
:
{
"type"
:
"string"
}
},
"additionalProperties"
:
false
}
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
0 → 100644
View file @
cfc97c0d
{
"type"
:
"object"
,
"required"
:
[
"variables"
],
"properties"
:
{
"variables"
:
{
"$ref"
:
"variables.json"
}
},
"additionalProperties"
:
false
}
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
0 → 100644
View file @
cfc97c0d
{
"type"
:
"object"
,
"required"
:
[
"type"
,
"options"
],
"properties"
:
{
"type"
:
{
"type"
:
"string"
},
"label"
:
{
"type"
:
"string"
},
"options"
:
{
"$ref"
:
"text_variable_options.json"
}
},
"additionalProperties"
:
false
}
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json
0 → 100644
View file @
cfc97c0d
{
"type"
:
"object"
,
"properties"
:
{
"default_value"
:
{
"type"
:
"string"
}
},
"additionalProperties"
:
false
}
spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
0 → 100644
View file @
cfc97c0d
{
"type"
:
"object"
,
"patternProperties"
:
{
"^[a-zA-Z0-9_]*$"
:
{
"anyOf"
:
[
{
"$ref"
:
"text_variable_full_syntax.json"
},
{
"type"
:
"string"
}
]
}
},
"additionalProperties"
:
false
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment