From 50a6d89fd76324ef81870ee9261a4ccaffda62df Mon Sep 17 00:00:00 2001
From: Isabel Matwawana <isabel.matwawana@grafana.com>
Date: Tue, 3 Oct 2023 12:19:17 -0400
Subject: [PATCH] Added 10.2 what's new and upgrade guide

---
 docs/sources/_index.md                        |  4 +-
 .../upgrade-guide/upgrade-v10.2/index.md      | 21 ++++++++++
 docs/sources/whatsnew/_index.md               |  1 +
 docs/sources/whatsnew/whats-new-in-v10-2.md   | 38 +++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 docs/sources/upgrade-guide/upgrade-v10.2/index.md
 create mode 100644 docs/sources/whatsnew/whats-new-in-v10-2.md

diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 0fe79be372a..678b2aacb0a 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -74,8 +74,8 @@ title: Grafana documentation
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v10-1/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v10.1</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v10-2/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v10.2</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
diff --git a/docs/sources/upgrade-guide/upgrade-v10.2/index.md b/docs/sources/upgrade-guide/upgrade-v10.2/index.md
new file mode 100644
index 00000000000..17e706d64ef
--- /dev/null
+++ b/docs/sources/upgrade-guide/upgrade-v10.2/index.md
@@ -0,0 +1,21 @@
+---
+description: Guide for upgrading to Grafana v10.2
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - upgrade
+title: Upgrade to Grafana v10.2
+menuTitle: Upgrade to v10.2
+weight: 1500
+---
+
+# Upgrade to Grafana v10.2
+
+{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA VERSION>" leveloffset="+1" >}}
+
+{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA VERSION>" >}}
+
+## Technical notes
diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md
index 63ab1a5446e..eb7ae59b3ee 100644
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -76,6 +76,7 @@ For a complete list of every change, with links to pull requests and related iss
 
 ## Grafana 10
 
+- [What's new in 10.1]({{< relref "whats-new-in-v10-2/" >}})
 - [What's new in 10.1]({{< relref "whats-new-in-v10-1/" >}})
 - [What's new in 10.0]({{< relref "whats-new-in-v10-0/" >}})
 
diff --git a/docs/sources/whatsnew/whats-new-in-v10-2.md b/docs/sources/whatsnew/whats-new-in-v10-2.md
new file mode 100644
index 00000000000..bd3ae545e48
--- /dev/null
+++ b/docs/sources/whatsnew/whats-new-in-v10-2.md
@@ -0,0 +1,38 @@
+---
+description: Feature and improvement highlights for Grafana v10.2
+keywords:
+  - grafana
+  - new
+  - documentation
+  - '10.2'
+  - release notes
+labels:
+products:
+  - cloud
+  - enterprise
+  - oss
+title: What's new in Grafana v10.2
+weight: -39
+---
+
+# What’s new in Grafana v10.1
+
+Welcome to Grafana 10.2! Read on to learn about changes to ...
+
+For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.2, check out our [Upgrade Guide]({{< relref "../upgrade-guide/upgrade-v10.2/index.md" >}}).
+
+<!-- Template below
+## Feature
+<!-- Name of contributor -->
+<!-- _[Generally available | Available in private/public preview | Experimental] in Grafana [Open Source, Enterprise]_
+Description. Include an overview of the feature and problem it solves, and where to learn more (like a link to the docs).
+{{% admonition type="note" %}}
+You must use relative references when linking to docs within the Grafana repo. Please do not use absolute URLs. For more information about relrefs, refer to [Links and references](/docs/writers-toolkit/writing-guide/references/).
+{{% /admonition %}}
+-->
+<!-- Add an image, GIF or video  as below
+
+{{< figure src="/media/docs/grafana/dashboards/WidgetVizSplit.png" max-width="750px" caption="DESCRIPTIVE CAPTION" >}}
+
+Learn how to upload images here: https://grafana.com/docs/writers-toolkit/write/image-guidelines/#where-to-store-media-assets
+-->