Skip to content

[BUGFIX] migration of datasource selector when it's a datasource var ref #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
celian-garcia wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[BUGFIX] migration of datasource selector when it's a datasource var ref #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions prometheus/schemas/prometheus-time-series-query/migrate/migrate.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

package migrate

import "github.com/perses/shared/cue/common"

#target: {
datasource?: {
type?: "prometheus"
Expand All @@ -31,9 +33,14 @@ package migrate
kind: "PrometheusTimeSeriesQuery"
spec: {
if #target.datasource != _|_ {
datasource: {
kind: "PrometheusDatasource"
name: #target.datasource.uid
if #target.datasource.uid =~ common.#variableSyntaxRegex {
datasource: #target.datasource.uid
}
if #target.datasource.uid !~ common.#variableSyntaxRegex {
datasource: {
kind: "PrometheusDatasource"
name: #target.datasource.uid
}
}
}
query: #target.expr
Expand Down
5 changes: 1 addition & 4 deletions prometheus/schemas/prometheus-time-series-query/migrate/tests/legend-format/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"kind": "PrometheusTimeSeriesQuery",
"spec": {
"datasource": {
"kind": "PrometheusDatasource",
"name": "${datasource}"
},
"datasource": "${datasource}",
"minStep": "",
"query": "avg without (instance) (hadoop_hdfs_datanode_capacity{bar_stack_id=\"$bar_stack_id\", _target=~\"$datanode\"})",
"seriesNameFormat": "{{_target}}"
Expand Down
2 changes: 0 additions & 2 deletions prometheus/schemas/prometheus-time-series-query/query.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,3 @@ spec: close({
minStep?: =~ds.#durationRegex | =~common.#variableSyntaxRegex
resolution?: number
})

#variableSyntaxRegex: "^\\$\\w+$"
Loading