feat(alerting): new design for alert tab with sidemenu

pkg/api/login_oauth.go

@@ -8,7 +8,6 @@ import (
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
@@ -42,7 +41,7 @@ func OAuthLogin(ctx *middleware.Context) {
 		return
 	}
 
-	log.Trace("login.OAuthLogin(Got token)")
+	ctx.Logger.Debug("OAuthLogin Got token")
 
 	userInfo, err := connect.UserInfo(token)
 	if err != nil {
@@ -56,11 +55,11 @@ func OAuthLogin(ctx *middleware.Context) {
 		return
 	}
 
-	log.Trace("login.OAuthLogin(social login): %s", userInfo)
+	ctx.Logger.Debug("OAuthLogin got user info", "userInfo", userInfo)
 
 	// validate that the email is allowed to login to grafana
 	if !connect.IsEmailAllowed(userInfo.Email) {
-		log.Info("OAuth login attempt with unallowed email, %s", userInfo.Email)
+		ctx.Logger.Info("OAuth login attempt with unallowed email", "email", userInfo.Email)
 		ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required email domain not fulfilled"))
 		return
 	}

pkg/services/alerting/notifier.go

@@ -38,6 +38,10 @@ func (n *RootNotifier) Notify(context *EvalContext) {
 		return
 	}
 
+	if len(notifiers) == 0 {
+		return
+	}
+
 	err = n.uploadImage(context)
 	if err != nil {
 		n.log.Error("Failed to upload alert panel image", "error", err)
@@ -84,8 +88,11 @@ func (n *RootNotifier) uploadImage(context *EvalContext) error {
 }
 
 func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64) ([]Notifier, error) {
-	query := &m.GetAlertNotificationsQuery{OrgId: orgId, Ids: notificationIds}
+	if len(notificationIds) == 0 {
+		return []Notifier{}, nil
+	}
 
+	query := &m.GetAlertNotificationsQuery{OrgId: orgId, Ids: notificationIds}
 	if err := bus.Dispatch(query); err != nil {
 		return nil, err
 	}