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.

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 22.11.0 to main #1528

Merged
merged 16 commits into from
Nov 21, 2022
Merged

chore: merge 22.11.0 to main #1528

merged 16 commits into from
Nov 21, 2022

Conversation

rahulguptajss
Copy link
Contributor

No description provided.

cgrinds and others added 16 commits November 17, 2022 13:12
fix: six volume dashboard panels need a topk range query

Fixes: #1250
* fix: smv_labels missing in zapi

* fix: svm_labels label agent same as rest
* docs: include Docker compose workflow in docs

* docs: include Docker compose workflow in docs

docs: include how to add a new poller
* feat: submetric support for restperf

* feat: add submetric parsing

* feat: address warnings

* feat: restperf submetrics (#1508)

test: include testcase for rest submetrics

Co-authored-by: Chris Grindstaff <[email protected]>
* fix: cdot svm panels

* fix: volume dash
* feat: StorageGrid collector should be included in autosupport

Example autosupport
```
{
 "Target": {
  "Version": "11.6.0",
  "Model": "storagegrid",
  "Serial": "",
  "Ping": 0,
  "ClusterUUID": "123456"
 },
 "Harvest": {
  "HostHash": "df62c133cbd0fef8ccda100e3c04c33eb3b2d911",
  "UUID": "7c4a8d09ca3762af61e59520943dc26494f8941b",
  "Version": "2.0.2",
  "Release": "rc2",
  "Commit": "HEAD",
  "BuildDate": "undefined",
  "NumClusters": 1
 },
 "Platform": {
  "OS": "darwin",
  "Arch": "darwin",
  "Memory": {
   "TotalKb": 33554432,
   "AvailableKb": 14977532,
   "UsedKb": 18576900
  },
  "CPUs": 1
 },
 "Nodes": {
  "Count": 537,
  "DataPoints": 2685,
  "PollTime": 73558462,
  "APITime": 2487764,
  "ParseTime": 4853,
  "PluginTime": 71064711
 },
 "Volumes": null,
 "Collectors": [
  {
   "Name": "StorageGrid",
   "Query": "grid/accounts-cache",
   "ClientTimeout": "1m0s",
   "Schedules": [
    {
     "Name": "data",
     "Schedule": "5m"
    }
   ],
   "Exporters": [
    "Prometheus"
   ],
   "Counters": {
    "Count": 5,
    "List": [
     "dataBytes",
     "policy.quotaObjectBytes",
     "id",
     "name",
     "objectCount"
    ]
   }
  }
 ]
}
```

* feat: StorageGrid collector should be included in autosupport

Example autosupport
```
{
  "Target": {
    "Version": "11.6.0",
    "Model": "storagegrid",
    "Serial": "",
    "Ping": 0,
    "ClusterUUID": "123456"
  },
  "Harvest": {
    "HostHash": "df62c133cbd0fef8ccda100e3c04c33eb3b2d911",
    "UUID": "7c4a8d09ca3762af61e59520943dc26494f8941b",
    "Version": "2.0.2",
    "Release": "rc2",
    "Commit": "HEAD",
    "BuildDate": "undefined",
    "NumClusters": 1
  },
  "Platform": {
    "OS": "darwin",
    "Arch": "darwin",
    "Memory": {
      "TotalKb": 33554432,
      "AvailableKb": 14574816,
      "UsedKb": 18979616
    },
    "CPUs": 1
  },
  "Nodes": {
    "Count": 537,
    "DataPoints": 2685,
    "PollTime": 206370048,
    "APITime": 4399641,
    "ParseTime": 4618,
    "PluginTime": 201965409,
    "Ids": [
      {
        "serial-number": "36e133d4-e47c-4fff-971c-9e420ca56e97",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "5870c484-205e-4ecf-8eba-a97d6b02b5c1",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "7eaf3aa4-abf2-43fc-84e5-e7d691fac2e6",
        "system-id": "1c3323bc-00cf-4c2c-972c-abc60f783cd9"
      },
      {
        "serial-number": "873ee71b-bd8c-46ef-a511-b4f39b2d10a9",
        "system-id": "bf949fd3-f157-465e-afcd-22dd6d50d02a"
      },
      {
        "serial-number": "8855538b-f8cd-46b4-a907-25efa08b3add",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "93dbb942-10cf-49ca-9869-c068ae38285b",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "961be16f-2523-4831-a919-80ff775072d7",
        "system-id": "bf949fd3-f157-465e-afcd-22dd6d50d02a"
      },
      {
        "serial-number": "9b064cdc-2252-4904-a159-7be39322ccea",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "b81278f1-76da-46c2-b432-e0fa5083d3d0",
        "system-id": "bf949fd3-f157-465e-afcd-22dd6d50d02a"
      },
      {
        "serial-number": "cdae1326-929a-424e-a17b-05ea6cb7682c",
        "system-id": "13527583-ed89-4633-bcc9-05a7cf2ea4a0"
      },
      {
        "serial-number": "cf1fb286-33f2-4da2-8f3b-fc34317b37b5",
        "system-id": "1c3323bc-00cf-4c2c-972c-abc60f783cd9"
      },
      {
        "serial-number": "f41db938-ad29-437b-9b03-7fe894048bed",
        "system-id": "1c3323bc-00cf-4c2c-972c-abc60f783cd9"
      }
    ]
  },
  "Volumes": null,
  "Collectors": [
    {
      "Name": "StorageGrid",
      "Query": "grid/accounts-cache",
      "ClientTimeout": "1m0s",
      "Schedules": [
        {
          "Name": "data",
          "Schedule": "5m"
        }
      ],
      "Exporters": [
        "Prometheus"
      ],
      "Counters": {
        "Count": 5,
        "List": [
          "objectCount",
          "dataBytes",
          "policy.quotaObjectBytes",
          "id",
          "name"
        ]
      }
    }
  ]
}
```
* chore: changelog for 22.11
@rahulguptajss rahulguptajss merged commit b803bb8 into main Nov 21, 2022
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.

3 participants