Make release 2.0.2

.bumpversion.cfg

@@ -0,0 +1,11 @@
+[bumpversion]
+commit = True
+tag = False
+current_version = 2.0.2
+
+[bumpversion:file:package.json]
+
+[bumpversion:file:src/plugin.json]
+
+[bumpversion:file:dist/plugin.json]
+

.gitignore

@@ -4,3 +4,4 @@ npm-debug.log
 yarn.lock
 package-lock.json
 .cache
+.release_env

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 2.0.2 (2020-07-06)
+
+## Enhancements:
+* add alerts support for Windows and MacOSX
+* improve ad-hoc filters for query field values as `SELECT DISTINCT field AS value FROM db.table LIMIT 300`, https://github.com/Vertamedia/clickhouse-grafana/pull/222
+* add ability to multiple JOIN parsing https://github.com/Vertamedia/clickhouse-grafana/pull/206 
+* multiple improvements for docker-compose environments, add automatic dashboards and datasource provisions which help to reproduce most of the corner cases which happens in Grafana + ClickHouse
+
+## Fixes:
+* apply a workaround for UTC timezone for Date and DateTime columns in grafana dashboards https://github.com/Vertamedia/clickhouse-grafana/issues/117
+* clear documentation about timestamp term for $from and $to https://github.com/Vertamedia/clickhouse-grafana/issues/115
+* fix AST parsing corner case in `WHERE [test, 'test']` "," was skipped, fix ah-doc ast FROM recursive parsing https://github.com/Vertamedia/clickhouse-grafana/issues/99
+* fix corner cases for table functions parsing when adhoc filter applied https://github.com/Vertamedia/clickhouse-grafana/issues/130
+* fix multiple grammar issues in README.md
+* fix convert rules for Float, Decimal columns from Clickhouse to Grafana Table plugin https://github.com/Vertamedia/clickhouse-grafana/issues/199 
+* fix corner cases when Grafana Template variable value represented as array of strings https://github.com/Vertamedia/clickhouse-grafana/issues/169
+* fix AST parsing corner cases for $macroFunctions correct position for FROM statement https://github.com/Vertamedia/clickhouse-grafana/issues/187
+
 # 2.0.1 (2020-06-19)
 
 ## Fixes:

dist/plugin.json

@@ -29,6 +29,6 @@
  "url": "https://github.com/Vertamedia/clickhouse-grafana"
  }
  ],
- "version": "2.0.1"
+ "version": "2.0.2"
  }
 }

docker-compose.yaml

@@ -70,8 +70,10 @@ services:
  - ./.cache:/go-cache
  command: |
  bash -xec "
- go build -gcflags=\"all=-N -l\" -o ./dist/vertamedia-clickhouse-plugin_linux_amd64 . && \
- chmod +x ./dist/vertamedia-clickhouse-plugin_linux_amd64
+ GOOS=linux GOARCH=amd64 go build -o ./dist/vertamedia-clickhouse-plugin_linux_amd64 . && \
+ GOOS=windows GOARCH=amd64 go build -o ./dist/vertamedia-clickhouse-plugin_windows_amd64.exe . && \
+ GOOS=darwin GOARCH=amd64 go build -o ./dist/vertamedia-clickhouse-plugin_darwin_amd64 . && \
+ chmod +x ./dist/vertamedia-clickhouse-plugin*
  "
 
 

docker/grafana/dashboards/datetime_table_dashboard.json

@@ -0,0 +1,131 @@
+{
+ "annotations": {
+ "list": [
+ {
+ "builtIn": 1,
+ "datasource": "-- Grafana --",
+ "enable": true,
+ "hide": true,
+ "iconColor": "rgba(0, 211, 255, 1)",
+ "name": "Annotations & Alerts",
+ "type": "dashboard"
+ }
+ ]
+ },
+ "editable": true,
+ "gnetId": null,
+ "graphTooltip": 0,
+ "id": 5,
+ "links": [],
+ "panels": [
+ {
+ "datasource": "clickhouse",
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "custom": {
+ "align": null
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "s"
+ },
+ "properties": [
+ {
+ "id": "decimals",
+ "value": 3
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byName",
+ "options": "t_local"
+ },
+ "properties": [
+ {
+ "id": "unit",
+ "value": "time: YYYY-MM-DD HH:mm:ss"
+ }
+ ]
+ }
+ ]
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 12,
+ "x": 0,
+ "y": 0
+ },
+ "id": 2,
+ "options": {
+ "frameIndex": 1,
+ "showHeader": true,
+ "sortBy": [
+ {
+ "desc": false,
+ "displayName": "t"
+ }
+ ]
+ },
+ "pluginVersion": "7.0.5",
+ "targets": [
+ {
+ "database": "default",
+ "dateColDataType": "",
+ "dateLoading": false,
+ "dateTimeColDataType": "event_time",
+ "dateTimeType": "DATETIME",
+ "datetimeLoading": false,
+ "extrapolate": true,
+ "format": "table",
+ "formattedQuery": "SELECT $timeSeries as t, count() FROM $table WHERE $timeFilter GROUP BY t ORDER BY t",
+ "interval": "",
+ "intervalFactor": 1,
+ "query": "SELECT\n toUInt64(event_time)*1000 as t_local,\n event_time as t_orig,\n count() c,\n sum(too_big_value) s\nFROM $table\nWHERE $timeFilter\nGROUP BY t_local, t_orig\nORDER BY t_local",
+ "rawQuery": "SELECT toUInt64(event_time)*1000 as t_local, event_time as t_orig, count() c, sum(too_big_value) s FROM default.test_grafana WHERE event_time >= toDateTime(1593417149) GROUP BY t_local, t_orig ORDER BY t_local",
+ "refId": "A",
+ "round": "0s",
+ "table": "test_grafana",
+ "tableLoading": false
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Table DateTime",
+ "type": "table"
+ }
+ ],
+ "schemaVersion": 25,
+ "style": "dark",
+ "tags": [],
+ "templating": {
+ "list": []
+ },
+ "time": {
+ "from": "now-7d",
+ "to": "now"
+ },
+ "timepicker": {},
+ "timezone": "",
+ "title": "datetime table dashboard",
+ "uid": "bwewNfGGz",
+ "version": 2
+}

package.json

@@ -1,6 +1,6 @@
 {
  "name": "vertamedia-clickhouse",
- "version": "2.0.1",
+ "version": "2.0.2",
  "description": "ClickHouse datasource for Grafana",
  "scripts": {
  "build:prod": "webpack --config webpack.config.prod.js",

release.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+if [[ $# -lt 1 ]]; then
+ echo "release.sh [major|minor|patch]"
+ exit 1
+fi
+if [[ $OSTYPE == *linux* ]]; then
+ echo 1 > /proc/sys/vm/drop_caches
+fi
+source .release_env
+git config core.eol lf
+git config core.autocrlf input
+git config user.name "$GITHUB_LOGIN"
+git config user.email "$GITHUB_EMAIL"
+docker-compose stop
+docker-compose run frontend_builder
+docker-compose run backend_builder
+dos2unix ./dist/*
+git add .
+git commit -m "prepare to new release, $(grep current_version .bumpversion.cfg)"
+bump2version --verbose $1
+git push

spec/datasource.jest.ts

@@ -5,7 +5,7 @@ import ResponseParser from "../src/response_parser";
 
 describe("clickhouse sql series:", () => {
  describe("SELECT $timeseries response WHERE $adhoc = 1", () => {
- var response = {
+ let response = {
  "meta":
  [
  {
@@ -38,12 +38,12 @@ describe("clickhouse sql series:", () => {
  ],
  };
 
- var sqlSeries = new SqlSeries({
+ let sqlSeries = new SqlSeries({
  series: response.data,
  meta: response.meta,
  table: '',
  });
- var timeSeries = sqlSeries.toTimeSeries();
+ let timeSeries = sqlSeries.toTimeSeries();
  it("expects two results", () => {
  expect(size(timeSeries)).toBe(2);
  });
@@ -55,7 +55,7 @@ describe("clickhouse sql series:", () => {
  });
 
  describe("SELECT $columns response", () => {
- var response = {
+ let response = {
  "meta":
  [
  {
@@ -89,12 +89,12 @@ describe("clickhouse sql series:", () => {
  ]
  };
 
- var sqlSeries = new SqlSeries({
+ let sqlSeries = new SqlSeries({
  series: response.data,
  meta: response.meta,
  table: '',
  });
- var timeSeries = sqlSeries.toTimeSeries();
+ let timeSeries = sqlSeries.toTimeSeries();
 
  it("expects four results", () => {
  expect(size(timeSeries)).toBe(4);
@@ -109,7 +109,7 @@ describe("clickhouse sql series:", () => {
  });
 
  describe("When performing ad-hoc query", () => {
- var response = {
+ let response = {
  "meta":
  [
  {
@@ -163,7 +163,7 @@ describe("clickhouse sql series:", () => {
  });
 
  let data = rp.parse("", response);
- adhocCtrl.processResponse(data);
+ adhocCtrl.processTagKeysResponse(data);
  it('should return adhoc filter list', function() {
  let results = adhocCtrl.tagKeys;
  expect(results.length).toBe(6);

src/plugin.json

@@ -29,6 +29,6 @@
  "url": "https://github.com/Vertamedia/clickhouse-grafana"
  }
  ],
- "version": "2.0.1"
+ "version": "2.0.2"
  }
 }

webpack.config.js

@@ -28,7 +28,7 @@ module.exports = {
  }
  ],
  plugins: [
- new CleanWebpackPlugin('dist', { exclude: ['vertamedia-clickhouse-plugin_linux_amd64']}),
+ new CleanWebpackPlugin('dist', { exclude: ['vertamedia-clickhouse-plugin_linux_amd64','vertamedia-clickhouse-plugin_darwin_amd64','vertamedia-clickhouse-plugin_windows_amd64.exe']}),
  new webpack.optimize.OccurrenceOrderPlugin(),
  new CopyWebpackPlugin([
  {from: 'plugin.json', to: '.'},