Add Grafana Cloud Integrations provider

catalog-info.yaml

@@ -31,6 +31,7 @@ spec:
     - ./internal/resources/asserts/catalog-resource.yaml
     - ./internal/resources/cloud/catalog-resource.yaml
     - ./internal/resources/cloudprovider/catalog-resource.yaml
+    - ./internal/resources/cloudintegrations/catalog-resource.yaml
     - ./internal/resources/connections/catalog-resource.yaml
     - ./internal/resources/fleetmanagement/catalog-resource.yaml
     - ./internal/resources/frontendo11y/catalog-resource.yaml
@@ -56,4 +57,4 @@ spec:
     - ./internal/resources/k6/catalog-data-source.yaml
     - ./internal/resources/oncall/catalog-data-source.yaml
     - ./internal/resources/slo/catalog-data-source.yaml
-    - ./internal/resources/syntheticmonitoring/catalog-data-source.yaml
+    - ./internal/resources/syntheticmonitoring/catalog-data-source.yaml

docs/resources/cloud_integration.md

@@ -0,0 +1,104 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "grafana_cloud_integration Resource - terraform-provider-grafana"
+subcategory: "Cloud Integrations"
+description: |-
+  Manages Grafana Cloud integrations.
+  Official documentation https://grafana.com/docs/grafana-cloud/data-configuration/integrations/
+  This provider lets you manage Grafana Cloud Integrations.
+  Alerts can optionally be disabled.
+  Please note: Grafana Cloud Integrations do not support in-place upgrades, and require a teardown and reapply to resolve version drift.
+  As such it is recommended to have a separate TF plan for integrations to cleanly destroy them as needed.
+  Update, only triggered on config change, is implemented as a complete uninstall, then reinstall of the integration in question.
+  Required access policy scopes:
+  folders:readfolders:writedashboards:readdashboards:writerules:readrules:write
+  Based on: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/alerting-migration/#import-rules-with-grafana-alerting
+  Note: This resource creates folders and dashboards as part of the integration installation process, which requires additional permissions beyond the basic integration scopes.
+---
+
+# grafana_cloud_integration (Resource)
+
+Manages Grafana Cloud integrations.
+
+* [Official documentation](https://grafana.com/docs/grafana-cloud/data-configuration/integrations/)
+
+This provider lets you manage Grafana Cloud Integrations.
+Alerts can optionally be disabled.
+
+Please note: Grafana Cloud Integrations do not support in-place upgrades, and require a teardown and reapply to resolve version drift.
+As such it is recommended to have a separate TF plan for integrations to cleanly destroy them as needed.
+
+Update, only triggered on config change, is implemented as a complete uninstall, then reinstall of the integration in question.
+
+Required access policy scopes:
+
+* folders:read
+* folders:write
+* dashboards:read
+* dashboards:write
+* rules:read
+* rules:write
+
+Based on: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/alerting-migration/#import-rules-with-grafana-alerting
+
+**Note:** This resource creates folders and dashboards as part of the integration installation process, which requires additional permissions beyond the basic integration scopes.
+
+## Example Usage
+
+```terraform
+# install linux-node integration
+resource "grafana_cloud_integration" "linux-node" {
+  slug = "linux-node"
+}
+
+# install kafka integration w. alerts disabled
+resource "grafana_cloud_integration" "kafka" {
+  slug           = "kafka"
+  alerts_enabled = false
+}
+
+# Output info
+output "linux_node_integration" {
+  value = {
+    name              = grafana_cloud_integration.linux-node.name
+    latest_version    = grafana_cloud_integration.linux-node.latest_version
+    installed_version = grafana_cloud_integration.linux-node.installed_version
+    dashboard_folder  = grafana_cloud_integration.linux-node.dashboard_folder
+  }
+}
+output "kafka_integration" {
+  value = {
+    name              = grafana_cloud_integration.kafka.name
+    latest_version    = grafana_cloud_integration.kafka.latest_version
+    installed_version = grafana_cloud_integration.kafka.installed_version
+    dashboard_folder  = grafana_cloud_integration.kafka.dashboard_folder
+  }
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `slug` (String) The slug of the integration to install (e.g., 'docker', 'linux-node').
+
+### Optional
+
+- `alerts_enabled` (Boolean) Whether alerts are enabled for this integration.
+
+### Read-Only
+
+- `dashboard_folder` (String) The dashboard folder associated with this integration.
+- `id` (String) The Terraform resource ID. Set to the integration slug.
+- `installed_version` (String) The version of the installed integration.
+- `latest_version` (String) The latest version available for this integration.
+- `name` (String) The display name of the integration.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import grafana_cloud_integration.name "{{ slug }}"
+```

examples/resources/grafana_cloud_integration/import.sh

@@ -0,0 +1 @@
+terraform import grafana_cloud_integration.name "{{ slug }}"

examples/resources/grafana_cloud_integration/resource.tf

@@ -0,0 +1,28 @@
+# install linux-node integration
+resource "grafana_cloud_integration" "linux-node" {
+  slug = "linux-node"
+}
+
+# install kafka integration w. alerts disabled
+resource "grafana_cloud_integration" "kafka" {
+  slug           = "kafka"
+  alerts_enabled = false
+}
+
+# Output info
+output "linux_node_integration" {
+  value = {
+    name              = grafana_cloud_integration.linux-node.name
+    latest_version    = grafana_cloud_integration.linux-node.latest_version
+    installed_version = grafana_cloud_integration.linux-node.installed_version
+    dashboard_folder  = grafana_cloud_integration.linux-node.dashboard_folder
+  }
+}
+output "kafka_integration" {
+  value = {
+    name              = grafana_cloud_integration.kafka.name
+    latest_version    = grafana_cloud_integration.kafka.latest_version
+    installed_version = grafana_cloud_integration.kafka.installed_version
+    dashboard_folder  = grafana_cloud_integration.kafka.dashboard_folder
+  }
+}

internal/common/client.go

@@ -19,6 +19,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
+	"github.com/grafana/terraform-provider-grafana/v4/internal/common/cloudintegrationsapi"
 	"github.com/grafana/terraform-provider-grafana/v4/internal/common/cloudproviderapi"
 	"github.com/grafana/terraform-provider-grafana/v4/internal/common/connectionsapi"
 	"github.com/grafana/terraform-provider-grafana/v4/internal/common/fleetmanagementapi"
@@ -36,16 +37,17 @@ type Client struct {
 	GrafanaOrgID                  int64
 	GrafanaStackID                int64
 
-	GrafanaCloudAPI       *gcom.APIClient
-	SMAPI                 *SMAPI.Client
-	MLAPI                 *mlapi.Client
-	OnCallClient          *onCallAPI.Client
-	SLOClient             *slo.APIClient
-	CloudProviderAPI      *cloudproviderapi.Client
-	ConnectionsAPIClient  *connectionsapi.Client
-	FleetManagementClient *fleetmanagementapi.Client
-	FrontendO11yAPIClient *frontendo11yapi.Client
-	AssertsAPIClient      *assertsapi.APIClient
+	GrafanaCloudAPI            *gcom.APIClient
+	SMAPI                      *SMAPI.Client
+	MLAPI                      *mlapi.Client
+	OnCallClient               *onCallAPI.Client
+	SLOClient                  *slo.APIClient
+	CloudIntegrationsAPIClient *cloudintegrationsapi.Client
+	CloudProviderAPI           *cloudproviderapi.Client
+	ConnectionsAPIClient       *connectionsapi.Client
+	FleetManagementClient      *fleetmanagementapi.Client
+	FrontendO11yAPIClient      *frontendo11yapi.Client
+	AssertsAPIClient           *assertsapi.APIClient
 
 	K6APIClient *k6.APIClient
 	K6APIConfig *k6providerapi.K6APIConfig
@@ -82,6 +84,13 @@ func WithFolderMutex[T schema.CreateContextFunc | schema.ReadContextFunc | schem
 	}
 }
 
+// WithFolderLock runs f while holding the folder mutex. Used by Plugin Framework resources that need to serialize folder API calls.
+func (c *Client) WithFolderLock(f func()) {
+	c.folderMutex.Lock()
+	defer c.folderMutex.Unlock()
+	f()
+}
+
 // WithDashboardMutex is a helper function that wraps a CRUD Terraform function with a mutex.
 func WithDashboardMutex[T schema.CreateContextFunc | schema.ReadContextFunc | schema.UpdateContextFunc | schema.DeleteContextFunc](f T) T {
 	return func(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
@@ -92,6 +101,13 @@ func WithDashboardMutex[T schema.CreateContextFunc | schema.ReadContextFunc | sc
 	}
 }
 
+// WithDashboardLock runs f while holding the dashboard mutex. Used by Plugin Framework resources that need to serialize dashboard API calls.
+func (c *Client) WithDashboardLock(f func()) {
+	c.dashboardMutex.Lock()
+	defer c.dashboardMutex.Unlock()
+	f()
+}
+
 func (c *Client) GrafanaSubpath(path string) string {
 	path = strings.TrimPrefix(path, c.GrafanaAPIURLParsed.Path)
 	return c.GrafanaAPIURLParsed.JoinPath(path).String()