bergquist 9 лет назад
Родитель
Сommit
a51de8e987
2 измененных файлов с 1 добавлено и 31 удалено
  1. 1 16
      conf/defaults.ini
  2. 0 15
      conf/sample.ini

+ 1 - 16
conf/defaults.ini

@@ -229,7 +229,7 @@ auth_url = https://accounts.google.com/o/oauth2/auth
 token_url = https://accounts.google.com/o/oauth2/token
 api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
-hosted_domain = 
+hosted_domain =
 
 #################################### Grafana.net Auth ####################
 [auth.grafananet]
@@ -390,21 +390,6 @@ global_api_key = -1
 global_session = -1
 
 #################################### Alerting ############################
-# docs about alerting can be found in /docs/sources/alerting/
-#              __.-/|
-#              \`o_O'
-#               =( )=  +----------------------------+
-#                 U|   | Alerting is still in alpha |
-#       /\  /\   / |   +----------------------------+
-#      ) /^\) ^\/ _)\     |
-#      )   /^\/   _) \    |
-#      )   _ /  / _)  \___|_
-#  /\  )/\/ ||  | )_)\___,|))
-# <  >      |(,,) )__)    |
-#  ||      /    \)___)\
-#  | \____(      )___) )____
-#   \______(_______;;;)__;;;)
-
 [alerting]
 # Makes it possible to turn off alert rule execution.
 execute_alerts = true

+ 0 - 15
conf/sample.ini

@@ -339,21 +339,6 @@
 ;path = /var/lib/grafana/dashboards
 
 #################################### Alerting ######################################
-# docs about alerting can be found in /docs/sources/alerting/
-#              __.-/|
-#              \`o_O'
-#               =( )=  +----------------------------+
-#                 U|   | Alerting is still in alpha |
-#       /\  /\   / |   +----------------------------+
-#      ) /^\) ^\/ _)\     |
-#      )   /^\/   _) \    |
-#      )   _ /  / _)  \___|_
-#  /\  )/\/ ||  | )_)\___,|))
-# <  >      |(,,) )__)    |
-#  ||      /    \)___)\
-#  | \____(      )___) )____
-#   \______(_______;;;)__;;;)
-
 [alerting]
 # Makes it possible to turn off alert rule execution.
 ;execute_alerts = true