Merge pull request #11742 from grafana/davkal/explore

Explore UI skeleton
This commit is contained in:
David
2018-04-27 15:46:40 +02:00
committed by GitHub
34 changed files with 3707 additions and 1613 deletions

View File

@@ -117,6 +117,19 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
Children: dashboardChildNavs,
})
if setting.ExploreEnabled {
data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Explore",
Id: "explore",
SubTitle: "Explore your data",
Icon: "fa fa-rocket",
Url: setting.AppSubUrl + "/explore",
Children: []*dtos.NavLink{
{Text: "New tab", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/explore"},
},
})
}
if c.IsSignedIn {
// Only set login if it's different from the name
var login string

View File

@@ -170,6 +170,9 @@ var (
AlertingEnabled bool
ExecuteAlerts bool
// Explore UI
ExploreEnabled bool
// logger
logger log.Logger
@@ -616,6 +619,9 @@ func NewConfigContext(args *CommandLineArgs) error {
AlertingEnabled = alerting.Key("enabled").MustBool(true)
ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
explore := Cfg.Section("explore")
ExploreEnabled = explore.Key("enabled").MustBool(false)
readSessionConfig()
readSmtpSettings()
readQuotaSettings()