From 0f14ed55dbe062e0c6085ea88f8831b873b095bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 09:35:00 +0200 Subject: [PATCH 1/6] Use development version of camshaft --- package-lock.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2aebb203..25aa36b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,9 +814,8 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "0.67.0", - "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.67.0.tgz", - "integrity": "sha512-IiE4y01qZmIJUm88Zy8bi6oNo2Y1lG4cYL/WPiqVT/HOqk5c2FBDpcOZU1LSK8M1KJmNX8zIaoUWVhs40w3HZQ==", + "version": "github:cartodb/camshaft#e9d173ccbf28951eed886a8cd2bbe6371997237b", + "from": "github:cartodb/camshaft#fix-kibana-index", "requires": { "async": "^1.5.2", "cartodb-psql": "0.14.0", diff --git a/package.json b/package.json index 7397e982..47c520f1 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "assign-deep": "^1.0.1", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "^0.67.0", + "camshaft": "github:cartodb/camshaft#fix-kibana-index", "cartodb-psql": "0.14.0", "cartodb-query-tables": "^0.7.0", "cartodb-redis": "^3.0.0", From a3f7acb21372fcb5ef8efe00f3148d7cdd25245f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 10:41:34 +0200 Subject: [PATCH 2/6] Use development version of camshaft --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25aa36b0..ea0ed26d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,8 +814,8 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#e9d173ccbf28951eed886a8cd2bbe6371997237b", - "from": "github:cartodb/camshaft#fix-kibana-index", + "version": "github:cartodb/camshaft#1e37ed5fc915ad5713b46a49a4d887f2d6d88648", + "from": "github:cartodb/camshaft#fix-kibana-index-bis", "requires": { "async": "^1.5.2", "cartodb-psql": "0.14.0", diff --git a/package.json b/package.json index 47c520f1..bc84987f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "assign-deep": "^1.0.1", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "github:cartodb/camshaft#fix-kibana-index", + "camshaft": "github:cartodb/camshaft#fix-kibana-index-bis", "cartodb-psql": "0.14.0", "cartodb-query-tables": "^0.7.0", "cartodb-redis": "^3.0.0", From c119c92de6b7f8686756c1999d6172981186bb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 10:50:16 +0200 Subject: [PATCH 3/6] Use development version of camshaft --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index ea0ed26d..f35d0ba5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,7 +814,7 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#1e37ed5fc915ad5713b46a49a4d887f2d6d88648", + "version": "github:cartodb/camshaft#0069d22f31a10822ba20bee730f7107d911261d8", "from": "github:cartodb/camshaft#fix-kibana-index-bis", "requires": { "async": "^1.5.2", From 4dd6bc466a988d5ea6e02632f6f8e62df0c8311f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 11:06:26 +0200 Subject: [PATCH 4/6] Use development version of camshaft --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index f35d0ba5..8660bd8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,7 +814,7 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#0069d22f31a10822ba20bee730f7107d911261d8", + "version": "github:cartodb/camshaft#c5b4ce752db8c3bc0d4bed438ffe5d0563ca36b0", "from": "github:cartodb/camshaft#fix-kibana-index-bis", "requires": { "async": "^1.5.2", From 8ad72ff2ce1f0f8c962038356279e6ca393c4762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 11:36:38 +0200 Subject: [PATCH 5/6] Update camshaft to version 0.67.1 --- package-lock.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8660bd8b..279dd6fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,8 +814,9 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#c5b4ce752db8c3bc0d4bed438ffe5d0563ca36b0", - "from": "github:cartodb/camshaft#fix-kibana-index-bis", + "version": "0.67.1", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.67.1.tgz", + "integrity": "sha512-2fDiAP3cztN+6xUeEei/nkq1jvwbXrPTIG5zzbMDcEtEpjMnQjfXtM+l90yj1aNpx8qfTXW5r5X4KSnvUqc/6w==", "requires": { "async": "^1.5.2", "cartodb-psql": "0.14.0", diff --git a/package.json b/package.json index bc84987f..085f8614 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "assign-deep": "^1.0.1", "basic-auth": "2.0.0", "body-parser": "1.18.3", - "camshaft": "github:cartodb/camshaft#fix-kibana-index-bis", + "camshaft": "^0.67.1", "cartodb-psql": "0.14.0", "cartodb-query-tables": "^0.7.0", "cartodb-redis": "^3.0.0", From f85417a8863ed7df253354b199286c9271f90d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 26 Aug 2020 11:39:34 +0200 Subject: [PATCH 6/6] Update NEWS --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 5a31df25..bc9f9cee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,7 +6,7 @@ Released 2020-mm-dd Breaking changes: - Log system revamp: - Logs to stdout, disabled while testing - - Upgrade `camshaft` to version [`0.66.0`](https://github.com/CartoDB/camshaft/releases/tag/0.66.0) + - Upgrade `camshaft` to version [`0.67.1`](https://github.com/CartoDB/camshaft/releases/tag/0.67.1) - Use header `X-Request-Id`, or create a new `uuid` when no present, to identyfy log entries - Be able to set log level from env variable `LOG_LEVEL`, useful while testing: `LOG_LEVEL=info npm test`; even more human-readable: `LOG_LEVEL=info npm t | ./node_modules/.bin/pino-pretty` - Stop responding with `X-Tiler-Errors` header. Now errors are properly logged and will end up in ELK as usual.