Skip to content

Commit 9ac5ff7

Browse files
dcheckowaydcheckoway
committed
Update dependencies to latest from Grafana
1 parent de639c8 commit 9ac5ff7

File tree

7 files changed

+158
-131
lines changed

7 files changed

+158
-131
lines changed

‎.config/.cprc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "5.11.1"
2+
"version": "5.13.0"
33
}

‎.config/Dockerfile

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ARG grafana_image=grafana-enterprise
33

44
FROM grafana/${grafana_image}:${grafana_version}
55

6+
ARG anonymous_auth_enabled=true
67
ARG development=false
78
ARG TARGETARCH
89

@@ -14,7 +15,7 @@ ENV DEV "${development}"
1415
# Make it as simple as possible to access the grafana instance for development purposes
1516
# Do NOT enable these settings in a public facing / production grafana instance
1617
ENV GF_AUTH_ANONYMOUS_ORG_ROLE "Admin"
17-
ENV GF_AUTH_ANONYMOUS_ENABLED "true"
18+
ENV GF_AUTH_ANONYMOUS_ENABLED "${anonymous_auth_enabled}"
1819
ENV GF_AUTH_BASIC_ENABLED "false"
1920
# Set development mode so plugins can be loaded without the need to sign
2021
ENV GF_DEFAULT_APP_MODE "development"
@@ -30,14 +31,14 @@ USER root
3031
# Installing supervisor and inotify-tools
3132
RUN if [ "${development}" = "true" ]; then \
3233
if grep -i -q alpine /etc/issue; then \
33-
apk add supervisor inotify-tools git; \
34+
apk add supervisor inotify-tools git; \
3435
elif grep -i -q ubuntu /etc/issue; then \
35-
DEBIAN_FRONTEND=noninteractive && \
36-
apt-get update && \
37-
apt-get install -y supervisor inotify-tools git && \
38-
rm -rf /var/lib/apt/lists/*; \
36+
DEBIAN_FRONTEND=noninteractive && \
37+
apt-get update && \
38+
apt-get install -y supervisor inotify-tools git && \
39+
rm -rf /var/lib/apt/lists/*; \
3940
else \
40-
echo 'ERROR: Unsupported base image' && /bin/false; \
41+
echo 'ERROR: Unsupported base image' && /bin/false; \
4142
fi \
4243
fi
4344

‎.config/webpack/webpack.config.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ const config = async (env): Promise<Configuration> => {
176176
keep: new RegExp(`(.*?_(amd64|arm(64)?)(.exe)?|go_plugin_build_manifest)`),
177177
},
178178
filename: '[name].js',
179+
chunkFilename: env.production ? '[name].js?_cache=[contenthash]' : '[name].js',
179180
library: {
180181
type: 'amd',
181182
},
@@ -202,14 +203,14 @@ const config = async (env): Promise<Configuration> => {
202203
{ from: 'plugin.json', to: '.' },
203204
{ from: '../LICENSE', to: '.' },
204205
{ from: '../CHANGELOG.md', to: '.', force: true },
205-
{ from: '**/*.json', to: '.' }, // TODO<Add an error for checking the basic structure of the repo>
206-
{ from: '**/*.svg', to: '.', noErrorOnMissing: true }, // Optional
207-
{ from: '**/*.png', to: '.', noErrorOnMissing: true }, // Optional
208-
{ from: '**/*.html', to: '.', noErrorOnMissing: true }, // Optional
209-
{ from: 'img/**/*', to: '.', noErrorOnMissing: true }, // Optional
210-
{ from: 'libs/**/*', to: '.', noErrorOnMissing: true }, // Optional
211-
{ from: 'static/**/*', to: '.', noErrorOnMissing: true }, // Optional
212-
{ from: '**/query_help.md', to: '.', noErrorOnMissing: true }, // Optional
206+
{ from: '**/*.json', to: '.' },
207+
{ from: '**/*.svg', to: '.', noErrorOnMissing: true },
208+
{ from: '**/*.png', to: '.', noErrorOnMissing: true },
209+
{ from: '**/*.html', to: '.', noErrorOnMissing: true },
210+
{ from: 'img/**/*', to: '.', noErrorOnMissing: true },
211+
{ from: 'libs/**/*', to: '.', noErrorOnMissing: true },
212+
{ from: 'static/**/*', to: '.', noErrorOnMissing: true },
213+
{ from: '**/query_help.md', to: '.', noErrorOnMissing: true },
213214
],
214215
}),
215216
// Replace certain template-variables in the README and plugin.json

‎go.mod

+32-31
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
module github.com/criblcloud/search-datasource
22

3-
go 1.22
3+
go 1.22.7
44

55
toolchain go1.23.1
66

77
require (
88
github.com/golang-jwt/jwt/v5 v5.2.1
9-
github.com/grafana/grafana-plugin-sdk-go v0.260.1
9+
github.com/grafana/grafana-plugin-sdk-go v0.263.0
1010
github.com/prometheus/client_golang v1.20.5
1111
github.com/stretchr/testify v1.10.0
1212
)
1313

1414
require (
1515
github.com/BurntSushi/toml v1.4.0 // indirect
16-
github.com/apache/arrow/go/v15 v15.0.2 // indirect
16+
github.com/apache/arrow-go/v18 v18.0.1-0.20241212180703-82be143d7c30 // indirect
1717
github.com/beorn7/perks v1.0.1 // indirect
1818
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
1919
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2020
github.com/cheekybits/genny v1.0.0 // indirect
2121
github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
2222
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
24+
github.com/elazarl/goproxy v1.3.0 // indirect
2525
github.com/fatih/color v1.15.0 // indirect
2626
github.com/getkin/kin-openapi v0.128.0 // indirect
2727
github.com/go-logr/logr v1.4.2 // indirect
2828
github.com/go-logr/stdr v1.2.2 // indirect
2929
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3030
github.com/go-openapi/swag v0.23.0 // indirect
31-
github.com/goccy/go-json v0.10.2 // indirect
31+
github.com/goccy/go-json v0.10.4 // indirect
3232
github.com/gogo/protobuf v1.3.2 // indirect
3333
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/flatbuffers v23.5.26+incompatible // indirect
34+
github.com/google/flatbuffers v24.3.25+incompatible // indirect
3535
github.com/google/go-cmp v0.6.0 // indirect
3636
github.com/google/uuid v1.6.0 // indirect
3737
github.com/gorilla/mux v1.8.1 // indirect
3838
github.com/grafana/otel-profiling-go v0.5.1 // indirect
3939
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
4040
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
41-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
42-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
41+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
42+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
4343
github.com/hashicorp/go-hclog v1.6.3 // indirect
4444
github.com/hashicorp/go-plugin v1.6.2 // indirect
4545
github.com/hashicorp/yamux v0.1.1 // indirect
4646
github.com/invopop/yaml v0.3.1 // indirect
4747
github.com/josharian/intern v1.0.0 // indirect
4848
github.com/json-iterator/go v1.1.12 // indirect
49-
github.com/klauspost/compress v1.17.9 // indirect
50-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
49+
github.com/klauspost/compress v1.17.11 // indirect
50+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
5151
github.com/magefile/mage v1.15.0 // indirect
5252
github.com/mailru/easyjson v0.7.7 // indirect
5353
github.com/mattetti/filebuffer v1.0.1 // indirect
@@ -61,38 +61,39 @@ require (
6161
github.com/oklog/run v1.1.0 // indirect
6262
github.com/olekukonko/tablewriter v0.0.5 // indirect
6363
github.com/perimeterx/marshmallow v1.1.5 // indirect
64-
github.com/pierrec/lz4/v4 v4.1.18 // indirect
64+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
6565
github.com/pmezard/go-difflib v1.0.0 // indirect
6666
github.com/prometheus/client_model v0.6.1 // indirect
67-
github.com/prometheus/common v0.60.1 // indirect
67+
github.com/prometheus/common v0.61.0 // indirect
6868
github.com/prometheus/procfs v0.15.1 // indirect
6969
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7070
github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
7171
github.com/unknwon/com v1.0.1 // indirect
7272
github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
7373
github.com/urfave/cli v1.22.16 // indirect
7474
github.com/zeebo/xxh3 v1.0.2 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
75+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
7677
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.57.0 // indirect
77-
go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect
78-
go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0 // indirect
79-
go.opentelemetry.io/otel v1.32.0 // indirect
80-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
81-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
82-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
83-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
84-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
85-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
86-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
87-
golang.org/x/mod v0.17.0 // indirect
88-
golang.org/x/net v0.31.0 // indirect
89-
golang.org/x/sync v0.9.0 // indirect
90-
golang.org/x/sys v0.27.0 // indirect
91-
golang.org/x/text v0.20.0 // indirect
92-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
93-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
78+
go.opentelemetry.io/contrib/propagators/jaeger v1.33.0 // indirect
79+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.27.0 // indirect
80+
go.opentelemetry.io/otel v1.33.0 // indirect
81+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
82+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
83+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
84+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
86+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
87+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
88+
golang.org/x/mod v0.22.0 // indirect
89+
golang.org/x/net v0.34.0 // indirect
90+
golang.org/x/sync v0.10.0 // indirect
91+
golang.org/x/sys v0.29.0 // indirect
92+
golang.org/x/text v0.21.0 // indirect
93+
golang.org/x/tools v0.28.0 // indirect
94+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
9495
google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79 // indirect
95-
google.golang.org/grpc v1.67.1 // indirect
96+
google.golang.org/grpc v1.69.2 // indirect
9697
google.golang.org/protobuf v1.35.2 // indirect
9798
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
9899
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)