IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-08 15:13:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(): renaming alerting hide ui option, #7318

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-01-25 13:32:26 +01:00
parent fee4846429
commit 40d39f8a3e
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/defaults.ini
View File

@ -402,9 +402,10 @@ global_session = -1
#################################### Alerting ############################
[alerting]
# Makes it possible to turn off alert rule execution.
# Disable alerting engine & UI features
enabled = true
# Makes it possible to turn off alert rule execution but alerting UI is visible
execute_alerts = true
show_alerting_ui = true
#################################### Internal Grafana Metrics ############
# Metrics available at HTTP API Url /api/metrics

2
pkg/api/frontendsettings.go
View File

@ -140,7 +140,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
"authProxyEnabled": setting.AuthProxyEnabled,
"ldapEnabled": setting.LdapEnabled,
"showAlertingUI": setting.ShowAlertingUI,
"alertingEnabled": setting.AlertingEnabled,
"buildInfo": map[string]interface{}{
"version": setting.BuildVersion,
"commit": setting.BuildCommit,

2
pkg/api/index.go
View File

@ -103,7 +103,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
Children: dashboardChildNavs,
})
if setting.ShowAlertingUI && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) {
if setting.AlertingEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) {
alertChildNavs := []*dtos.NavLink{
{Text: "Alert List", Url: setting.AppSubUrl + "/alerting/list"},
{Text: "Notification channels", Url: setting.AppSubUrl + "/alerting/notifications"},

2
pkg/cmd/grafana-server/server.go
View File

@ -59,7 +59,7 @@ func (g *GrafanaServerImpl) Start() {
plugins.Init()
// init alerting
if setting.ExecuteAlerts {
if setting.AlertingEnabled && setting.ExecuteAlerts {
engine := alerting.NewEngine()
g.childRoutines.Go(func() error { return engine.Run(g.context) })
}

4
pkg/setting/setting.go
View File

@ -150,8 +150,8 @@ var (
Quota QuotaSettings
// Alerting
AlertingEnabled bool
ExecuteAlerts bool
ShowAlertingUI bool
// logger
logger log.Logger
@ -579,8 +579,8 @@ func NewConfigContext(args *CommandLineArgs) error {
LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
alerting := Cfg.Section("alerting")
AlertingEnabled = alerting.Key("enabled").MustBool(true)
ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
ShowAlertingUI = alerting.Key("show_alerting_ui").MustBool(true)
readSessionConfig()
readSmtpSettings()

3
public/app/plugins/panel/graph/module.ts
View File

@ -132,7 +132,8 @@ class GraphCtrl extends MetricsPanelCtrl {
this.addEditorTab('Axes', axesEditorComponent, 2);
this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3);
this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4);
if (config.showAlertingUI) {
if (config.alertingEnabled) {
this.addEditorTab('Alert', alertTab, 5);
}