chore: merge 26.05.0 to main#4278
Merged
Merged
Conversation
# Conflicts: # mcp/go.mod # mcp/go.sum
Contributor
There was a problem hiding this comment.
Pull request overview
This PR appears to merge the 26.05.0 release branch into main, bringing in updated Go dependencies, refreshed Grafana dashboards, regenerated metrics docs, and the 26.05.0 changelog content.
Changes:
- Update Go module sums (root and
mcp/) to newer dependency versions. - Update Grafana dashboards (Workload variable “All” value and a new Aggregate “Space Used %” panel) and adjust Grafana tooling/tests accordingly.
- Refresh generated metrics documentation creation dates and expand the 26.05.0
CHANGELOG.mdentry.
Reviewed changes
Copilot reviewed 9 out of 11 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
mcp/go.sum |
Dependency checksum updates for the MCP Go module. |
go.sum |
Root dependency checksum updates. |
cmd/tools/grafana/grafana.go |
Adjusts dashboard import/customize behavior by trimming trailing slash in opts.dir. |
cmd/tools/grafana/dashboard_test.go |
Updates dashboard variable expectations to include Workload. |
grafana/dashboards/cmode/workload.json |
Sets Workload variable allValue to .* for “All”. |
grafana/dashboards/cmode/aggregate.json |
Adds a “Top $TopResources Aggregates by Space Used %” timeseries panel. |
docs/ontap-metrics.md |
Regenerates creation date and updates several template references (e.g., restperf path template version). |
docs/storagegrid-metrics.md |
Regenerates creation date. |
docs/eseries-metrics.md |
Regenerates creation date. |
docs/cisco-switch-metrics.md |
Regenerates creation date. |
CHANGELOG.md |
Adds/expands 26.05.0 release notes and PR list. |
Comments suppressed due to low confidence (1)
cmd/tools/grafana/grafana.go:545
initImportVarstrims a trailing "/" but the subsequentswitchonly recognizes the default dashboards path whenopts.dir == "grafana/dashboards". In the default import flow,validateImportmay setopts.dirtofilepath.Join(homePath, "grafana/dashboards")(e.g., whenHARVEST_CONFis set), which means none of theswitchcases match andopts.dirGrafanaFolderMapstays empty—resulting in a no-op import. Consider normalizingopts.dirwithfilepath.Cleanand matching the default case against both the relative andfilepath.Join(homePath, "grafana/dashboards")forms (and/or usingfilepath.Base/filepath.Rel) so the default folder mapping works regardless ofHARVEST_CONFor whether the path is absolute.
// default behavior
opts.dir = strings.TrimSuffix(opts.dir, "/")
switch {
case opts.dir == "grafana/dashboards" && opts.serverfolder.name == "":
m[filepath.Join(opts.dir, "cmode")] = &Folder{name: "Harvest-main-cDOT"}
m[filepath.Join(opts.dir, "cmode-details")] = &Folder{name: "Harvest-main-cDOT Details"}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
cgrinds
approved these changes
May 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.