From 26980460c80625307a8a867526b81a4f31c66bf5 Mon Sep 17 00:00:00 2001 From: x10an14-nav Date: Mon, 2 Sep 2024 11:54:24 +0200 Subject: [PATCH 1/2] network: Make grafana happier again Ref: https://grafana.nav.cloud.nais.io/d/06QXK89Wk/amplitude-proxy?orgId=1&from=1722204000000&to=1725141599000 Revert "Bump fastify from 4.26.2 to 4.28.1 (#531)" This reverts commit b553a842ced45e32345978cfec2892a51145dbe2. This reverts commit adc2798980569756ceed038ef891735f9f0eb3c2. --- .nais/prod-gcp.yaml | 2 +- package-lock.json | 61 ++++----------------------------------------- package.json | 2 +- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/.nais/prod-gcp.yaml b/.nais/prod-gcp.yaml index c6c4e3a..c5c004d 100644 --- a/.nais/prod-gcp.yaml +++ b/.nais/prod-gcp.yaml @@ -36,7 +36,7 @@ spec: limits: memory: 2Gi requests: - cpu: "2" + cpu: "1" memory: 1Gi ingresses: - "https://amplitude.nav.no" diff --git a/package-lock.json b/package-lock.json index f816e68..40c4260 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fastify/static": "7.0.1", "ajv": "8.12.0", "axios": "1.6.8", - "fastify": "4.28.1", + "fastify": "4.26.2", "fastify-metrics": "10.6.0", "geoip-lite": "^1.4.10", "isbot": "5.1.6", @@ -838,9 +838,9 @@ "integrity": "sha512-cIusKBIt/R/oI6z/1nyfe2FvGKVTohVRfvkOhvx0nCEW+xf5NoCXjAHcWp93uOUBchzYcsvPlrapAdX1uW+YGg==" }, "node_modules/fastify": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.28.1.tgz", - "integrity": "sha512-kFWUtpNr4i7t5vY2EJPCN2KgMVpuqfU4NjnJNCgiNB900oiDeYqaNDRcAfeBbOF5hGixixxcKnOU4KN9z6QncQ==", + "version": "4.26.2", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-4.26.2.tgz", + "integrity": "sha512-90pjTuPGrfVKtdpLeLzND5nyC4woXZN5VadiNQCicj/iJU4viNHKhsAnb7jmv1vu2IzkLXyBiCzdWuzeXgQ5Ug==", "funding": [ { "type": "github", @@ -861,7 +861,7 @@ "fast-json-stringify": "^5.8.0", "find-my-way": "^8.0.0", "light-my-request": "^5.11.0", - "pino": "^9.0.0", + "pino": "^8.17.0", "process-warning": "^3.0.0", "proxy-addr": "^2.0.7", "rfdc": "^1.3.0", @@ -898,62 +898,11 @@ "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-4.5.0.tgz", "integrity": "sha512-79ak0JxddO0utAXAQ5ccKhvs6vX2MGyHHMMsmZkBANrq3hXc1CHzvNPHOcvTsVMEPl5I+NT+RO4YKMGehOfSIg==" }, - "node_modules/fastify/node_modules/pino": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-9.2.0.tgz", - "integrity": "sha512-g3/hpwfujK5a4oVbaefoJxezLzsDgLcNJeITvC6yrfwYeT9la+edCK42j5QpEQSQCZgTKapXvnQIdgZwvRaZug==", - "dependencies": { - "atomic-sleep": "^1.0.0", - "fast-redact": "^3.1.1", - "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "^1.2.0", - "pino-std-serializers": "^7.0.0", - "process-warning": "^3.0.0", - "quick-format-unescaped": "^4.0.3", - "real-require": "^0.2.0", - "safe-stable-stringify": "^2.3.1", - "sonic-boom": "^4.0.1", - "thread-stream": "^3.0.0" - }, - "bin": { - "pino": "bin.js" - } - }, - "node_modules/fastify/node_modules/pino-abstract-transport": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", - "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", - "dependencies": { - "readable-stream": "^4.0.0", - "split2": "^4.0.0" - } - }, - "node_modules/fastify/node_modules/pino-std-serializers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz", - "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==" - }, "node_modules/fastify/node_modules/process-warning": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-3.0.0.tgz", "integrity": "sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ==" }, - "node_modules/fastify/node_modules/sonic-boom": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.0.1.tgz", - "integrity": "sha512-hTSD/6JMLyT4r9zeof6UtuBDpjJ9sO08/nmS5djaA9eozT9oOlNdpXSnzcgj4FTqpk3nkLrs61l4gip9r1HCrQ==", - "dependencies": { - "atomic-sleep": "^1.0.0" - } - }, - "node_modules/fastify/node_modules/thread-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz", - "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==", - "dependencies": { - "real-require": "^0.2.0" - } - }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", diff --git a/package.json b/package.json index a520225..90c034d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "ajv": "8.12.0", "axios": "1.6.8", - "fastify": "4.28.1", + "fastify": "4.26.2", "@fastify/cors": "9.0.1", "@fastify/formbody": "^7.4.0", "fastify-metrics": "10.6.0", From f219428634ac2d7b9d2cc090420f26d9281b87b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 09:58:53 +0000 Subject: [PATCH 2/2] Bump isbot from 5.1.6 to 5.1.17 Bumps [isbot](https://github.com/omrilotan/isbot) from 5.1.6 to 5.1.17. - [Changelog](https://github.com/omrilotan/isbot/blob/main/CHANGELOG.md) - [Commits](https://github.com/omrilotan/isbot/compare/v5.1.6...v5.1.17) --- updated-dependencies: - dependency-name: isbot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40c4260..6c1fe9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "fastify": "4.26.2", "fastify-metrics": "10.6.0", "geoip-lite": "^1.4.10", - "isbot": "5.1.6", + "isbot": "5.1.17", "kafkajs": "^2.2.4", "pino": "^8.19.0", "prom-client": "^15.1.2", @@ -1283,9 +1283,9 @@ } }, "node_modules/isbot": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.6.tgz", - "integrity": "sha512-Phksj1A0dBP/M/5xeOx0zWemKlZRQvrbNzI19/HWso0uodiOcR8YYCXN60IdzwbKsGj5LnxPkMy6FuBtgckMNw==", + "version": "5.1.17", + "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz", + "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==", "engines": { "node": ">=18" } diff --git a/package.json b/package.json index 90c034d..b26c2b5 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "fastify-metrics": "10.6.0", "@fastify/static": "7.0.1", "geoip-lite": "^1.4.10", - "isbot": "5.1.6", + "isbot": "5.1.17", "kafkajs": "^2.2.4", "pino": "^8.19.0", "prom-client": "^15.1.2",