Add support for Grafana 10.3.x (#3)

* Add support for Grafana 10.3.x

* PR review feedback

Author: xnyo

api/grafana/grafana.go

@@ -2,12 +2,15 @@ package grafana
 
 import (
 	"context"
+	"errors"
 	"net/url"
 	"strconv"
 
 	"github.com/grafana/detect-angular-dashboards/api"
 )
 
+var errUnknownAngularStatus = errors.New("could not determine if plugin is angular or not, use GCOM instead")
+
 const DefaultBaseURL = "http://127.0.0.1:3000/api"
 
 type APIClient struct {
@@ -72,19 +75,78 @@ func (cl APIClient) GetDashboard(ctx context.Context, uid string) (*Dashboard, e
 // FrontendSettings is the response returned by api/frontend/settings
 type FrontendSettings struct {
 	// Panels is a map from panel plugin id to plugin metadata
-	Panels map[string]struct {
-		// AngularDetected is true if the plugin uses Angular APIs
-		AngularDetected *bool
-	}
+	Panels map[string]FrontendSettingsPanel
 
 	// Datasources is a map from datasource names to plugin metadata
-	Datasources map[string]struct {
-		// Type is the plugin's ID
-		Type string
+	Datasources map[string]FrontendSettingsDatasource
+}
+
+// FrontendSettingsPanel is a panel present in FrontendSettings.
+// Which fields are populated depends on the Grafana version.
+type FrontendSettingsPanel struct {
+	// AngularDetected is true if the plugin uses Angular APIs
+	// (present in Grafana >= 10.1.0 && < 10.3.0)
+	AngularDetected *bool
+
+	// Angular contains the Angular metadata for the plugin
+	// (present in Grafana >= 10.3.0)
+	Angular *struct {
+		// Detected is true if the plugin uses Angular APIs
+		Detected bool
+	}
+}
+
+// IsAngular returns true if the panel plugin is an angular plugin.
+// The correct fields are used depending on the Grafana version.
+// If this information cannot be determined, it returns an errUnknownAngularStatus.
+func (p FrontendSettingsPanel) IsAngular() (bool, error) {
+	if p.Angular != nil {
+		// >= 10.3.0
+		return p.Angular.Detected, nil
+	}
+	if p.AngularDetected != nil {
+		// >= 10.1.0 && < 10.3.0
+		return *p.AngularDetected, nil
+	}
+	// < 10.1.0
+	return false, errUnknownAngularStatus
+}
+
+// FrontendSettingsDatasource is a datasource present in FrontendSettings.
+// Which fields are populated depends on the Grafana version.
+type FrontendSettingsDatasource struct {
+	// AngularDetected is true if the plugin uses Angular APIs
+	// (present in Grafana >= 10.1.0 && < 10.3.0)
+	AngularDetected *bool
+
+	// Meta contains plugin metadata
+	Meta struct {
+		// Angular contains angular plugin metadata
+		// (present in Grafana >= 10.3.0)
+		Angular *struct {
+			// Detected is true if the plugin uses Angular APIs
+			Detected bool
+		}
+	}
+
+	// Type is the plugin's ID
+	Type string
+}
 
-		// AngularDetected is true if the plugin uses Angular APIs
-		AngularDetected *bool
+// IsAngular returns true if the datasource plugin is an angular plugin.
+// The correct fields are used depending on the Grafana version.
+// If this information cannot be determined, it returns an errUnknownAngularStatus.
+func (d FrontendSettingsDatasource) IsAngular() (bool, error) {
+	if d.Meta.Angular != nil {
+		// >= 10.3.0
+		return d.Meta.Angular.Detected, nil
+	}
+	if d.AngularDetected != nil {
+		// >= 10.1.0 && < 10.3.0
+		return *d.AngularDetected, nil
 	}
+	// < 10.1.0
+	return false, errUnknownAngularStatus
 }
 
 func (cl APIClient) GetFrontendSettings(ctx context.Context) (*FrontendSettings, error) {

api/grafana/models.go

@@ -24,13 +24,13 @@ type PanelDatasource struct {
 	Type string
 }
 
-type Panel struct {
+type DashboardPanel struct {
 	Type       string
 	Title      string
 	Datasource interface{}
 }
 
 type Dashboard struct {
-	Panels        []*Panel `json:"panels"`
-	SchemaVersion int      `json:"schemaVersion"`
+	Panels        []*DashboardPanel `json:"panels"`
+	SchemaVersion int               `json:"schemaVersion"`
 }

main.go

@@ -66,11 +66,13 @@ func _main() error {
 
 	// Determine if we should use GCOM or frontendsettings
 	var useGCOM bool
-	// Get any key and see if AngularDetected is present or not.
-	// From Grafana 10.1.0, it will always be present.
-	// Before Grafana 10.1.0, it's always nil as it's not present in the body.
+	// Get any key and see if Angular or AngularDetected is present or not.
+	// With Grafana >= 10.3.0, Angular is present.
+	// With Grafana >= 10.1.0 && < 10.3.0, AngularDetected is present.
+	// With Grafana <= 10.1.0, it's always nil as it's not present in the body.
+	// In the last case, we can only rely on the data in GCOM.
 	for _, p := range frontendSettings.Panels {
-		useGCOM = p.AngularDetected == nil
+		useGCOM = p.Angular == nil && p.AngularDetected == nil
 		break
 	}
 	if useGCOM {
@@ -115,11 +117,19 @@ func _main() error {
 		}
 	} else {
 		log.Verbose().Log("Using frontendsettings to find Angular plugins")
-		for pluginID, meta := range frontendSettings.Panels {
-			angularDetected[pluginID] = *meta.AngularDetected
+		for pluginID, panel := range frontendSettings.Panels {
+			v, err := panel.IsAngular()
+			if err != nil {
+				return fmt.Errorf("%q is angular: %w", pluginID, err)
+			}
+			angularDetected[pluginID] = v
 		}
-		for _, meta := range frontendSettings.Datasources {
-			angularDetected[meta.Type] = *meta.AngularDetected
+		for _, ds := range frontendSettings.Datasources {
+			v, err := ds.IsAngular()
+			if err != nil {
+				return fmt.Errorf("%q is angular: %w", ds.Type, err)
+			}
+			angularDetected[ds.Type] = v
 		}
 	}