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.

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

Grafana 9.1.6 - Druid 24.0.0 - versions updates #126

Merged
merged 1 commit into from
Oct 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMPOSE_DOCKER_CLI_BUILD=1
COMPOSE_FILE="docker/docker-compose.yml"
COMPOSE_PROJECT_NAME="druidgrafana"
DRUID_VERSION="0.21.0"
GRAFANA_VERSION="8.4.3"
POSTGRES_VERSION="13.2"
ZOOKEEPER_VERSION="3.6.2"
DRUID_VERSION="24.0.0"
GRAFANA_VERSION="9.1.6"
POSTGRES_VERSION="14.5"
ZOOKEEPER_VERSION="3.8.0"
12 changes: 6 additions & 6 deletions Magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const (
defaultCoordinatorURL string = "http://coordinator:8081"
defaultBrokerURL string = "http://broker:8082"
taskEndpoint string = "/druid/indexer/v1/task"
grafanaVersion string = "8.4.3"
grafanaVersion string = "9.1.6"
)

var (
Expand Down Expand Up @@ -135,23 +135,23 @@ func (Frontend) Build() error {
if err != nil {
return err
}
return runToolboxCmd("npx", "@grafana/toolkit@"+grafanaVersion, "plugin:build")
// return runToolboxCmd("npx", "@grafana/toolkit", "plugin:build", "--preserveConsole")
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build")
// return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:build", "--preserveConsole")
}

// Test runs frontend tests
func (Frontend) Test() error {
return runToolboxCmd("npx", "@grafana/toolkit@"+grafanaVersion, "plugin:test")
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:test")
}

// Dev runs frontend in development mode
func (Frontend) Dev() error {
return runToolboxCmd("npx", "@grafana/toolkit@"+grafanaVersion, "plugin:dev")
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev")
}

// Watch runs frontend in development mode + autoreload on changes
func (Frontend) Watch() error {
return runToolboxCmd("npx", "@grafana/toolkit@"+grafanaVersion, "plugin:dev", "--watch")
return runToolboxCmd("npx", "--yes", "@grafana/toolkit@"+grafanaVersion, "plugin:dev", "--watch")
}

type Backend mg.Namespace
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# Test against the latest version of this Node.js version
environment:
nodejs_version: '10'
nodejs_version: '16'

# Local NPM Modules
cache:
Expand Down
6 changes: 3 additions & 3 deletions docker/toolbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:16-alpine3.15
ENV CGO_ENABLED=0
RUN apk add --no-cache go python3 && npm install -g npm@8.5.3
FROM node:16-alpine3.16
WORKDIR /workspace
ENV CGO_ENABLED=0
RUN apk add --no-cache git go python3 && git config --global --add safe.directory /workspace && npm install -g npm@8.19.2
ENTRYPOINT ["tail", "-f"]
63 changes: 59 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,66 @@
module github.com/grafadruid/druid-grafana

go 1.14
go 1.17

require (
github.com/bitly/go-simplejson v0.5.0
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/grafadruid/go-druid v0.0.5-0.20211224091918-d91fa9d1674a
github.com/grafana/grafana-plugin-sdk-go v0.80.0
github.com/magefile/mage v1.11.0
github.com/grafana/grafana-plugin-sdk-go v0.140.0
github.com/magefile/mage v1.13.0
)

require (
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/getkin/kin-openapi v0.94.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/flatbuffers v2.0.0+incompatible // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-plugin v1.4.3 // indirect
github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.13.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattetti/filebuffer v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pierrec/lz4/v4 v4.1.8 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79 // indirect
google.golang.org/grpc v1.41.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading