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', 'origin/renovate/mysql2-3.x', 'origin/renovate/node-lts-alpine' and 'origin/renovate/opentelemetry'
  • Loading branch information
myrotvorets-team committed Dec 11, 2024
7 parents ffa1c74 + 9aee36a + 177f1f8 + 7a531e6 + d964ce6 + 16fbddd + 3b47d9b commit e3c4bbc
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 47 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
restart: always

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 @@ -75,13 +75,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 @@ -37,7 +37,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 docker-compose-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
dzhura:
image: node:lts-alpine@sha256:b64ced2e7cd0a4816699fe308ce6e8a08ccba463c757c00c14cd372e3d2c763e
image: node:lts-alpine@sha256:6e80991f69cc7722c561e5d14d5e72ab47c0d6b6cfb3ae50fb9cf9a7b30fdf97
read_only: true
volumes:
- ".:/usr/src/service"
Expand Down
46 changes: 7 additions & 39 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
"@myrotvorets/express-otel-middlewares": "^1.2.3",
"@myrotvorets/express-request-logger": "^1.2.2",
"@myrotvorets/oav-installer": "^5.0.0",
"@myrotvorets/opentelemetry-configurator": "^7.11.0",
"@myrotvorets/opentelemetry-plugin-knex": "^0.35.0",
"@myrotvorets/opentelemetry-configurator": "^7.12.0",
"@myrotvorets/opentelemetry-plugin-knex": "^0.37.0",
"@myrotvorets/otel-utils": "^1.4.0",
"@opentelemetry/api": "^1.9.0",
"awilix": "^12.0.3",
"envalid": "^8.0.0",
"express": "^4.21.2",
"express-openapi-validator": "^5.3.9",
"knex": "^3.1.0",
"mysql2": "^3.11.4",
"mysql2": "^3.11.5",
"wpautop": "^1.0.0"
},
"devDependencies": {
Expand Down

0 comments on commit e3c4bbc

Please sign in to comment.