* fix templates_test.go - removed orgId from urls

* changed implementation in alertmanager.go NewAlertmanager() to avoid null exception if there is no ParsedAppUrl provided in config (fixes a lot of tests)
* changed implementation in navtree.go to remove the connections section (datasources) in another place, to help tests pass and makes more sense.

Author: yasmin-tr

pkg/services/navtree/navtreeimpl/navtree.go

@@ -151,9 +151,11 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
 		}
 	}
 
-	if connectionsSection := s.buildDataConnectionsNavLink(c); connectionsSection != nil {
-		treeRoot.AddSection(connectionsSection)
-	}
+	// LOGZ.IO GRAFANA CHANGE :: DEV-45139 - hide datasources menu
+	//if connectionsSection := s.buildDataConnectionsNavLink(c); connectionsSection != nil {
+	//	treeRoot.AddSection(connectionsSection)
+	//}
+	// LOGZ.IO GRAFANA CHANGE :: End
 
 	orgAdminNode, err := s.getAdminNode(c)
 
@@ -485,7 +487,7 @@ func (s *ServiceImpl) buildDataConnectionsNavLink(c *contextmodel.ReqContext) *n
 
 	baseUrl := s.cfg.AppSubURL + "/connections"
 
-	if false && hasAccess(datasources.ConfigurationPageAccess) { // LOGZ.IO GRAFANA CHANGE :: hide datasources menu, should be done by altering permissions
+	if hasAccess(datasources.ConfigurationPageAccess) {
 		// Add new connection
 		children = append(children, &navtree.NavLink{
 			Id:       "connections-add-new-connection",

pkg/services/ngalert/notifier/alertmanager.go

@@ -122,9 +122,18 @@ func NewAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store A
 		},
 	}
 
+	// LOGZ.IO GRAFANA CHANGE :: DEV-43657 - Set APP url to logzio grafana for alert notification URLs
+	externalUrl := ""
+	if cfg.ParsedAppURL != nil {
+		externalUrl = cfg.ParsedAppURL.String()
+	} else {
+		externalUrl = cfg.AppURL
+	}
+	// LOGZ.IO GRAFANA CHANGE :: End
+
 	amcfg := &alertingNotify.GrafanaAlertmanagerConfig{
 		WorkingDirectory:   filepath.Join(cfg.DataPath, workingDir, strconv.Itoa(int(orgID))),
-		ExternalURL:        cfg.ParsedAppURL.String(), // LOGZ.IO GRAFANA CHANGE :: DEV-43657 - Set APP url to logzio grafana for alert notification URLs
+		ExternalURL:        externalUrl, // LOGZ.IO GRAFANA CHANGE :: DEV-43657 - Set APP url to logzio grafana for alert notification URLs
 		AlertStoreCallback: nil,
 		PeerTimeout:        cfg.UnifiedAlerting.HAPeerTimeout,
 		Silences:           silencesOptions,

pkg/services/ngalert/notifier/templates_test.go

@@ -124,9 +124,10 @@ CommonAnnotations: {{ range .CommonAnnotations.SortedPairs }}{{ .Name }}={{ .Val
 		expected: TestTemplatesResults{
 			Results: []alertingNotify.TestTemplatesResult{{
 				Name: "slack.title",
-				Text: fmt.Sprintf("http://localhost:9093/d/%s?orgId=%s",
-					DefaultAnnotations[alertingModels.DashboardUIDAnnotation],
-					DefaultAnnotations[alertingModels.OrgIDAnnotation]),
+				// LOGZ.IO GRAFANA CHANGE :: DEV-45707: remove org id query param from notification urls
+				Text: fmt.Sprintf("http://localhost:9093/d/%s",
+					DefaultAnnotations[alertingModels.DashboardUIDAnnotation]),
+				// LOGZ.IO GRAFANA CHANGE :: End
 			}},
 			Errors: nil,
 		},
@@ -140,10 +141,11 @@ CommonAnnotations: {{ range .CommonAnnotations.SortedPairs }}{{ .Name }}={{ .Val
 		expected: TestTemplatesResults{
 			Results: []alertingNotify.TestTemplatesResult{{
 				Name: "slack.title",
-				Text: fmt.Sprintf("http://localhost:9093/d/%s?orgId=%s&viewPanel=%s",
+				// LOGZ.IO GRAFANA CHANGE :: DEV-45707: remove org id query param from notification urls
+				Text: fmt.Sprintf("http://localhost:9093/d/%s?viewPanel=%s",
 					DefaultAnnotations[alertingModels.DashboardUIDAnnotation],
-					DefaultAnnotations[alertingModels.OrgIDAnnotation],
 					DefaultAnnotations[alertingModels.PanelIDAnnotation]),
+				// LOGZ.IO GRAFANA CHANGE :: End
 			}},
 			Errors: nil,
 		},
@@ -157,7 +159,7 @@ CommonAnnotations: {{ range .CommonAnnotations.SortedPairs }}{{ .Name }}={{ .Val
 		expected: TestTemplatesResults{
 			Results: []alertingNotify.TestTemplatesResult{{
 				Name: "slack.title",
-				Text: fmt.Sprintf("http://localhost:3000?orgId=%s", DefaultAnnotations[alertingModels.OrgIDAnnotation]),
+				Text: "http://localhost:3000", // LOGZ.IO GRAFANA CHANGE :: DEV-45707: remove org id query param from notification urls
 			}},
 			Errors: nil,
 		},