Merge pull request #30 from grafana/summarize-list-operations

Limit the amount of data returned for list tools

Author: sd2k

tools/datasources.go

@@ -12,13 +12,35 @@ import (
 
 type ListDatasourcesParams struct{}
 
-func listDatasources(ctx context.Context, args ListDatasourcesParams) (models.DataSourceList, error) {
+type dataSourceSummary struct {
+	ID        int64  `json:"id"`
+	UID       string `json:"uid"`
+	Name      string `json:"name"`
+	Type      string `json:"type"`
+	IsDefault bool   `json:"isDefault"`
+}
+
+func listDatasources(ctx context.Context, args ListDatasourcesParams) ([]dataSourceSummary, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasources, err := c.Datasources.GetDataSources()
 	if err != nil {
 		return nil, fmt.Errorf("list datasources: %w", err)
 	}
-	return datasources.Payload, nil
+	return summarizeDatasources(datasources.Payload), nil
+}
+
+func summarizeDatasources(dataSources models.DataSourceList) []dataSourceSummary {
+	result := make([]dataSourceSummary, 0, len(dataSources))
+	for _, ds := range dataSources {
+		result = append(result, dataSourceSummary{
+			ID:        ds.ID,
+			UID:       ds.UID,
+			Name:      ds.Name,
+			Type:      ds.Type,
+			IsDefault: ds.IsDefault,
+		})
+	}
+	return result
 }
 
 var ListDatasources = mcpgrafana.MustTool(

tools/incident.go

@@ -15,7 +15,7 @@ type ListIncidentsParams struct {
 	Status string `json:"status" jsonschema:"description=The status of the incidents to include"`
 }
 
-func listIncidents(ctx context.Context, args ListIncidentsParams) (*incident.QueryIncidentsResponse, error) {
+func listIncidents(ctx context.Context, args ListIncidentsParams) (*incident.QueryIncidentPreviewsResponse, error) {
 	c := mcpgrafana.IncidentClientFromContext(ctx)
 	is := incident.NewIncidentsService(c)
 	query := ""
@@ -25,8 +25,8 @@ func listIncidents(ctx context.Context, args ListIncidentsParams) (*incident.Que
 	if args.Status != "" {
 		query += fmt.Sprintf(" and status:%s", args.Status)
 	}
-	incidents, err := is.QueryIncidents(ctx, incident.QueryIncidentsRequest{
-		Query: incident.IncidentsQuery{
+	incidents, err := is.QueryIncidentPreviews(ctx, incident.QueryIncidentPreviewsRequest{
+		Query: incident.IncidentPreviewsQuery{
 			QueryString:    query,
 			OrderDirection: "DESC",
 			Limit:          args.Limit,

tools/incident_integration_test.go

@@ -21,6 +21,6 @@ func TestCloudIncidentTools(t *testing.T) {
 			Limit: 2,
 		})
 		require.NoError(t, err)
-		assert.Len(t, result.Incidents, 2)
+		assert.Len(t, result.IncidentPreviews, 2)
 	})
 }

tools/incident_test.go

@@ -22,7 +22,7 @@ func TestIncidentTools(t *testing.T) {
 			Limit: 2,
 		})
 		require.NoError(t, err)
-		assert.Len(t, result.Incidents, 2)
+		assert.Len(t, result.IncidentPreviews, 2)
 	})
 
 	t.Run("create incident", func(t *testing.T) {