Merge pull request #731 from red-hat-storage/sync_us--master

Syncing latest changes from upstream master for rook

.github/workflows/codespell.yaml

@@ -34,7 +34,8 @@ jobs:
           # in other places, so ignore the file itself assuming it is correct
           # crds.yaml, resources.yaml: CRD files are fully generated from content we control (should
           # be flagged elsewhere) and content we don't control (can't fix easily), so ignore
-          skip: .git,*.png,*.jpg,*.svg,*.sum,./LICENSE,./deploy/examples/crds.yaml,./deploy/charts/rook-ceph/templates/resources.yaml,./deploy/examples/csi-operator.yaml
+          # *Dashboard.jjson: Grafana dashboards that are generated via exporting them from Grafana.
+          skip: .git,*.png,*.jpg,*.svg,*.sum,./LICENSE,./deploy/examples/crds.yaml,./deploy/charts/rook-ceph/templates/resources.yaml,./deploy/examples/csi-operator.yaml,*Dashboard.json
           # aks: Amazon Kubernetes Service
           # keyserver: flag to apt-key
           # atleast: codespell wants to flag any 'AtLeast' method

.github/workflows/docs-check.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           python-version: 3.9
 
-      - uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
+      - uses: DavidAnson/markdownlint-cli2-action@db43aef879112c3119a410d69f66701e0d530809 # v17.0.0
         with:
           globs: |
             Documentation/**/*.md

.github/workflows/scorecards.yml

@@ -64,6 +64,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           sarif_file: results.sarif

Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md

@@ -228,9 +228,11 @@ The dashboards have been created by [@galexrt](https://github.com/galexrt). For
 
 The following Grafana dashboards are available:
 
-- [Ceph - Cluster](https://grafana.com/grafana/dashboards/2842)
-- [Ceph - OSD (Single)](https://grafana.com/grafana/dashboards/5336)
-- [Ceph - Pools](https://grafana.com/grafana/dashboards/5342)
+- [Ceph - Cluster (ID: 2842)](https://grafana.com/grafana/dashboards/2842)
+- [Ceph - OSD (Single) (ID: 5336)](https://grafana.com/grafana/dashboards/5336)
+- [Ceph - Pools (ID: 5342)](https://grafana.com/grafana/dashboards/5342)
+
+The dashboard JSON files are also available on [GitHub here `/deploy/examples/monitoring/grafana/`](https://github.com/rook/rook/tree/master/deploy/examples/monitoring/grafana/).
 
 ## Updates and Upgrades