* Config: fix buildInfo initialization
* change default to be parseable
* apply default values for buildInfo
(cherry picked from commit 59388bf546)
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
This commit is contained in:
co-authored by
Agnès Toulet
parent
c7877e09d0
commit
99dbf0502a
@@ -119,7 +119,6 @@ export class GrafanaBootConfig implements GrafanaConfig {
|
||||
this.theme2 = createTheme({ colors: { mode } });
|
||||
this.theme = this.theme2.v1;
|
||||
this.bootData = options.bootData;
|
||||
this.buildInfo = options.buildInfo;
|
||||
|
||||
const defaults = {
|
||||
datasources: {},
|
||||
@@ -131,7 +130,7 @@ export class GrafanaBootConfig implements GrafanaConfig {
|
||||
appUrl: '',
|
||||
appSubUrl: '',
|
||||
buildInfo: {
|
||||
version: 'v1.0',
|
||||
version: '1.0',
|
||||
commit: '1',
|
||||
env: 'production',
|
||||
},
|
||||
@@ -142,6 +141,8 @@ export class GrafanaBootConfig implements GrafanaConfig {
|
||||
|
||||
merge(this, defaults, options);
|
||||
|
||||
this.buildInfo = options.buildInfo || defaults.buildInfo;
|
||||
|
||||
if (this.dateFormats) {
|
||||
systemDateFormats.update(this.dateFormats);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user