4665: Setup for Log v2 config

.github/workflows/acc-tests.yml

@@ -70,6 +70,8 @@ jobs:
           timeout_minutes: 30
           max_attempts: 3 # Try 3 times to make sure we don't report failures on flaky tests
           command: make testacc-cloud-instance
+        env:
+          TF_ACC_ASSERTS: true
 
   local:
     strategy:

docs/resources/asserts_custom_model_rules.md

@@ -0,0 +1,46 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "grafana_asserts_custom_model_rules Resource - terraform-provider-grafana"
+subcategory: "Asserts"
+description: |-
+  Manages Asserts Custom Model Rules through the Grafana API.
+---
+
+# grafana_asserts_custom_model_rules (Resource)
+
+Manages Asserts Custom Model Rules through the Grafana API.
+
+## Example Usage
+
+```terraform
+resource "grafana_asserts_custom_model_rules" "test" {
+  name  = "test-anything"
+  rules = <<-EOT
+    entities:
+    - type: Whatever
+      name: Nothing
+      definedBy:
+      - query: "up{job=\\"nothing\\"}"
+  EOT
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String) The name of the custom model rules.
+- `rules` (String) The rules of the custom model rules, in YAML format.
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import grafana_asserts_custom_model_rules.name "{{ name }}"
+```

docs/resources/asserts_log_drilldown_config.md

@@ -0,0 +1,53 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "grafana_asserts_log_drilldown_config Resource - terraform-provider-grafana"
+subcategory: "Asserts"
+description: |-
+  Manages Asserts Log Drilldown Environment Configuration through the Grafana API.
+---
+
+# grafana_asserts_log_drilldown_config (Resource)
+
+Manages Asserts Log Drilldown Environment Configuration through the Grafana API.
+
+## Example Usage
+
+```terraform
+resource "grafana_asserts_log_drilldown_config" "example" {
+  name   = "default"
+  config = <<-EOT
+    # Example log drilldown configuration
+    # Structure depends on API schema; this is illustrative
+    providers:
+      - name: "loki"
+        url: "https://logs.example.com"
+        default: true
+    mappings:
+      - name: "kubernetes"
+        matchers:
+          - label: "job"
+            value: "kubelet"
+        query: "{job=\"kubelet\", namespace=\"default\"} |= \"error\""
+  EOT
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `config` (String) The environment configuration (EnvironmentDto), in YAML format.
+- `name` (String) The environment name for the log drilldown configuration.
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import grafana_asserts_log_drilldown_config.name "{{ name }}"
+```

docs/resources/asserts_notification_alerts_config.md

@@ -18,9 +18,9 @@ resource "grafana_asserts_notification_alerts_config" "prometheus_remote_storage
   name = "PrometheusRemoteStorageFailures"
 
   match_labels = {
-    alertname   = "PrometheusRemoteStorageFailures"
-    alertgroup  = "prometheus.alerts"
-    asserts_env = "prod"
+    alertname     = "PrometheusRemoteStorageFailures"
+    alertgroup    = "prometheus.alerts"
+    asserts_env   = "prod"
   }
 
   silenced = true
@@ -31,10 +31,10 @@ resource "grafana_asserts_notification_alerts_config" "error_buildup_notify" {
   name = "ErrorBuildupNotify"
 
   match_labels = {
-    alertname               = "ErrorBuildup"
-    job                     = "acai"
-    asserts_request_type    = "inbound"
-    asserts_request_context = "/auth"
+    alertname                = "ErrorBuildup"
+    job                      = "acai"
+    asserts_request_type     = "inbound"
+    asserts_request_context  = "/auth"
   }
 
   silenced = false
@@ -45,9 +45,9 @@ resource "grafana_asserts_notification_alerts_config" "payment_test_alert" {
   name = "PaymentTestAlert"
 
   match_labels = {
-    alertname         = "PaymentTestAlert"
-    additional_labels = "asserts_severity=~\"critical\""
-    alertgroup        = "alex-k8s-integration-test.alerts"
+    alertname          = "PaymentTestAlert"
+    additional_labels  = "asserts_severity=~\"critical\""
+    alertgroup         = "alex-k8s-integration-test.alerts"
   }
 
   alert_labels = {
@@ -76,8 +76,8 @@ resource "grafana_asserts_notification_alerts_config" "cpu_throttling_sustained"
   name = "CPUThrottlingSustained"
 
   match_labels = {
-    alertname         = "CPUThrottlingSustained"
-    additional_labels = "asserts_severity=~\"warning\""
+    alertname          = "CPUThrottlingSustained"
+    additional_labels  = "asserts_severity=~\"warning\""
   }
 
   silenced = true

docs/resources/asserts_suppressed_assertions_config.md

@@ -39,7 +39,7 @@ resource "grafana_asserts_suppressed_assertions_config" "test_environment_suppre
   name = "TestEnvironmentSuppression"
 
   match_labels = {
-    alertgroup  = "test.alerts"
+    alertgroup = "test.alerts"
     environment = "test"
   }
 }

examples/resources/grafana_asserts_custom_model_rules/import.sh

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

examples/resources/grafana_asserts_custom_model_rules/resource.tf

@@ -0,0 +1,10 @@
+resource "grafana_asserts_custom_model_rules" "test" {
+  name  = "test-anything"
+  rules = <<-EOT
+    entities:
+    - type: Whatever
+      name: Nothing
+      definedBy:
+      - query: "up{job=\\"nothing\\"}"
+  EOT
+}

examples/resources/grafana_asserts_log_drilldown_config/import.sh

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

examples/resources/grafana_asserts_log_drilldown_config/resource.tf

@@ -0,0 +1,17 @@
+resource "grafana_asserts_log_drilldown_config" "example" {
+  name   = "default"
+  config = <<-EOT
+    # Example log drilldown configuration
+    # Structure depends on API schema; this is illustrative
+    providers:
+      - name: "loki"
+        url: "https://logs.example.com"
+        default: true
+    mappings:
+      - name: "kubernetes"
+        matchers:
+          - label: "job"
+            value: "kubelet"
+        query: "{job=\"kubelet\", namespace=\"default\"} |= \"error\""
+  EOT
+}

examples/resources/grafana_asserts_notification_alerts_config/resource.tf

@@ -3,9 +3,9 @@ resource "grafana_asserts_notification_alerts_config" "prometheus_remote_storage
   name = "PrometheusRemoteStorageFailures"
 
   match_labels = {
-    alertname   = "PrometheusRemoteStorageFailures"
-    alertgroup  = "prometheus.alerts"
-    asserts_env = "prod"
+    alertname     = "PrometheusRemoteStorageFailures"
+    alertgroup    = "prometheus.alerts"
+    asserts_env   = "prod"
   }
 
   silenced = true
@@ -16,10 +16,10 @@ resource "grafana_asserts_notification_alerts_config" "error_buildup_notify" {
   name = "ErrorBuildupNotify"
 
   match_labels = {
-    alertname               = "ErrorBuildup"
-    job                     = "acai"
-    asserts_request_type    = "inbound"
-    asserts_request_context = "/auth"
+    alertname                = "ErrorBuildup"
+    job                      = "acai"
+    asserts_request_type     = "inbound"
+    asserts_request_context  = "/auth"
   }
 
   silenced = false
@@ -30,9 +30,9 @@ resource "grafana_asserts_notification_alerts_config" "payment_test_alert" {
   name = "PaymentTestAlert"
 
   match_labels = {
-    alertname         = "PaymentTestAlert"
-    additional_labels = "asserts_severity=~\"critical\""
-    alertgroup        = "alex-k8s-integration-test.alerts"
+    alertname          = "PaymentTestAlert"
+    additional_labels  = "asserts_severity=~\"critical\""
+    alertgroup         = "alex-k8s-integration-test.alerts"
   }
 
   alert_labels = {
@@ -61,8 +61,8 @@ resource "grafana_asserts_notification_alerts_config" "cpu_throttling_sustained"
   name = "CPUThrottlingSustained"
 
   match_labels = {
-    alertname         = "CPUThrottlingSustained"
-    additional_labels = "asserts_severity=~\"warning\""
+    alertname          = "CPUThrottlingSustained"
+    additional_labels  = "asserts_severity=~\"warning\""
   }
 
   silenced = true

examples/resources/grafana_asserts_suppressed_assertions_config/resource.tf

@@ -24,7 +24,7 @@ resource "grafana_asserts_suppressed_assertions_config" "test_environment_suppre
   name = "TestEnvironmentSuppression"
 
   match_labels = {
-    alertgroup  = "test.alerts"
+    alertgroup = "test.alerts"
     environment = "test"
   }
 }

go.mod

@@ -52,7 +52,7 @@ require (
 	k8s.io/client-go v0.32.3
 )
 
-require github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250805165836-14e16b51b910
+require github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250811221725-7aa50fc5d960
 
 require (
 	cuelang.org/go v0.11.1 // indirect

go.sum

@@ -182,6 +182,10 @@ github.com/grafana/grafana-app-sdk/logging v0.35.1 h1:taVpl+RoixTYl0JBJGhH+fPVmw
 github.com/grafana/grafana-app-sdk/logging v0.35.1/go.mod h1:Y/bvbDhBiV/tkIle9RW49pgfSPIPSON8Q4qjx3pyqDk=
 github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250805165836-14e16b51b910 h1:2OfDIhMtXWWVQcDp9cq/VMSBOJJfDek9450rcsV+qLg=
 github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250805165836-14e16b51b910/go.mod h1:EL/5hluCvj6EDjkUfoClLKSKDoCoDowZUety28jhxQI=
+github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250811125322-247815da58ca h1:GVzyCTi3rqvjK42b++lFjabG2zsrLvyAbbR43dWP6s0=
+github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250811125322-247815da58ca/go.mod h1:EL/5hluCvj6EDjkUfoClLKSKDoCoDowZUety28jhxQI=
+github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250811221725-7aa50fc5d960 h1:KZ1Hp0Crqja1D8iX3IekIH+z57ThRvOaMqi+kVhsM0g=
+github.com/grafana/grafana-asserts-public-clients/go/gcom v0.0.0-20250811221725-7aa50fc5d960/go.mod h1:EL/5hluCvj6EDjkUfoClLKSKDoCoDowZUety28jhxQI=
 github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250526074454-7ec66e02e4bb h1:rmYEnCXHNQbRsuzc5jCX5qkBqFF37c5RCHlyqAAPJZo=
 github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20250526074454-7ec66e02e4bb/go.mod h1:sYWkB3NhyirQJfy3wtNQ29UYjoHbRlJlYhqN1jNsC5g=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20250617151817-c0f8cbb88d5c h1:jox7J0BnJmcZJp8lp631u4gjDEoIfpi6O3yrpiXNTtg=

internal/resources/asserts/catalog-resource.yaml

@@ -2,10 +2,10 @@
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: resource-grafana_asserts_notification_alerts_config
-  title: grafana_asserts_notification_alerts_config (resource)
+  name: resource-grafana_asserts_alert_config
+  title: grafana_asserts_alert_config (resource)
   description: |
-    resource `grafana_asserts_notification_alerts_config` in Grafana Labs' Terraform Provider
+    resource `grafana_asserts_alert_config` in Grafana Labs' Terraform Provider
 spec:
   subcomponentOf: component:default/terraform-provider-grafana
   type: terraform-resource
@@ -15,10 +15,23 @@ spec:
 apiVersion: backstage.io/v1alpha1
 kind: Component
 metadata:
-  name: resource-grafana_asserts_suppressed_assertions_config
-  title: grafana_asserts_suppressed_assertions_config (resource)
+  name: resource-grafana_asserts_disabled_alert_config
+  title: grafana_asserts_disabled_alert_config (resource)
   description: |
-    resource `grafana_asserts_suppressed_assertions_config` in Grafana Labs' Terraform Provider
+    resource `grafana_asserts_disabled_alert_config` in Grafana Labs' Terraform Provider
+spec:
+  subcomponentOf: component:default/terraform-provider-grafana
+  type: terraform-resource
+  owner: group:default/asserts
+  lifecycle: production
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: resource-grafana_asserts_log_drilldown_config
+  title: grafana_asserts_log_drilldown_config (resource)
+  description: |
+    resource `grafana_asserts_log_drilldown_config` in Grafana Labs' Terraform Provider
 spec:
   subcomponentOf: component:default/terraform-provider-grafana
   type: terraform-resource