Skip to content

chore: merge 26.05.0 to main#4278

Merged
rahulguptajss merged 12 commits into
mainfrom
rg2-merge-26.05
May 11, 2026
Merged

chore: merge 26.05.0 to main#4278
rahulguptajss merged 12 commits into
mainfrom
rg2-merge-26.05

Conversation

@rahulguptajss
Copy link
Copy Markdown
Contributor

No description provided.

Copilot AI review requested due to automatic review settings May 11, 2026 14:04
@cla-bot cla-bot Bot added the cla-signed label May 11, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.md entry.

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

  • initImportVars trims a trailing "/" but the subsequent switch only recognizes the default dashboards path when opts.dir == "grafana/dashboards". In the default import flow, validateImport may set opts.dir to filepath.Join(homePath, "grafana/dashboards") (e.g., when HARVEST_CONF is set), which means none of the switch cases match and opts.dirGrafanaFolderMap stays empty—resulting in a no-op import. Consider normalizing opts.dir with filepath.Clean and matching the default case against both the relative and filepath.Join(homePath, "grafana/dashboards") forms (and/or using filepath.Base/filepath.Rel) so the default folder mapping works regardless of HARVEST_CONF or 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.

Comment thread CHANGELOG.md
@rahulguptajss rahulguptajss merged commit 41e10a9 into main May 11, 2026
17 checks passed
@rahulguptajss rahulguptajss deleted the rg2-merge-26.05 branch May 11, 2026 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants