Config: fix buildInfo initialization (#47402)

* Config: fix buildInfo initialization

* change default to be parseable

* apply default values for buildInfo
pull/47290/head^2
Agnès Toulet 4 years ago committed by GitHub
parent 21d82132bb
commit 59388bf546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      packages/grafana-runtime/src/config.ts

@ -119,7 +119,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
this.theme2 = createTheme({ colors: { mode } }); this.theme2 = createTheme({ colors: { mode } });
this.theme = this.theme2.v1; this.theme = this.theme2.v1;
this.bootData = options.bootData; this.bootData = options.bootData;
this.buildInfo = options.buildInfo;
const defaults = { const defaults = {
datasources: {}, datasources: {},
@ -131,7 +130,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
appUrl: '', appUrl: '',
appSubUrl: '', appSubUrl: '',
buildInfo: { buildInfo: {
version: 'v1.0', version: '1.0',
commit: '1', commit: '1',
env: 'production', env: 'production',
}, },
@ -142,6 +141,8 @@ export class GrafanaBootConfig implements GrafanaConfig {
merge(this, defaults, options); merge(this, defaults, options);
this.buildInfo = options.buildInfo || defaults.buildInfo;
if (this.dateFormats) { if (this.dateFormats) {
systemDateFormats.update(this.dateFormats); systemDateFormats.update(this.dateFormats);
} }

Loading…
Cancel
Save