Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 71 insertions, 52 deletions

diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
index 4b08163f30a..e7c51d82cd2 100644
--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -4,22 +4,32 @@ exports[`Dashboard template matches the default snapshot 1`] = `
 <div
   class="prometheus-graphs"
   data-qa-selector="prometheus_graphs"
+  environmentstate="available"
+  metricsdashboardbasepath="/monitoring/monitor-project/-/environments/1/metrics"
+  metricsendpoint="/monitoring/monitor-project/-/environments/1/additional_metrics.json"
+  prometheusstatus=""
 >
   <div
     class="prometheus-graphs-header d-sm-flex flex-sm-wrap pt-2 pr-1 pb-0 pl-2 border-bottom bg-gray-light"
   >
     <div
-      class="mb-2 pr-2 d-flex d-sm-block"
+      class="mb-2 mr-2 d-flex d-sm-block"
     >
       <dashboards-dropdown-stub
         class="flex-grow-1"
         data-qa-selector="dashboards_filter_dropdown"
         defaultbranch="master"
         id="monitor-dashboards-dropdown"
+        modalid="duplicateDashboard"
         toggle-class="dropdown-menu-toggle"
       />
     </div>
      
+    <span
+      aria-hidden="true"
+      class="gl-pl-3 border-left gl-mb-3 d-none d-sm-block"
+    />
+     
     <div
       class="mb-2 pr-2 d-flex d-sm-block"
     >
@@ -80,17 +90,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
     <div
       class="mb-2 pr-2 d-flex d-sm-block"
     >
-      <gl-deprecated-button-stub
-        class="flex-grow-1"
-        size="md"
-        title="Refresh dashboard"
-        variant="default"
-      >
-        <icon-stub
-          name="retry"
-          size="16"
-        />
-      </gl-deprecated-button-stub>
+      <refresh-button-stub />
     </div>
      
     <div
@@ -127,23 +127,30 @@ exports[`Dashboard template matches the default snapshot 1`] = `
       <!---->
        
       <!---->
+       
+      <!---->
+       
+      <!---->
+       
+      <!---->
     </div>
+     
+    <duplicate-dashboard-modal-stub
+      defaultbranch="master"
+      modalid="duplicateDashboard"
+    />
   </div>
    
-  <!---->
-   
-  <!---->
-   
   <empty-state-stub
-    clusterspath="/path/to/clusters"
-    documentationpath="/path/to/docs"
-    emptygettingstartedsvgpath="/path/to/getting-started.svg"
-    emptyloadingsvgpath="/path/to/loading.svg"
-    emptynodatasmallsvgpath="/path/to/no-data-small.svg"
-    emptynodatasvgpath="/path/to/no-data.svg"
-    emptyunabletoconnectsvgpath="/path/to/unable-to-connect.svg"
+    clusterspath="/monitoring/monitor-project/-/clusters"
+    documentationpath="/help/administration/monitoring/prometheus/index.md"
+    emptygettingstartedsvgpath="/images/illustrations/monitoring/getting_started.svg"
+    emptyloadingsvgpath="/images/illustrations/monitoring/loading.svg"
+    emptynodatasmallsvgpath="/images/illustrations/chart-empty-state-small.svg"
+    emptynodatasvgpath="/images/illustrations/monitoring/no_data.svg"
+    emptyunabletoconnectsvgpath="/images/illustrations/monitoring/unable_to_connect.svg"
     selectedstate="gettingStarted"
-    settingspath="/path/to/settings"
+    settingspath="/monitoring/monitor-project/-/services/prometheus/edit"
   />
 </div>
 `;
diff --git a/spec/frontend/monitoring/components/__snapshots__/empty_state_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/empty_state_spec.js.snap
index 31b3ad1bd76..4f8a82692b8 100644
--- a/spec/frontend/monitoring/components/__snapshots__/empty_state_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/empty_state_spec.js.snap
@@ -1,37 +1,49 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EmptyState shows gettingStarted state 1`] = `
-<gl-empty-state-stub
-  description="Stay updated about the performance and health of your environment by configuring Prometheus to monitor your deployments."
-  primarybuttonlink="/clustersPath"
-  primarybuttontext="Install on clusters"
-  secondarybuttonlink="/settingsPath"
-  secondarybuttontext="Configure existing installation"
-  svgpath="/path/to/getting-started.svg"
-  title="Get started with performance monitoring"
-/>
+<div>
+  <!---->
+   
+  <gl-empty-state-stub
+    description="Stay updated about the performance and health of your environment by configuring Prometheus to monitor your deployments."
+    primarybuttonlink="/clustersPath"
+    primarybuttontext="Install on clusters"
+    secondarybuttonlink="/settingsPath"
+    secondarybuttontext="Configure existing installation"
+    svgpath="/path/to/getting-started.svg"
+    title="Get started with performance monitoring"
+  />
+</div>
 `;
 
-exports[`EmptyState shows loading state 1`] = `
-<gl-empty-state-stub
-  description="Creating graphs uses the data from the Prometheus server. If this takes a long time, ensure that data is available."
-  primarybuttonlink="/documentationPath"
-  primarybuttontext="View documentation"
-  secondarybuttonlink=""
-  secondarybuttontext=""
-  svgpath="/path/to/loading.svg"
-  title="Waiting for performance data"
-/>
+exports[`EmptyState shows noData state 1`] = `
+<div>
+  <!---->
+   
+  <gl-empty-state-stub
+    description="You are connected to the Prometheus server, but there is currently no data to display."
+    primarybuttonlink="/settingsPath"
+    primarybuttontext="Configure Prometheus"
+    secondarybuttonlink=""
+    secondarybuttontext=""
+    svgpath="/path/to/no-data.svg"
+    title="No data found"
+  />
+</div>
 `;
 
 exports[`EmptyState shows unableToConnect state 1`] = `
-<gl-empty-state-stub
-  description="Ensure connectivity is available from the GitLab server to the Prometheus server"
-  primarybuttonlink="/documentationPath"
-  primarybuttontext="View documentation"
-  secondarybuttonlink="/settingsPath"
-  secondarybuttontext="Configure Prometheus"
-  svgpath="/path/to/unable-to-connect.svg"
-  title="Unable to connect to Prometheus server"
-/>
+<div>
+  <!---->
+   
+  <gl-empty-state-stub
+    description="Ensure connectivity is available from the GitLab server to the Prometheus server"
+    primarybuttonlink="/documentationPath"
+    primarybuttontext="View documentation"
+    secondarybuttonlink="/settingsPath"
+    secondarybuttontext="Configure Prometheus"
+    svgpath="/path/to/unable-to-connect.svg"
+    title="Unable to connect to Prometheus server"
+  />
+</div>
 `;