Skip to content

Commit

Permalink
Merge pull request #91 from krzko/feat-bump-all-deps
Browse files Browse the repository at this point in the history
feat: bumping deps
  • Loading branch information
krzko authored Jan 16, 2024
2 parents be4b6c9 + 0f94f90 commit 52286a3
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

Expand Down
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
OUTPUT:=bin
EXECUTABLE:=run-o11y-run

VERSION:=v0.1.0
VERSION:=v0.11.0
COMMIT=$(shell git describe --tags --always --long)
NOW=$(shell date +'%Y%m%d')

Expand All @@ -24,65 +24,65 @@ build: build-arm build-darwin-amd64 build-darwin-arm64 build-freebsd build-linux
build-arm:
@echo " 🍒 Building binary ${ARM5}..."
@[ -d "${OUTPUT}/${ARM5}" ] || mkdir -p "${OUTPUT}/${ARM5}"
@env GOOS=linux GOARCH=arm GOARM=5 go build -o "${OUTPUT}/${ARM5}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=linux GOARCH=arm GOARM=5 go build -o "${OUTPUT}/${ARM5}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${ARM5}.tar.gz" "${OUTPUT}/${ARM5}/${EXECUTABLE}"
@echo " ✨ Build binary ${ARM5} complete"

@echo " 🍒 Building binary ${ARM6}..."
@[ -d "${OUTPUT}/${ARM6}" ] || mkdir -p "${OUTPUT}/${ARM6}"
@env GOOS=linux GOARCH=arm GOARM=6 go build -o "${OUTPUT}/${ARM6}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=linux GOARCH=arm GOARM=6 go build -o "${OUTPUT}/${ARM6}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${ARM6}.tar.gz" "${OUTPUT}/${ARM6}/${EXECUTABLE}"
@echo " ✨ Build binary ${ARM6} complete"

@echo " 🍒 Building binary ${ARM7}..."
@[ -d "${OUTPUT}/${ARM7}" ] || mkdir -p "${OUTPUT}/${ARM7}"
@env GOOS=linux GOARCH=arm GOARM=7 go build -o "${OUTPUT}/${ARM7}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=linux GOARCH=arm GOARM=7 go build -o "${OUTPUT}/${ARM7}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${ARM7}.tar.gz" "${OUTPUT}/${ARM7}/${EXECUTABLE}"
@echo " ✨ Build binary ${ARM7} complete"

@echo " 🍒 Building binary${ARM8}..."
@[ -d "${OUTPUT}/${ARM8}" ] || mkdir -p "${OUTPUT}/${ARM8}"
@env GOOS=linux GOARCH=arm64 go build -o "${OUTPUT}/${ARM8}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=linux GOARCH=arm64 go build -o "${OUTPUT}/${ARM8}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${ARM8}.tar.gz" "${OUTPUT}/${ARM8}/${EXECUTABLE}"
@echo " ✨ Build binary ${ARM8} complete"
@echo

build-darwin-amd64:
@echo " 🍎 Building binary ${DARWIN_AMD64}..."
@[ -d "${OUTPUT}/${DARWIN_AMD64}" ] || mkdir -p "${OUTPUT}/${DARWIN_AMD64}"
@env GOOS=darwin GOARCH=amd64 go build -o "${OUTPUT}/${DARWIN_AMD64}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=darwin GOARCH=amd64 go build -o "${OUTPUT}/${DARWIN_AMD64}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@zip -q "${OUTPUT}/${DARWIN_AMD64}".zip "${OUTPUT}/${DARWIN_AMD64}/${EXECUTABLE}"
@echo " ✨ Build binary ${DARWIN_AMD64} complete"
@echo

build-darwin-arm64:
@echo " 🍏 Building binary ${DARWIN_ARM64}..."
@[ -d "${OUTPUT}/${DARWIN_ARM64}" ] || mkdir -p "${OUTPUT}/${DARWIN_ARM64}"
@env GOOS=darwin GOARCH=arm64 go build -o "${OUTPUT}/${DARWIN_ARM64}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=darwin GOARCH=arm64 go build -o "${OUTPUT}/${DARWIN_ARM64}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@zip -q "${OUTPUT}/${DARWIN_ARM64}".zip "${OUTPUT}/${DARWIN_ARM64}/${EXECUTABLE}"
@echo " ✨ Build binary ${DARWIN_ARM64} complete"
@echo

build-freebsd:
@echo " 👿 Building binary ${FREEBSD}..."
@[ -d "${OUTPUT}/${FREEBSD}" ] || mkdir -p "${OUTPUT}/${FREEBSD}"
@env GOOS=freebsd GOARCH=amd64 go build -o "${OUTPUT}/${FREEBSD}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=freebsd GOARCH=amd64 go build -o "${OUTPUT}/${FREEBSD}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${FREEBSD}.tar.gz" "${OUTPUT}/${FREEBSD}/${EXECUTABLE}"
@echo " ✨ Build binary ${FREEBSD} complete"
@echo

build-linux:
@echo " 🐧 Building binary ${LINUX}..."
@[ -d "${OUTPUT}/${LINUX}" ] || mkdir -p "${OUTPUT}/${LINUX}"
@env GOOS=linux GOARCH=amd64 go build -o "${OUTPUT}/${LINUX}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=linux GOARCH=amd64 go build -o "${OUTPUT}/${LINUX}/${EXECUTABLE}" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@tar -czf "${OUTPUT}/${LINUX}.tar.gz" "${OUTPUT}/${LINUX}/${EXECUTABLE}"
@echo " ✨ Build binary ${LINUX} complete"
@echo

build-windows:
@echo " 💾 Building binary ${WINDOWS}..."
@[ -d "${OUTPUT}/${WINDOWS}" ] || mkdir -p "${OUTPUT}/${WINDOWS}"
@env GOOS=windows GOARCH=amd64 go build -o "${OUTPUT}/${WINDOWS}/${EXECUTABLE}.exe" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./main.go
@env GOOS=windows GOARCH=amd64 go build -o "${OUTPUT}/${WINDOWS}/${EXECUTABLE}.exe" -ldflags="-s -w -X main.buildVersion=${VERSION} -X main.commit=${COMMIT} -X main.date=${NOW}" ./cmd/run-o11y-run/main.go
@zip -q "${OUTPUT}/${WINDOWS}.zip" "${OUTPUT}/${WINDOWS}/${EXECUTABLE}.exe"
@echo " ✨ Build binary ${WINDOWS} complete"
@echo
Expand All @@ -98,7 +98,7 @@ fmt:
go fmt ./...

run:
go run ./main.go
go run ./cmd/run-o11y-run/main.go

test:
go test -v ./...
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# dependabot will update this file when base image is updated
FROM grafana/grafana:10.1.2
FROM grafana/grafana:10.2.3
2 changes: 1 addition & 1 deletion dockerfiles/loki/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# dependabot will update this file when base image is updated
FROM grafana/loki:2.8.5
FROM grafana/loki:2.8.7
2 changes: 1 addition & 1 deletion dockerfiles/otel-collector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# dependabot will update this file when base image is updated
FROM otel/opentelemetry-collector-contrib:0.85.0
FROM otel/opentelemetry-collector-contrib:0.92.0
2 changes: 1 addition & 1 deletion dockerfiles/prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# dependabot will update this file when base image is updated
FROM prom/prometheus:v2.47.0
FROM prom/prometheus:v2.48.1
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@ module github.com/krzko/run-o11y-run
go 1.20

require (
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/mitchellh/go-homedir v1.1.0
github.com/olekukonko/tablewriter v0.0.5
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
github.com/urfave/cli/v2 v2.25.7
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
github.com/urfave/cli/v2 v2.27.1
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
golang.org/x/sys v0.6.0 // indirect
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
golang.org/x/sys v0.16.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
22 changes: 22 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
Expand All @@ -14,26 +18,44 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI=
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
8 changes: 4 additions & 4 deletions internal/files/files/grafana/run-o11y-run/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:

grafana:
image: grafana/grafana:10.1.2
image: grafana/grafana:10.2.3
volumes:
- ../shared/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
# - ../shared/pyroscope/grafana-provisioning:/etc/grafana/provisioning
Expand All @@ -20,7 +20,7 @@ services:
- "3000:3000"

loki:
image: grafana/loki:2.8.5
image: grafana/loki:2.8.7
command: "-config.file=/etc/loki/local-config.yaml"
environment:
- NO_PROXY=grafana,loki,minio,otel-collector,prometheus,pyroscope,tempo
Expand Down Expand Up @@ -64,7 +64,7 @@ services:
retries: 5

otel-collector:
image: otel/opentelemetry-collector-contrib:0.85.0
image: otel/opentelemetry-collector-contrib:0.92.0
command: [ "--config=/etc/otel-collector.yaml" ]
volumes:
- ../shared/otel-collector.yaml:/etc/otel-collector.yaml
Expand All @@ -82,7 +82,7 @@ services:
- tempo

prometheus:
image: prom/prometheus:v2.47.0
image: prom/prometheus:v2.48.1
command:
- --config.file=/etc/prometheus.yaml
- --web.enable-remote-write-receiver
Expand Down

0 comments on commit 52286a3

Please sign in to comment.