Reverted "Added version information to log lines"

refs https://github.com/TryGhost/Toolbox/issues/501

- this reverts commit f2116357b7
- something with Elasticsearch is causing high CPU usage, so this commit
  reverts that for now

ghost/bootstrap-socket/package.json

@@ -22,6 +22,6 @@
     "sinon": "14.0.2"
   },
   "dependencies": {
-    "@tryghost/logging": "2.4.0"
+    "@tryghost/logging": "2.3.6"
   }
 }

ghost/core/loggingrc.js

@@ -11,9 +11,6 @@ if (!loggingConfig.path) {
 // Additional values used by logging
 loggingConfig.env = config.get('env');
 loggingConfig.domain = config.get('url');
-loggingConfig.metadata = {
-    version: ghostVersion.original
-};
 
 // Config for metrics
 loggingConfig.metrics = config.get('logging:metrics') || {};

ghost/core/package.json

@@ -97,7 +97,7 @@
     "@tryghost/link-redirects": "0.0.0",
     "@tryghost/link-replacer": "0.0.0",
     "@tryghost/link-tracking": "0.0.0",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/magic-link": "0.0.0",
     "@tryghost/mailgun-client": "0.0.0",
     "@tryghost/member-attribution": "0.0.0",
@@ -228,7 +228,7 @@
     "toml": "3.0.0"
   },
   "resolutions": {
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }

ghost/domain-events/package.json

@@ -17,7 +17,7 @@
     "lib"
   ],
   "devDependencies": {
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "c8": "7.12.0",
     "mocha": "10.2.0",
     "should": "13.2.3"

ghost/email-service/package.json

@@ -29,7 +29,7 @@
     "@tryghost/errors": "1.2.20",
     "@tryghost/html-to-plaintext": "0.0.0",
     "@tryghost/kg-default-cards": "6.0.0",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/tpl": "0.1.21",
     "bson-objectid": "2.0.4",
     "cheerio": "0.22.0",

ghost/job-manager/package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@breejs/later": "4.1.0",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "bree": "6.5.0",
     "cron-validate": "1.4.5",
     "fastq": "1.15.0",

ghost/mailgun-client/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@tryghost/debug": "0.1.21",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/metrics": "1.0.20",
     "form-data": "4.0.0",
     "lodash": "4.17.21",

ghost/members-api/package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/magic-link": "0.0.0",
     "@tryghost/member-events": "0.0.0",
     "@tryghost/members-payments": "0.0.0",

ghost/members-events-service/package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/member-events": "0.0.0",
     "moment-timezone": "0.5.34"
   }

ghost/members-importer/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/members-csv": "0.0.0",
     "@tryghost/tpl": "0.1.21",
     "moment-timezone": "0.5.23"

ghost/oembed-service/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/tpl": "0.1.21",
     "charset": "1.0.1",
     "cheerio": "0.22.0",

ghost/stripe/package.json

@@ -26,7 +26,7 @@
     "@tryghost/debug": "0.1.21",
     "@tryghost/domain-events": "0.0.0",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/member-events": "0.0.0",
     "leaky-bucket": "2.2.0",
     "lodash": "4.17.21",

ghost/update-check-service/package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@tryghost/debug": "0.1.21",
     "@tryghost/errors": "1.2.20",
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "@tryghost/tpl": "0.1.21",
     "lodash": "4.17.21",
     "moment": "2.24.0"

package.json

@@ -36,7 +36,7 @@
     "prepare": "husky install .github/hooks"
   },
   "resolutions": {
-    "@tryghost/logging": "2.4.0",
+    "@tryghost/logging": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   },

yarn.lock

@@ -1951,25 +1951,25 @@
     ee-log "^3.0.0"
     section-tests "^1.3.0"
 
-"@elastic/elasticsearch@8.6.0":
+"@elastic/elasticsearch@8.5.0":
-  version "8.6.0"
+  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.6.0.tgz#c474f49808deee64b5bc5b8f938bf78f4468cb94"
+  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea"
-  integrity sha512-mN5EbbgSp1rfRmQ/5Hv7jqAK8xhGJxCg7G84xje8hSefE59P+HPPCv/+DgesCUSJdZpwXIo0DwOWHfHvktxxLw==
+  integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ==
   dependencies:
-    "@elastic/transport" "^8.3.1"
+    "@elastic/transport" "^8.2.0"
     tslib "^2.4.0"
 
-"@elastic/transport@^8.3.1":
+"@elastic/transport@^8.2.0":
-  version "8.3.1"
+  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.1.tgz#e7569d7df35b03108ea7aa886113800245faa17f"
+  resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.2.0.tgz#f292cb79c918a36268dd853431e41f13544814ad"
-  integrity sha512-jv/Yp2VLvv5tSMEOF8iGrtL2YsYHbpf4s+nDsItxUTLFTzuJGpnsB/xBlfsoT2kAYEnWHiSJuqrbRcpXEI/SEQ==
+  integrity sha512-H/HmefMNQfLiBSVTmNExu2lYs5EzwipUnQB53WLr17RCTDaQX0oOLHcWpDsbKQSRhDAMPPzp5YZsZMJxuxPh7A==
   dependencies:
     debug "^4.3.4"
     hpagent "^1.0.0"
     ms "^2.1.3"
     secure-json-parse "^2.4.0"
     tslib "^2.4.0"
-    undici "^5.5.1"
+    undici "^5.1.1"
 
 "@ember-data/adapter@3.24.0":
   version "3.24.0"
@@ -4328,12 +4328,12 @@
     "@tryghost/root-utils" "^0.3.19"
     debug "^4.3.1"
 
-"@tryghost/elasticsearch@^3.0.8", "@tryghost/elasticsearch@^3.0.9":
+"@tryghost/elasticsearch@^3.0.8":
-  version "3.0.9"
+  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.9.tgz#e13db1f4b73c202389d4bd14ee5f20d8f5c6f6c1"
+  resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.8.tgz#cc39d7781140403c66b760233b87793a6cecb29a"
-  integrity sha512-b5qtQ7t976Y47G7yJShr5Rw/OPYdo1aQLzhb26VJXPQbF3ApadkuiFZP27YtApLm10MZzeTM/X+RLR0DSdvdtQ==
+  integrity sha512-CDLDsvwLMHVOorS19m2bUwSbHagDZR00Rc8x4yKhtpihetOXXdFbwRu/0eYjenTDZfd+94JeQAyoEwK9RsrHPg==
   dependencies:
-    "@elastic/elasticsearch" "8.6.0"
+    "@elastic/elasticsearch" "8.5.0"
     "@tryghost/debug" "^0.1.21"
     split2 "4.1.0"
 
@@ -4397,13 +4397,13 @@
   resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.6.tgz#893ffad3b03b29ef5a4ab72b6298e95f9d6a7a08"
   integrity sha512-8j35Ixs5Ioa88cSKz2MaAILusuNa2cmbgt7b+XabwAyL3thxNZd6iaEyExPqqX6UOLkGJgO2e1oA5J+qeC7Ajg==
 
-"@tryghost/http-stream@^0.1.17":
+"@tryghost/http-stream@^0.1.16":
-  version "0.1.17"
+  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.17.tgz#3241ff2e1a403c052a3096855fc89f4d21c90d97"
+  resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.16.tgz#4200cc785d39862f08b75d31b497d7f7af3a328e"
-  integrity sha512-tcl8aRO47avrjoMneIKTlEakqsTHA8pFn1WNVH5nYC4cbgvkv0jOv4UgZ4NpwI2dbaRscfrgfsuq5KV5ZuvSiw==
+  integrity sha512-/W60TawqGK2IN1tMCNH3V4SLMpMHeUMEyG7PQfZXpK2VZUXkD4Puyz/45C79J71uftSUlIDN7XtruBKxZRvB+w==
   dependencies:
     "@tryghost/errors" "^1.2.20"
-    "@tryghost/request" "^0.1.35"
+    "@tryghost/request" "^0.1.34"
 
 "@tryghost/image-transform@1.2.3":
   version "1.2.3"
@@ -4523,14 +4523,14 @@
     lodash "^4.17.21"
     luxon "^1.26.0"
 
-"@tryghost/logging@2.3.6", "@tryghost/logging@2.4.0", "@tryghost/logging@^2.3.6":
+"@tryghost/logging@2.3.6", "@tryghost/logging@^2.3.6":
-  version "2.4.0"
+  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.0.tgz#b6620ba3029b5d481d317a04eb5c578b0b13ae08"
+  resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.3.6.tgz#7faab8f43bf934e2276c16d8e9bec638e930a355"
-  integrity sha512-Q3y3gPHOGgijViCkuu2ARr4G++jnGDeafWD9JdPZO8CK6K3N20Dun3M7ujX3OY+u5UXhQTsMQw+nC5pjPRBRGg==
+  integrity sha512-PkxFwwlOgvn6hkkANYj6E/NZa8bJ82CbeNdSYd87FjgMNSuLXUcQuQSRbs/89ZF20NO1P4PUQTSs6cPoZHP54Q==
   dependencies:
     "@tryghost/bunyan-rotating-filestream" "^0.0.7"
-    "@tryghost/elasticsearch" "^3.0.9"
+    "@tryghost/elasticsearch" "^3.0.8"
-    "@tryghost/http-stream" "^0.1.17"
+    "@tryghost/http-stream" "^0.1.16"
     "@tryghost/pretty-stream" "^0.1.15"
     "@tryghost/root-utils" "^0.3.19"
     bunyan "^1.8.15"
@@ -4641,7 +4641,7 @@
   resolved "https://registry.yarnpkg.com/@tryghost/promise/-/promise-0.2.1.tgz#78d922e6e9c99e52f472ff53cf4afd60049ee0f7"
   integrity sha512-XfrwP69eXPM8ebIS/oWtprsox+ufV+n3R3+UsEN6OmijXm9wGZInX0dZ45gERbLDJOzbvyl1qvbGGt1fsFoynw==
 
-"@tryghost/request@0.1.34":
+"@tryghost/request@0.1.34", "@tryghost/request@^0.1.34":
   version "0.1.34"
   resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-0.1.34.tgz#0fdd1e8cf5745244446507319346ffcf5dfc243d"
   integrity sha512-DLAXDBqTHqEgUbeXEJ3/u+iqZXJp1gdLKuH5Ti9B6WVVVcMGUZeU7/JQS5NuSeJ0mwB8a83F2DIFMkEmFAebQw==
@@ -4652,17 +4652,6 @@
     got "9.6.0"
     lodash "^4.17.21"
 
-"@tryghost/request@^0.1.35":
-  version "0.1.35"
-  resolved "https://registry.yarnpkg.com/@tryghost/request/-/request-0.1.35.tgz#37d2091ef7e0b163d88ad36e00f141169f62f272"
-  integrity sha512-5++pw+E4CxdX1VdaM/xOuIv7WVHEr+Lr55zXCM9ijt4rKcQNVvSd8SQgE+mGVsWHiJnk5ZX2NnDNWpZTjzoZlg==
-  dependencies:
-    "@tryghost/errors" "^1.2.20"
-    "@tryghost/validator" "^0.2.0"
-    "@tryghost/version" "^0.1.19"
-    got "9.6.0"
-    lodash "^4.17.21"
-
 "@tryghost/root-utils@0.3.19", "@tryghost/root-utils@^0.3.19":
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.19.tgz#714e67fdea080efc97d12f477b62cc89a66ade74"
@@ -25593,10 +25582,10 @@ underscore@~1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
   integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==
 
-undici@^5.5.1:
+undici@^5.1.1:
-  version "5.15.0"
+  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.15.0.tgz#cb8437c43718673a8be59df0fdd4856ff6689283"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.11.0.tgz#1db25f285821828fc09d3804b9e2e934ae86fc13"
-  integrity sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g==
+  integrity sha512-oWjWJHzFet0Ow4YZBkyiJwiK5vWqEYoH7BINzJAJOLedZ++JpAlCbUktW2GQ2DS2FpKmxD/JMtWUUWl1BtghGw==
   dependencies:
     busboy "^1.6.0"