Merge branch 'master' into alerting_definitions

2016-05-19 08:05:35 +02:00
parent c133a00125 2b06ceda71
commit ef4f5147be
42 changed files with 1833 additions and 95 deletions
@@ -142,6 +142,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 			"buildstamp":    setting.BuildStamp,
 			"latestVersion": plugins.GrafanaLatestVersion,
 			"hasUpdate":     plugins.GrafanaHasUpdate,
+			"env":           setting.Env,
 		},
 		"alertingEnabled": setting.AlertingEnabled,
 	}