Skip to content

Commit

Permalink
Merge pull request #399 from Altinity/master
Browse files Browse the repository at this point in the history
release 2.4.1
  • Loading branch information
Slach authored Dec 22, 2021
2 parents 40e4e33 + 3753991 commit c8eeab9
Show file tree
Hide file tree
Showing 25 changed files with 6,721 additions and 6,861 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 2.4.0
current_version = 2.4.1

[bumpversion:file:package.json]

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ yarn.lock
.release_env
.env
ubuntu*.log
dist/**.LICENSE.txt
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# 2.4.1 (2021-12-20)

## Enhancements:
* update dependencies, try to fix critical nodejs dependencies issues

## Fixes:
* fix unnecessary warning Logging message on backend part
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/366
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/357
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/345
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/342
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/385
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/317
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/336
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/320
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/326

# 2.4.0 (2021-11-29)

## Enhancement:
Expand All @@ -13,7 +30,6 @@

* implements properly GET and POST support for alert queries, fix https://github.com/Vertamedia/clickhouse-grafana/issues/353
* SQL syntax highlight now works always, fix https://github.com/Vertamedia/clickhouse-grafana/issues/174, fix https://github.com/Vertamedia/clickhouse-grafana/issues/381
* SQL syntax highlight, fix https://github.com/Vertamedia/clickhouse-grafana/issues/174, fix https://github.com/Vertamedia/clickhouse-grafana/issues/381
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/376,
* fix negative behavior for $perSecondColumns https://github.com/Vertamedia/clickhouse-grafana/issues/337
* fix https://github.com/Vertamedia/clickhouse-grafana/issues/374, ignore `--` inside quotas as comment
Expand Down
30 changes: 15 additions & 15 deletions dist/MANIFEST.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@ Hash: SHA512
"signedByOrg": "vertamedia",
"signedByOrgName": "Vertamedia",
"plugin": "vertamedia-clickhouse-datasource",
"version": "2.4.0",
"time": 1638204922377,
"version": "2.4.1",
"time": 1640088468822,
"keyId": "7e4d0c6a708866e7",
"files": {
"img/annotations.png": "09cc19df992fede5c4dd830f7b3c7a783702feced07ea9693d417ec127077b00",
"img/clickhouse_logo.svg": "111c2048c9bad4a11b0273cf17839696d98968c04cdcc5ea0716bdc973f2e8e4",
"img/datasource.png": "8d6dcdddfad512abed8c251404f652383f63ad17bc5c7cbe3e67ad9e6fa0327f",
"img/query_editor.png": "b8d50f644d413b15aaf0d7b71fdfa4423f1a045761ec368b19a15e3d1aaf9308",
"LICENSE": "a434fc6dd97d5c425c6edbeff0276afd60ab5fffab3ed2c563f95a389502d074",
"module.js": "0878c1faee82276c10365ca45ca7e17d268a3ebcbd780a346f482d4977784c9e",
"module.js.map": "fd4a3f4317beb398d19835cc3cc5c16c966f06a4e4e02f911a6107be45469080",
"module.js": "c3b028bcc7c7819085571b9032f25f6e885dd1aa6784bb0560d6253c27472171",
"module.js.map": "235628897e72aac977b6b661fad433304c6a43e0c9b1eea36f344cbeca5986f4",
"partials/annotations.editor.html": "14d2d5add7f13c7c722e33bbc53ef83750fb624e5f7d6efee4a9568addc2ab78",
"partials/config.html": "51ba130304c63c1a00590a9dc94c8351ff6277e4cf695720de57bff87aeec744",
"partials/query.editor.html": "b013c5f8547fd5f7e4723c21b274b27fb652214a78ee2bec95a31ff99f8c2b76",
"plugin.json": "3b277e6fea0155db0fdf49dc39e146075c4778397a5deec9da117ef5cf1dfb44",
"plugin.json": "d25b7bb72e0a8512730c9a062790556d232c7636a40e973171486d22836db761",
"README.md": "df32fee62c849da4459480470036843bc00351b66af2aa46bb93d14687f107d9",
"vertamedia-clickhouse-plugin_darwin_amd64": "f46f7f024ceaed97427cd1a0d3abe03507464c79979a7a31369b010b365182aa",
"vertamedia-clickhouse-plugin_darwin_arm64": "b9941b33301bf817c88cd5668c45c74b0c8250dd1df24fff3c566e9c7c5a7262",
"vertamedia-clickhouse-plugin_linux_amd64": "e70faf4a24a3e8b9a7242f1972109ac2d4b66822ab8d2b370a676606c0bc79b7",
"vertamedia-clickhouse-plugin_linux_arm64": "5f0880b82e841f13a1a6cf913e5fa7a5dde7a4c9e1a91d36d64dcfa49cfc4272",
"vertamedia-clickhouse-plugin_windows_amd64.exe": "b7e94de7e90832873c0993bb9ff04689a15d43b613dc6d18a4c0d8e3f008db12"
"vertamedia-clickhouse-plugin_darwin_amd64": "dafad72976d238b09becbd888ba30805af7c730fcc2f7d316dc44dddb0c0d8dd",
"vertamedia-clickhouse-plugin_darwin_arm64": "5b5fda6ff39327fc526f445d3916376942add79bb123912466518fd962f5b328",
"vertamedia-clickhouse-plugin_linux_amd64": "c970ccc1c0f5388c06008804ef83884a53975abbe2e42cd1448b1a15ed9ace20",
"vertamedia-clickhouse-plugin_linux_arm64": "afe66daa8792bd9947bcb58b233c32a75609536c4770ba80fd5f3832ea311921",
"vertamedia-clickhouse-plugin_windows_amd64.exe": "87bbddbaa60f86f4dc6ea88a61314bb1c0f570d16976573d61f3a3b42b8baa6a"
}
}
-----BEGIN PGP SIGNATURE-----
Version: OpenPGP.js v4.10.1
Comment: https://openpgpjs.org

wqIEARMKAAYFAmGlBfoACgkQfk0ManCIZufoeAIJAfuEm+thaW+/J1EGorCx
WUltPxKD44ByovG5iRHorXsnmSOU0iIJsTEaDk003jfLt9Y1ENstO6bIgrLC
HGc0h0wBAgkBYvurLG4kUFYmRtgNE5X+ghb5ng7H/NoVy5hnz1GiF7yBBN6E
DXVG7t0qMLOX+9hDWUWKCX3oksiB30nKQ0J6bHY=
=OpJU
wqEEARMKAAYFAmHBw5QACgkQfk0ManCIZueUJQIJAe+phMYDKwZiHHm5FB+1
6taG+giaKKWXAeEjw/VFBy7o2w+g+QA4VjDTnKcnTSpb1efXQmZccMHKsL5i
7CZuvOI/AgjL5ZL641Y97Ux16qTH13J7vea9oHZb41pg+KYp/rPSqokk9QG5
SWztw5xX62gvHmDn1CMQjyqGOlHS/exz2vpEkA==
=hydV
-----END PGP SIGNATURE-----
295 changes: 138 additions & 157 deletions dist/module.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/module.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"url": "https://github.com/Vertamedia/clickhouse-grafana"
}
],
"version": "2.4.0",
"version": "2.4.1",
"updated": "2020-07-31"
},

Expand Down
Binary file modified dist/vertamedia-clickhouse-plugin_darwin_amd64
Binary file not shown.
Binary file modified dist/vertamedia-clickhouse-plugin_darwin_arm64
Binary file not shown.
Binary file modified dist/vertamedia-clickhouse-plugin_linux_amd64
Binary file not shown.
Binary file modified dist/vertamedia-clickhouse-plugin_linux_arm64
Binary file not shown.
Binary file modified dist/vertamedia-clickhouse-plugin_windows_amd64.exe
Binary file not shown.
16 changes: 16 additions & 0 deletions docker/clickhouse/init_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,19 @@ CREATE TABLE IF NOT EXISTS default.test_alerts_low_frequency (

INSERT INTO default.test_alerts_low_frequency SELECT now() + ((number-500)*600) + ( rand()%180 - 90 ) d, toDate(d), 'category1', number % 200 FROM numbers(1000);
INSERT INTO default.test_alerts_low_frequency SELECT now() + ((number-500)*600) + ( rand()%180 - 90 ) d, toDate(d), 'category2', number % 200 FROM numbers(1000);



CREATE TABLE IF NOT EXISTS default.nested_array_join_example
(
time DateTime,
dataMap Nested (
key String,
value UInt64
)
)
ENGINE = MergeTree
PARTITION BY toYYYYMMDD(time)
ORDER BY time;

INSERT INTO default.nested_array_join_example(time, dataMap.key, dataMap.value) VALUES (now()-INTERVAL 2 MINUTE, ['a', 'b'], [1, 2]), (now()-INTERVAL 2 MINUTE, ['a', 'b'], [3, 4]), (now()-INTERVAL 1 MINUTE, ['a', 'b'], [5, 6]), (now()-INTERVAL 1 MINUTE, ['a', 'b'], [7, 8]), (now(), ['a', 'b'], [9, 10]);
148 changes: 148 additions & 0 deletions docker/grafana/dashboards/array_join_nested.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"target": {
"limit": 100,
"matchAny": false,
"tags": [],
"type": "dashboard"
},
"type": "dashboard"
}
]
},
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
"id": 19,
"links": [],
"liveNow": false,
"panels": [
{
"datasource": {
"type": "vertamedia-clickhouse-datasource",
"uid": "P7E099F39B84EA795"
},
"description": "reproduce https://github.com/Vertamedia/clickhouse-grafana/issues/326",
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 0
},
"id": 2,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom"
},
"tooltip": {
"mode": "single"
}
},
"targets": [
{
"database": "default",
"datasource": {
"type": "vertamedia-clickhouse-datasource",
"uid": "P7E099F39B84EA795"
},
"dateColDataType": "",
"dateLoading": false,
"dateTimeColDataType": "time",
"dateTimeType": "DATETIME",
"datetimeLoading": false,
"extrapolate": true,
"format": "time_series",
"formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t",
"interval": "",
"intervalFactor": 1,
"query": "$columns(\r\n dataMap.key AS key,\r\n sum(dataMap.value) AS value\r\n)\r\nFROM default.nested_array_join_example\r\nARRAY JOIN dataMap\r\nWHERE $timeFilter\r\n",
"rawQuery": "SELECT t, groupArray((key, value)) AS groupArr FROM ( SELECT (intDiv(toUInt32(time), 1) * 1) * 1000 AS t, dataMap.key AS key, sum(dataMap.value) AS value FROM default.nested_array_join_example\r\nARRAY JOIN dataMap\r\nWHERE time >= toDateTime(1640161547) AND time <= toDateTime(1640162447) AND time >= toDateTime(1640161547) AND time <= toDateTime(1640162447) GROUP BY t, key ORDER BY t, key) GROUP BY t ORDER BY t",
"refId": "A",
"round": "0s",
"skip_comments": true,
"table": "nested_array_join_example",
"tableLoading": false
}
],
"title": "array join + Nested ",
"type": "timeseries"
}
],
"schemaVersion": 34,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {},
"timezone": "",
"title": "array Join + Nested",
"uid": "gFNStaonk",
"version": 1,
"weekStart": ""
}
Loading

0 comments on commit c8eeab9

Please sign in to comment.