Merge pull request #129 from Cray-HPE/backport/127-to-release/2.6

[Backport release/2.6] STP-3705: Remove dashboard info now in SMA
Cray-HPE · Oct 12, 2023 · 2a9bfe3 · 2a9bfe3
2 parents af78335 + 60a869c
commit 2a9bfe3
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 322 deletions.
diff --git a/.spelling b/.spelling
@@ -116,6 +116,7 @@ update-vcs-config
 # HPE publication numbers
 S-8000
 S-8001
+S-8029
 S-8052
 # CVE IDs
 CVE-2021-33503

diff --git a/docs/README.md b/docs/README.md
@@ -32,11 +32,6 @@
 - [Authenticate SAT Commands](external_system.md#authenticate-sat-commands)
 - [Generate SAT S3 Credentials](external_system.md#generate-sat-s3-credentials)
 
-## [SAT Dashboards](dashboards/README.md)
-
-- [SAT Kibana Dashboards](dashboards/SAT_Kibana_Dashboards.md)
-- [SAT Grafana Dashboards](dashboards/SAT_Grafana_Dashboards.md)
-
 ## [SAT Usage](usage/README.md)
 
 - [SAT Bootprep](usage/sat_bootprep.md)

diff --git a/docs/about_sat/introduction.md b/docs/about_sat/introduction.md
@@ -9,23 +9,6 @@ components.
 SAT offers a command line utility which uses subcommands. There are similarities between SAT commands and `xt` commands
 used on the Cray XC platform. For more information on SAT commands, see [SAT Command Overview](#sat-command-overview).
 
-Six Kibana Dashboards are included with SAT. They provide organized output for system health information.
-
-- [AER Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#aer-kibana-dashboard)
-- [ATOM Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#atom-kibana-dashboard)
-- [Heartbeat Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#heartbeat-kibana-dashboard)
-- [Kernel Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#kernel-kibana-dashboard)
-- [MCE Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#mce-kibana-dashboard)
-- [RAS Daemon Kibana Dashboard](../dashboards/SAT_Kibana_Dashboards.md#ras-daemon-kibana-dashboard)
-
-Four Grafana Dashboards are included with SAT. They display messages that are generated by the HSN (High Speed Network) and
-are reported through Redfish.
-
-- [Grafana Fabric Congestion Dashboard](../dashboards/SAT_Grafana_Dashboards.md#grafana-fabric-congestion-dashboard)
-- [Grafana Fabric Errors Dashboard](../dashboards/SAT_Grafana_Dashboards.md#grafana-fabric-errors-dashboard)
-- [Grafana Fabric Port State Dashboard](../dashboards/SAT_Grafana_Dashboards.md#grafana-fabric-port-state-dashboard)
-- [Grafana Fabric RFC3635 Dashboard](../dashboards/SAT_Grafana_Dashboards.md#grafana-fabric-rfc3635-dashboard)
-
 In CSM 1.3 and newer, the `sat` command is automatically available on all the
 Kubernetes control plane. For more information, see [SAT in CSM](sat_in_csm.md). Older
 versions of CSM do not have the `sat` command automatically available, and SAT

diff --git a/docs/dashboards/README.md b/docs/dashboards/README.md
diff --git a/docs/dashboards/SAT_Grafana_Dashboards.md b/docs/dashboards/SAT_Grafana_Dashboards.md
diff --git a/docs/dashboards/SAT_Kibana_Dashboards.md b/docs/dashboards/SAT_Kibana_Dashboards.md
diff --git a/docs/img/Fabric_PortState_Locations_UI.png b/docs/img/Fabric_PortState_Locations_UI.png
diff --git a/docs/img/Grafana_Fabric_Congestion.png b/docs/img/Grafana_Fabric_Congestion.png
diff --git a/docs/img/Grafana_HSN_Errors.png b/docs/img/Grafana_HSN_Errors.png
diff --git a/docs/img/Grafana_rfc3635.png b/docs/img/Grafana_rfc3635.png
diff --git a/docs/img/SAT_Grafana_Fabric_Vars.png b/docs/img/SAT_Grafana_Fabric_Vars.png
diff --git a/docs/release_notes/sat_2.6_release_notes.md b/docs/release_notes/sat_2.6_release_notes.md
@@ -62,6 +62,11 @@ No new `sat` commands were added in SAT 2.6.
 
 ## Other SAT Changes
 
+- The SAT Kibana and Grafana dashboards were moved to the System Monitoring
+  Application (SMA) beside other dashboards. For more information on how to
+  view these dashboards going forward, see the *HPE Cray EX System Monitoring
+  Application Administration Guide (S-8029)*.
+
 - Add the new `s3.cert_verify` option to the SAT configuration file to
   control whether certificate verification is performed when accessing S3.
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,7 @@ update-vcs-config @@
     # HPE publication numbers
     S-8000
     S-8001
+    S-8029
     S-8052
     # CVE IDs
     CVE-2021-33503
@@ Expand Down @@