Skip to content

Commit

Permalink
Merge remote-tracking branches 'origin/renovate/codecov-codecov-actio…
Browse files Browse the repository at this point in the history
…n-5.x', 'origin/renovate/grafana-grafana-11.x', 'origin/renovate/grafana-loki-3.x' and 'origin/renovate/opentelemetry'
  • Loading branch information
myrotvorets-team committed Dec 11, 2024
5 parents 55e4e92 + 7f82d6f + 4698dee + 14420d1 + 637cb63 commit f519464
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
working_dir: /usr/src/service

otel-collector:
image: otel/opentelemetry-collector-contrib:0.114.0@sha256:37fa87091cfaaec7234a27e4e395a40c31c2bfaea97a349a4afef6d9e9681197
image: otel/opentelemetry-collector-contrib:0.115.1@sha256:d2da12c4336a79758826700be9e21ecf4a9f7d945b7f8a58ba55ee3fa45427c8
command:
- "--config=/etc/otel-collector-config.yaml"
depends_on:
Expand All @@ -52,13 +52,13 @@ services:
- vmdata:/storage

loki:
image: grafana/loki:3.3.0@sha256:58b60b901255c209d3455d8a1979a3f73d1d09686a0a858c2c93025a969eb550
image: grafana/loki:3.3.1@sha256:7e30f1aa1b17970a29739432b5f3df30bf2b3e4bdfc22e896452c18bcfe017be
command:
- "-config.file=/etc/loki/local-config.yaml"
restart: always

grafana:
image: grafana/grafana:11.3.1@sha256:fa801ab6e1ae035135309580891e09f7eb94d1abdbd2106bdc288030b028158c
image: grafana/grafana:11.4.0@sha256:d8ea37798ccc41061a62ab080f2676dda6bf7815558499f901bdb0f533a456fb
depends_on:
- victoriametrics
- loki
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: npm run build -- --sourcemap

- name: Upload coverage report to Codecov
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage/lcov.info
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@myrotvorets/express-request-logger": "^1.2.2",
"@myrotvorets/facex": "^2.7.0",
"@myrotvorets/oav-installer": "^5.0.0",
"@myrotvorets/opentelemetry-configurator": "^7.11.0",
"@myrotvorets/opentelemetry-configurator": "^7.12.0",
"@myrotvorets/otel-utils": "^1.4.0",
"@opentelemetry/api": "^1.9.0",
"@types/multer": "^1.4.12",
Expand Down

0 comments on commit f519464

Please sign in to comment.