Skip to content

Commit 750b6b8

Browse files
authored
[6.x] Log correct Kibana URL when TLS is enabled and log it only once. (#20954)
1 parent 17694da commit 750b6b8

File tree

9 files changed

+52
-53
lines changed

9 files changed

+52
-53
lines changed

src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,13 @@ Object {
1515
},
1616
Object {
1717
"@timestamp": "## @timestamp ##",
18-
"message": "starting server :tada:",
19-
"pid": "## PID ##",
20-
"tags": Array [
21-
"info",
22-
"server",
23-
],
24-
"type": "log",
25-
},
26-
Object {
27-
"@timestamp": "## @timestamp ##",
28-
"message": "registering route handler for [/core]",
29-
"pid": "## PID ##",
30-
"tags": Array [
31-
"info",
32-
"http",
33-
],
34-
"type": "log",
35-
},
36-
Object {
37-
"@timestamp": "## @timestamp ##",
38-
"message": "starting http server [localhost:8274]",
18+
"message": "Server running at http://localhost:8274",
3919
"pid": "## PID ##",
4020
"tags": Array [
4121
"info",
4222
"http",
4323
"server",
44-
],
45-
"type": "log",
46-
},
47-
Object {
48-
"@timestamp": "## @timestamp ##",
49-
"message": "Server running at http://localhost:8274",
50-
"pid": "## PID ##",
51-
"tags": Array [
5224
"listening",
53-
"info",
5425
],
5526
"type": "log",
5627
},

src/core/server/http/__tests__/__snapshots__/http_service.test.ts.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Object {
1818

1919
exports[`register route handler 1`] = `
2020
Object {
21-
"debug": Array [],
22-
"error": Array [],
23-
"fatal": Array [],
24-
"info": Array [
21+
"debug": Array [
2522
Array [
2623
"registering route handler for [/foo]",
2724
],
2825
],
26+
"error": Array [],
27+
"fatal": Array [],
28+
"info": Array [],
2929
"log": Array [],
3030
"trace": Array [],
3131
"warn": Array [],

src/core/server/http/http_server.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,13 @@ export class HttpServer {
8383
});
8484
}
8585

86-
this.log.info(`starting http server [${config.host}:${config.port}]`);
87-
8886
await this.server.start();
87+
88+
this.log.info(
89+
`Server running at ${this.server.info.uri}${config.rewriteBasePath ? config.basePath : ''}`,
90+
// The "legacy" Kibana will output log records with `listening` tag even if `quiet` logging mode is enabled.
91+
{ tags: ['listening'] }
92+
);
8993
}
9094

9195
public async stop() {

src/core/server/http/http_service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class HttpService implements CoreService {
8585
'Router will **not** be applied.'
8686
);
8787
} else {
88-
this.log.info(`registering route handler for [${router.path}]`);
88+
this.log.debug(`registering route handler for [${router.path}]`);
8989
this.httpServer.registerRouter(router);
9090
}
9191
}

src/core/server/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class Server {
3333
}
3434

3535
public async start() {
36-
this.log.info('starting server :tada:');
36+
this.log.debug('starting server :tada:');
3737

3838
const router = new Router('/core');
3939
router.get({ path: '/', validate: false }, async (req, res) => res.ok({ version: '0.0.1' }));

src/core/server/legacy_compat/logging/appenders/__tests__/__snapshots__/legacy_appender.test.ts.snap

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,25 @@ Array [
7272
"message-8-with-message",
7373
2012-02-01T11:22:33.044Z,
7474
],
75+
Array [
76+
Array [
77+
"info",
78+
"context-9",
79+
"sub-context-9",
80+
],
81+
"message-9-with-message",
82+
2012-02-01T11:22:33.044Z,
83+
],
84+
Array [
85+
Array [
86+
"info",
87+
"context-10",
88+
"sub-context-10",
89+
"tag1",
90+
"tag2",
91+
],
92+
"message-10-with-message",
93+
2012-02-01T11:22:33.044Z,
94+
],
7595
]
7696
`;

src/core/server/legacy_compat/logging/appenders/__tests__/legacy_appender.test.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,20 @@ test('`append()` correctly pushes records to legacy platform.', () => {
8686
message: 'message-8-with-message',
8787
timestamp,
8888
},
89+
{
90+
context: 'context-9.sub-context-9',
91+
level: LogLevel.Info,
92+
message: 'message-9-with-message',
93+
timestamp,
94+
meta: { someValue: 3 },
95+
},
96+
{
97+
context: 'context-10.sub-context-10',
98+
level: LogLevel.Info,
99+
message: 'message-10-with-message',
100+
timestamp,
101+
meta: { tags: ['tag1', 'tag2'] },
102+
},
89103
];
90104

91105
const rawKbnServerMock = {

src/core/server/legacy_compat/logging/appenders/legacy_appender.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ export class LegacyAppender implements DisposableAppender {
4141
* write record to the configured destination.
4242
* @param record `LogRecord` instance to forward to.
4343
*/
44-
public append(record: LogRecord) {
45-
this.kbnServer.log(
46-
[record.level.id.toLowerCase(), ...record.context.split('.')],
47-
record.error || record.message,
48-
record.timestamp
49-
);
44+
public append({ level, context, message, error, timestamp, meta = {} }: LogRecord) {
45+
const tags = [level.id.toLowerCase(), ...context.split('.'), ...(meta.tags || [])];
46+
47+
this.kbnServer.log(tags, error || message, timestamp);
5048
}
5149

5250
public async dispose() {

src/server/kbn_server.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,7 @@ export default class KbnServer {
138138
* @return undefined
139139
*/
140140
async listen() {
141-
const {
142-
server,
143-
config,
144-
} = this;
141+
const { server } = this;
145142

146143
await this.ready();
147144
await fromNode(cb => server.start(cb));
@@ -151,11 +148,6 @@ export default class KbnServer {
151148
process.send(['WORKER_LISTENING']);
152149
}
153150

154-
server.log(['listening', 'info'], `Server running at ${server.info.uri}${
155-
config.get('server.rewriteBasePath')
156-
? config.get('server.basePath')
157-
: ''
158-
}`);
159151
return server;
160152
}
161153

0 commit comments

Comments
 (0)