Feature/liaohj

Feature/grafana plugin

fix tbase-1381

Feature/grafana plugin

#586 [TBASE-1330]

# Conflicts:
#	src/client/inc/tsclient.h

[TBASE-1360]

Feature/liaohj

remove some warnings

add a simple assert

add a simple assert

Merge pull request #962 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/underscore.string-3.3.5

Bump underscore.string from 3.3.4 to 3.3.5 in /src/connector/grafana/tdengine

Merge pull request #961 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/sshpk-1.16.1

Bump sshpk from 1.10.2 to 1.16.1 in /src/connector/grafana/tdengine

Merge pull request #960 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/lodash-4.17.13

Bump lodash from 4.17.10 to 4.17.13 in /src/connector/grafana/tdengine

Merge pull request #959 from taosdata/dependabot/npm_and_yarn/src/connector/grafana/tdengine/extend-3.0.2

Bump extend from 3.0.1 to 3.0.2 in /src/connector/grafana/tdengine

Bumps [underscore.string](https://github.com/epeli/underscore.string) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/epeli/underscore.string/releases)
- [Changelog](https://github.com/esamattis/underscore.string/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/epeli/underscore.string/compare/3.3.4...3.3.5)
Signed-off-by: Ndependabot[bot] <support@github.com>

Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.10.2 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.10.2...v1.16.1)
Signed-off-by: Ndependabot[bot] <support@github.com>

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.13)
Signed-off-by: Ndependabot[bot] <support@github.com>

Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/justmoon/node-extend/releases)
- [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md)
- [Commits](https://github.com/justmoon/node-extend/compare/v3.0.1...v3.0.2)
Signed-off-by: Ndependabot[bot] <support@github.com>

Feature/grafana plugin

merge master into develop