Re-add docker-compose provisioning files; update datasources tests

sd2k · sd2k · commit a4e0f2b0318f · 2025-03-11T20:08:06.000Z
diff --git a/tests/dashboards/demo.json b/tests/dashboards/demo.json
@@ -0,0 +1,140 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 1,
+  "isStarred": true,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "default": true,
+        "type": "prometheus",
+        "uid": "robustperception"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "robustperception"
+          },
+          "editorMode": "code",
+          "expr": "node_load1",
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Node Load",
+      "type": "timeseries"
+    }
+  ],
+  "schemaVersion": 39,
+  "tags": [
+    "demo"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Demo",
+  "uid": "fe9gm6guyzi0wd",
+  "version": 2,
+  "weekStart": ""
+}
diff --git a/tests/provisioning/dashboards/dashboards.yaml b/tests/provisioning/dashboards/dashboards.yaml
@@ -0,0 +1,16 @@
+apiVersion: 1
+
+providers:
+  - name: 'docker-compose'
+    orgId: 1
+    folder: ''
+    folderUid: ''
+    type: file
+    disableDeletion: true
+    updateIntervalSeconds: 60
+    allowUiUpdates: false
+    options:
+      # <string, required> path to dashboard files on disk. Required when using the 'file' type
+      path: /var/lib/grafana/dashboards
+      # <bool> use folder names from filesystem to create folders in Grafana
+      foldersFromFilesStructure: true
diff --git a/tests/provisioning/datasources/datasources.yaml b/tests/provisioning/datasources/datasources.yaml
@@ -0,0 +1,10 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    id: 1
+    uid: prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+    isDefault: true
diff --git a/tools/datasources.go b/tools/datasources.go
@@ -2,10 +2,8 @@ package tools
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
-	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 
 	"github.com/grafana/grafana-openapi-client-go/client/datasources"
@@ -33,17 +31,13 @@ type GetDatasourceByUIDParams struct {
 	UID string `json:"uid" jsonschema:"required,description=The uid of the datasource"`
 }
 
-func getDatasourceByUID(ctx context.Context, args GetDatasourceByUIDParams) (*mcp.CallToolResult, error) {
+func getDatasourceByUID(ctx context.Context, args GetDatasourceByUIDParams) (*datasources.GetDataSourceByUIDOK, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasource, err := c.Datasources.GetDataSourceByUID(args.UID)
 	if err != nil {
 		return nil, fmt.Errorf("get datasource by uid %s: %w", args.UID, err)
 	}
-	b, err := json.Marshal(datasource.Payload)
-	if err != nil {
-		return nil, fmt.Errorf("marshal datasource: %w", err)
-	}
-	return mcp.NewToolResultText(string(b)), nil
+	return datasource, nil
 }
 
 var GetDatasourceByUID = mcpgrafana.MustTool(
@@ -56,17 +50,13 @@ type GetDatasourceByNameParams struct {
 	Name string `json:"name" jsonschema:"required,description=The name of the datasource"`
 }
 
-func getDatasourceByName(ctx context.Context, args GetDatasourceByNameParams) (*mcp.CallToolResult, error) {
+func getDatasourceByName(ctx context.Context, args GetDatasourceByNameParams) (*datasources.GetDataSourceByNameOK, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasource, err := c.Datasources.GetDataSourceByName(args.Name)
 	if err != nil {
 		return nil, fmt.Errorf("get datasource by name %s: %w", args.Name, err)
 	}
-	b, err := json.Marshal(datasource.Payload)
-	if err != nil {
-		return nil, fmt.Errorf("marshal datasource: %w", err)
-	}
-	return mcp.NewToolResultText(string(b)), nil
+	return datasource, nil
 }
 
 var GetDatasourceByName = mcpgrafana.MustTool(
diff --git a/tools/datasources_test.go b/tools/datasources_test.go
@@ -41,30 +41,24 @@ func TestDatasourcesTools(t *testing.T) {
 		ctx := newTestContext()
 		result, err := listDatasources(ctx, ListDatasourcesParams{})
 		require.NoError(t, err)
-		assert.Len(t, result.Payload, 0)
-		// tc := result.Content[0].(mcp.TextContent)
-		// assert.Equal(t, tc.Text, "[]")
+		assert.Len(t, result.Payload, 1)
 	})
 
-	// t.Run("get datasource by uid", func(t *testing.T) {
-	// 	ctx := context.Background()
-	// 	result, err := getDatasourceByUID(ctx, GetDatasourceByUIDParams{
-	// 		UID: "uid-1",
-	// 	})
-	// 	if err != nil {
-	// 		t.Fatal(err)
-	// 	}
-	// 	t.Log(result)
-	// })
+	t.Run("get datasource by uid", func(t *testing.T) {
+		ctx := newTestContext()
+		result, err := getDatasourceByUID(ctx, GetDatasourceByUIDParams{
+			UID: "prometheus",
+		})
+		require.NoError(t, err)
+		assert.Equal(t, "Prometheus", result.Payload.Name)
+	})
 
-	// t.Run("get datasource by name", func(t *testing.T) {
-	// 	ctx := context.Background()
-	// 	result, err := getDatasourceByName(ctx, GetDatasourceByNameParams{
-	// 		Name: "name-1",
-	// 	})
-	// 	if err != nil {
-	// 		t.Fatal(err)
-	// 	}
-	// 	t.Log(result)
-	// })
+	t.Run("get datasource by name", func(t *testing.T) {
+		ctx := newTestContext()
+		result, err := getDatasourceByName(ctx, GetDatasourceByNameParams{
+			Name: "Prometheus",
+		})
+		require.NoError(t, err)
+		assert.Equal(t, "Prometheus", result.Payload.Name)
+	})
 }
