Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Tracking cluster image update progress via Rest #3306

Merged
merged 15 commits into from
Nov 25, 2024
Merged

feat: Tracking cluster image update progress via Rest #3306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8aff52a
feat: Tracking cluster image update progress via Rest
Hardikl Nov 19, 2024
dfa366a
feat: Tracking cluster image update progress via Rest
Hardikl Nov 19, 2024
7bd59fe
feat: Adding plugin to tracking cluster image update
Hardikl Nov 19, 2024
063f106
feat: Adding status and validation metrics in cluster software
Hardikl Nov 21, 2024
7b2c73a
Merge remote-tracking branch 'origin/main' into hl_cl_upg
Hardikl Nov 21, 2024
0599ed6
Merge remote-tracking branch 'origin/main' into hl_cl_upg
Hardikl Nov 21, 2024
0498d39
feat: handled review comments
Hardikl Nov 21, 2024
166017c
feat: handled review comments
Hardikl Nov 22, 2024
238ce66
feat: handled review comments
Hardikl Nov 22, 2024
fb33b24
feat: update time field
Hardikl Nov 22, 2024
f343630
feat: adding color to status column
Hardikl Nov 25, 2024
496fcfb
feat: minor change
Hardikl Nov 25, 2024
e6b5be4
feat: ignore counters in zapi ci
Hardikl Nov 25, 2024
b966355
feat: ignore counters in ci and add docs
Hardikl Nov 25, 2024
3bb6c67
feat: handled review comments
Hardikl Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/tools/generate/counter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ var (
"_labels",
"volume_arw_status",
"ALERTS",
"_tags",
}

// Exclude extra metrics for ZAPI
Expand Down
41 changes: 41 additions & 0 deletions cmd/tools/generate/counter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1988,3 +1988,44 @@ counters:
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.12.0/fru.yaml

- Name: cluster_tags
Description: This metric display tags at cluster level.
Hardikl marked this conversation as resolved.
Show resolved Hide resolved
APIs:
- API: REST
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.12.0/status.yaml

- Name: volume_tags
Description: This metric display tags at volume level.
Hardikl marked this conversation as resolved.
Show resolved Hide resolved
APIs:
- API: REST
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.12.0/volume.yaml


- Name: cluster_software_update
Description: This metric displays the software update phase with its status.
Hardikl marked this conversation as resolved.
Show resolved Hide resolved
APIs:
- API: REST
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.6.0/clustersoftware.yaml

- Name: cluster_software_status
Description: This metric displays the software job with its status.
Hardikl marked this conversation as resolved.
Show resolved Hide resolved
APIs:
- API: REST
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.6.0/clustersoftware.yaml

- Name: cluster_software_validation
Description: This metric displays the software pre validation checks with its status.
Hardikl marked this conversation as resolved.
Show resolved Hide resolved
APIs:
- API: REST
Endpoint: NA
ONTAPCounter: Harvest generated
Template: conf/rest/9.6.0/clustersoftware.yaml
5 changes: 2 additions & 3 deletions integration/test/dashboard_json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ var zapiCounterMap = map[string]struct{}{
"aggr_object_store_logical_used": {},
"aggr_object_store_physical_used": {},
"fru_status": {},
"cluster_software_update": {},
"cluster_software_status": {},
"cluster_software_validation": {},
}

// restCounterMap are additional counters, above and beyond the ones from counterMap, which should be excluded from Rest
Expand Down Expand Up @@ -113,6 +110,8 @@ var excludeCounters = []string{
"svm_write_total",
"volume_top_clients_",
"volume_top_files_",
// Based on the cluster upgrade, these metrics existence would be changed.
"cluster_software_",
}

var flakyCounters = []string{
Expand Down