Skip to content

Commit a677176

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/opengemini-plugin
2 parents e746551 + 5b1f96f commit a677176

108 files changed

Lines changed: 1864 additions & 626 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ dist/
2222

2323
# external CUE dependencies
2424
/*/cue.mod/pkg/
25+
26+
# ignore shared package links
27+
.plugins-shared-link-bk.json
28+
.plugins-shared-link-lock-bk.json

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.14.0
1+
v22.14.0

barchart/cue.mod/module.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source: {
77
}
88
deps: {
99
"github.com/perses/shared/cue@v0": {
10-
v: "v0.53.0-rc.1"
10+
v: "v0.53.0-rc.2"
1111
default: true
1212
}
1313
}

barchart/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"@emotion/react": "^11.7.1",
2828
"@emotion/styled": "^11.6.0",
2929
"@hookform/resolvers": "^3.2.0",
30-
"@perses-dev/components": "^0.53.0-rc.1",
31-
"@perses-dev/core": "^0.53.0-beta.4",
32-
"@perses-dev/plugin-system": "^0.53.0-rc.1",
30+
"@perses-dev/components": "^0.53.0-rc.2",
31+
"@perses-dev/core": "^0.53.0-rc.0",
32+
"@perses-dev/plugin-system": "^0.53.0-rc.2",
3333
"date-fns": "^4.1.0",
3434
"date-fns-tz": "^3.2.0",
3535
"echarts": "5.5.0",

clickhouse/cue.mod/module.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source: {
77
}
88
deps: {
99
"github.com/perses/shared/cue@v0": {
10-
v: "v0.53.0-rc.1"
10+
v: "v0.53.0-rc.2"
1111
default: true
1212
}
1313
}

clickhouse/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"@emotion/react": "^11.7.1",
1919
"@emotion/styled": "^11.6.0",
2020
"@hookform/resolvers": "^3.2.0",
21-
"@perses-dev/components": "^0.53.0-rc.1",
22-
"@perses-dev/core": "^0.53.0-beta.4",
23-
"@perses-dev/dashboards": "^0.53.0-rc.1",
24-
"@perses-dev/explore": "^0.53.0-rc.1",
25-
"@perses-dev/plugin-system": "^0.53.0-rc.1",
21+
"@perses-dev/components": "^0.53.0-rc.2",
22+
"@perses-dev/core": "^0.53.0-rc.0",
23+
"@perses-dev/dashboards": "^0.53.0-rc.2",
24+
"@perses-dev/explore": "^0.53.0-rc.2",
25+
"@perses-dev/plugin-system": "^0.53.0-rc.2",
2626
"@tanstack/react-query": "^4.39.1",
2727
"date-fns": "^4.1.0",
2828
"date-fns-tz": "^3.2.0",

clickhouse/schemas/datasources/click-house-datasource/click-house-datasource.cue

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ import (
1818
commonProxy "github.com/perses/shared/cue/common/proxy"
1919
)
2020

21-
kind: "ClickHouseDatasource"
22-
spec: {
23-
#directUrl | #proxy
24-
}
21+
#kind: "ClickHouseDatasource"
2522

26-
#directUrl: {
27-
directUrl: common.#url
23+
kind: #kind
24+
spec: {
25+
commonProxy.#baseHTTPDatasourceSpec
2826
}
2927

30-
#proxy: {
31-
proxy: commonProxy.#HTTPProxy
32-
}
28+
#selector: common.#datasourceSelector & { _kind: #kind }

clickhouse/schemas/queries/click-house-log-query/query.cue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ package model
1515

1616
import (
1717
"strings"
18+
ds "github.com/perses/plugins/clickhouse/schemas/datasources/click-house-datasource:model"
1819
)
1920

2021
kind: "ClickHouseLogQuery"
2122
spec: close({
22-
datasource?: {
23-
kind: "ClickHouseDatasource"
24-
}
25-
query: strings.MinRunes(1)
23+
ds.#selector
24+
query: strings.MinRunes(1)
2625
})

clickhouse/schemas/queries/click-house-time-series-query/query.cue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ package model
1515

1616
import (
1717
"strings"
18+
ds "github.com/perses/plugins/clickhouse/schemas/datasources/click-house-datasource:model"
1819
)
1920

2021
kind: "ClickHouseTimeSeriesQuery"
2122
spec: close({
22-
datasource?: {
23-
kind: "ClickHouseDatasource"
24-
}
25-
query: strings.MinRunes(1)
23+
ds.#selector
24+
query: strings.MinRunes(1)
2625
})

datasourcevariable/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"@emotion/react": "^11.7.1",
2828
"@emotion/styled": "^11.6.0",
2929
"@hookform/resolvers": "^3.2.0",
30-
"@perses-dev/components": "^0.53.0-rc.1",
31-
"@perses-dev/core": "^0.53.0-beta.4",
32-
"@perses-dev/plugin-system": "^0.53.0-rc.1",
30+
"@perses-dev/components": "^0.53.0-rc.2",
31+
"@perses-dev/core": "^0.53.0-rc.0",
32+
"@perses-dev/plugin-system": "^0.53.0-rc.2",
3333
"date-fns": "^4.1.0",
3434
"date-fns-tz": "^3.2.0",
3535
"echarts": "5.5.0",

0 commit comments

Comments
 (0)