diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/description.yml b/actions/com.steadybit.extension_grafana.alert-rule.check/description.yml
new file mode 100644
index 0000000..bf3d01c
--- /dev/null
+++ b/actions/com.steadybit.extension_grafana.alert-rule.check/description.yml
@@ -0,0 +1,12 @@
+---
+id: com.steadybit.extension_grafana.alert-rule.check
+label: alert-rule check
+description: Collects information about the alert-rule state and optionally verifies that the monitor has an expected state.
+icon: |
+
+kind: check
+category: monitoring
+targetType: com.steadybit.extension_grafana.alert-rule
+extension: com.steadybit.extension_grafana
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/previews.yml b/actions/com.steadybit.extension_grafana.alert-rule.check/previews.yml
new file mode 100644
index 0000000..f18feab
--- /dev/null
+++ b/actions/com.steadybit.extension_grafana.alert-rule.check/previews.yml
@@ -0,0 +1,16 @@
+---
+- type: image
+ src: 1.png
+ alt: The alert rule check within the experiment editor.
+- type: image
+ src: 2.png
+ alt: The run log shows an experiment failed because of an unexpected monitor status.
+- type: image
+ src: 3.png
+ alt: Part of the run view is a visualization of the alert rule state over time.
+- type: image
+ src: 4.png
+ alt: Events are reported to Grafana as annotations to indicate when a chaos engineering experiment is executed.
+- type: image
+ src: 5.png
+ alt: Overlay the annotations to your dashboards or panels in Grafana.
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/public/1.png b/actions/com.steadybit.extension_grafana.alert-rule.check/public/1.png
new file mode 100644
index 0000000..2f97fe9
Binary files /dev/null and b/actions/com.steadybit.extension_grafana.alert-rule.check/public/1.png differ
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/public/2.png b/actions/com.steadybit.extension_grafana.alert-rule.check/public/2.png
new file mode 100644
index 0000000..52c9265
Binary files /dev/null and b/actions/com.steadybit.extension_grafana.alert-rule.check/public/2.png differ
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/public/3.png b/actions/com.steadybit.extension_grafana.alert-rule.check/public/3.png
new file mode 100644
index 0000000..e764e61
Binary files /dev/null and b/actions/com.steadybit.extension_grafana.alert-rule.check/public/3.png differ
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/public/4.png b/actions/com.steadybit.extension_grafana.alert-rule.check/public/4.png
new file mode 100644
index 0000000..7960734
Binary files /dev/null and b/actions/com.steadybit.extension_grafana.alert-rule.check/public/4.png differ
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/public/5.png b/actions/com.steadybit.extension_grafana.alert-rule.check/public/5.png
new file mode 100644
index 0000000..8d6d226
Binary files /dev/null and b/actions/com.steadybit.extension_grafana.alert-rule.check/public/5.png differ
diff --git a/actions/com.steadybit.extension_grafana.alert-rule.check/summary.mdx b/actions/com.steadybit.extension_grafana.alert-rule.check/summary.mdx
new file mode 100644
index 0000000..80034a8
--- /dev/null
+++ b/actions/com.steadybit.extension_grafana.alert-rule.check/summary.mdx
@@ -0,0 +1,20 @@
+# Introduction
+
+The alert rule check step can be dragged&dropped into the experiment editor. Once done, you can use it to collect information about the state of the Grafana alert rules and, optionally, to verify that they are within the expected state.
+
+Experiments can be aborted and marked as failed when the Grafana alert rule check's actual state diverges from the expected state. This helps implement pre-/post-conditions and invariants. For example, to only start an experiment when the system is healthy.
+
+At last, to help you understand the alert rule states and how they evolved, the run view also contains a state visualization. Through this visualization, you can see what states the Alert rules had throughout the experiment execution.
+
+# Use Cases
+
+ - Pre-/postcondition or invariant for any experiment.
+ - Verify that alerts are triggered during incidents.
+
+# Parameters
+
+| Parameter | Description | Default |
+| --------- | ------------------------------------- | ------- |
+| Duration | How long should the state of the alert rule be checked | 30s |
+| Expected State | The expected state of the alert rule. One of Inactive, Normal, Pending, Firing. | |
+| State Check Mode | How often should the state be expected. "At least once" or "All the time" | "All the time" |
\ No newline at end of file
diff --git a/extensions/com.steadybit.extension_grafana/description.yml b/extensions/com.steadybit.extension_grafana/description.yml
new file mode 100644
index 0000000..71998cc
--- /dev/null
+++ b/extensions/com.steadybit.extension_grafana/description.yml
@@ -0,0 +1,27 @@
+---
+id: com.steadybit.extension_grafana
+label: Grafana
+description: A Steadybit check implementation for data exposed through Grafana.
+icon: |
+
+maintainer: com.steadybit
+license: MIT
+gitHub:
+ owner: steadybit
+ repository: extension-grafana
+ghcr:
+ owner: steadybit
+ repository: extension-grafana
+ package: extension-grafana
+helmChart:
+ repository: https://steadybit.github.io/extension-grafana
+ name: steadybit-extension-grafana
+homepage: https://hub.steadybit.com/extension/com.steadybit.extension_grafana
+installation: https://github.com/steadybit/extension-grafana#installation
+changelog: https://github.com/steadybit/extension-grafana/blob/main/CHANGELOG.md
+tags:
+ - Grafana
+ - Kubernetes
+ - Check
+ - Observability
+ - Monitoring
diff --git a/extensions/com.steadybit.extension_grafana/previews.yml b/extensions/com.steadybit.extension_grafana/previews.yml
new file mode 100644
index 0000000..6d9be77
--- /dev/null
+++ b/extensions/com.steadybit.extension_grafana/previews.yml
@@ -0,0 +1,13 @@
+---
+- type: image
+ src: steadybit_experiment_editor.png
+ alt: Steadybit's "Alert Rule Check" allows you to verify the behaviour of your Grafana alert rules.
+- type: image
+ src: steadybit_grafana_experiment_execution_run_log.png
+ alt: The run log showing that an experiment completed because the alert rule state is the one expected for this kind of failure.
+- type: image
+ src: grafana_annotations.png
+ alt: Steadybit events are reported to Grafana as annotations with tags to filter them easily.
+- type: image
+ src: grafana_steadybit_events.png
+ alt: Steadybit events as Grafana annotations can be showed on dashboards to ease analyzing causes and effects.
diff --git a/extensions/com.steadybit.extension_grafana/public/grafana_annotations.png b/extensions/com.steadybit.extension_grafana/public/grafana_annotations.png
new file mode 100644
index 0000000..7960734
Binary files /dev/null and b/extensions/com.steadybit.extension_grafana/public/grafana_annotations.png differ
diff --git a/extensions/com.steadybit.extension_grafana/public/grafana_steadybit_events.png b/extensions/com.steadybit.extension_grafana/public/grafana_steadybit_events.png
new file mode 100644
index 0000000..8d6d226
Binary files /dev/null and b/extensions/com.steadybit.extension_grafana/public/grafana_steadybit_events.png differ
diff --git a/extensions/com.steadybit.extension_grafana/public/steadybit_experiment_editor.png b/extensions/com.steadybit.extension_grafana/public/steadybit_experiment_editor.png
new file mode 100644
index 0000000..2f97fe9
Binary files /dev/null and b/extensions/com.steadybit.extension_grafana/public/steadybit_experiment_editor.png differ
diff --git a/extensions/com.steadybit.extension_grafana/public/steadybit_grafana_experiment_execution_run_log.png b/extensions/com.steadybit.extension_grafana/public/steadybit_grafana_experiment_execution_run_log.png
new file mode 100644
index 0000000..04e8650
Binary files /dev/null and b/extensions/com.steadybit.extension_grafana/public/steadybit_grafana_experiment_execution_run_log.png differ
diff --git a/extensions/com.steadybit.extension_grafana/summary.mdx b/extensions/com.steadybit.extension_grafana/summary.mdx
new file mode 100644
index 0000000..bcb110c
--- /dev/null
+++ b/extensions/com.steadybit.extension_grafana/summary.mdx
@@ -0,0 +1,17 @@
+# Introduction to the Grafana Extension
+The Steadybit Grafana Extension bridges the world of Steadybit and Grafana.
+The extension adds checks to your Chaos Engineering experiments to validate Grafana Alert rules state and reports events of your experiments to Grafana [as annotations to ease correlation](https://grafana.com/docs/grafana/latest/dashboards/build-dashboards/annotate-visualizations/).
+
+# Integration and Functionality
+Integration of Grafana into Steadybit works via the Grafana API.
+Thus, all you need is a Grafana's [Service Account Token](https://grafana.com/docs/grafana/latest/developers/http_api/create-api-tokens-for-org/).
+
+## Integration of Grafana in Steadybit
+With the [Alert Rule Check](/action/com.steadybit.extension_grafana.alert-rule.check) you can integrate your Grafana alert rules into your experiments.
+Verify that Grafana alert rules notice a fault injected by Steadybit to check that your observability strategy is working as expected.
+
+## Integration of Steadybit in Grafana
+The extension automatically reports experiment executions to Grafana, which helps you to correlate experiments with your dashboards.
+
+# Installation and Setup
+To integrate the Grafana extension with your environment, follow our [setup guide](https://github.com/steadybit/extension-grafana#installation).
\ No newline at end of file
diff --git a/targetTypes/com.steadybit.extension_grafana.alert-rule/description.yml b/targetTypes/com.steadybit.extension_grafana.alert-rule/description.yml
new file mode 100644
index 0000000..bf3dc59
--- /dev/null
+++ b/targetTypes/com.steadybit.extension_grafana.alert-rule/description.yml
@@ -0,0 +1,11 @@
+---
+id: com.steadybit.extension_grafana.alert-rule
+label:
+ one: Grafana alert rule
+ other: Grafana alert rules
+icon: |
+
+category: monitoring
+extension: com.steadybit.extension_grafana
diff --git a/targetTypes/com.steadybit.extension_grafana.alert-rule/previews.yml b/targetTypes/com.steadybit.extension_grafana.alert-rule/previews.yml
new file mode 100644
index 0000000..be3459a
--- /dev/null
+++ b/targetTypes/com.steadybit.extension_grafana.alert-rule/previews.yml
@@ -0,0 +1,4 @@
+---
+- type: image
+ src: 1.png
+ alt: Identified information about a Grafana alert rule that can later be used within experiments.
diff --git a/targetTypes/com.steadybit.extension_grafana.alert-rule/public/1.png b/targetTypes/com.steadybit.extension_grafana.alert-rule/public/1.png
new file mode 100644
index 0000000..41b4235
Binary files /dev/null and b/targetTypes/com.steadybit.extension_grafana.alert-rule/public/1.png differ
diff --git a/targetTypes/com.steadybit.extension_grafana.alert-rule/summary.mdx b/targetTypes/com.steadybit.extension_grafana.alert-rule/summary.mdx
new file mode 100644
index 0000000..172a4b7
--- /dev/null
+++ b/targetTypes/com.steadybit.extension_grafana.alert-rule/summary.mdx
@@ -0,0 +1,3 @@
+# Introduction
+
+Grafana alert rules are discovered to ease their selection within experiments. As a result of the discovery, Grafana alert rules are selectable by their ID, name, group and datasource.