File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
conf/etc/grafana/provisioning/datasources Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 11# ---------------------- BUILD IMAGE ---------------------------------------
22FROM golang:1-alpine as builder
33
4- ENV GOCARBON_VERSION=0.14.0
5- ENV CARBONAPI_VERSION=0.12.6
6- ENV GRAFANA_VERSION=6.4.3
4+ ENV GOCARBON_VERSION=0.15.6
5+ ENV CARBONAPI_VERSION=0.14.2
6+ ENV GRAFANA_VERSION=7.3.7
77ENV GOPATH=/opt/go
88
99RUN \
@@ -66,7 +66,8 @@ COPY --from=builder /tmp/grafana/bin/grafana-cli /usr/bin/grafana-cli
6666COPY --from=builder /tmp/grafana/bin/grafana-server /usr/sbin/grafana-server
6767COPY --from=builder /tmp/grafana/conf /usr/share/grafana/conf
6868COPY --from=builder /tmp/grafana/public /usr/share/grafana/public
69- COPY --from=builder /tmp/grafana/tools /usr/share/grafana/tools
69+ COPY --from=builder /tmp/grafana/plugins-bundled /usr/share/grafana/plugins-bundled
70+ COPY --from=builder /tmp/grafana/scripts /usr/share/grafana/scripts
7071COPY --from=builder /tmp/go-carbon /usr/bin/go-carbon
7172COPY --from=builder /tmp/carbonapi /usr/bin/carbonapi
7273
Original file line number Diff line number Diff line change @@ -37,6 +37,6 @@ datasources:
3737 isDefault : true
3838 # <map> fields that will be converted to json and stored in json_data
3939 jsonData :
40- graphiteVersion : " 1.0 "
40+ graphiteVersion : " 1.1.x "
4141 # <bool> allow users to edit datasources from the UI.
4242 editable : true
You can’t perform that action at this time.
0 commit comments