diff --git a/charts/kubernetes-external-secrets/values.yaml b/charts/kubernetes-external-secrets/values.yaml index 72315516..4469bb17 100644 --- a/charts/kubernetes-external-secrets/values.yaml +++ b/charts/kubernetes-external-secrets/values.yaml @@ -16,6 +16,7 @@ env: AWS_DEFAULT_REGION: us-west-2 POLLER_INTERVAL_MILLISECONDS: 10000 # Caution, setting this frequency may incur additional charges on some platforms LOG_LEVEL: info + LOG_MESSAGE_KEY: 'msg' # Print logs level as string ("info") rather than integer (30) # USE_HUMAN_READABLE_LOG_LEVELS: true METRICS_PORT: 3001 diff --git a/config/environment.js b/config/environment.js index 73798329..bb327484 100644 --- a/config/environment.js +++ b/config/environment.js @@ -25,6 +25,7 @@ const pollerIntervalMilliseconds = process.env.POLLER_INTERVAL_MILLISECONDS const logLevel = process.env.LOG_LEVEL || 'info' const useHumanReadableLogLevels = 'USE_HUMAN_READABLE_LOG_LEVELS' in process.env +const logMessageKey = 'LOG_MESSAGE_KEY' in process.env const pollingDisabled = 'DISABLE_POLLING' in process.env @@ -46,5 +47,6 @@ module.exports = { pollingDisabled, logLevel, customResourceManagerDisabled, - useHumanReadableLogLevels + useHumanReadableLogLevels, + logMessageKey } diff --git a/config/index.js b/config/index.js index de5f5c1f..f3bbb62f 100644 --- a/config/index.js +++ b/config/index.js @@ -33,10 +33,15 @@ const kubeClient = new kube.Client({ backend: kubeBackend }) const logger = pino({ serializers: { - err: pino.stdSerializers.err + err: pino.stdSerializers.err, + messageKey: envConfig.logMessageKey || 'msg' }, level: envConfig.logLevel, - useLevelLabels: envConfig.useHumanReadableLogLevels + formatters: { + level (label, number) { + return { level: envConfig.useHumanReadableLogLevels ? label : number } + } + } }) const customResourceManager = new CustomResourceManager({ diff --git a/package-lock.json b/package-lock.json index 79f3c6cb..1506c7e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6173,9 +6173,9 @@ } }, "pino": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-6.0.0.tgz", - "integrity": "sha512-3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/pino/-/pino-6.4.1.tgz", + "integrity": "sha512-1zDSQworQZw14tvqjuW5aj5GV5oUQpV5Bz5wnpVVltVPBzaOoV1Dv+oKn1xNCz2CCkOyZd+kkdlel9lCLBYl+Q==", "requires": { "fast-redact": "^2.0.0", "fast-safe-stringify": "^2.0.7", @@ -6780,9 +6780,9 @@ } }, "sonic-boom": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.1.tgz", - "integrity": "sha512-o9tx+bonVEXSaPtptyXQXpP8l6UV9Bi3im2geZskvWw2a/o/hrbWI7EBbbv+rOx6Hubnzun9GgH4WfbgEA3MFQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.2.tgz", + "integrity": "sha512-sRMmXu7uFDXoniGvtLHuQk5KWovLWoi6WKASn7rw0ro41mPf0fOolkGp4NE6680CbxvNh26zWNyFQYYWXe33EA==", "requires": { "atomic-sleep": "^1.0.0", "flatstr": "^1.0.12" diff --git a/package.json b/package.json index de60842d..86dc73d0 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "lodash.merge": "^4.6.2", "make-promises-safe": "^5.1.0", "node-vault": "^0.9.18", - "pino": "^6.0.0", + "pino": "^6.4.1", "prom-client": "^12.0.0" }, "devDependencies": {