PMM-13943 Provide a UID per datasource (#3926)

* PMM-13493 Provide a UID per datasource

* PMM-13943 Revert prior removal of DS

* PMM-13943 remove a redundant grafana method

* PMM-13943 remove datasource prior to adding them

Author: ademidoff

build/ansible/roles/grafana/files/datasources.yml

@@ -1,5 +1,11 @@
 apiVersion: 1
 deleteDatasources:
+  - name: Metrics
+    orgId: 1
+  - name: PostgreSQL
+    orgId: 1
+  - name: PTSummary
+    orgId: 1
   - name: ClickHouse
     orgId: 1
 
@@ -8,6 +14,7 @@ datasources:
   version: 2
   orgId: 1
   type: prometheus
+  uid: prometheus
   access: proxy
   url: http://127.0.0.1:8430/
   isDefault: true
@@ -20,6 +27,7 @@ datasources:
   version: 2
   orgId: 1
   type: postgres
+  uid: postgres
   access: proxy
   url: ${PMM_POSTGRES_ADDR}
   user: ${PMM_POSTGRES_USERNAME}
@@ -37,13 +45,15 @@ datasources:
   version: 2
   orgId: 1
   type: pmm-pt-summary-datasource
+  uid: pt-summary
   access: proxy
 
 # https://github.com/grafana/clickhouse-datasource?tab=readme-ov-file#with-a-configuration-file
 - name: ClickHouse
   orgId: 1
   version: 2
   type: grafana-clickhouse-datasource
+  uid: clickhouse
   jsonData:
     username: ${PMM_CLICKHOUSE_USER}
     port: ${PMM_CLICKHOUSE_PORT}

managed/services/alerting/deps.go

@@ -25,6 +25,5 @@ import (
 
 type grafanaClient interface {
 	CreateAlertRule(ctx context.Context, folderUID, groupName, interval string, rule *services.Rule) error
-	GetDatasourceUIDByID(ctx context.Context, id int64) (string, error)
 	GetFolderByUID(ctx context.Context, uid string) (*gapi.Folder, error)
 }

managed/services/alerting/mock_grafana_client_test.go

@@ -51,6 +51,7 @@ const (
 	builtinTemplatesDir       = "/usr/local/percona/alerting-templates"
 	userTemplatesDir          = "/srv/alerting/templates"
 	defaultEvaluationInterval = time.Minute
+	prometheusDatasourceUID   = "prometheus"
 
 	dirPerm = os.FileMode(0o775)
 )
@@ -612,11 +613,6 @@ func (s *Service) CreateRule(ctx context.Context, req *alerting.CreateRuleReques
 		return nil, status.Error(codes.InvalidArgument, "Rule group name should be specified.")
 	}
 
-	metricsDatasourceUID, err := s.grafanaClient.GetDatasourceUIDByID(ctx, 1) // 1 - it's id of Metrics datasource in PMM
-	if err != nil {
-		return nil, err
-	}
-
 	sourceTemplate, ok := s.GetTemplates()[req.TemplateName]
 	if !ok {
 		return nil, status.Errorf(codes.NotFound, "Unknown template %s.", req.TemplateName)
@@ -693,7 +689,7 @@ func (s *Service) CreateRule(ctx context.Context, req *alerting.CreateRuleReques
 			Data: []services.Data{
 				{
 					RefID:         "A",
-					DatasourceUID: metricsDatasourceUID,
+					DatasourceUID: prometheusDatasourceUID,
 					// TODO: https://community.grafana.com/t/grafana-requires-time-range-for-alert-rule-creation-with-instant-promql-quieriy/70919
 					RelativeTimeRange: services.RelativeTimeRange{From: 600, To: 0},
 					Model: services.Model{

managed/services/alerting/service.go

@@ -533,20 +533,6 @@ func validateDurations(intervalD, forD string) error {
 	return nil
 }
 
-// GetDatasourceUIDByID returns grafana datasource UID.
-func (c *Client) GetDatasourceUIDByID(ctx context.Context, id int64) (string, error) {
-	grafanaClient, err := c.createGrafanaClient(ctx)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to create grafana client")
-	}
-
-	ds, err := grafanaClient.DataSource(id)
-	if err != nil {
-		return "", err
-	}
-	return ds.UID, nil
-}
-
 // CreateFolder creates grafana folder.
 func (c *Client) CreateFolder(ctx context.Context, title string) (*gapi.Folder, error) {
 	grafanaClient, err := c.createGrafanaClient(ctx)