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

chore: merge release/24.08.0 into main #3099

Merged
merged 3 commits into from
Aug 12, 2024
+989 −275
Merged

chore: merge release/24.08.0 into main #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
451137c
fix: add datacenter,cluster columns in tables with links
rahulguptajss Aug 9, 2024
1001dcd
doc: add container troubleshooting steps (#3097)
rahulguptajss Aug 12, 2024
0cd7265
doc: release notes for 24.08 (#3095)
cgrinds Aug 12, 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
208 changes: 208 additions & 0 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions cmd/tools/generate/counter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
counters:

- Name: aggr_object_store_logical_used
Description: Logical space usage of aggregates in the attached object store.
APIs:
- API: REST
Endpoint: api/private/cli/aggr/show-space
ONTAPCounter: object_store_logical_used
Template: conf/rest/9.12.0/aggr.yaml

- Name: aggr_object_store_physical_used
Description: Physical space usage of aggregates in the attached object store.
APIs:
- API: REST
Endpoint: api/private/cli/aggr/show-space
ONTAPCounter: object_store_physical_used
Template: conf/rest/9.12.0/aggr.yaml

- Name: aggr_physical_used_wo_snapshots
Description: Total Data Reduction Physical Used Without Snapshots

Expand Down
22 changes: 19 additions & 3 deletions docs/install/containers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,25 @@ Make sure you don't skip this step. It is essential as it updates local copies o

4. Restart your containers using the following:

```
docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
```
```
docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
```

??? question "Troubleshooting"

If you encounter the following error:

```
network harvest_backend was found but has incorrect label com.docker.compose.network set to "harvest_backend"
```

Remove the conflicting networks:

```sh
docker network rm harvest_backend harvest_frontend
```

Then, restart your containers again using the command above.

## Building Harvest Docker Image

Expand Down
78 changes: 39 additions & 39 deletions docs/ontap-metrics.md
View file
Open in desktop

Large diffs are not rendered by default.

138 changes: 97 additions & 41 deletions grafana/dashboards/cmode/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1718968539143,
"iteration": 1723188161723,
"links": [
{
"asDropdown": true,
Expand Down Expand Up @@ -1128,6 +1128,10 @@
],
"title": "Target Systems",
"transformations": [
{
"id": "merge",
"options": {}
},
{
"id": "organize",
"options": {
Expand All @@ -1139,22 +1143,25 @@
"version": true
},
"indexByName": {
"Time": 0,
"Value": 8,
"__name__": 1,
"Time": 1,
"Value #A": 11,
"Value #B": 12,
"__name__": 2,
"addr": 4,
"host": 3,
"datacenter": 0,
"hostname": 8,
"instance": 5,
"job": 6,
"poller": 2,
"pid": 9,
"poller": 3,
"promport": 10,
"version": 7
},
"renameByName": {}
"renameByName": {
"addr": "",
"poller": ""
}
}
},
{
"id": "merge",
"options": {}
}
],
"type": "table"
Expand Down Expand Up @@ -1430,10 +1437,10 @@
"Value #A": 4,
"Value #B": 8,
"addr": 5,
"datacenter": 2,
"hostname": 1,
"datacenter": 0,
"hostname": 2,
"pid": 3,
"poller": 0,
"poller": 1,
"promport": 6,
"version": 7
},
Expand Down Expand Up @@ -1618,6 +1625,28 @@
"value": 160
}
]
},
{
"matcher": {
"id": "byName",
"options": "datacenter"
},
"properties": [
{
"id": "displayName",
"value": "Datacenter"
},
{
"id": "links",
"value": [
{
"targetBlank": true,
"title": "",
"url": "/d/cdot-datacenter/ontap-datacenter?orgId=1&${__url_time_range}&var-Datacenter=${__value.raw}"
}
]
}
]
}
]
},
Expand Down Expand Up @@ -1667,26 +1696,28 @@
"excludeByName": {
"Time": true,
"__name__": true,
"datacenter": true,
"datacenter": false,
"harvest_version": true,
"instance": true,
"job": true,
"type": true,
"version": true
},
"indexByName": {
"Time": 0,
"Value": 7,
"__name__": 1,
"hostname": 3,
"instance": 8,
"job": 9,
"name": 4,
"poller": 2,
"reason": 6,
"target": 5,
"type": 10,
"version": 11
"Time": 1,
"Value": 8,
"__name__": 2,
"datacenter": 0,
"hostname": 4,
"instance": 9,
"job": 10,
"name": 5,
"poller": 3,
"promport": 13,
"reason": 7,
"target": 6,
"type": 11,
"version": 12
},
"renameByName": {
"Value": "status",
Expand Down Expand Up @@ -1852,6 +1883,28 @@
"value": 214
}
]
},
{
"matcher": {
"id": "byName",
"options": "datacenter"
},
"properties": [
{
"id": "displayName",
"value": "Datacenter"
},
{
"id": "links",
"value": [
{
"targetBlank": true,
"title": "",
"url": "/d/cdot-datacenter/ontap-datacenter?orgId=1&${__url_time_range}&var-Datacenter=${__value.raw}"
}
]
}
]
}
]
},
Expand Down Expand Up @@ -1900,29 +1953,32 @@
"excludeByName": {
"Time": true,
"__name__": true,
"datacenter": true,
"datacenter": false,
"harvest_version": true,
"instance": true,
"job": true,
"type": true,
"version": true
},
"indexByName": {
"Time": 0,
"Value": 9,
"__name__": 1,
"hostname": 3,
"instance": 6,
"job": 7,
"name": 4,
"poller": 2,
"reason": 8,
"target": 5,
"type": 10,
"version": 11
"Time": 1,
"Value": 10,
"__name__": 2,
"datacenter": 0,
"hostname": 4,
"instance": 7,
"job": 8,
"name": 5,
"poller": 3,
"promport": 13,
"reason": 9,
"target": 6,
"type": 11,
"version": 12
},
"renameByName": {
"Value": "status",
"datacenter": "",
"exporter": "Exporter Class",
"harvest_version": "",
"hostname": "",
Expand Down Expand Up @@ -3169,5 +3225,5 @@
"timezone": "",
"title": "Harvest Metadata",
"uid": "cdot-metadata",
"version": 9
"version": 10
}
96 changes: 48 additions & 48 deletions grafana/dashboards/cmode/namespace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1705060375167,
"iteration": 1723016094711,
"links": [
{
"asDropdown": true,
Expand Down Expand Up @@ -949,53 +949,53 @@
"volume 4": true
},
"indexByName": {
"Time": 43,
"Time 2": 16,
"Time 3": 25,
"Time 4": 35,
"Value #A": 14,
"Value #B": 9,
"Value #C": 10,
"Value #D": 11,
"__name__": 13,
"__name__ 2": 17,
"__name__ 3": 26,
"__name__ 4": 46,
"cluster": 1,
"cluster 2": 18,
"cluster 3": 27,
"cluster 4": 36,
"datacenter": 0,
"datacenter 2": 19,
"datacenter 3": 28,
"datacenter 4": 37,
"instance": 44,
"instance 2": 20,
"instance 3": 29,
"instance 4": 38,
"is_read_only": 30,
"job": 45,
"job 2": 21,
"job 3": 31,
"job 4": 39,
"Time 1": 35,
"Time 2": 38,
"Time 3": 41,
"Time 4": 44,
"Value #A": 10,
"Value #B": 6,
"Value #C": 7,
"Value #D": 8,
"__name__ 1": 31,
"__name__ 2": 12,
"__name__ 3": 18,
"__name__ 4": 30,
"cluster 1": 1,
"cluster 2": 13,
"cluster 3": 19,
"cluster 4": 25,
"datacenter 1": 0,
"datacenter 2": 14,
"datacenter 3": 20,
"datacenter 4": 26,
"instance 1": 36,
"instance 2": 39,
"instance 3": 42,
"instance 4": 45,
"is_read_only": 21,
"job 1": 37,
"job 2": 40,
"job 3": 43,
"job 4": 46,
"node": 2,
"nsid": 8,
"os_type": 12,
"path": 3,
"path 2": 22,
"path 3": 32,
"path 4": 40,
"state": 4,
"subsystem": 5,
"svm": 6,
"svm 2": 23,
"svm 3": 33,
"svm 4": 41,
"uuid": 15,
"volume": 7,
"volume 2": 24,
"volume 3": 34,
"volume 4": 42
"nsid": 5,
"os_type": 9,
"path 1": 32,
"path 2": 15,
"path 3": 22,
"path 4": 27,
"state": 3,
"subsystem": 4,
"svm 1": 33,
"svm 2": 16,
"svm 3": 23,
"svm 4": 28,
"uuid": 11,
"volume 1": 34,
"volume 2": 17,
"volume 3": 24,
"volume 4": 29
},
"renameByName": {
"Value #B": "Used",
Expand Down Expand Up @@ -1295,5 +1295,5 @@
"timezone": "",
"title": "ONTAP: NVMe Namespaces",
"uid": "cdot-nvme-namespaces",
"version": 3
"version": 6
}
Loading