Skip to content

Commit bd0ac28

Browse files
committed
PMM-14072 Upgrade plugins
1 parent dff2218 commit bd0ac28

Some content is hidden

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

86 files changed

+598
-967
lines changed

panels/grafana-clickhouse-datasource/CHANGELOG.md

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,84 @@
11
# Changelog
22

3+
# 4.9.0
4+
5+
### Features
6+
7+
- Add support for the Grafana `row_limit` [configuration setting](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#row_limit).
8+
- Add support for kind, status, instrumentation library, links, events and state data for traces (#1043, #1208)
9+
- Cancel JSON paths query after 10s (#1206)
10+
- SQL Editor now suggests database, table, column, and function names while typing (#1204)
11+
- Add SQL Formatter button + shortcut for making long queries more readable in the editor (#1205)
12+
13+
### Fixes
14+
15+
- Fixed "run query" shortcut from running stale query (#1205)
16+
- Dependency updates
17+
18+
## 4.8.2
19+
20+
### Fixes
21+
22+
- Dependency updates
23+
24+
## 4.8.1
25+
26+
### Fixes
27+
28+
- Dependency updates
29+
30+
## 4.8.0
31+
32+
### Features
33+
34+
- Enable CtrlCmd + Enter keyboard shortcut to Run Query (#1158)
35+
36+
### Fixes
37+
38+
- Refactor `MutateResponse` function and PDC dialler creation (#1155)
39+
- Refactor `clickhouse.Connect` to improve context cancellation handling (#1154)
40+
- Prevent usage of failed connections and improve connection management (#1156). Please note that following this change, the following limits will be set. Although we believe these limits are reasonable, you can adjust them in the datasource settings if needed:
41+
- `MaxOpenConns` to 50.
42+
- `MaxIdleConns` to 25.
43+
- `ConnMaxLifetime` to 5 minutes.
44+
- Dependency updates
45+
46+
## 4.7.0
47+
48+
### Features
49+
50+
- Add JSON column sub-paths to column selection in query builder
51+
- Added events support in trace detail view.(https://github.com/grafana/clickhouse-datasource/pull/1128)
52+
53+
## 4.6.0
54+
55+
### Features
56+
57+
- Add support for new Variant, Dynamic, and JSON types (https://github.com/grafana/clickhouse-datasource/pull/1108)
58+
59+
### Fixes
60+
61+
- Optimized performance for log volumes processing using ClickHouse `multiSearchAny`
62+
63+
## 4.5.1
64+
65+
### Fixes
66+
67+
- Dependency updates
68+
69+
## 4.5.0
70+
71+
### Features
72+
73+
- Implemented log context for log queries
74+
- Added configuration options for log context columns
75+
- Queries parsed from the SQL editor will now attempt to re-map columns into their correct fields for Log and Trace queries.
76+
- Added support for IN operator in adhoc filters
77+
78+
### Fixes
79+
80+
- Fixed and enhanced the logic for parsing a query back into the query builder.
81+
382
## 4.4.0
483

584
### Features
@@ -105,7 +184,7 @@
105184
- Fixed empty builder options when switching from SQL Editor back to Query Editor
106185
- Fix SQL Generator including "undefined" in `FROM` when database isn't defined
107186
- Allow adding spaces in multi filters (such as `WHERE .. IN`)
108-
- Fixed missing `AND` keyword when adding a filter to a Trace ID query
187+
- Fixed missing `AND` keyword when adding a filter to a Trace ID query
109188

110189
## 4.0.2
111190

@@ -155,10 +234,12 @@ Version 4.0.0 contains major revisions to the query builder and datasource confi
155234
- Added column hints, which offers better linking across query components when working with columns and filters. For example, a filter can be added for the `Time` column, even without knowing what the time column name is yet. This enables better SQL generation that is "aware" of a column's intended use.
156235

157236
### Plugin Backend
237+
158238
- Added migration logic for `v3` configs going to `v4+`. This is applied when the config is loaded when building a database connection.
159239
- `$__timeFilter`, `$__fromTime`, and `$__toTime` macros now convert to `DateTime64(3)` for better server-side type conversion. Also enables millisecond precision time range filtering.
160240

161241
#### Datasource Configuration
242+
162243
- Added migration script for `v3.x` configurations to `v4+`. This runs automatically when opening/saving the datasource configuration.
163244
- Renamed config value `server` to `host`.
164245
- Renamed config value `timeout` to the more specific `dial_timeout`.
Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
2-
-----BEGIN PGP SIGNED MESSAGE-----
3-
Hash: SHA512
4-
5-
{
6-
"manifestVersion": "2.0.0",
7-
"signatureType": "grafana",
8-
"signedByOrg": "grafana",
9-
"signedByOrgName": "Grafana Labs",
10-
"plugin": "grafana-clickhouse-datasource",
11-
"version": "4.4.0",
12-
"time": 1726245931902,
13-
"keyId": "7e4d0c6a708866e7",
14-
"files": {
15-
"CHANGELOG.md": "580cccb7707725e8c059fa60952bb7ea40d36b3153ea56f8418afb9b24b84a02",
16-
"LICENSE": "cdd15e614b50e88443fe574ad56bde5ba697d958a45376431638eea816e3bfc3",
17-
"README.md": "01c2a56425fa4fb836dcb30b7575b0ed031be483567704025e160497e5002e24",
18-
"dashboards/cluster-analysis.json": "7f83d4d09cc6f045768f5bf47485b864dd6da03094f8607808dec77cb96902e5",
19-
"dashboards/data-analysis.json": "71695f08dfad47f3d4da4c2d331a09eb8fe5789520d5566fffeecd626079caa1",
20-
"dashboards/opentelemetry-clickhouse.json": "7000bb0d91bf0474eb5da966ee65fece8a591785e4a06f8dc7c4431fef35314a",
21-
"dashboards/query-analysis.json": "1b2006a3f4142e512e50156a7d2fd8cf03a178019aaccc964c0283c8559298b3",
22-
"dashboards/system-dashboards.json": "a47eb47b9cd0bea82a7276fc805bba214164e677f68fb1e821b0278b17bee7f0",
23-
"go_plugin_build_manifest": "7980a82c9b5646c237a4e240e3879ba6a836566b6dbe746cb68c907921188732",
24-
"gpx_clickhouse_linux_amd64": "1d34927dde5dfc3ee4e44e7d3060cdb0d4132b8770515d4a038a4cb77e991df3",
25-
"img/logo.svg": "838199055d86584ff105e5e91013203a6acb7d3f2061ae27678786125ab11f09",
26-
"module.js": "5479144fa6aa0d4254153c2e25568cd1bf11af7f91c4cbd308203a59f94e226c",
27-
"module.js.map": "545a409ec85976c4ab66dc479eecf3de821d606eaf6883cda43f932a9a95f024",
28-
"plugin.json": "c04b488966776c58a8deafbabc113acd44dc245035c9eaaf8776102019fca131"
29-
}
30-
}
31-
-----BEGIN PGP SIGNATURE-----
32-
Version: OpenPGP.js v4.10.11
33-
Comment: https://openpgpjs.org
34-
35-
wrkEARMKAAYFAmbkbCwAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
36-
cIhm55bwAgkAJRo3J8E0fgJhZDy4iWPdgdra/6ErAdqYc3YDTHEFCVWtU2j1
37-
WNGq5SMAvakm59R7aJmCP5I+9zowsEAi93NkKi0CCQCuNfkaaYqDZoP71gSd
38-
RkeAtao81WyrsKRx0SVho38UpQ+B2rEBfCpEtjinpgxuosQOcCaImJPGatnX
39-
bcT6fbtWZg==
40-
=9Dsz
41-
-----END PGP SIGNATURE-----
1+
2+
-----BEGIN PGP SIGNED MESSAGE-----
3+
Hash: SHA512
4+
5+
{
6+
"manifestVersion": "2.0.0",
7+
"signatureType": "grafana",
8+
"signedByOrg": "grafana",
9+
"signedByOrgName": "Grafana Labs",
10+
"plugin": "grafana-clickhouse-datasource",
11+
"version": "4.9.0",
12+
"time": 1747781385279,
13+
"keyId": "7e4d0c6a708866e7",
14+
"files": {
15+
"CHANGELOG.md": "40184efbe7e88642d1a5d4961cc6d1b6f64ee901e9e82f36284d565d51f992f5",
16+
"LICENSE": "cdd15e614b50e88443fe574ad56bde5ba697d958a45376431638eea816e3bfc3",
17+
"README.md": "01c2a56425fa4fb836dcb30b7575b0ed031be483567704025e160497e5002e24",
18+
"dashboards/cluster-analysis.json": "7f83d4d09cc6f045768f5bf47485b864dd6da03094f8607808dec77cb96902e5",
19+
"dashboards/data-analysis.json": "71695f08dfad47f3d4da4c2d331a09eb8fe5789520d5566fffeecd626079caa1",
20+
"dashboards/opentelemetry-clickhouse.json": "1a710a750988fdcd7d788e8aef001c1fb106e00253ea0208c2963d9a71d717e8",
21+
"dashboards/query-analysis.json": "1b2006a3f4142e512e50156a7d2fd8cf03a178019aaccc964c0283c8559298b3",
22+
"dashboards/system-dashboards.json": "a47eb47b9cd0bea82a7276fc805bba214164e677f68fb1e821b0278b17bee7f0",
23+
"go_plugin_build_manifest": "be4052736a10582b3645c669ad007537183f19418d688d71ce7f05df5f9c0532",
24+
"gpx_clickhouse_linux_amd64": "e1362dce555ab59a847b29dadc4a49ab3dcc60b3170e8e224149d2cc984ac95b",
25+
"img/logo.svg": "838199055d86584ff105e5e91013203a6acb7d3f2061ae27678786125ab11f09",
26+
"module.js": "41182baf4a92a2a9628892546d9d022cae0c35b9252e43f07bd0a8e6de9bd63b",
27+
"module.js.map": "bc5bcfff53cecd22e6a7157d3e46c1ee49e3f4620194cd819a08ff0ef7aba031",
28+
"plugin.json": "e585ce369c4c76ce8562687ed88e22d8a89410a5f858e5d329363025023d61b2"
29+
}
30+
}
31+
-----BEGIN PGP SIGNATURE-----
32+
Version: OpenPGP.js v4.10.11
33+
Comment: https://openpgpjs.org
34+
35+
wrkEARMKAAYFAmgtBwkAIQkQfk0ManCIZucWIQTzOyW2kQdOhGNlcPN+TQxq
36+
cIhm50XFAgkAJYOgIYv0j6zNnW9T9xYvHS7QOBBHqaoKIRab7w1R/3qRD59G
37+
MMm8Ot262ukOUp9glAuIxtCUuDaaLKQrXcnqTBoCCQFYdsD+yznOIGmzxdf6
38+
QS+fVJ/DIr3C+nBslcMRChHSFM4kBEVk8smw3+uUHriezTVj3obuXczC8z7H
39+
YIqx4v0UJg==
40+
=lZ+p
41+
-----END PGP SIGNATURE-----

panels/grafana-clickhouse-datasource/dashboards/opentelemetry-clickhouse.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@
806806
},
807807
"pluginVersion": "4.0.6",
808808
"queryType": "traces",
809-
"rawSql": "WITH '${trace_id}' as trace_id, (SELECT min(Start) FROM \"default\".\"otel_traces_trace_id_ts\" WHERE TraceId = trace_id) as trace_start, (SELECT max(End) + 1 FROM \"default\".\"otel_traces_trace_id_ts\" WHERE TraceId = trace_id) as trace_end SELECT \"TraceId\" as traceID, \"SpanId\" as spanID, \"ParentSpanId\" as parentSpanID, \"ServiceName\" as serviceName, \"SpanName\" as operationName, \"Timestamp\" as startTime, multiply(\"Duration\", 0.000001) as duration, arrayMap(key -> map('key', key, 'value',\"SpanAttributes\"[key]), mapKeys(\"SpanAttributes\")) as tags, arrayMap(key -> map('key', key, 'value',\"ResourceAttributes\"[key]), mapKeys(\"ResourceAttributes\")) as serviceTags FROM \"default\".\"otel_traces\" WHERE traceID = trace_id AND startTime >= trace_start AND startTime <= trace_end AND ( Timestamp >= $__fromTime AND Timestamp <= $__toTime ) AND ( Duration > 0 ) ORDER BY Timestamp DESC, Duration DESC LIMIT 1000",
809+
"rawSql": "WITH '${trace_id}' as trace_id, (SELECT min(Start) FROM \"otel_traces_trace_id_ts\" WHERE TraceId = trace_id) as trace_start, (SELECT max(End) + 1 FROM \"otel_traces_trace_id_ts\" WHERE TraceId = trace_id) as trace_end SELECT \"TraceId\" as traceID, \"SpanId\" as spanID, \"ParentSpanId\" as parentSpanID, \"ServiceName\" as serviceName, \"SpanName\" as operationName, \"Timestamp\" as startTime, multiply(\"Duration\", 0.000001) as duration, arrayMap(key -> map('key', key, 'value',\"SpanAttributes\"[key]), mapKeys(\"SpanAttributes\")) as tags, arrayMap(key -> map('key', key, 'value',\"ResourceAttributes\"[key]), mapKeys(\"ResourceAttributes\")) as serviceTags FROM \"otel_traces\" WHERE traceID = trace_id AND startTime >= trace_start AND startTime <= trace_end AND ( Timestamp >= $__fromTime AND Timestamp <= $__toTime ) AND ( Duration > 0 ) ORDER BY Timestamp DESC, Duration DESC LIMIT 1000",
810810
"refId": "A"
811811
}
812812
],
@@ -887,7 +887,7 @@
887887
"editorType": "builder",
888888
"format": 2,
889889
"pluginVersion": "4.0.6",
890-
"rawSql": "SELECT Timestamp as timestamp, Body as body, SeverityText as level FROM \"default\".\"otel_logs\" LIMIT 1000",
890+
"rawSql": "SELECT Timestamp as timestamp, Body as body, SeverityText as level FROM \"otel_logs\" LIMIT 1000",
891891
"refId": "A"
892892
}
893893
],
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
04707ad0a7f03cb6ab28466b82d791e7578c8d11274c4855d226acf11d5ecafb:Magefile.go
2-
633cead7326f37a33d950c6ed57bbc517125664069b6bd7679b56c524218f0a2:pkg/converters/converters.go
2+
7a274598c05dc66b69e58ca594882ece9aa6f33f8f00251599132ce8911dfc0b:pkg/converters/converters.go
33
a1c6a6171521d93dfc24353416a2bf90f3db3f51301888a18c98f950189f3e67:pkg/converters/converters_test.go
4-
847ff0c9fc6ff85d85c3997e1f48fbf922cae7143c56f2f6b8a42559f2919b5b:pkg/macros/macros.go
5-
3a39042ce625ec33b2003a162d57d5a86a21ae6445e66ffc33d518ac88fe0b51:pkg/macros/macros_test.go
4+
f18be511b4ee3b0decd135232e16a6c8960a387eb36622baf4a160fe8cc601b0:pkg/macros/macros.go
5+
f2df2e47c293763876937dd5ea1775dd00696eecb68d0b87769dc9f3290a6715:pkg/macros/macros_test.go
66
67ffdde8c54a45348f13695d4c8312f990549fd375665f3506361f14fb68c468:pkg/main.go
7-
ce3bd56371c3918a2f81e9f1fbb7357e3d8b9babc1691897e1912630852f263f:pkg/plugin/datasource.go
8-
465f9c7963d197f6f864fe107c33beef49d50cd41720c093a55805e19402d4a6:pkg/plugin/driver.go
9-
4e91d18deaf83fd5bc3617a185aa2fdecabb5b5427ff47fbd69098ebc24cdbe8:pkg/plugin/driver_test.go
7+
148912315b55ed9f2cdbd688d476d79c9dd23621cb92183674d5aadedfde616d:pkg/plugin/datasource.go
8+
c03fd6147247df27d461e0dd216be1bac123ed0d8bc90b6e15c6aaa496d7555a:pkg/plugin/driver.go
9+
beabfad747831df195665b6f17ec34649c1a606fac6f4b68c8845fb9e30af352:pkg/plugin/driver_test.go
1010
51ee8486dde6fea63e682154446cf3b47376d63b0d60eaadeb5823f792a07ce7:pkg/plugin/errors.go
11-
d0d5ece8062b1d1debeacae64fd68b69fbc9add3dd975f5f84db8ebfa0134613:pkg/plugin/settings.go
12-
699e8c9e73b4293d9b80be7013f336c855400c7b795cfb2d9f6c4c0804427b78:pkg/plugin/settings_test.go
11+
2d5c2b0e5d1f4a0b49133d27f30fd13742128e90d993ce93133689fb1cd12f59:pkg/plugin/settings.go
12+
464da1dc843ce2f11f7f6ced666ca2d06cfa004b69d8f50d5d9dfa3f38d9fe0b:pkg/plugin/settings_test.go
Binary file not shown.

panels/grafana-clickhouse-datasource/module.js

Lines changed: 55 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panels/grafana-clickhouse-datasource/module.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panels/grafana-clickhouse-datasource/plugin.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
"name": "Grafana Labs"
4343
},
4444
"build": {
45-
"time": 1726245921682,
45+
"time": 1747781376766,
4646
"repo": "https://github.com/grafana/clickhouse-datasource",
4747
"branch": "main",
48-
"hash": "7b50309aefba12ef9f2b980e2f9f255001b98db0",
49-
"build": 2383
48+
"hash": "065ad3486a6abd58e8bd43ba2ffe88c23f159036",
49+
"build": 2904
5050
},
5151
"description": "ClickHouse datasource plugin for Grafana",
5252
"keywords": [
@@ -67,8 +67,8 @@
6767
"small": "img/logo.svg"
6868
},
6969
"screenshots": [],
70-
"updated": "2024-09-13",
71-
"version": "4.4.0"
70+
"updated": "2025-05-20",
71+
"version": "4.9.0"
7272
},
7373
"logs": true,
7474
"metrics": true,

panels/grafana-polystat-panel/CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,55 @@
22

33
## Entries
44

5+
## v2.1.14
6+
7+
- Fix for auto-generation of composites. Depending on the format of metric names some groupings overlapped. This feature now requires an exact match instead of a wildcard.
8+
- Fixes [#425](https://github.com/grafana/grafana-polystat-panel/issues/425)
9+
- Fixes [[#426](https://github.com/grafana/grafana-polystat-panel/issues/426)]
10+
- Minimum version of Grafana is now v9.5 due to API changes
11+
12+
## v2.1.13
13+
14+
- Fix for id conflicts [#413](https://github.com/grafana/grafana-polystat-panel/pull/413)
15+
- Adds natural sort [#410](https://github.com/grafana/grafana-polystat-panel/pull/410)
16+
17+
## v2.1.12
18+
19+
- Fix for runtime differences causing parsing errors [#387](https://github.com/grafana/grafana-polystat-panel/issues/387) and [#389](https://github.com/grafana/grafana-polystat-panel/issues/389)
20+
21+
## v2.1.11
22+
23+
- Fix for show/hide metric value in composites [#383](https://github.com/grafana/grafana-polystat-panel/issues/381)
24+
- Fix for value toggle in tooltips [#381](https://github.com/grafana/grafana-polystat-panel/issues/381)
25+
- NEW: Tooltips now have a toggle for showing values
26+
27+
## v2.1.10
28+
29+
- Fix for filtering triggered composites in tooltips [#368](https://github.com/grafana/grafana-polystat-panel/issues/368)
30+
- Remove deprecated ArrayVector usage (G11 compatibility)
31+
32+
## v2.1.9
33+
34+
- NEW: Option to display timestamp of metric inside polygon, available in Global Configuration Section
35+
- Show Timestamp Toggle on/off
36+
- Preset time formats, and allows entry of arbitrary format
37+
- Position of timestamp can be above or below the metric value (default is below)
38+
- Y Offset can be specified to fine tune placement of timestamp displayed
39+
- Fixed alignment bug when name or value is disabled, will now align correctly (and use more space)
40+
41+
## v2.1.8
42+
43+
- Tooltips will now display newest time of data received, and current time if none is supplied
44+
45+
## v2.1.7
46+
47+
- Fix for using ${__composite_name} in clickthrough
48+
- Update dependencies
49+
50+
## v2.1.6
51+
52+
- Fix for repeat panel usage of template variables not expanding correctly [#331](https://github.com/grafana/grafana-polystat-panel/issues/331)
53+
554
## v2.1.5
655

756
- Fixes rendering of composites when template variables changes

0 commit comments

Comments
 (0)