From c2231854fdfeb6f6fd4126a895e92a11bc10c811 Mon Sep 17 00:00:00 2001
From: Yariv Amar <yariv.amar@gmail.com>
Date: Wed, 3 Apr 2019 10:37:56 +0300
Subject: [PATCH] Feat: Improve embed panel info text (#16344)

* improving documentation for Embed Panel

Fixes #16345
---
 docs/sources/reference/sharing.md                 |  1 +
 .../dashboard/components/ShareModal/template.html | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index 59c2e0345ea..81ad80e5de0 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -57,6 +57,7 @@ http://play.grafana.org/render/dashboard-solo/db/grafana-play-home?orgId=1&panel
 ### Embed Panel
 
 You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use.
+> *Notice* This sharing require either anonymous access or setting [cookie_samesite]({{< relref "installation/configuration/#cookie-samesite" >}}) to none
 
 Example:
 
diff --git a/public/app/features/dashboard/components/ShareModal/template.html b/public/app/features/dashboard/components/ShareModal/template.html
index 81573aa89e3..d6a22c94717 100644
--- a/public/app/features/dashboard/components/ShareModal/template.html
+++ b/public/app/features/dashboard/components/ShareModal/template.html
@@ -31,18 +31,21 @@
 			<i class="fa fa-code"></i>
 		</div>
 		<div class="share-modal-content">
-			<p class="share-modal-info-text">
-				The html code below can be pasted and included in another web page. Unless anonymous access
-				is enabled the user viewing that page need to be signed into grafana for the graph to load.
-			</p>
-
 			<div ng-include src="'shareLinkOptions.html'"></div>
 
-			<div class="gf-form-group gf-form--grow">
+      <p class="share-modal-info-text">
+			 The html code below can be pasted and included in another web page. Unless anonymous access
+			 is enabled, the user viewing that page need to be signed into grafana for the graph to load.
+       Grafana server setting <code>cookie_samesite</code> might also need to be changed to support login
+       inside an iframe.
+			/p>
+
+      <div class="gf-form-group gf-form--grow">
 				<div class="gf-form">
 					<textarea rows="5" data-share-panel-url class="gf-form-input" ng-model='iframeHtml'></textarea>
 				</div>
 			</div>
+
 		</div>
 	</div>
 </script>