Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix docker-compose for use backend plugin in grafana 7.x #192

Merged
merged 1 commit into from
Jun 9, 2020
Merged

fix docker-compose for use backend plugin in grafana 7.x #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/module.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/module.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/vertamedia-clickhouse-plugin_linux_amd64
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ services:

grafana:
image: grafana/grafana:latest
# image: grafana/grafana:6.7.4
volumes:
- ./:/var/lib/grafana/plugins/vertamedia-clickhouse/
- ./grafana-clickhouse-datasource.yaml:/etc/grafana/provisioning/datasources/grafana-clickhouse-datasource.yaml
# @TODO need sign instructions in https://grafana.com/docs/grafana/latest/developers/plugins/sign-a-plugin/
environment:
- GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=vertamedia-clickhouse-datasource
ports:
- 3000:3000
depends_on:
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"@types/jest": "^24.0.6",
"@types/lodash-es": "^4.17.1",
"babel-jest": "^25.3.0",
"babel-loader": "^8.1.0",
"clean-webpack-plugin": "^1.0.1",
"copy-webpack-plugin": "^4.6.0",
"grafana-sdk-mocks": "github:grafana/grafana-sdk-mocks",
Expand Down
2 changes: 1 addition & 1 deletion src/sql_series.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class SqlSeries {
return data;
}

toTimeSeries(extrapolate: boolean): any {
toTimeSeries(extrapolate: boolean = true): any {
let self = this, timeSeries = [];
if (self.series.length === 0) {
return timeSeries;
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ module.exports = {
rules: [
{
test: /\.tsx?$/,
loaders: [
use: [
{ loader: 'babel-loader' },
'ts-loader'
{ loader: 'ts-loader' },
],
exclude: /(node_modules)/,
},
Expand Down