diff --git a/cmd/poller/collector/asup.go b/cmd/poller/collector/asup.go
index 7ec186dfe..74df2cebf 100644
--- a/cmd/poller/collector/asup.go
+++ b/cmd/poller/collector/asup.go
@@ -12,10 +12,10 @@ import (
"github.com/netapp/harvest/v2/pkg/conf"
"github.com/netapp/harvest/v2/pkg/logging"
"github.com/netapp/harvest/v2/pkg/matrix"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/host"
- "github.com/shirou/gopsutil/v3/mem"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/host"
+ "github.com/shirou/gopsutil/v4/mem"
+ "github.com/shirou/gopsutil/v4/process"
"os"
"os/exec"
"path"
diff --git a/cmd/poller/poller.go b/cmd/poller/poller.go
index c0bf8170c..6a6b489df 100644
--- a/cmd/poller/poller.go
+++ b/cmd/poller/poller.go
@@ -54,8 +54,8 @@ import (
"github.com/netapp/harvest/v2/pkg/requests"
"github.com/netapp/harvest/v2/pkg/tree/node"
"github.com/netapp/harvest/v2/pkg/util"
- "github.com/shirou/gopsutil/v3/mem"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/mem"
+ "github.com/shirou/gopsutil/v4/process"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
"io"
diff --git a/cmd/tools/grafana/grafana.go b/cmd/tools/grafana/grafana.go
index 0f016275a..45925bd15 100644
--- a/cmd/tools/grafana/grafana.go
+++ b/cmd/tools/grafana/grafana.go
@@ -378,7 +378,7 @@ func doImport(_ *cobra.Command, _ []string) {
opts.command = "import"
_, err := conf.LoadHarvestConfig(opts.config)
if err != nil {
- return
+ printErrorAndExit(err)
}
adjustOptions()
@@ -390,6 +390,11 @@ func doImport(_ *cobra.Command, _ []string) {
importDashboards(opts)
}
+func printErrorAndExit(err error) {
+ fmt.Println(err)
+ os.Exit(1)
+}
+
func validateImport() {
// default case
if opts.dir == "" && opts.serverfolder.name == "" {
@@ -429,8 +434,7 @@ func initImportVars() {
if opts.customizeDir == "" {
err := checkAndCreateServerFolder(v)
if err != nil {
- fmt.Print(err)
- os.Exit(1)
+ printErrorAndExit(err)
}
}
opts.dirGrafanaFolderMap[k] = v
@@ -492,8 +496,7 @@ func importFiles(dir string, folder *Folder) {
return
}
if files, err = os.ReadDir(dir); err != nil {
- // TODO check for not exist
- return
+ printErrorAndExit(err)
}
for _, file := range files {
diff --git a/docs/ontap-metrics.md b/docs/ontap-metrics.md
index 90ff043aa..d4b02191f 100644
--- a/docs/ontap-metrics.md
+++ b/docs/ontap-metrics.md
@@ -7,8 +7,8 @@ These can be generated on demand by running `bin/harvest grafana metrics`. See
- More information about ONTAP REST performance counters can be found [here](https://docs.netapp.com/us-en/ontap-pcmap-9121/index.html).
```
-Creation Date : 2024-May-29
-ONTAP Version: 9.13.1
+Creation Date : 2024-Jun-03
+ONTAP Version: 9.15.1
```
## Understanding the structure
@@ -3120,6 +3120,7 @@ Average RDMA I/O latency.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/iwarp` | `average_latency`
Unit: microsec
Type: average
Base: ops | conf/restperf/9.14.1/iwarp.yaml |
| ZAPI | `perf-object-get-instances iwarp` | `iw_avg_latency`
Unit: microsec
Type: average
Base: iw_ops | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
@@ -3129,6 +3130,7 @@ Number of RDMA I/Os issued.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/iwarp` | `ops`
Unit: none
Type: rate
Base: | conf/restperf/9.14.1/iwarp.yaml |
| ZAPI | `perf-object-get-instances iwarp` | `iw_ops`
Unit: none
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
@@ -3138,7 +3140,8 @@ Number of RDMA read I/Os issued.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances iwarp` | `iw_read_ops`
Unit: none
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
+| REST | `api/cluster/counter/tables/iwarp` | `read_ops`
Unit: none
Type: rate
Base: | conf/restperf/9.14.1/iwarp.yaml |
+| ZAPI | `perf-object-get-instances iwarp` | `iw_read_ops`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
### iw_write_ops
@@ -3147,7 +3150,8 @@ Number of RDMA write I/Os issued.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances iwarp` | `iw_write_ops`
Unit: none
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
+| REST | `api/cluster/counter/tables/iwarp` | `write_ops`
Unit: none
Type: rate
Base: | conf/restperf/9.14.1/iwarp.yaml |
+| ZAPI | `perf-object-get-instances iwarp` | `iw_write_ops`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/iwarp.yaml |
### lif_recv_data
@@ -4337,7 +4341,7 @@ Total errors sent
### node_avg_processor_busy
-Average processor utilization across all processors in the system
+Average processor utilization across active processors in the system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
@@ -6794,7 +6798,6 @@ NVMe/FC kilobytes (KB) received per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_data_received`
Unit: kb_per_sec
Type: rate
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvme_fc_data_recv`
Unit: kb_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_nvme_fc_data_sent
@@ -6804,7 +6807,6 @@ NVMe/FC kilobytes (KB) sent per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_data_sent`
Unit: kb_per_sec
Type: rate
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvme_fc_data_sent`
Unit: kb_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_nvme_fc_ops
@@ -6814,7 +6816,6 @@ NVMe/FC operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvme_fc_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_nvmf_data_recv
@@ -6824,7 +6825,7 @@ NVMe/FC kilobytes (KB) received per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_data_received, 1`
Unit:
Type:
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvmf_data_recv`
Unit: kb_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
+| ZAPI | `perf-object-get-instances system:node` | `nvmf_data_recv`
Unit:
Type:
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_nvmf_data_sent
@@ -6834,7 +6835,7 @@ NVMe/FC kilobytes (KB) sent per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_data_sent, 1`
Unit:
Type:
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvmf_data_sent`
Unit: kb_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
+| ZAPI | `perf-object-get-instances system:node` | `nvmf_data_sent`
Unit:
Type:
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_nvmf_ops
@@ -6844,7 +6845,7 @@ NVMe/FC operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
| REST | `api/cluster/counter/tables/system:node` | `nvme_fc_ops, 1`
Unit:
Type:
Base: | conf/restperf/9.12.0/system_node.yaml |
-| ZAPI | `perf-object-get-instances system:node` | `nvmf_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
+| ZAPI | `perf-object-get-instances system:node` | `nvmf_ops`
Unit:
Type:
Base: | conf/zapiperf/cdot/9.8.0/system_node.yaml |
### node_ssd_data_read
@@ -7623,15 +7624,17 @@ Average latency for NVMF operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `average_latency`
Unit: microsec
Type: average
Base: total_ops | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `avg_latency`
Unit: microsec
Type: average
Base: total_ops | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
### nvmf_rdma_port_avg_other_latency
-Average latency for operations other than read, write, compare or caw
+Average latency for operations other than read, write, compare or compare-and-write
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `average_other_latency`
Unit: microsec
Type: average
Base: other_ops | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `avg_other_latency`
Unit: microsec
Type: average
Base: other_ops | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7641,6 +7644,7 @@ Average latency for read operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `average_read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `avg_read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7650,15 +7654,17 @@ Average latency for write operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `average_write_latency`
Unit: microsec
Type: average
Base: write_ops | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `avg_write_latency`
Unit: microsec
Type: average
Base: write_ops | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
### nvmf_rdma_port_other_ops
-Number of operations that are not read, write, compare or caw.
+Number of operations that are not read, write, compare or compare-and-right.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `other_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `other_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7668,6 +7674,7 @@ Amount of data read from the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `read_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `read_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7677,6 +7684,7 @@ Number of read operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7686,6 +7694,7 @@ Amount of NVMF traffic to and from the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `total_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `total_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7695,6 +7704,7 @@ Total number of operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `total_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `total_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7704,6 +7714,7 @@ Amount of data written to the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `write_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `write_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7713,6 +7724,7 @@ Number of write operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_rdma_port` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_rdma_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_rdma_port` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_rdma_port.yaml |
@@ -7722,15 +7734,17 @@ Average latency for NVMF operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `average_latency`
Unit: microsec
Type: average
Base: total_ops | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `avg_latency`
Unit: microsec
Type: average
Base: total_ops | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
### nvmf_tcp_port_avg_other_latency
-Average latency for operations other than read, write, compare or caw
+Average latency for operations other than read, write, compare or compare-and-write
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `average_other_latency`
Unit: microsec
Type: average
Base: other_ops | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `avg_other_latency`
Unit: microsec
Type: average
Base: other_ops | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7740,6 +7754,7 @@ Average latency for read operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `average_read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `avg_read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7749,15 +7764,17 @@ Average latency for write operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `average_write_latency`
Unit: microsec
Type: average
Base: write_ops | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `avg_write_latency`
Unit: microsec
Type: average
Base: write_ops | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
### nvmf_tcp_port_other_ops
-Number of operations that are not read, write, compare or caw.
+Number of operations that are not read, write, compare or compare-and-write.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `other_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `other_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7767,6 +7784,7 @@ Amount of data read from the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `read_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `read_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7776,6 +7794,7 @@ Number of read operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7785,6 +7804,7 @@ Amount of NVMF traffic to and from the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `total_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `total_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7794,6 +7814,7 @@ Total number of operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `total_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `total_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7803,6 +7824,7 @@ Amount of data written to the storage system
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `write_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `write_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
@@ -7812,12 +7834,13 @@ Number of write operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/nvmf_tcp_port` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/nvmf_tcp_port.yaml |
| ZAPI | `perf-object-get-instances nvmf_tcp_port` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/nvmf_tcp_port.yaml |
### ontaps3_logical_used_size
-Specifies the bucket logical used size up to this point.
+Specifies the bucket logical used size up to this point. This field cannot be specified using a POST or PATCH method.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
@@ -7826,7 +7849,7 @@ Specifies the bucket logical used size up to this point.
### ontaps3_size
-Specifies the bucket size in bytes; ranges from 80MB to 64TB.
+Specifies the bucket size in bytes; ranges from 190MB to 62PB.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
@@ -7839,16 +7862,18 @@ Number of failed Abort Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `abort_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_abort_multipart_upload_failed_client_close
-Number of times Abort Multipart Upload operation failed because client terminated connection for operation pending on server.
+Number of times Abort Multipart Upload operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `abort_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_abort_multipart_upload_latency
@@ -7857,7 +7882,8 @@ Average latency for Abort Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_latency`
Unit: microsec
Type: average
Base: abort_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `abort_multipart_upload_latency`
Unit: microsec
Type: average
Base: abort_multipart_upload_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_latency`
Unit: microsec
Type: average,no-zero-values
Base: abort_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_abort_multipart_upload_rate
@@ -7866,7 +7892,8 @@ Number of Abort Multipart Upload operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `abort_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_abort_multipart_upload_total
@@ -7875,7 +7902,8 @@ Number of Abort Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `abort_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `abort_multipart_upload_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_allow_access
@@ -7884,6 +7912,7 @@ Number of times access was allowed.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `allow_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `allow_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -7893,6 +7922,7 @@ Number of times anonymous access was allowed.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `anonymous_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `anonymous_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -7902,6 +7932,7 @@ Number of times anonymous access was denied.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `anonymous_deny_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `anonymous_deny_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -7911,7 +7942,8 @@ Number of authentication failures.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `authentication_failures`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `authentication_failures`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `authentication_failures`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_chunked_upload_reqs
@@ -7920,7 +7952,8 @@ Total number of object store server chunked object upload requests
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `chunked_upload_reqs`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `chunked_upload_requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `chunked_upload_reqs`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_complete_multipart_upload_failed
@@ -7929,16 +7962,18 @@ Number of failed Complete Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `complete_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_complete_multipart_upload_failed_client_close
-Number of times Complete Multipart Upload operation failed because client terminated connection for operation pending on server.
+Number of times Complete Multipart Upload operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `complete_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_complete_multipart_upload_latency
@@ -7947,7 +7982,8 @@ Average latency for Complete Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_latency`
Unit: microsec
Type: average
Base: complete_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `complete_multipart_upload_latency`
Unit: microsec
Type: average
Base: complete_multipart_upload_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_latency`
Unit: microsec
Type: average,no-zero-values
Base: complete_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_complete_multipart_upload_rate
@@ -7956,7 +7992,8 @@ Number of Complete Multipart Upload operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `complete_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_complete_multipart_upload_total
@@ -7965,7 +8002,8 @@ Number of Complete Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `complete_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `complete_multipart_upload_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_connected_connections
@@ -7974,7 +8012,8 @@ Number of object store server connections currently established
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `connected_connections`
Unit: none
Type: raw
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `connected_connections`
Unit: none
Type: raw
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `connected_connections`
Unit: none
Type: raw,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_connections
@@ -7983,7 +8022,8 @@ Total number of object store server connections.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `connections`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `connections`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `connections`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_create_bucket_failed
@@ -7992,15 +8032,17 @@ Number of failed Create Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `create_bucket_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `create_bucket_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_create_bucket_failed_client_close
-Number of times Create Bucket operation failed because client terminated connection for operation pending on server.
+Number of times Create Bucket operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `create_bucket_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `create_bucket_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8010,6 +8052,7 @@ Average latency for Create Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `create_bucket_latency`
Unit: microsec
Type: average
Base: create_bucket_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `create_bucket_latency`
Unit: microsec
Type: average,no-zero-values
Base: create_bucket_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8019,6 +8062,7 @@ Number of Create Bucket operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `create_bucket_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `create_bucket_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8028,6 +8072,7 @@ Number of Create Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `create_bucket_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `create_bucket_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8037,6 +8082,7 @@ Number of times access was denied by default and not through any policy statemen
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `default_deny_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `default_deny_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8046,15 +8092,17 @@ Number of failed Delete Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_bucket_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_bucket_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_bucket_failed_client_close
-Number of times Delete Bucket operation failed because client terminated connection for operation pending on server.
+Number of times Delete Bucket operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_bucket_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_bucket_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8064,6 +8112,7 @@ Average latency for Delete Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_bucket_latency`
Unit: microsec
Type: average
Base: delete_bucket_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_bucket_latency`
Unit: microsec
Type: average,no-zero-values
Base: delete_bucket_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8073,6 +8122,7 @@ Number of Delete Bucket operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_bucket_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_bucket_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8082,6 +8132,7 @@ Number of Delete Bucket operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_bucket_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_bucket_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8091,7 +8142,8 @@ Number of failed DELETE object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_failed_client_close
@@ -8100,7 +8152,8 @@ Number of times DELETE object operation failed due to the case where client clos
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_latency
@@ -8109,16 +8162,18 @@ Average latency for DELETE object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_latency`
Unit: microsec
Type: average
Base: delete_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_latency`
Unit: microsec
Type: average
Base: delete_object_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_latency`
Unit: microsec
Type: average,no-zero-values
Base: delete_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_rate
-Number of DELETE object operations per sec
+Number of DELETE object operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_tagging_failed
@@ -8127,15 +8182,17 @@ Number of failed DELETE object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_tagging_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_tagging_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_tagging_failed_client_close
-Number of times DELETE object tagging operation failed because client terminated connection for operation pending on server.
+Number of times DELETE object tagging operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_tagging_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_tagging_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8145,15 +8202,17 @@ Average latency for DELETE object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_tagging_latency`
Unit: microsec
Type: average
Base: delete_object_tagging_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_tagging_latency`
Unit: microsec
Type: average,no-zero-values
Base: delete_object_tagging_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_delete_object_tagging_rate
-Number of DELETE object tagging operations per sec.
+Number of DELETE object tagging operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_tagging_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_tagging_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8163,6 +8222,7 @@ Number of DELETE object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_tagging_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_tagging_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8172,7 +8232,8 @@ Number of DELETE object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `delete_object_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `delete_object_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_explicit_deny_access
@@ -8181,6 +8242,7 @@ Number of times access was denied explicitly by a policy statement.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `explicit_deny_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `explicit_deny_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8190,7 +8252,8 @@ Number of failed GET Bucket ACL operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_acl_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_bucket_acl_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_acl_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_bucket_acl_total
@@ -8199,7 +8262,8 @@ Number of GET Bucket ACL operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_acl_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_bucket_acl_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_acl_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_bucket_versioning_failed
@@ -8208,7 +8272,8 @@ Number of failed Get Bucket Versioning operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_versioning_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_bucket_versioning_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_versioning_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_bucket_versioning_total
@@ -8217,7 +8282,8 @@ Number of Get Bucket Versioning operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_versioning_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_bucket_versioning_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_bucket_versioning_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_data
@@ -8226,7 +8292,8 @@ Rate of GET object data transfers per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_data`
Unit: b_per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_acl_failed
@@ -8235,7 +8302,8 @@ Number of failed GET Object ACL operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_acl_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_acl_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_acl_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_acl_total
@@ -8244,7 +8312,8 @@ Number of GET Object ACL operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_acl_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_acl_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_acl_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_failed
@@ -8253,7 +8322,8 @@ Number of failed GET object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_failed_client_close
@@ -8262,7 +8332,8 @@ Number of times GET object operation failed due to the case where client closed
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_lastbyte_latency
@@ -8271,7 +8342,8 @@ Average last-byte latency for GET object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_lastbyte_latency`
Unit: microsec
Type: average
Base: get_object_lastbyte_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_lastbyte_latency`
Unit: microsec
Type: average
Base: get_object_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_lastbyte_latency`
Unit: microsec
Type: average,no-zero-values
Base: get_object_lastbyte_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_latency
@@ -8280,16 +8352,18 @@ Average first-byte latency for GET object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_latency`
Unit: microsec
Type: average
Base: get_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_latency`
Unit: microsec
Type: average
Base: get_object_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_latency`
Unit: microsec
Type: average,no-zero-values
Base: get_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_rate
-Number of GET object operations per sec
+Number of GET object operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_tagging_failed
@@ -8298,7 +8372,8 @@ Number of failed GET object tagging operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_tagging_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_tagging_failed_client_close
@@ -8307,7 +8382,8 @@ Number of times GET object tagging operation failed due to the case where client
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_tagging_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_tagging_latency
@@ -8316,16 +8392,18 @@ Average latency for GET object tagging operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_latency`
Unit: microsec
Type: average
Base: get_object_tagging_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_tagging_latency`
Unit: microsec
Type: average
Base: get_object_tagging_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_latency`
Unit: microsec
Type: average,no-zero-values
Base: get_object_tagging_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_tagging_rate
-Number of GET object tagging operations per sec
+Number of GET object tagging operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_tagging_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_tagging_total
@@ -8334,7 +8412,8 @@ Number of GET object tagging operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_tagging_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_tagging_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_get_object_total
@@ -8343,7 +8422,8 @@ Number of GET object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `get_object_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `get_object_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `get_object_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_group_policy_evaluated
@@ -8352,6 +8432,7 @@ Number of times group policies were evaluated.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `group_policy_evaluated`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `group_policy_evaluated`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8361,7 +8442,8 @@ Number of failed HEAD bucket operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_bucket_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_bucket_failed_client_close
@@ -8370,7 +8452,8 @@ Number of times HEAD bucket operation failed due to the case where client closed
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_bucket_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_bucket_latency
@@ -8379,16 +8462,18 @@ Average latency for HEAD bucket operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_latency`
Unit: microsec
Type: average
Base: head_bucket_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_bucket_latency`
Unit: microsec
Type: average
Base: head_bucket_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_latency`
Unit: microsec
Type: average,no-zero-values
Base: head_bucket_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_bucket_rate
-Number of HEAD bucket operations per sec
+Number of HEAD bucket operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_bucket_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_bucket_total
@@ -8397,7 +8482,8 @@ Number of HEAD bucket operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_bucket_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_bucket_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_object_failed
@@ -8406,7 +8492,8 @@ Number of failed HEAD Object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_object_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_object_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_object_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_object_failed_client_close
@@ -8415,7 +8502,8 @@ Number of times HEAD object operation failed due to the case where client closed
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_object_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_object_latency
@@ -8424,16 +8512,18 @@ Average latency for HEAD object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_object_latency`
Unit: microsec
Type: average
Base: head_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_object_latency`
Unit: microsec
Type: average
Base: head_object_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_object_latency`
Unit: microsec
Type: average,no-zero-values
Base: head_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_object_rate
-Number of HEAD Object operations per sec
+Number of HEAD Object operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_object_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_object_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_object_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_head_object_total
@@ -8442,7 +8532,8 @@ Number of HEAD Object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `head_object_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `head_object_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `head_object_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_initiate_multipart_upload_failed
@@ -8451,16 +8542,18 @@ Number of failed Initiate Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `initiate_multipart_upload_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_initiate_multipart_upload_failed_client_close
-Number of times Initiate Multipart Upload operation failed because client terminated connection for operation pending on server.
+Number of times Initiate Multipart Upload operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `initiate_multipart_upload_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_initiate_multipart_upload_latency
@@ -8469,7 +8562,8 @@ Average latency for Initiate Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_latency`
Unit: microsec
Type: average
Base: initiate_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `initiate_multipart_upload_latency`
Unit: microsec
Type: average
Base: initiate_multipart_upload_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_latency`
Unit: microsec
Type: average,no-zero-values
Base: initiate_multipart_upload_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_initiate_multipart_upload_rate
@@ -8478,7 +8572,8 @@ Number of Initiate Multipart Upload operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `initiate_multipart_upload_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_initiate_multipart_upload_total
@@ -8487,7 +8582,8 @@ Number of Initiate Multipart Upload operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `initiate_multipart_upload_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `initiate_multipart_upload_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_input_flow_control_entry
@@ -8496,7 +8592,8 @@ Number of times input flow control was entered.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `input_flow_control_entry`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `input_flow_control_entry`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `input_flow_control_entry`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_input_flow_control_exit
@@ -8505,7 +8602,8 @@ Number of times input flow control was exited.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `input_flow_control_exit`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `input_flow_control_exit`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `input_flow_control_exit`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_buckets_failed
@@ -8514,7 +8612,8 @@ Number of failed LIST Buckets operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_buckets_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_buckets_failed_client_close
@@ -8523,7 +8622,8 @@ Number of times LIST Bucket operation failed due to the case where client closed
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_buckets_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_buckets_latency
@@ -8532,16 +8632,18 @@ Average latency for LIST Buckets operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_latency`
Unit: microsec
Type: average
Base: head_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_buckets_latency`
Unit: microsec
Type: average
Base: list_buckets_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_latency`
Unit: microsec
Type: average,no-zero-values
Base: head_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_buckets_rate
-Number of LIST Buckets operations per sec
+Number of LIST Buckets operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_buckets_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_buckets_total
@@ -8550,7 +8652,8 @@ Number of LIST Buckets operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_buckets_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_buckets_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_object_versions_failed
@@ -8559,7 +8662,8 @@ Number of failed LIST object versions operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_object_versions_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_object_versions_failed_client_close
@@ -8568,6 +8672,7 @@ Number of times LIST object versions operation failed due to the case where clie
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `list_object_versions_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8577,15 +8682,17 @@ Average latency for LIST Object versions operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `list_object_versions_latency`
Unit: microsec
Type: average
Base: list_object_versions_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_latency`
Unit: microsec
Type: average,no-zero-values
Base: list_object_versions_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_object_versions_rate
-Number of LIST Object Versions operations per sec
+Number of LIST Object Versions operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `list_object_versions_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8595,7 +8702,8 @@ Number of LIST Object Versions operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_object_versions_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_object_versions_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_objects_failed
@@ -8604,7 +8712,8 @@ Number of failed LIST objects operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_objects_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_objects_failed_client_close
@@ -8613,7 +8722,8 @@ Number of times LIST objects operation failed due to the case where client close
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_objects_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_objects_latency
@@ -8622,16 +8732,18 @@ Average latency for LIST Objects operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_latency`
Unit: microsec
Type: average
Base: list_objects_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_objects_latency`
Unit: microsec
Type: average
Base: list_objects_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_latency`
Unit: microsec
Type: average,no-zero-values
Base: list_objects_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_objects_rate
-Number of LIST Objects operations per sec
+Number of LIST Objects operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_objects_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_objects_total
@@ -8640,52 +8752,58 @@ Number of LIST Objects operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_objects_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_objects_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_uploads_failed
-Number of failed LIST Uploads operations
+Number of failed LIST Upload operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_uploads_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_uploads_failed_client_close
-Number of times LIST Uploads operation failed due to the case where client closed the connection while the operation was still pending on server.
+Number of times LIST Upload operation failed due to the case where client closed the connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_uploads_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_uploads_latency
-Average latency for LIST Uploads operations
+Average latency for LIST Upload operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_latency`
Unit: microsec
Type: average
Base: list_uploads_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_uploads_latency`
Unit: microsec
Type: average
Base: list_uploads_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_latency`
Unit: microsec
Type: average,no-zero-values
Base: list_uploads_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_uploads_rate
-Number of LIST Uploads operations per sec
+Number of LIST Upload operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_uploads_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_list_uploads_total
-Number of LIST Uploads operations
+Number of LIST Upload operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `list_uploads_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `list_uploads_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_max_cmds_per_connection
@@ -8694,7 +8812,8 @@ Maximum commands pipelined at any instance on a connection.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `max_cmds_per_connection`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `maximum_commands_per_connection`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `max_cmds_per_connection`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_max_connected_connections
@@ -8703,7 +8822,8 @@ Maximum number of object store server connections established at one time
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `max_connected_connections`
Unit: none
Type: raw
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `maximum_connected_connections`
Unit: none
Type: raw
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `max_connected_connections`
Unit: none
Type: raw,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_max_requests_outstanding
@@ -8712,7 +8832,8 @@ Maximum number of object store server requests in process at one time
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `max_requests_outstanding`
Unit: none
Type: raw
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `maximum_requests_outstanding`
Unit: none
Type: raw
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `max_requests_outstanding`
Unit: none
Type: raw,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_multi_delete_reqs
@@ -8721,7 +8842,8 @@ Total number of object store server multiple object delete requests
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `multi_delete_reqs`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `multiple_delete_requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `multi_delete_reqs`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_output_flow_control_entry
@@ -8730,7 +8852,8 @@ Number of output flow control was entered.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `output_flow_control_entry`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `output_flow_control_entry`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `output_flow_control_entry`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_output_flow_control_exit
@@ -8739,7 +8862,8 @@ Number of times output flow control was exited.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `output_flow_control_exit`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `output_flow_control_exit`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `output_flow_control_exit`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_presigned_url_reqs
@@ -8748,7 +8872,8 @@ Total number of presigned object store server URL requests.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `presigned_url_reqs`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `presigned_url_requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `presigned_url_reqs`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_bucket_versioning_failed
@@ -8757,7 +8882,8 @@ Number of failed Put Bucket Versioning operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_bucket_versioning_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_bucket_versioning_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_bucket_versioning_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_bucket_versioning_total
@@ -8766,7 +8892,8 @@ Number of Put Bucket Versioning operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_bucket_versioning_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_bucket_versioning_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_bucket_versioning_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_data
@@ -8775,7 +8902,8 @@ Rate of PUT object data transfers per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_data`
Unit: b_per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_data`
Unit: b_per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_data`
Unit: b_per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_failed
@@ -8784,7 +8912,8 @@ Number of failed PUT object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_object_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_object_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_failed_client_close
@@ -8793,7 +8922,8 @@ Number of times PUT object operation failed due to the case where client closed
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_object_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_latency
@@ -8802,16 +8932,18 @@ Average latency for PUT object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_object_latency`
Unit: microsec
Type: average
Base: put_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_latency`
Unit: microsec
Type: average
Base: put_object_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_object_latency`
Unit: microsec
Type: average,no-zero-values
Base: put_object_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_rate
-Number of PUT object operations per sec
+Number of PUT object operations per second
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_object_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_object_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_tagging_failed
@@ -8820,15 +8952,17 @@ Number of failed PUT object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_tagging_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `put_object_tagging_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_put_object_tagging_failed_client_close
-Number of times PUT object tagging operation failed because client terminated connection for operation pending on server.
+Number of times PUT object tagging operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_tagging_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `put_object_tagging_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8838,6 +8972,7 @@ Average latency for PUT object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_tagging_latency`
Unit: microsec
Type: average
Base: put_object_tagging_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `put_object_tagging_latency`
Unit: microsec
Type: average,no-zero-values
Base: put_object_tagging_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8847,6 +8982,7 @@ Number of PUT object tagging operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_tagging_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `put_object_tagging_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8856,6 +8992,7 @@ Number of PUT object tagging operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_tagging_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `put_object_tagging_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8865,7 +9002,8 @@ Number of PUT object operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `put_object_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `put_object_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `put_object_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_request_parse_errors
@@ -8874,7 +9012,8 @@ Number of request parser errors due to malformed requests.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `request_parse_errors`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `request_parse_errors`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `request_parse_errors`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_requests
@@ -8883,7 +9022,8 @@ Total number of object store server requests
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `requests`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `requests`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_requests_outstanding
@@ -8892,7 +9032,8 @@ Number of object store server requests in process
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `requests_outstanding`
Unit: none
Type: raw
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `requests_outstanding`
Unit: none
Type: raw
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `requests_outstanding`
Unit: none
Type: raw,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_root_user_access
@@ -8901,6 +9042,7 @@ Number of times access was done by root user.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `root_user_access`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `root_user_access`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8910,7 +9052,8 @@ Number of connection closes triggered by server due to fatal errors.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `server_connection_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `server_connection_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `server_connection_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_signature_v2_reqs
@@ -8919,7 +9062,8 @@ Total number of object store server signature V2 requests
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `signature_v2_reqs`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `signature_v2_requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `signature_v2_reqs`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_signature_v4_reqs
@@ -8928,7 +9072,8 @@ Total number of object store server signature V4 requests
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `signature_v4_reqs`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `signature_v4_requests`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `signature_v4_reqs`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_tagging
@@ -8937,6 +9082,7 @@ Number of requests with tagging specified.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/object_store_server` | `tagging`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
| ZAPI | `perf-object-get-instances object_store_server` | `tagging`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
@@ -8946,16 +9092,18 @@ Number of failed Upload Part operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_failed`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `upload_part_failed`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_failed`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_upload_part_failed_client_close
-Number of times Upload Part operation failed because client terminated connection for operation pending on server.
+Number of times Upload Part operation failed because client terminated connection while the operation was still pending on server.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_failed_client_close`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `upload_part_failed_client_close`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_failed_client_close`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_upload_part_latency
@@ -8964,7 +9112,8 @@ Average latency for Upload Part operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_latency`
Unit: microsec
Type: average
Base: upload_part_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `upload_part_latency`
Unit: microsec
Type: average
Base: upload_part_total | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_latency`
Unit: microsec
Type: average,no-zero-values
Base: upload_part_latency_base | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_upload_part_rate
@@ -8973,7 +9122,8 @@ Number of Upload Part operations per second.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_rate`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `upload_part_rate`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_rate`
Unit: per_sec
Type: rate,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_svm_upload_part_total
@@ -8982,7 +9132,8 @@ Number of Upload Part operations.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_total`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
+| REST | `api/cluster/counter/tables/object_store_server` | `upload_part_total`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/ontap_s3_svm.yaml |
+| ZAPI | `perf-object-get-instances object_store_server` | `upload_part_total`
Unit: none
Type: delta,no-zero-values
Base: | conf/zapiperf/cdot/9.8.0/ontap_s3_svm.yaml |
### ontaps3_used_percent
@@ -9807,7 +9958,7 @@ The destination port used to forward the message.
### security_certificate_expiry_time
-Certificate expiration time. Can be provided on POST if creating self-signed certificate. The expiration time range is between 1 day to 10 years.
+Certificate expiration time, in ISO 8601 duration format or date and time format. Can be provided on POST if creating self-signed certificate. The expiration time range is between 1 day to 10 years.
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
@@ -9930,6 +10081,7 @@ Average latency for SMB2_COM_CLOSE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `close_latency`
Unit: microsec
Type: average
Base: close_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `close_latency`
Unit: microsec
Type: average
Base: close_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9939,6 +10091,7 @@ Latency histogram for SMB2_COM_CLOSE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `close_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `close_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9948,6 +10101,7 @@ Number of SMB2_COM_CLOSE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `close_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `close_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9957,6 +10111,7 @@ Average latency for SMB2_COM_CREATE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `create_latency`
Unit: microsec
Type: average
Base: create_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `create_latency`
Unit: microsec
Type: average
Base: create_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9966,6 +10121,7 @@ Latency histogram for SMB2_COM_CREATE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `create_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `create_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9975,6 +10131,7 @@ Number of SMB2_COM_CREATE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `create_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `create_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9984,6 +10141,7 @@ Average latency for SMB2_COM_LOCK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `lock_latency`
Unit: microsec
Type: average
Base: lock_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `lock_latency`
Unit: microsec
Type: average
Base: lock_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -9993,6 +10151,7 @@ Latency histogram for SMB2_COM_LOCK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `lock_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `lock_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10002,6 +10161,7 @@ Number of SMB2_COM_LOCK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `lock_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `lock_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10011,6 +10171,7 @@ Average latency for SMB2_COM_NEGOTIATE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `negotiate_latency`
Unit: microsec
Type: average
Base: negotiate_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `negotiate_latency`
Unit: microsec
Type: average
Base: negotiate_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10020,6 +10181,7 @@ Number of SMB2_COM_NEGOTIATE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `negotiate_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `negotiate_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10029,6 +10191,7 @@ Average latency for SMB2_COM_OPLOCK_BREAK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `oplock_break_latency`
Unit: microsec
Type: average
Base: oplock_break_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `oplock_break_latency`
Unit: microsec
Type: average
Base: oplock_break_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10038,6 +10201,7 @@ Latency histogram for SMB2_COM_OPLOCK_BREAK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `oplock_break_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `oplock_break_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10047,6 +10211,7 @@ Number of SMB2_COM_OPLOCK_BREAK operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `oplock_break_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `oplock_break_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10056,6 +10221,7 @@ Average latency for SMB2_COM_QUERY_DIRECTORY operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_directory_latency`
Unit: microsec
Type: average
Base: query_directory_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_directory_latency`
Unit: microsec
Type: average
Base: query_directory_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10065,6 +10231,7 @@ Latency histogram for SMB2_COM_QUERY_DIRECTORY operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_directory_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_directory_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10074,6 +10241,7 @@ Number of SMB2_COM_QUERY_DIRECTORY operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_directory_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_directory_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10083,6 +10251,7 @@ Average latency for SMB2_COM_QUERY_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_info_latency`
Unit: microsec
Type: average
Base: query_info_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_info_latency`
Unit: microsec
Type: average
Base: query_info_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10092,6 +10261,7 @@ Latency histogram for SMB2_COM_QUERY_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_info_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_info_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10101,6 +10271,7 @@ Number of SMB2_COM_QUERY_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `query_info_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `query_info_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10110,6 +10281,7 @@ Average latency for SMB2_COM_READ operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `read_latency`
Unit: microsec
Type: average
Base: read_ops | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10119,6 +10291,7 @@ Number of SMB2_COM_READ operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `read_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10128,6 +10301,7 @@ Average latency for SMB2_COM_SESSION_SETUP operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `session_setup_latency`
Unit: microsec
Type: average
Base: session_setup_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `session_setup_latency`
Unit: microsec
Type: average
Base: session_setup_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10137,6 +10311,7 @@ Latency histogram for SMB2_COM_SESSION_SETUP operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `session_setup_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `session_setup_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10146,6 +10321,7 @@ Number of SMB2_COM_SESSION_SETUP operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `session_setup_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `session_setup_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10155,6 +10331,7 @@ Average latency for SMB2_COM_SET_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `set_info_latency`
Unit: microsec
Type: average
Base: set_info_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `set_info_latency`
Unit: microsec
Type: average
Base: set_info_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10164,6 +10341,7 @@ Latency histogram for SMB2_COM_SET_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `set_info_latency_histogram`
Unit: none
Type: delta
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `set_info_latency_histogram`
Unit: none
Type: delta
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10173,6 +10351,7 @@ Number of SMB2_COM_SET_INFO operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `set_info_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `set_info_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10182,6 +10361,7 @@ Average latency for SMB2_COM_TREE_CONNECT operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `tree_connect_latency`
Unit: microsec
Type: average
Base: tree_connect_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `tree_connect_latency`
Unit: microsec
Type: average
Base: tree_connect_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10191,6 +10371,7 @@ Number of SMB2_COM_TREE_CONNECT operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `tree_connect_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `tree_connect_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10200,6 +10381,7 @@ Average latency for SMB2_COM_WRITE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `write_latency`
Unit: microsec
Type: average
Base: write_ops | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `write_latency`
Unit: microsec
Type: average
Base: write_latency_base | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -10209,6 +10391,7 @@ Number of SMB2_COM_WRITE operations
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
+| REST | `api/cluster/counter/tables/smb2` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/restperf/9.14.1/smb2.yaml |
| ZAPI | `perf-object-get-instances smb2` | `write_ops`
Unit: per_sec
Type: rate
Base: | conf/zapiperf/cdot/9.8.0/smb2.yaml |
@@ -13040,7 +13223,7 @@ The size (in bytes) that is logically available in the volume.This is the amount
| API | Endpoint | Metric | Template |
|--------|----------|--------|---------|
-| REST | `api/private/cli/volume` | `logical-available` | conf/rest/9.12.0/volume.yaml |
+| REST | `api/private/cli/volume` | `logical_available` | conf/rest/9.12.0/volume.yaml |
| ZAPI | `volume-get-iter` | `volume-attributes.volume-space-attributes.logical-available` | conf/zapi/cdot/9.8.0/volume.yaml |
diff --git a/docs/resources/ems-alert-runbook.md b/docs/resources/ems-alert-runbook.md
index 9c9ceb897..ecc2fd5bd 100644
--- a/docs/resources/ems-alert-runbook.md
+++ b/docs/resources/ems-alert-runbook.md
@@ -2,6 +2,7 @@ This document describes each [ONTAP event management system](https://mysupport.n
(EMS) event that Harvest [collects](../configure-ems.md) and remediation steps.
+
### AWS Credentials Not Initialized
**Impact**: Availability
@@ -13,6 +14,7 @@ This event occurs when a module attempts to access Amazon Web Services (AWS) Ide
**Remediation**
Wait for the cloud credential thread, as well as the system, to complete initialization.
+
### Antivirus Server Busy
**Impact**: Availability
@@ -24,6 +26,7 @@ The antivirus server is too busy to accept any new scan requests.
**Remediation**
If this message occurs frequently, ensure that there are enough antivirus servers to handle the virus scan load generated by the SVM.
+
### Cloud Tier Unreachable
**Impact**: Availability
@@ -34,20 +37,21 @@ A storage node cannot connect to Cloud Tier object store API. Some data will be
**Remediation**
-If you use on-premises products, perform the following corrective actions:
+If you use on-premises products, perform the following corrective actions:
-1. Verify that your intercluster LIF is online and functional by using the "network interface show" command.
-2. Check the network connectivity to the object store server by using the "ping" command over the destination node intercluster LIF.
-3. Ensure the following:
- a. The configuration of your object store has not changed.
- b. The login and connectivity information is still valid.
- Contact NetApp technical support if the issue persists.
+ 1. Verify that your intercluster LIF is online and functional by using the "network interface show" command.
+ 2. Check the network connectivity to the object store server by using the "ping" command over the destination node intercluster LIF.
+ 3. Ensure the following:
+ a. The configuration of your object store has not changed.
+ b. The login and connectivity information is still valid.
+Contact NetApp technical support if the issue persists.
-If you use Cloud Volumes ONTAP, perform the following corrective actions:
+If you use Cloud Volumes ONTAP, perform the following corrective actions:
+
+ 1. Ensure that the configuration of your object store has not changed.
+ 2. Ensure that the login and connectivity information is still valid.
+Contact NetApp technical support if the issue persists.
-1. Ensure that the configuration of your object store has not changed.
-2. Ensure that the login and connectivity information is still valid.
- Contact NetApp technical support if the issue persists.
### Disk Out of Service
**Impact**: Availability
@@ -55,6 +59,7 @@ If you use Cloud Volumes ONTAP, perform the following corrective actions:
**EMS Event**: `disk.outOfService`
This event occurs when a disk is removed from service because it has been marked failed, is being sanitized, or has entered the Maintenance Center.
+
### Disk Shelf Power Supply Discovered
**Impact**: Configuration
@@ -62,6 +67,7 @@ This event occurs when a disk is removed from service because it has been marked
**EMS Event**: `diskShelf.psu.added`
This message occurs when a power supply unit is added to the disk shelf.
+
### Disk Shelves Power Supply Removed
**Impact**: Availability
@@ -69,6 +75,7 @@ This message occurs when a power supply unit is added to the disk shelf.
**EMS Event**: `diskShelf.psu.removed`
This message occurs when a power supply unit is removed from the disk shelf.
+
### FC Target Port Commands Exceeded
**Impact**: Availability
@@ -81,14 +88,15 @@ The number of outstanding commands on the physical FC target port exceeds the su
Perform the following corrective actions:
-1. Evaluate the host fan-in on the port, and perform one of the following actions:
- a. Reduce the number of hosts that log in to this port.
- b. Reduce the number of LUNs accessed by the hosts that log in to this port.
- c. Reduce the host command queue depth.
-2. Monitor the "queue_full" counter on the "fcp_port" CM object, and ensure that it does not increase. For example:
- statistics show -object fcp_port -counter queue_full -instance port.portname -raw
-3. Monitor the threshold counter and ensure that it does not increase. For example:
- statistics show -object fcp_port -counter threshold_full -instance port.portname -raw
+ 1. Evaluate the host fan-in on the port, and perform one of the following actions:
+ a. Reduce the number of hosts that log in to this port.
+ b. Reduce the number of LUNs accessed by the hosts that log in to this port.
+ c. Reduce the host command queue depth.
+ 2. Monitor the "queue_full" counter on the "fcp_port" CM object, and ensure that it does not increase. For example:
+statistics show -object fcp_port -counter queue_full -instance port.portname -raw
+ 3. Monitor the threshold counter and ensure that it does not increase. For example:
+statistics show -object fcp_port -counter threshold_full -instance port.portname -raw
+
### FabricPool Mirror Replication Resync Completed
**Impact**: Capacity
@@ -96,6 +104,7 @@ Perform the following corrective actions:
**EMS Event**: `wafl.ca.resync.complete`
This message occurs when Data ONTAP(R) completes the resync process from the primary object store to the mirror object store for a mirrored FabricPool aggregate.
+
### FabricPool Space Usage Limit Nearly Reached
**Impact**: Capacity
@@ -111,6 +120,7 @@ Perform the following corrective actions:
1. Check the percentage of the licensed capacity used by each FabricPool storage tier by using the "storage aggregate object-store show-space" command.
2. Delete Snapshot copies from volumes with the tiering policy "snapshot" or "backup" by using the "volume snapshot delete" command to clear up space.
3. Install a new license on the cluster to increase the licensed capacity.
+
### FabricPool Space Usage Limit Reached
**Impact**: Capacity
@@ -126,6 +136,19 @@ Perform the following corrective actions:
1. Check the percentage of the licensed capacity used by each FabricPool storage tier by using the "storage aggregate object-store show-space" command.
2. Delete Snapshot copies from volumes with the tiering policy "snapshot" or "backup" by using the "volume snapshot delete" command to clear up space.
3. Install a new license on the cluster to increase the licensed capacity.
+
+### Fanout SnapMirror Relationship Common Snapshot Deleted
+
+**Impact**: Protection
+
+**EMS Event**: `sms.fanout.comm.snap.deleted`
+
+This message occurs when an older Snapshot(tm) copy is deleted as part of a SnapMirror® Synchronous resynchronize or update (common Snapshot copy) operation, which could lead to a "no common Snapshot scenario" between the synchronous and asynchronous disaster recovery (DR) copies that share the same source volume. If there is no common Snapshot copy between the synchronous and asynchronous DR copies, then a re-baseline will need to be performed during a disaster recovery.
+
+**Remediation**
+
+You can ignore this message if there is no asynchronous relationship configured for the synchronous source volume. If there is an asynchronous relationship configured, then update the asynchronous relationship by using the "snapmirror update" command. The SnapMirror update operation will transfer the snapshots that will act as common snapshots between the synchronous and asynchronous destinations.
+
### Giveback of Storage Pool Failed
**Impact**: Availability
@@ -139,12 +162,13 @@ This event occurs during the migration of an storage pool (aggregate) as part of
Perform the following corrective actions:
1. Verify that your intercluster LIF is online and functional by using the "network interface show" command.
-2. Check network connectivity to the object store server by using the"'ping" command over the destination node intercluster LIF.
+2. Check network connectivity to the object store server by using the"'ping" command over the destination node intercluster LIF.
3. Verify that the configuration of your object store has not changed and that login and connectivity information is still accurate by using the "aggregate object-store config show" command.
Alternatively, you can override the error by specifying false for the "require-partner-waiting" parameter of the giveback command.
Contact NetApp technical support for more information or assistance.
+
### HA Interconnect Down
**Impact**: Availability
@@ -155,16 +179,17 @@ The high-availability (HA) interconnect is down. Risk of service outage when fai
**Remediation**
-Corrective actions depend on the number and type of HA interconnect links supported by the platform, as well as the reason why the interconnect is down.
+Corrective actions depend on the number and type of HA interconnect links supported by the platform, as well as the reason why the interconnect is down.
* If the links are down:
- - Verify that both controllers in the HA pair are operational.
- - For externally connected links, make sure that the interconnect cables are connected properly and that the small form-factor pluggables (SFPs), if applicable, are seated properly on both controllers.
- - For internally connected links, disable and re-enable the links, one after the other, by using the "ic link off" and "ic link on" commands.
-* If links are disabled, enable the links by using the "ic link on" command.
+ - Verify that both controllers in the HA pair are operational.
+ - For externally connected links, make sure that the interconnect cables are connected properly and that the small form-factor pluggables (SFPs), if applicable, are seated properly on both controllers.
+ - For internally connected links, disable and re-enable the links, one after the other, by using the "ic link off" and "ic link on" commands.
+* If links are disabled, enable the links by using the "ic link on" command.
* If a peer is not connected, disable and re-enable the links, one after the other, by using the "ic link off" and "ic link on" commands.
Contact NetApp technical support if the issue persists.
+
### LUN Destroyed
**Impact**: Availability
@@ -172,6 +197,7 @@ Contact NetApp technical support if the issue persists.
**EMS Event**: `LUN.destroy`
This event occurs when a LUN is destroyed.
+
### LUN Offline
**Impact**: Availability
@@ -183,6 +209,7 @@ This message occurs when a LUN is brought offline manually.
**Remediation**
Bring the LUN back online.
+
### Main Unit Fan Failed
**Impact**: Availability
@@ -196,6 +223,7 @@ However, if the condition persists for too long, the overtemperature might trigg
**Remediation**
Reseat the failed fans. If the error persists, replace them.
+
### Main Unit Fan in Warning State
**Impact**: Availability
@@ -207,23 +235,25 @@ This event occurs when one or more main unit fans are in a warning state.
**Remediation**
Replace the indicated fans to avoid overheating.
+
### Max Sessions Per User Exceeded
**Impact**: Availability
**EMS Event**: `Nblade.cifsMaxSessPerUsrConn`
-You have exceeded the maximum number of sessions allowed per user over a TCP connection. Any request to establish a session will be denied until some sessions are released.
+You have exceeded the maximum number of sessions allowed per user over a TCP connection. Any request to establish a session will be denied until some sessions are released.
**Remediation**
-Perform the following corrective actions:
+Perform the following corrective actions:
1. Inspect all the applications that run on the client, and terminate any that are not operating properly.
2. Reboot the client.
3. Check if the issue is caused by a new or existing application:
- a. If the application is new, set a higher threshold for the client by using the "cifs option modify -max-opens-same-file-per-tree" command. In some cases, clients operate as expected, but require a higher threshold. You should have advanced privilege to set a higher threshold for the client.
- b. If the issue is caused by an existing application, there might be an issue with the client. Contact NetApp technical support for more information or assistance.
+ a. If the application is new, set a higher threshold for the client by using the "cifs option modify -max-opens-same-file-per-tree" command. In some cases, clients operate as expected, but require a higher threshold. You should have advanced privilege to set a higher threshold for the client.
+ b. If the issue is caused by an existing application, there might be an issue with the client. Contact NetApp technical support for more information or assistance.
+
### Max Times Open Per File Exceeded
**Impact**: Availability
@@ -237,12 +267,13 @@ You have exceeded the maximum number of times that you can open the file over a
Perform the following corrective actions:
1. Inspect the applications that run on the client using this TCP connection.
- The client might be operating incorrectly because of the application running on it.
+The client might be operating incorrectly because of the application running on it.
2. Reboot the client.
3. Check if the issue is caused by a new or existing application:
- a. If the application is new, set a higher threshold for the client by using the "cifs option modify -max-opens-same-file-per-tree" command.
- In some cases, clients operate as expected, but require a higher threshold. You should have advanced privilege to set a higher threshold for the client.
- b. If the issue is caused by an existing application, there might be an issue with the client. Contact NetApp technical support for more information or assistance.
+ a. If the application is new, set a higher threshold for the client by using the "cifs option modify -max-opens-same-file-per-tree" command.
+In some cases, clients operate as expected, but require a higher threshold. You should have advanced privilege to set a higher threshold for the client.
+ b. If the issue is caused by an existing application, there might be an issue with the client. Contact NetApp technical support for more information or assistance.
+
### MetroCluster Automatic Unplanned Switchover Disabled
**Impact**: Availability
@@ -254,6 +285,7 @@ This message occurs when automatic unplanned switchover capability is disabled.
**Remediation**
Run the "metrocluster modify -node-name -automatic-switchover-onfailure true" command for each node in the cluster to enable automatic switchover.
+
### MetroCluster Monitoring
**Impact**: Availability
@@ -266,6 +298,7 @@ Aggregate was left behind during switchback.
1) Check the aggregate state by using the command "aggr show".
2) If the aggregate is online, return it to its original owner by using the command "metrocluster switchback".
+
### NFSv4 Store Pool Exhausted
**Impact**: Availability
@@ -277,6 +310,7 @@ A NFSv4 store pool has been exhausted.
**Remediation**
If the NFS server is unresponsive for more than 10 minutes after this event, contact NetApp technical support.
+
### NVMe Namespace Destroyed
**Impact**: Availability
@@ -284,6 +318,7 @@ If the NFS server is unresponsive for more than 10 minutes after this event, con
**EMS Event**: `NVMeNS.destroy`
This event occurs when an NVMe namespace is destroyed.
+
### NVMe Namespace Offline
**Impact**: Availability
@@ -291,6 +326,7 @@ This event occurs when an NVMe namespace is destroyed.
**EMS Event**: `NVMeNS.offline`
This event occurs when an NVMe namespace is brought offline manually.
+
### NVMe Namespace Online
**Impact**: Availability
@@ -298,6 +334,7 @@ This event occurs when an NVMe namespace is brought offline manually.
**EMS Event**: `NVMeNS.online`
This event occurs when an NVMe namespace is brought online manually.
+
### NVMe-oF License Grace Period Active
**Impact**: Availability
@@ -309,6 +346,7 @@ This event occurs on a daily basis when the NVMe over Fabrics (NVMe-oF) protocol
**Remediation**
Contact your sales representative to obtain an NVMe-oF license, and add it to the cluster, or remove all instances of NVMe-oF configuration from the cluster.
+
### NVMe-oF License Grace Period Expired
**Impact**: Availability
@@ -320,6 +358,7 @@ The NVMe over Fabrics (NVMe-oF) license grace period is over and the NVMe-oF fun
**Remediation**
Contact your sales representative to obtain an NVMe-oF license, and add it to the cluster.
+
### NVMe-oF License Grace Period Start
**Impact**: Availability
@@ -331,6 +370,7 @@ The NVMe over Fabrics (NVMe-oF) configuration was detected during the upgrade to
**Remediation**
Contact your sales representative to obtain an NVMe-oF license, and add it to the cluster.
+
### NVRAM Battery Low
**Impact**: Availability
@@ -345,9 +385,10 @@ Your system generates and transmits an AutoSupport or "call home" message to Net
Perform the following corrective actions:
-1. View the battery's current status, capacity, and charging state by using the "system node environment sensors show" command.
-2. If the battery was replaced recently or the system was non-operational for an extended period of time, monitor the battery to verify that it is charging properly.
-3. Contact NetApp technical support if the battery runtime continues to decrease below critical levels, and the storage system shuts down automatically.
+ 1. View the battery's current status, capacity, and charging state by using the "system node environment sensors show" command.
+ 2. If the battery was replaced recently or the system was non-operational for an extended period of time, monitor the battery to verify that it is charging properly.
+ 3. Contact NetApp technical support if the battery runtime continues to decrease below critical levels, and the storage system shuts down automatically.
+
### NetBIOS Name Conflict
**Impact**: Availability
@@ -361,17 +402,18 @@ The NetBIOS Name Service has received a negative response to a name registration
Perform any one of the following corrective actions:
* If there is a conflict in the NetBIOS name or an alias, perform one of the following:
- - Delete the duplicate NetBIOS alias by using the "vserver cifs delete -aliases alias -vserver vserver" command.
- - Rename a NetBIOS alias by deleting the duplicate name and adding an alias with a new name by using the "vserver cifs create -aliases alias -vserver vserver" command.
-* If there are no aliases configured and there is a conflict in the NetBIOS name, then rename the CIFS server by using the "vserver cifs delete -vserver vserver" and "vserver cifs create -cifs-server netbiosname" commands. NOTE: Deleting a CIFS server can make data inaccessible.
+ - Delete the duplicate NetBIOS alias by using the "vserver cifs delete -aliases alias -vserver vserver" command.
+ - Rename a NetBIOS alias by deleting the duplicate name and adding an alias with a new name by using the "vserver cifs create -aliases alias -vserver vserver" command.
+* If there are no aliases configured and there is a conflict in the NetBIOS name, then rename the CIFS server by using the "vserver cifs delete -vserver vserver" and "vserver cifs create -cifs-server netbiosname" commands. NOTE: Deleting a CIFS server can make data inaccessible.
* Remove NetBIOS name or rename the NetBIOS on the remote machine.
+
### No Registered Scan Engine
**Impact**: Availability
**EMS Event**: `Nblade.vscanNoRegdScanner`
-The antivirus connector notified ONTAP that it does not have a registered scan engine. This might cause data unavailability if the "scan-mandatory" option is enabled.
+The antivirus connector notified ONTAP that it does not have a registered scan engine. This might cause data unavailability if the "scan-mandatory" option is enabled.
**Remediation**
@@ -379,6 +421,7 @@ Perform the following corrective actions:
1. Ensure that the scan engine software installed on the antivirus server is compatible with ONTAP.
2. Ensure that scan engine software is running and configured to connect to the antivirus connector over local loopback.
+
### No Vscan Connection
**Impact**: Availability
@@ -390,6 +433,7 @@ ONTAP has no Vscan connection to service virus scan requests. This might cause d
**Remediation**
Ensure that the scanner pool is properly configured and the antivirus servers are active and connected to ONTAP.
+
### Node Panic
**Impact**: Performance
@@ -401,6 +445,7 @@ This event is issued when a panic occurs.
**Remediation**
Contact NetApp customer support.
+
### Node Root Volume Space Low
**Impact**: Capacity
@@ -417,6 +462,7 @@ Perform the following corrective actions:
2. Reboot the controller.
Contact NetApp technical support for more information or assistance.
+
### Non-responsive AntiVirus Server
**Impact**: Availability
@@ -428,6 +474,7 @@ This event occurs when ONTAP(R) detects a non-responsive antivirus (AV) server a
**Remediation**
Ensure that the AV server installed on the AV connector can connect to the Storage Virtual Machine (SVM) and receive the scan requests.
+
### Nonexistent Admin Share
**Impact**: Availability
@@ -439,6 +486,7 @@ Vscan issue: a client has attempted to connect to a nonexistent ONTAP_ADMIN$ sha
**Remediation**
Ensure that Vscan is enabled for the mentioned SVM ID. Enabling Vscan on a SVM causes the ONTAP_ADMIN$ share to be created for the SVM automatically.
+
### ONTAP Mediator Added
**Impact**: Protection
@@ -446,6 +494,7 @@ Ensure that Vscan is enabled for the mentioned SVM ID. Enabling Vscan on a SVM c
**EMS Event**: `sm.mediator.added`
This message occurs when ONTAP Mediator is added successfully on a cluster.
+
### ONTAP Mediator CA Certificate Expired
**Impact**: Protection
@@ -457,6 +506,7 @@ This message occurs when the ONTAP Mediator certificate authority (CA) certifica
**Remediation**
Remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Update a new CA certificate on the ONTAP Mediator server. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator CA Certificate Expiring
**Impact**: Protection
@@ -468,6 +518,7 @@ This message occurs when the ONTAP Mediator certificate authority (CA) certifica
**Remediation**
Before this certificate expires, remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Update a new CA certificate on the ONTAP Mediator server. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Client Certificate Expired
**Impact**: Protection
@@ -479,6 +530,7 @@ This message occurs when the ONTAP Mediator client certificate has expired. As a
**Remediation**
Remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Client Certificate Expiring
**Impact**: Protection
@@ -490,6 +542,7 @@ This message occurs when the ONTAP Mediator client certificate is due to expire
**Remediation**
Before this certificate expires, remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Not Accessible
**Impact**: Protection
@@ -501,6 +554,7 @@ This message occurs when either the ONTAP Mediator is repurposed or the Mediator
**Remediation**
Remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Removed
**Impact**: Protection
@@ -508,6 +562,7 @@ Remove the configuration of the current ONTAP Mediator by using the "snapmirror
**EMS Event**: `sm.mediator.removed`
This message occurs when ONTAP Mediator is removed successfully from a cluster.
+
### ONTAP Mediator Server Certificate Expired
**Impact**: Protection
@@ -519,6 +574,7 @@ This message occurs when the ONTAP Mediator server certificate has expired. As a
**Remediation**
Remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Update a new server certificate on the ONTAP Mediator server. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Server Certificate Expiring
**Impact**: Protection
@@ -530,6 +586,7 @@ This message occurs when the ONTAP Mediator server certificate is due to expire
**Remediation**
Before this certificate expires, remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Update a new server certificate on the ONTAP Mediator server. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### ONTAP Mediator Unreachable
**Impact**: Protection
@@ -541,6 +598,7 @@ This message occurs when the ONTAP Mediator is unreachable on a cluster. As a re
**Remediation**
Check the network connectivity to the ONTAP Mediator by using the "network ping" and "network traceroute" commands. If the issue persists, remove the configuration of the current ONTAP Mediator by using the "snapmirror mediator remove" command. Reconfigure access to the ONTAP Mediator by using the "snapmirror mediator add" command.
+
### Object Store Host Unresolvable
**Impact**: Availability
@@ -552,6 +610,7 @@ The object store server host name cannot be resolved to an IP address. The objec
**Remediation**
Check the DNS configuration to verify that the host name is configured correctly with an IP address.
+
### Object Store Intercluster LIF Down
**Impact**: Availability
@@ -567,6 +626,7 @@ Perform the following corrective actions:
1. Check the intercluster LIF status by using the "network interface show -role intercluster" command.
2. Verify that the intercluster LIF is configured correctly and operational.
3. If an intercluster LIF is not configured, add it by using the "network interface create -role intercluster" command.
+
### Object Store Signature Mismatch
**Impact**: Availability
@@ -578,6 +638,7 @@ The request signature sent to the object store server does not match the signatu
**Remediation**
Verify that the secret access key is configured correctly. If it is configured correctly, contact NetApp technical support for assistance.
+
### QoS Monitor Memory Maxed Out
**Impact**: Capacity
@@ -589,6 +650,7 @@ This event occurs when a QoS subsystem's dynamic memory reaches its limit for th
**Remediation**
Delete some active workloads or streams to free up memory. Use the "statistics show -object workload -counter ops" command to determine which workloads are active. Active workloads show non-zero ops. Then use the "workload delete " command multiple times to remove specific workloads. Alternatively, use the "stream delete -workload *" command to delete the associated streams from the active workload.
+
### READDIR Timeout
**Impact**: Availability
@@ -602,10 +664,11 @@ A READDIR file operation has exceeded the timeout that it is allowed to run in W
Perform the following corrective actions:
1. Find information specific to recent directories that have had READDIR file operations expire by using the following 'diag' privilege nodeshell CLI command:
- wafl readdir notice show.
+wafl readdir notice show.
2. Check if directories are indicated as sparse or not:
- a. If a directory is indicated as sparse, it is recommended that you copy the contents of the directory to a new directory to remove the sparseness of the directory file.
- b. If a directory is not indicated as sparse and the directory is large, it is recommended that you reduce the size of the directory file by reducing the number of file entries in the directory.
+ a. If a directory is indicated as sparse, it is recommended that you copy the contents of the directory to a new directory to remove the sparseness of the directory file.
+ b. If a directory is not indicated as sparse and the directory is large, it is recommended that you reduce the size of the directory file by reducing the number of file entries in the directory.
+
### Ransomware Activity Detected
**Impact**: Security
@@ -619,6 +682,7 @@ Your system generates and transmits an AutoSupport or "call home" message to Net
**Remediation**
Refer to the anti-ransomware documentation to take remedial measures for ransomware activity. If you need assistance, contact NetApp technical support.
+
### Relocation of Storage Pool Failed
**Impact**: Availability
@@ -632,12 +696,13 @@ This event occurs during the relocation of an storage pool (aggregate), when the
Perform the following corrective actions:
1. Verify that your intercluster LIF is online and functional by using the "network interface show" command.
-2. Check network connectivity to the object store server by using the"'ping" command over the destination node intercluster LIF.
+2. Check network connectivity to the object store server by using the"'ping" command over the destination node intercluster LIF.
3. Verify that the configuration of your object store has not changed and that login and connectivity information is still accurate by using the "aggregate object-store config show" command.
Alternatively, you can override the error by using the "override-destination-checks" parameter of the relocation command.
Contact NetApp technical support for more information or assistance.
+
### SAN "active-active" State Changed
**Impact**: Availability
@@ -649,6 +714,7 @@ The SAN pathing is no longer symmetric. Pathing should be asymmetric only on ASA
**Remediation**
Try and enable the "active-active" state. Contact customer support if the problem persists.
+
### SFP in FC target adapter receiving low power
**Impact**: Availability
@@ -660,6 +726,7 @@ This alert occurs when the power received (RX) by a small form-factor pluggable
**Remediation**
Monitor the operating value. If it continues to decrease, then replace the SFP and/or the cables.
+
### SFP in FC target adapter transmitting low power
**Impact**: Availability
@@ -671,6 +738,7 @@ This alert occurs when the power transmitted (TX) by a small form-factor pluggab
**Remediation**
Monitor the operating value. If it continues to decrease, then replace the SFP and/or the cables.
+
### Service Processor Heartbeat Missed
**Impact**: Availability
@@ -682,6 +750,7 @@ This message occurs when ONTAP does not receive an expected "heartbeat" signal f
**Remediation**
Contact NetApp technical support.
+
### Service Processor Heartbeat Stopped
**Impact**: Availability
@@ -693,6 +762,7 @@ This message occurs when ONTAP is no longer receiving heartbeats from the Servic
**Remediation**
If the system has shut down, attempt a hard power cycle: Pull the controller out from the chassis, push it back in then power on the system. Contact NetApp technical support if the problem persists after the power cycle, or for any other condition that may warrant attention.
+
### Service Processor Not Configured
**Impact**: Availability
@@ -705,11 +775,12 @@ This event occurs on a weekly basis, to remind you to configure the Service Proc
Perform the following corrective actions:
-1. Configure the SP by using the "system service-processor network modify" command.
-2. Optionally, obtain the MAC address of the SP by using the "system service-processor network show" command.
-3. Verify the SP network configuration by using the "system service-processor network show" command.
-4. Verify that the SP can send an AutoSupport email by using the "system service-processor autosupport invoke" command.
- NOTE: AutoSupport email hosts and recipients should be configured in ONTAP before you issue this command.
+ 1. Configure the SP by using the "system service-processor network modify" command.
+ 2. Optionally, obtain the MAC address of the SP by using the "system service-processor network show" command.
+ 3. Verify the SP network configuration by using the "system service-processor network show" command.
+ 4. Verify that the SP can send an AutoSupport email by using the "system service-processor autosupport invoke" command.
+ NOTE: AutoSupport email hosts and recipients should be configured in ONTAP before you issue this command.
+
### Service Processor Offline
**Impact**: Availability
@@ -727,7 +798,8 @@ Power-cycle the system by performing the following actions:
1. Pull the controller out from the chassis.
2. Push the controller back in.
3. Turn the controller back on.
- If the problem persists, replace the controller module.
+If the problem persists, replace the controller module.
+
### Shadow Copy Failed
**Impact**: Availability
@@ -741,11 +813,12 @@ A Volume Shadow Copy Service (VSS), a Microsoft Server backup and restore servic
Check the following using the information provided in the event message:
* Is shadow copy configuration enabled?
-* Are the appropriate licenses installed?
+* Are the appropriate licenses installed?
* On which shares is the shadow copy operation performed?
* Is the share name correct?
* Does the share path exist?
* What are the states of the shadow copy set and its shadow copies?
+
### Shelf Fan Failed
**Impact**: Availability
@@ -758,10 +831,35 @@ The indicated cooling fan or fan module of the shelf has failed. The disks in th
Perform the following corrective actions:
-1. Verify that the fan module is fully seated and secured.
- NOTE: The fan is integrated into the power supply module in some disk shelves.
-2. If the issue persists, replace the fan module.
-3. If the issue still persists, contact NetApp technical support for assistance.
+ 1. Verify that the fan module is fully seated and secured.
+ NOTE: The fan is integrated into the power supply module in some disk shelves.
+ 2. If the issue persists, replace the fan module.
+ 3. If the issue still persists, contact NetApp technical support for assistance.
+
+### SnapMirror Relationship Common Snapshot Failed
+
+**Impact**: Protection
+
+**EMS Event**: `sms.common.snapshot.failed`
+
+This message occurs when there is a failure in creating a common Snapshot(tm) copy. The SnapMirror® Sync relationship continues to be in "in-sync" status. The latest common Snapshot copy is used for recovery in case the relationship status changes to "out-of-sync." The common Snapshot copy should be created at scheduled intervals to decrease the recovery time of "out-of-sync" relationships.
+
+**Remediation**
+
+Create a common snapshot manually by using the "snapmirror update" command at the destination.
+
+### SnapMirror Relationship Initialization Failed
+
+**Impact**: Protection
+
+**EMS Event**: `smc.snapmir.init.fail`
+
+This message occurs when a SnapMirror® 'initialize' command fails and no more retries will be attempted.
+
+**Remediation**
+
+Check the reason for the error, take action accordingly, and issue the command again.
+
### SnapMirror Relationship Out of Sync
**Impact**: Protection
@@ -773,6 +871,73 @@ This event occurs when a SnapMirror(R) Sync relationship status changes from "in
**Remediation**
Check the network connection between the source and destination volumes. Monitor the SnapMirror Sync relationship status using the "snapmirror show" command. "Auto-resync" attempts to bring the relationship back to the "in-sync" status.
+
+### SnapMirror Relationship Resync Attempt Failed
+
+**Impact**: Protection
+
+**EMS Event**: `sms.resync.attempt.failed`
+
+This message occurs when a resynchronize operation between the source volume and destination volume fails. The SnapMirror® Sync relationship is in "out-of-sync" status. Data protection is impacted.
+
+**Remediation**
+
+Monitor SnapMirror Sync status using the "snapmirror show" command.
+If the auto-resync attempts fail, bring the relationship back to "in-sync" status manually by using the "snapmirror resync" command.
+
+### SnapMirror Relationship Snapshot is not Replicated
+
+**Impact**: Protection
+
+**EMS Event**: `sms.snap.not.replicated`
+
+This message occurs when a Snapshot(tm) copy for SnapMirror® Synchronous relationship is not successfully replicated.
+
+**Remediation**
+
+No remediation required. User can trigger another snap create request to create a snapshot that exists on both primary and secondary site.
+
+### SnapMirror active sync Automatic Unplanned Failover Completed
+
+**Impact**: Protection
+
+**EMS Event**: `smbc.aufo.completed`
+
+This message occurs when the SnapMirror® active sync automatic unplanned failover operation completes.
+
+### SnapMirror active sync Automatic Unplanned Failover Failed
+
+**Impact**: Protection
+
+**EMS Event**: `smbc.aufo.failed`
+
+This message occurs when the SnapMirror® active sync automatic unplanned failover operation fails.
+
+**Remediation**
+
+The automatic unplanned failover will be retried internally. However, operations will be suspended till the failover is complete.
+If AUFO is failing persistently and the customer wishes to continue servicing IO, they can perform "snapmirror delete -destination-path destination_path" followed by "snapmirror break" on the volumes. Doing so will affect protection as the relationship will be removed, customer will need to re-establish protection relationship.
+
+### SnapMirror active sync Planned Failover Completed
+
+**Impact**: Protection
+
+**EMS Event**: `smbc.pfo.completed`
+
+ This message occurs when the SnapMirror® active sync planned failover operation completes.
+
+### SnapMirror active sync Planned Failover Failed
+
+**Impact**: Protection
+
+**EMS Event**: `smbc.pfo.failed`
+
+This message occurs when the SnapMirror® active sync planned failover operation fails.
+
+**Remediation**
+
+Determine the cause of the failure by using the "snapmirror failover show -fields error-reason" command. If the relationship is out-of-sync, wait till the relationship is brought to in-sync. Else, address the error causing planned failover failure and then retry the "snapmirror failover start -destination-path destination_path" command.
+
### SnapMirror active sync Relationship Out of Sync
**Impact**: Protection
@@ -784,6 +949,7 @@ This message occurs when a SnapMirror for Business Continuity (SMBC) relationshi
**Remediation**
Check the network connection between the source and destination volumes. Monitor the SMBC relationship status by using the "snapmirror show" command on the destination, and by using the "snapmirror list-destinations" command on the source. Auto-resync will attempt to bring the relationship back to "in-sync" status. If the resync fails, verify that all the nodes in the cluster are in quorum and are healthy.
+
### Storage Switch Power Supplies Failed
**Impact**: Availability
@@ -800,6 +966,7 @@ Perform the following corrective actions:
2. Ensure that the power cord is connected to the power supply.
Contact NetApp technical support if the issue persists.
+
### Storage VM Anti-ransomware Monitoring
**Impact**: Security
@@ -811,6 +978,7 @@ The anti-ransomware monitoring for the storage VM is disabled.
**Remediation**
Enable anti-ransomware to protect the storage VM.
+
### Storage VM Stop Succeeded
**Impact**: Availability
@@ -822,6 +990,7 @@ This message occurs when a 'vserver stop' operation succeeds.
**Remediation**
Use 'vserver start' command to start the data access on a storage VM.
+
### System Cannot Operate Due to Main Unit Fan Failure
**Impact**: Availability
@@ -833,6 +1002,7 @@ One or more main unit fans have failed, disrupting system operation. This might
**Remediation**
Replace the failed fans.
+
### Too Many CIFS Authentication
**Impact**: Availability
@@ -844,6 +1014,7 @@ Many authentication negotiations have occurred simultaneously. There are 256 inc
**Remediation**
Investigate why the client has created 256 or more new connection requests. You might have to contact the vendor of the client or of the application to determine why the error occurred.
+
### Unassigned Disks
**Impact**: Availability
@@ -858,6 +1029,7 @@ Perform the following corrective actions:
1. Determine which disks are unassigned by using the "disk show -n" command.
2. Assign the disks to a system by using the "disk assign" command.
+
### Unauthorized User Access to Admin Share
**Impact**: Security
@@ -872,6 +1044,7 @@ Perform the following corrective actions:
1. Ensure that the mentioned username and IP address is configured in one of the active Vscan scanner pools.
2. Check the scanner pool configuration that is currently active by using the "vserver vscan scanner pool show-active" command.
+
### Virus Detected
**Impact**: Availability
@@ -885,6 +1058,7 @@ Client access to the file is denied. The Vscan server might, depending on its se
**Remediation**
Check the log of the Vscan server reported in the "syslog" event to see if it was able to successfully clean, quarantine, or delete the infected file. If it was not able to do so, a system administrator might have to manually delete the file.
+
### Volume Anti-ransomware Monitoring
**Impact**: Security
@@ -896,6 +1070,7 @@ The anti-ransomware monitoring for the volume is disabling.
**Remediation**
Enable anti-ransomware to protect the storage VM.
+
### Volume Automatic Resizing Succeeded
**Impact**: Capacity
@@ -903,6 +1078,7 @@ Enable anti-ransomware to protect the storage VM.
**EMS Event**: `wafl.vol.autoSize.done`
This event occurs when the automatic resizing of a volume is successful. It happens when the "autosize grow" option is enabled, and the volume reaches the grow threshold percentage.
+
### Volume Offline
**Impact**: Availability
@@ -914,6 +1090,7 @@ This message indicates that a volume has been taken offline.
**Remediation**
Bring the volume back online.
+
### Volume Restricted
**Impact**: Availability
diff --git a/go.mod b/go.mod
index bdcc5e670..c671dea1f 100644
--- a/go.mod
+++ b/go.mod
@@ -6,12 +6,11 @@ require (
github.com/go-openapi/spec v0.21.0
github.com/mattn/go-runewidth v0.0.15
github.com/rs/zerolog v1.33.0
- github.com/shirou/gopsutil/v3 v3.24.4
+ github.com/shirou/gopsutil/v4 v4.24.5
github.com/spf13/cobra v1.8.0
github.com/tidwall/gjson v1.17.1
github.com/zekroTJA/timedmap v1.5.2
- github.com/zekroTJA/timedmap/v2 v2.0.0
- golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d
+ golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc
golang.org/x/sys v0.20.0
golang.org/x/term v0.20.0
golang.org/x/text v0.15.0
@@ -26,7 +25,7 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
- github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
+ github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -34,6 +33,7 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/pflag v1.0.5 // indirect
+ github.com/stretchr/objx v0.5.2 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
diff --git a/go.sum b/go.sum
index 1cd0ca00a..9b4e9ee85 100644
--- a/go.sum
+++ b/go.sum
@@ -15,8 +15,6 @@ github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -27,9 +25,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 h1:1KuuSOy4ZNgW0KA2oYIngXVFhQcXxhLqCVK7cBcldkk=
-github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -43,7 +40,6 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -52,13 +48,11 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
-github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM=
+github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -68,14 +62,9 @@ github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyh
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
@@ -85,37 +74,28 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/zekroTJA/timedmap v1.5.2 h1:5bhWBdyvekLHLrZu8cNJB6iCpIQl4bGaG4HTmPbTNKY=
github.com/zekroTJA/timedmap v1.5.2/go.mod h1:Go4uPxMN1Wjl5IgO6HYD1tM9IQhkYEVqcrrdsI4ljXo=
-github.com/zekroTJA/timedmap/v2 v2.0.0/go.mod h1:xHDLg687zASqLBJqoysF+WORHxL/kYNphVD36CRJxhM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
-golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d h1:N0hmiNbwsSNwHBAvR3QB5w25pUwH4tK0Y/RltD1j1h4=
-golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
index f43ce5c0c..cb6867a23 100644
--- a/integration/Jenkinsfile
+++ b/integration/Jenkinsfile
@@ -196,7 +196,7 @@ pipeline {
rm -f docker_logs.zip
zip -r docker_logs.zip /var/log/harvest
cd $WORKSPACE/docker
- docker-compose -f prom-stack.yml -f harvest-compose.yml down
+ docker ps -q | xargs docker stop | xargs docker rm --force
ANALYZE_DOCKER_LOGS=1 bash $WORKSPACE/harvest/integration/test/test.sh
"""
archiveArtifacts artifacts: "docker_logs.zip", fingerprint: true
diff --git a/integration/go.mod b/integration/go.mod
index 01a20682f..2ee986db2 100644
--- a/integration/go.mod
+++ b/integration/go.mod
@@ -6,7 +6,7 @@ replace github.com/netapp/harvest/v2 => ../
require (
github.com/carlmjohnson/requests v0.23.5
- github.com/netapp/harvest/v2 v2.0.0-20240529062525-2ab393d07921
+ github.com/netapp/harvest/v2 v2.0.0-20240531092116-c05e6eebbd24
github.com/rs/zerolog v1.33.0
github.com/tidwall/gjson v1.17.1
golang.org/x/text v0.15.0
@@ -27,7 +27,7 @@ require (
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
- github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+ github.com/shirou/gopsutil/v4 v4.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
@@ -36,7 +36,7 @@ require (
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
- golang.org/x/exp v0.0.0-20240529005216-23cca8864a10 // indirect
+ golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
diff --git a/integration/go.sum b/integration/go.sum
index 70e847ba7..dea401c48 100644
--- a/integration/go.sum
+++ b/integration/go.sum
@@ -2,7 +2,6 @@ github.com/carlmjohnson/requests v0.23.5 h1:NPANcAofwwSuC6SIMwlgmHry2V3pLrSqRiSB
github.com/carlmjohnson/requests v0.23.5/go.mod h1:zG9P28thdRnN61aD7iECFhH5iGGKX2jIjKQD9kqYH+o=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -17,8 +16,6 @@ github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -29,7 +26,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -45,7 +41,6 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -57,8 +52,8 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
-github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shirou/gopsutil/v4 v4.24.5 h1:gGsArG5K6vmsh5hcFOHaPm87UD003CaDMkAOweSQjhM=
+github.com/shirou/gopsutil/v4 v4.24.5/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -67,13 +62,6 @@ github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
@@ -83,16 +71,14 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-golang.org/x/exp v0.0.0-20240529005216-23cca8864a10 h1:vpzMC/iZhYFAjJzHU0Cfuq+w1vLLsF2vLkDrPjzKYck=
-golang.org/x/exp v0.0.0-20240529005216-23cca8864a10/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -100,20 +86,15 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/integration/test/dashboard_test.go b/integration/test/dashboard_test.go
index 534457f17..78d410eb7 100644
--- a/integration/test/dashboard_test.go
+++ b/integration/test/dashboard_test.go
@@ -39,7 +39,7 @@ func TestGrafanaAndPrometheusAreConfigured(t *testing.T) {
cDotFolder = "Harvest-main-cDOT"
sevenModeFolder = "Harvest-main-7mode"
log.Info().Str("cMode", cDotFolder).Str("7mode", sevenModeFolder).Msg("Folder name details")
- status, out := new(grafana.Mgr).Import("") // send empty so that it will import all dashboards
+ status, out := new(grafana.Mgr).Import()
if !status {
t.Errorf("Grafana import operation failed out=%s", out)
}
diff --git a/integration/test/grafana/grafana_mgr.go b/integration/test/grafana/grafana_mgr.go
index 2ce0dfaff..de379f780 100644
--- a/integration/test/grafana/grafana_mgr.go
+++ b/integration/test/grafana/grafana_mgr.go
@@ -12,7 +12,7 @@ import (
type Mgr struct {
}
-func (g *Mgr) Import(jsonDir string) (bool, string) {
+func (g *Mgr) Import() (bool, string) {
var (
importOutput string
status bool
@@ -31,15 +31,11 @@ func (g *Mgr) Import(jsonDir string) (bool, string) {
if err != nil {
panic(err)
}
- directoryOption := ""
- if jsonDir != "" {
- directoryOption = "--directory"
- }
grafanaURL := utils.GetGrafanaURL()
if docker.IsDockerBasedPoller() {
grafanaURL = "grafana:3000"
}
- importCmds := []string{"grafana", "import", "--overwrite", "--addr", grafanaURL, directoryOption, jsonDir}
+ importCmds := []string{"grafana", "import", "--overwrite", "--addr", grafanaURL}
if docker.IsDockerBasedPoller() {
params := []string{"exec", containerIDs[0].ID, "bin/harvest"}
params = append(params, importCmds...)
diff --git a/pkg/util/util.go b/pkg/util/util.go
index f2637bf7f..bae63fb10 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -9,7 +9,7 @@ import (
"fmt"
"github.com/netapp/harvest/v2/third_party/go-version"
"github.com/rs/zerolog"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/process"
"golang.org/x/exp/maps"
"golang.org/x/sys/unix"
"gopkg.in/yaml.v3"
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_nocgo.go b/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_nocgo.go
deleted file mode 100644
index a77b4dbb7..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_nocgo.go
+++ /dev/null
@@ -1,92 +0,0 @@
-//go:build aix && !cgo
-// +build aix,!cgo
-
-package cpu
-
-import (
- "context"
- "strconv"
- "strings"
-
- "github.com/shirou/gopsutil/v3/internal/common"
-)
-
-func TimesWithContext(ctx context.Context, percpu bool) ([]TimesStat, error) {
- if percpu {
- return []TimesStat{}, common.ErrNotImplementedError
- } else {
- out, err := invoke.CommandWithContext(ctx, "sar", "-u", "10", "1")
- if err != nil {
- return nil, err
- }
- lines := strings.Split(string(out), "\n")
- if len(lines) < 5 {
- return []TimesStat{}, common.ErrNotImplementedError
- }
-
- ret := TimesStat{CPU: "cpu-total"}
- h := strings.Fields(lines[len(lines)-3]) // headers
- v := strings.Fields(lines[len(lines)-2]) // values
- for i, header := range h {
- if t, err := strconv.ParseFloat(v[i], 64); err == nil {
- switch header {
- case `%usr`:
- ret.User = t
- case `%sys`:
- ret.System = t
- case `%wio`:
- ret.Iowait = t
- case `%idle`:
- ret.Idle = t
- }
- }
- }
-
- return []TimesStat{ret}, nil
- }
-}
-
-func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
- out, err := invoke.CommandWithContext(ctx, "prtconf")
- if err != nil {
- return nil, err
- }
-
- ret := InfoStat{}
- for _, line := range strings.Split(string(out), "\n") {
- if strings.HasPrefix(line, "Number Of Processors:") {
- p := strings.Fields(line)
- if len(p) > 3 {
- if t, err := strconv.ParseUint(p[3], 10, 64); err == nil {
- ret.Cores = int32(t)
- }
- }
- } else if strings.HasPrefix(line, "Processor Clock Speed:") {
- p := strings.Fields(line)
- if len(p) > 4 {
- if t, err := strconv.ParseFloat(p[3], 64); err == nil {
- switch strings.ToUpper(p[4]) {
- case "MHZ":
- ret.Mhz = t
- case "GHZ":
- ret.Mhz = t * 1000.0
- case "KHZ":
- ret.Mhz = t / 1000.0
- default:
- ret.Mhz = t
- }
- }
- }
- break
- }
- }
- return []InfoStat{ret}, nil
-}
-
-func CountsWithContext(ctx context.Context, logical bool) (int, error) {
- info, err := InfoWithContext(ctx)
- if err == nil {
- return int(info[0].Cores), nil
- }
- return 0, err
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_cgo.go
deleted file mode 100644
index ffdc7b78f..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_cgo.go
+++ /dev/null
@@ -1,47 +0,0 @@
-//go:build darwin && cgo
-// +build darwin,cgo
-
-package host
-
-// #cgo LDFLAGS: -framework IOKit
-// #include "smc_darwin.h"
-import "C"
-import "context"
-
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- temperatureKeys := []string{
- C.AMBIENT_AIR_0,
- C.AMBIENT_AIR_1,
- C.CPU_0_DIODE,
- C.CPU_0_HEATSINK,
- C.CPU_0_PROXIMITY,
- C.ENCLOSURE_BASE_0,
- C.ENCLOSURE_BASE_1,
- C.ENCLOSURE_BASE_2,
- C.ENCLOSURE_BASE_3,
- C.GPU_0_DIODE,
- C.GPU_0_HEATSINK,
- C.GPU_0_PROXIMITY,
- C.HARD_DRIVE_BAY,
- C.MEMORY_SLOT_0,
- C.MEMORY_SLOTS_PROXIMITY,
- C.NORTHBRIDGE,
- C.NORTHBRIDGE_DIODE,
- C.NORTHBRIDGE_PROXIMITY,
- C.THUNDERBOLT_0,
- C.THUNDERBOLT_1,
- C.WIRELESS_MODULE,
- }
- var temperatures []TemperatureStat
-
- C.gopsutil_v3_open_smc()
- defer C.gopsutil_v3_close_smc()
-
- for _, key := range temperatureKeys {
- temperatures = append(temperatures, TemperatureStat{
- SensorKey: key,
- Temperature: float64(C.gopsutil_v3_get_temperature(C.CString(key))),
- })
- }
- return temperatures, nil
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_nocgo.go
deleted file mode 100644
index 6285ba94d..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_nocgo.go
+++ /dev/null
@@ -1,14 +0,0 @@
-//go:build darwin && !cgo
-// +build darwin,!cgo
-
-package host
-
-import (
- "context"
-
- "github.com/shirou/gopsutil/v3/internal/common"
-)
-
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- return []TemperatureStat{}, common.ErrNotImplementedError
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.c b/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.c
deleted file mode 100644
index 0197d95b4..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include
-#include
-#include "smc_darwin.h"
-
-#define IOSERVICE_SMC "AppleSMC"
-#define IOSERVICE_MODEL "IOPlatformExpertDevice"
-
-#define DATA_TYPE_SP78 "sp78"
-
-typedef enum {
- kSMCUserClientOpen = 0,
- kSMCUserClientClose = 1,
- kSMCHandleYPCEvent = 2,
- kSMCReadKey = 5,
- kSMCWriteKey = 6,
- kSMCGetKeyCount = 7,
- kSMCGetKeyFromIndex = 8,
- kSMCGetKeyInfo = 9,
-} selector_t;
-
-typedef struct {
- unsigned char major;
- unsigned char minor;
- unsigned char build;
- unsigned char reserved;
- unsigned short release;
-} SMCVersion;
-
-typedef struct {
- uint16_t version;
- uint16_t length;
- uint32_t cpuPLimit;
- uint32_t gpuPLimit;
- uint32_t memPLimit;
-} SMCPLimitData;
-
-typedef struct {
- IOByteCount data_size;
- uint32_t data_type;
- uint8_t data_attributes;
-} SMCKeyInfoData;
-
-typedef struct {
- uint32_t key;
- SMCVersion vers;
- SMCPLimitData p_limit_data;
- SMCKeyInfoData key_info;
- uint8_t result;
- uint8_t status;
- uint8_t data8;
- uint32_t data32;
- uint8_t bytes[32];
-} SMCParamStruct;
-
-typedef enum {
- kSMCSuccess = 0,
- kSMCError = 1,
- kSMCKeyNotFound = 0x84,
-} kSMC_t;
-
-typedef struct {
- uint8_t data[32];
- uint32_t data_type;
- uint32_t data_size;
- kSMC_t kSMC;
-} smc_return_t;
-
-static const int SMC_KEY_SIZE = 4; // number of characters in an SMC key.
-static io_connect_t conn; // our connection to the SMC.
-
-kern_return_t gopsutil_v3_open_smc(void) {
- kern_return_t result;
- io_service_t service;
-
- service = IOServiceGetMatchingService(0, IOServiceMatching(IOSERVICE_SMC));
- if (service == 0) {
- // Note: IOServiceMatching documents 0 on failure
- printf("ERROR: %s NOT FOUND\n", IOSERVICE_SMC);
- return kIOReturnError;
- }
-
- result = IOServiceOpen(service, mach_task_self(), 0, &conn);
- IOObjectRelease(service);
-
- return result;
-}
-
-kern_return_t gopsutil_v3_close_smc(void) { return IOServiceClose(conn); }
-
-static uint32_t to_uint32(char *key) {
- uint32_t ans = 0;
- uint32_t shift = 24;
-
- if (strlen(key) != SMC_KEY_SIZE) {
- return 0;
- }
-
- for (int i = 0; i < SMC_KEY_SIZE; i++) {
- ans += key[i] << shift;
- shift -= 8;
- }
-
- return ans;
-}
-
-static kern_return_t call_smc(SMCParamStruct *input, SMCParamStruct *output) {
- kern_return_t result;
- size_t input_cnt = sizeof(SMCParamStruct);
- size_t output_cnt = sizeof(SMCParamStruct);
-
- result = IOConnectCallStructMethod(conn, kSMCHandleYPCEvent, input, input_cnt,
- output, &output_cnt);
-
- if (result != kIOReturnSuccess) {
- result = err_get_code(result);
- }
- return result;
-}
-
-static kern_return_t read_smc(char *key, smc_return_t *result_smc) {
- kern_return_t result;
- SMCParamStruct input;
- SMCParamStruct output;
-
- memset(&input, 0, sizeof(SMCParamStruct));
- memset(&output, 0, sizeof(SMCParamStruct));
- memset(result_smc, 0, sizeof(smc_return_t));
-
- input.key = to_uint32(key);
- input.data8 = kSMCGetKeyInfo;
-
- result = call_smc(&input, &output);
- result_smc->kSMC = output.result;
-
- if (result != kIOReturnSuccess || output.result != kSMCSuccess) {
- return result;
- }
-
- result_smc->data_size = output.key_info.data_size;
- result_smc->data_type = output.key_info.data_type;
-
- input.key_info.data_size = output.key_info.data_size;
- input.data8 = kSMCReadKey;
-
- result = call_smc(&input, &output);
- result_smc->kSMC = output.result;
-
- if (result != kIOReturnSuccess || output.result != kSMCSuccess) {
- return result;
- }
-
- memcpy(result_smc->data, output.bytes, sizeof(output.bytes));
-
- return result;
-}
-
-double gopsutil_v3_get_temperature(char *key) {
- kern_return_t result;
- smc_return_t result_smc;
-
- result = read_smc(key, &result_smc);
-
- if (!(result == kIOReturnSuccess) && result_smc.data_size == 2 &&
- result_smc.data_type == to_uint32(DATA_TYPE_SP78)) {
- return 0.0;
- }
-
- return (double)result_smc.data[0];
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.h b/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.h
deleted file mode 100644
index e3013abdb..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/host/smc_darwin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __SMC_H__
-#define __SMC_H__ 1
-
-#include
-
-#define AMBIENT_AIR_0 "TA0P"
-#define AMBIENT_AIR_1 "TA1P"
-#define CPU_0_DIODE "TC0D"
-#define CPU_0_HEATSINK "TC0H"
-#define CPU_0_PROXIMITY "TC0P"
-#define ENCLOSURE_BASE_0 "TB0T"
-#define ENCLOSURE_BASE_1 "TB1T"
-#define ENCLOSURE_BASE_2 "TB2T"
-#define ENCLOSURE_BASE_3 "TB3T"
-#define GPU_0_DIODE "TG0D"
-#define GPU_0_HEATSINK "TG0H"
-#define GPU_0_PROXIMITY "TG0P"
-#define HARD_DRIVE_BAY "TH0P"
-#define MEMORY_SLOT_0 "TM0S"
-#define MEMORY_SLOTS_PROXIMITY "TM0P"
-#define NORTHBRIDGE "TN0H"
-#define NORTHBRIDGE_DIODE "TN0D"
-#define NORTHBRIDGE_PROXIMITY "TN0P"
-#define THUNDERBOLT_0 "TI0P"
-#define THUNDERBOLT_1 "TI1P"
-#define WIRELESS_MODULE "TW0P"
-
-kern_return_t gopsutil_v3_open_smc(void);
-kern_return_t gopsutil_v3_close_smc(void);
-double gopsutil_v3_get_temperature(char *);
-
-#endif // __SMC_H__
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_linux_111.go b/vendor/github.com/shirou/gopsutil/v3/net/net_linux_111.go
deleted file mode 100644
index bd5c95871..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_linux_111.go
+++ /dev/null
@@ -1,12 +0,0 @@
-//go:build !go1.16
-// +build !go1.16
-
-package net
-
-import (
- "os"
-)
-
-func readDir(f *os.File, max int) ([]os.FileInfo, error) {
- return f.Readdir(max)
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_linux_116.go b/vendor/github.com/shirou/gopsutil/v3/net/net_linux_116.go
deleted file mode 100644
index a45072e92..000000000
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_linux_116.go
+++ /dev/null
@@ -1,12 +0,0 @@
-//go:build go1.16
-// +build go1.16
-
-package net
-
-import (
- "os"
-)
-
-func readDir(f *os.File, max int) ([]os.DirEntry, error) {
- return f.ReadDir(max)
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/LICENSE b/vendor/github.com/shirou/gopsutil/v4/LICENSE
similarity index 100%
rename from vendor/github.com/shirou/gopsutil/v3/LICENSE
rename to vendor/github.com/shirou/gopsutil/v4/LICENSE
diff --git a/vendor/github.com/shirou/gopsutil/v3/common/env.go b/vendor/github.com/shirou/gopsutil/v4/common/env.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/common/env.go
rename to vendor/github.com/shirou/gopsutil/v4/common/env.go
index 4b5f4980c..4acad1fd1 100644
--- a/vendor/github.com/shirou/gopsutil/v3/common/env.go
+++ b/vendor/github.com/shirou/gopsutil/v4/common/env.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
type EnvKeyType string
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu.go
index 83bc23d45..56f53c3a1 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
import (
@@ -11,7 +12,7 @@ import (
"sync"
"time"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
// TimesStat contains the amounts of time the CPU has spent performing different
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix.go
similarity index 85%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix.go
index 1439d1d79..bc766bd4f 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix
-// +build aix
package cpu
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_cgo.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_cgo.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_cgo.go
index 9c1e70b17..559dc5fea 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_aix_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix && cgo
-// +build aix,cgo
package cpu
diff --git a/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_nocgo.go
new file mode 100644
index 000000000..329ef8336
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_aix_nocgo.go
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build aix && !cgo
+
+package cpu
+
+import (
+ "context"
+ "strconv"
+ "strings"
+
+ "github.com/shirou/gopsutil/v4/internal/common"
+)
+
+func TimesWithContext(ctx context.Context, percpu bool) ([]TimesStat, error) {
+ var ret []TimesStat
+ if percpu {
+ per_out, err := invoke.CommandWithContext(ctx, "sar", "-u", "-P", "ALL", "10", "1")
+ if err != nil {
+ return nil, err
+ }
+ lines := strings.Split(string(per_out), "\n")
+ if len(lines) < 6 {
+ return []TimesStat{}, common.ErrNotImplementedError
+ }
+
+ hp := strings.Fields(lines[5]) // headers
+ for l := 6; l < len(lines)-1; l++ {
+ ct := &TimesStat{}
+ v := strings.Fields(lines[l]) // values
+ for i, header := range hp {
+ // We're done in any of these use cases
+ if i >= len(v) || v[0] == "-" {
+ break
+ }
+
+ // Position variable for v
+ pos := i
+ // There is a missing field at the beginning of all but the first line
+ // so adjust the position
+ if l > 6 {
+ pos = i - 1
+ }
+ // We don't want invalid positions
+ if pos < 0 {
+ continue
+ }
+
+ if t, err := strconv.ParseFloat(v[pos], 64); err == nil {
+ switch header {
+ case `cpu`:
+ ct.CPU = strconv.FormatFloat(t, 'f', -1, 64)
+ case `%usr`:
+ ct.User = t
+ case `%sys`:
+ ct.System = t
+ case `%wio`:
+ ct.Iowait = t
+ case `%idle`:
+ ct.Idle = t
+ }
+ }
+ }
+ // Valid CPU data, so append it
+ ret = append(ret, *ct)
+ }
+ } else {
+ out, err := invoke.CommandWithContext(ctx, "sar", "-u", "10", "1")
+ if err != nil {
+ return nil, err
+ }
+ lines := strings.Split(string(out), "\n")
+ if len(lines) < 5 {
+ return []TimesStat{}, common.ErrNotImplementedError
+ }
+
+ ct := &TimesStat{CPU: "cpu-total"}
+ h := strings.Fields(lines[len(lines)-3]) // headers
+ v := strings.Fields(lines[len(lines)-2]) // values
+ for i, header := range h {
+ if t, err := strconv.ParseFloat(v[i], 64); err == nil {
+ switch header {
+ case `%usr`:
+ ct.User = t
+ case `%sys`:
+ ct.System = t
+ case `%wio`:
+ ct.Iowait = t
+ case `%idle`:
+ ct.Idle = t
+ }
+ }
+ }
+
+ ret = append(ret, *ct)
+ }
+
+ return ret, nil
+}
+
+func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
+ out, err := invoke.CommandWithContext(ctx, "prtconf")
+ if err != nil {
+ return nil, err
+ }
+
+ ret := InfoStat{}
+ for _, line := range strings.Split(string(out), "\n") {
+ if strings.HasPrefix(line, "Number Of Processors:") {
+ p := strings.Fields(line)
+ if len(p) > 3 {
+ if t, err := strconv.ParseUint(p[3], 10, 64); err == nil {
+ ret.Cores = int32(t)
+ }
+ }
+ } else if strings.HasPrefix(line, "Processor Clock Speed:") {
+ p := strings.Fields(line)
+ if len(p) > 4 {
+ if t, err := strconv.ParseFloat(p[3], 64); err == nil {
+ switch strings.ToUpper(p[4]) {
+ case "MHZ":
+ ret.Mhz = t
+ case "GHZ":
+ ret.Mhz = t * 1000.0
+ case "KHZ":
+ ret.Mhz = t / 1000.0
+ default:
+ ret.Mhz = t
+ }
+ }
+ }
+ break
+ } else if strings.HasPrefix(line, "System Model:") {
+ p := strings.Split(string(line), ":")
+ if p != nil {
+ ret.VendorID = strings.TrimSpace(p[1])
+ }
+ } else if strings.HasPrefix(line, "Processor Type:") {
+ p := strings.Split(string(line), ":")
+ if p != nil {
+ c := strings.Split(string(p[1]), "_")
+ if c != nil {
+ ret.Family = strings.TrimSpace(c[0])
+ ret.Model = strings.TrimSpace(c[1])
+ }
+ }
+ }
+ }
+ return []InfoStat{ret}, nil
+}
+
+func CountsWithContext(ctx context.Context, logical bool) (int, error) {
+ info, err := InfoWithContext(ctx)
+ if err == nil {
+ return int(info[0].Cores), nil
+ }
+ return 0, err
+}
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin.go
index 41f395e5e..79a458b8e 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package cpu
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_cgo.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_cgo.go
index 1d5f0772e..3a02024c5 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && cgo
-// +build darwin,cgo
package cpu
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_nocgo.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_nocgo.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_nocgo.go
index e067e99f9..1af8566a6 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_darwin_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_darwin_nocgo.go
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && !cgo
-// +build darwin,!cgo
package cpu
-import "github.com/shirou/gopsutil/v3/internal/common"
+import "github.com/shirou/gopsutil/v4/internal/common"
func perCPUTimes() ([]TimesStat, error) {
return []TimesStat{}, common.ErrNotImplementedError
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly.go
index fef53e5dc..19b1e9dd3 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
import (
@@ -10,7 +11,7 @@ import (
"strings"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly_amd64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly_amd64.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly_amd64.go
index 57e14528d..25ececa68 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_dragonfly_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_dragonfly_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_fallback.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_fallback.go
similarity index 83%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_fallback.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_fallback.go
index 089f603c8..245c1ec98 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_fallback.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build !darwin && !linux && !freebsd && !openbsd && !netbsd && !solaris && !windows && !dragonfly && !plan9 && !aix
-// +build !darwin,!linux,!freebsd,!openbsd,!netbsd,!solaris,!windows,!dragonfly,!plan9,!aix
package cpu
@@ -7,7 +7,7 @@ import (
"context"
"runtime"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func Times(percpu bool) ([]TimesStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd.go
index d3f47353c..c68d6bff0 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
import (
@@ -10,7 +11,7 @@ import (
"strings"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_386.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_386.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_386.go
index 8b7f4c321..e4799bcf5 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_386.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_amd64.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_amd64.go
index 57e14528d..25ececa68 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm.go
index 8b7f4c321..e4799bcf5 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm64.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm64.go
index 57e14528d..25ececa68 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_freebsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_freebsd_arm64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
index da467e2dd..f78c61a25 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package cpu
@@ -13,7 +13,7 @@ import (
"github.com/tklauser/go-sysconf"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
var ClocksPerSec = float64(100)
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd.go
index 1f66be342..2cda5cd24 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build netbsd
-// +build netbsd
package cpu
@@ -9,7 +9,7 @@ import (
"runtime"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_amd64.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_amd64.go
index 57e14528d..25ececa68 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_arm64.go
similarity index 71%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_arm64.go
index 57e14528d..25ececa68 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_netbsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_netbsd_arm64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd.go
index fe3329030..33233d3c7 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package cpu
@@ -9,7 +9,7 @@ import (
"runtime"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_386.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_386.go
similarity index 73%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_386.go
index 5e878399a..40a6f43e4 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_386.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_amd64.go
similarity index 73%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_amd64.go
index d659058cd..464156d54 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm.go
similarity index 73%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm.go
index 5e878399a..40a6f43e4 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm64.go
similarity index 73%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm64.go
index d659058cd..464156d54 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_arm64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_riscv64.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_riscv64.go
similarity index 73%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_riscv64.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_riscv64.go
index d659058cd..464156d54 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_openbsd_riscv64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_openbsd_riscv64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
type cpuTimes struct {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_plan9.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_plan9.go
similarity index 91%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_plan9.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_plan9.go
index a2e99d8c0..bff2e0c75 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_plan9.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_plan9.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build plan9
-// +build plan9
package cpu
@@ -9,7 +9,7 @@ import (
"runtime"
stats "github.com/lufia/plan9stats"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func Times(percpu bool) ([]TimesStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_solaris.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_solaris.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
index 4231ad168..d8ba1d324 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package cpu
import (
diff --git a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_windows.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_windows.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/cpu/cpu_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/cpu/cpu_windows.go
index e10612fd1..4476b91cb 100644
--- a/vendor/github.com/shirou/gopsutil/v3/cpu/cpu_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_windows.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package cpu
@@ -8,14 +8,12 @@ import (
"fmt"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/yusufpapurcu/wmi"
"golang.org/x/sys/windows"
)
-var (
- procGetNativeSystemInfo = common.Modkernel32.NewProc("GetNativeSystemInfo")
-)
+var procGetNativeSystemInfo = common.Modkernel32.NewProc("GetNativeSystemInfo")
type win32_Processor struct {
Family uint16
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host.go b/vendor/github.com/shirou/gopsutil/v4/host/host.go
similarity index 90%
rename from vendor/github.com/shirou/gopsutil/v3/host/host.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host.go
index ee9486369..b69d2f624 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package host
import (
@@ -8,7 +9,7 @@ import (
"runtime"
"time"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
type Warnings = common.Warnings
@@ -40,13 +41,6 @@ type UserStat struct {
Started int `json:"started"`
}
-type TemperatureStat struct {
- SensorKey string `json:"sensorKey"`
- Temperature float64 `json:"temperature"`
- High float64 `json:"sensorHigh"`
- Critical float64 `json:"sensorCritical"`
-}
-
func (h InfoStat) String() string {
s, _ := json.Marshal(h)
return string(s)
@@ -57,11 +51,6 @@ func (u UserStat) String() string {
return string(s)
}
-func (t TemperatureStat) String() string {
- s, _ := json.Marshal(t)
- return string(s)
-}
-
var enableBootTimeCache bool
// EnableBootTimeCache change cache behavior of BootTime. If true, cache BootTime value. Default is false.
@@ -157,10 +146,6 @@ func KernelVersion() (string, error) {
return KernelVersionWithContext(context.Background())
}
-func SensorsTemperatures() ([]TemperatureStat, error) {
- return SensorsTemperaturesWithContext(context.Background())
-}
-
func timeSince(ts uint64) uint64 {
return uint64(time.Now().Unix()) - ts
}
diff --git a/vendor/github.com/shirou/gopsutil/v4/host/host_aix.go b/vendor/github.com/shirou/gopsutil/v4/host/host_aix.go
new file mode 100644
index 000000000..39f7447f1
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_aix.go
@@ -0,0 +1,196 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build aix
+
+package host
+
+import (
+ "context"
+ "errors"
+ "strconv"
+ "strings"
+
+ "github.com/shirou/gopsutil/v4/internal/common"
+)
+
+// from https://www.ibm.com/docs/en/aix/7.2?topic=files-utmph-file
+const (
+ user_PROCESS = 7
+)
+
+func HostIDWithContext(ctx context.Context) (string, error) {
+ out, err := invoke.CommandWithContext(ctx, "uname", "-u")
+ if err != nil {
+ return "", err
+ }
+
+ // The command always returns an extra newline, so we make use of Split() to get only the first line
+ return strings.Split(string(out[:]), "\n")[0], nil
+}
+
+func numProcs(ctx context.Context) (uint64, error) {
+ return 0, common.ErrNotImplementedError
+}
+
+func BootTimeWithContext(ctx context.Context) (btime uint64, err error) {
+ ut, err := UptimeWithContext(ctx)
+ if err != nil {
+ return 0, err
+ }
+
+ if ut <= 0 {
+ return 0, errors.New("Uptime was not set, so cannot calculate boot time from it.")
+ }
+
+ ut = ut * 60
+ return timeSince(ut), nil
+}
+
+// This function takes multiple formats of output frmo the uptime
+// command and converts the data into minutes.
+// Some examples of uptime output that this command handles:
+// 11:54AM up 13 mins, 1 user, load average: 2.78, 2.62, 1.79
+// 12:41PM up 1 hr, 1 user, load average: 2.47, 2.85, 2.83
+// 07:43PM up 5 hrs, 1 user, load average: 3.27, 2.91, 2.72
+// 11:18:23 up 83 days, 18:29, 4 users, load average: 0.16, 0.03, 0.01
+func UptimeWithContext(ctx context.Context) (uint64, error) {
+ out, err := invoke.CommandWithContext(ctx, "uptime")
+ if err != nil {
+ return 0, err
+ }
+
+ // Convert our uptime to a series of fields we can extract
+ ut := strings.Fields(string(out[:]))
+
+ // Convert the second field value to integer
+ var days uint64 = 0
+ var hours uint64 = 0
+ var minutes uint64 = 0
+ if ut[3] == "days," {
+ days, err = strconv.ParseUint(ut[2], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+
+ // Split field 4 into hours and minutes
+ hm := strings.Split(ut[4], ":")
+ hours, err = strconv.ParseUint(hm[0], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ minutes, err = strconv.ParseUint(strings.Replace(hm[1], ",", "", -1), 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ } else if ut[3] == "hr," || ut[3] == "hrs," {
+ hours, err = strconv.ParseUint(ut[2], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ } else if ut[3] == "mins," {
+ minutes, err = strconv.ParseUint(ut[2], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ } else if _, err := strconv.ParseInt(ut[3], 10, 64); err == nil && strings.Contains(ut[2], ":") {
+ // Split field 2 into hours and minutes
+ hm := strings.Split(ut[2], ":")
+ hours, err = strconv.ParseUint(hm[0], 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ minutes, err = strconv.ParseUint(strings.Replace(hm[1], ",", "", -1), 10, 64)
+ if err != nil {
+ return 0, err
+ }
+ }
+
+ // Stack them all together as minutes
+ total_time := (days * 24 * 60) + (hours * 60) + minutes
+
+ return total_time, nil
+}
+
+// This is a weak implementation due to the limitations on retrieving this data in AIX
+func UsersWithContext(ctx context.Context) ([]UserStat, error) {
+ var ret []UserStat
+ out, err := invoke.CommandWithContext(ctx, "w")
+ if err != nil {
+ return nil, err
+ }
+ lines := strings.Split(string(out), "\n")
+ if len(lines) < 3 {
+ return []UserStat{}, common.ErrNotImplementedError
+ }
+
+ hf := strings.Fields(lines[1]) // headers
+ for l := 2; l < len(lines); l++ {
+ v := strings.Fields(lines[l]) // values
+ us := &UserStat{}
+ for i, header := range hf {
+ // We're done in any of these use cases
+ if i >= len(v) || v[0] == "-" {
+ break
+ }
+
+ if t, err := strconv.ParseFloat(v[i], 64); err == nil {
+ switch header {
+ case `User`:
+ us.User = strconv.FormatFloat(t, 'f', 1, 64)
+ case `tty`:
+ us.Terminal = strconv.FormatFloat(t, 'f', 1, 64)
+ }
+ }
+ }
+
+ // Valid User data, so append it
+ ret = append(ret, *us)
+ }
+
+ return ret, nil
+}
+
+// Much of this function could be static. However, to be future proofed, I've made it call the OS for the information in all instances.
+func PlatformInformationWithContext(ctx context.Context) (platform string, family string, version string, err error) {
+ // Set the platform (which should always, and only be, "AIX") from `uname -s`
+ out, err := invoke.CommandWithContext(ctx, "uname", "-s")
+ if err != nil {
+ return "", "", "", err
+ }
+ platform = strings.TrimRight(string(out[:]), "\n")
+
+ // Set the family
+ family = strings.TrimRight(string(out[:]), "\n")
+
+ // Set the version
+ out, err = invoke.CommandWithContext(ctx, "oslevel")
+ if err != nil {
+ return "", "", "", err
+ }
+ version = strings.TrimRight(string(out[:]), "\n")
+
+ return platform, family, version, nil
+}
+
+func KernelVersionWithContext(ctx context.Context) (version string, err error) {
+ out, err := invoke.CommandWithContext(ctx, "oslevel", "-s")
+ if err != nil {
+ return "", err
+ }
+ version = strings.TrimRight(string(out[:]), "\n")
+
+ return version, nil
+}
+
+func KernelArch() (arch string, err error) {
+ out, err := invoke.Command("bootinfo", "-y")
+ if err != nil {
+ return "", err
+ }
+ arch = strings.TrimRight(string(out[:]), "\n")
+
+ return arch, nil
+}
+
+func VirtualizationWithContext(ctx context.Context) (string, string, error) {
+ return "", "", common.ErrNotImplementedError
+}
diff --git a/vendor/github.com/shirou/gopsutil/v4/host/host_aix_ppc64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_aix_ppc64.go
new file mode 100644
index 000000000..de9674b73
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_aix_ppc64.go
@@ -0,0 +1,48 @@
+//go:build aix && ppc64 && cgo
+// +build aix,ppc64,cgo
+
+// Guessed at from the following document:
+// https://www.ibm.com/docs/sl/ibm-mq/9.2?topic=platforms-standard-data-types-aix-linux-windows
+
+package host
+
+const (
+ sizeofPtr = 0x8
+ sizeofShort = 0x2
+ sizeofInt = 0x4
+ sizeofLong = 0x8
+ sizeofLongLong = 0x8
+ sizeOfUtmp = 0x180
+)
+
+type (
+ _C_short int16
+ _C_int int32
+ _C_long int64
+ _C_long_long int64
+)
+
+type utmp struct {
+ Type int16
+ Pad_cgo_0 [2]byte
+ Pid int32
+ Line [32]int8
+ Id [4]int8
+ User [32]int8
+ Host [256]int8
+ Exit exit_status
+ Session int32
+ Tv timeval
+ Addr_v6 [4]int32
+ X__glibc_reserved [20]int8
+}
+
+type exit_status struct {
+ Termination int16
+ Exit int16
+}
+
+type timeval struct {
+ Sec int64
+ Usec int64
+}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_bsd.go b/vendor/github.com/shirou/gopsutil/v4/host/host_bsd.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_bsd.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_bsd.go
index f9a296148..b67f8fb6e 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_bsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_bsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin || freebsd || openbsd || netbsd
-// +build darwin freebsd openbsd netbsd
package host
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin.go b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_darwin.go
index 873ed4aee..068f1060a 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package host
@@ -15,8 +15,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/process"
)
// from utmpx.h
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_amd64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin_amd64.go
similarity index 88%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_darwin_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_darwin_amd64.go
index 8caeed2e8..1efc353aa 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_darwin.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_arm64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin_arm64.go
similarity index 89%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_darwin_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_darwin_arm64.go
index 293bd4df8..512e56970 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_darwin_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_darwin_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && arm64
-// +build darwin,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_darwin.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_fallback.go b/vendor/github.com/shirou/gopsutil/v4/host/host_fallback.go
similarity index 79%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_fallback.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_fallback.go
index a393ca15d..bc8397909 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_fallback.go
@@ -1,12 +1,12 @@
-//go:build !darwin && !linux && !freebsd && !openbsd && !netbsd && !solaris && !windows
-// +build !darwin,!linux,!freebsd,!openbsd,!netbsd,!solaris,!windows
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build !darwin && !linux && !freebsd && !openbsd && !netbsd && !solaris && !windows && !aix
package host
import (
"context"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func HostIDWithContext(ctx context.Context) (string, error) {
@@ -41,10 +41,6 @@ func PlatformInformationWithContext(ctx context.Context) (string, string, string
return "", "", "", common.ErrNotImplementedError
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- return []TemperatureStat{}, common.ErrNotImplementedError
-}
-
func KernelArch() (string, error) {
return "", common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_freebsd.go
index 9a5382d39..97aa05a14 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd
-// +build freebsd
package host
@@ -13,8 +13,8 @@ import (
"strings"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/process"
"golang.org/x/sys/unix"
)
@@ -141,10 +141,6 @@ func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
return ret, nil
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- return []TemperatureStat{}, common.ErrNotImplementedError
-}
-
func KernelVersionWithContext(ctx context.Context) (string, error) {
_, _, version, err := PlatformInformationWithContext(ctx)
return version, err
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_386.go b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_386.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_386.go
index 88453d2a2..0d31eb113 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_386.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_amd64.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_amd64.go
index 8af74b0fe..603a0ba50 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm.go
index f7d6ede55..5021f5e1b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm64.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm64.go
index 41bec3c11..4fe188b33 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_freebsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_freebsd_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd && arm64
-// +build freebsd,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux.go
similarity index 70%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux.go
index 5d4c1a90f..04bda6c98 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package host
@@ -10,14 +10,12 @@ import (
"fmt"
"io"
"os"
- "path/filepath"
"regexp"
- "strconv"
"strings"
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
type lsbStruct struct {
@@ -30,8 +28,6 @@ type lsbStruct struct {
// from utmp.h
const (
user_PROCESS = 7
-
- hostTemperatureScale = 1000.0
)
func HostIDWithContext(ctx context.Context) (string, error) {
@@ -392,147 +388,3 @@ func getSusePlatform(contents []string) string {
func VirtualizationWithContext(ctx context.Context) (string, string, error) {
return common.VirtualizationWithContext(ctx)
}
-
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- var err error
-
- var files []string
-
- temperatures := make([]TemperatureStat, 0)
-
- // Only the temp*_input file provides current temperature
- // value in millidegree Celsius as reported by the temperature to the device:
- // https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
- if files, err = filepath.Glob(common.HostSysWithContext(ctx, "/class/hwmon/hwmon*/temp*_input")); err != nil {
- return temperatures, err
- }
-
- if len(files) == 0 {
- // CentOS has an intermediate /device directory:
- // https://github.com/giampaolo/psutil/issues/971
- if files, err = filepath.Glob(common.HostSysWithContext(ctx, "/class/hwmon/hwmon*/device/temp*_input")); err != nil {
- return temperatures, err
- }
- }
-
- var warns Warnings
-
- if len(files) == 0 { // handle distributions without hwmon, like raspbian #391, parse legacy thermal_zone files
- files, err = filepath.Glob(common.HostSysWithContext(ctx, "/class/thermal/thermal_zone*/"))
- if err != nil {
- return temperatures, err
- }
- for _, file := range files {
- // Get the name of the temperature you are reading
- name, err := os.ReadFile(filepath.Join(file, "type"))
- if err != nil {
- warns.Add(err)
- continue
- }
- // Get the temperature reading
- current, err := os.ReadFile(filepath.Join(file, "temp"))
- if err != nil {
- warns.Add(err)
- continue
- }
- temperature, err := strconv.ParseInt(strings.TrimSpace(string(current)), 10, 64)
- if err != nil {
- warns.Add(err)
- continue
- }
-
- temperatures = append(temperatures, TemperatureStat{
- SensorKey: strings.TrimSpace(string(name)),
- Temperature: float64(temperature) / 1000.0,
- })
- }
- return temperatures, warns.Reference()
- }
-
- temperatures = make([]TemperatureStat, 0, len(files))
-
- // example directory
- // device/ temp1_crit_alarm temp2_crit_alarm temp3_crit_alarm temp4_crit_alarm temp5_crit_alarm temp6_crit_alarm temp7_crit_alarm
- // name temp1_input temp2_input temp3_input temp4_input temp5_input temp6_input temp7_input
- // power/ temp1_label temp2_label temp3_label temp4_label temp5_label temp6_label temp7_label
- // subsystem/ temp1_max temp2_max temp3_max temp4_max temp5_max temp6_max temp7_max
- // temp1_crit temp2_crit temp3_crit temp4_crit temp5_crit temp6_crit temp7_crit uevent
- for _, file := range files {
- var raw []byte
-
- var temperature float64
-
- // Get the base directory location
- directory := filepath.Dir(file)
-
- // Get the base filename prefix like temp1
- basename := strings.Split(filepath.Base(file), "_")[0]
-
- // Get the base path like /temp1
- basepath := filepath.Join(directory, basename)
-
- // Get the label of the temperature you are reading
- label := ""
-
- if raw, _ = os.ReadFile(basepath + "_label"); len(raw) != 0 {
- // Format the label from "Core 0" to "core_0"
- label = strings.Join(strings.Split(strings.TrimSpace(strings.ToLower(string(raw))), " "), "_")
- }
-
- // Get the name of the temperature you are reading
- if raw, err = os.ReadFile(filepath.Join(directory, "name")); err != nil {
- warns.Add(err)
- continue
- }
-
- name := strings.TrimSpace(string(raw))
-
- if label != "" {
- name = name + "_" + label
- }
-
- // Get the temperature reading
- if raw, err = os.ReadFile(file); err != nil {
- warns.Add(err)
- continue
- }
-
- if temperature, err = strconv.ParseFloat(strings.TrimSpace(string(raw)), 64); err != nil {
- warns.Add(err)
- continue
- }
-
- // Add discovered temperature sensor to the list
- temperatures = append(temperatures, TemperatureStat{
- SensorKey: name,
- Temperature: temperature / hostTemperatureScale,
- High: optionalValueReadFromFile(basepath+"_max") / hostTemperatureScale,
- Critical: optionalValueReadFromFile(basepath+"_crit") / hostTemperatureScale,
- })
- }
-
- return temperatures, warns.Reference()
-}
-
-func optionalValueReadFromFile(filename string) float64 {
- var raw []byte
-
- var err error
-
- var value float64
-
- // Check if file exists
- if _, err := os.Stat(filename); os.IsNotExist(err) {
- return 0
- }
-
- if raw, err = os.ReadFile(filename); err != nil {
- return 0
- }
-
- if value, err = strconv.ParseFloat(strings.TrimSpace(string(raw)), 64); err != nil {
- return 0
- }
-
- return value
-}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_386.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_386.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_386.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_386.go
index 46e0c5d5a..3e241b104 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_386.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// ATTENTION - FILE MANUAL FIXED AFTER CGO.
// Fixed line: Tv _Ctype_struct_timeval -> Tv UtTv
// Created by cgo -godefs, MANUAL FIXED
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_amd64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_amd64.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_amd64.go
index 1e574482f..480e72d3b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm.go
index 7abbbb8a3..1b7ee978a 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go | sed "s/uint8/int8/g"
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm64.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm64.go
index cd0b4ddcf..0e6fc8b76 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs types_linux.go
package host
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_loong64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_loong64.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_loong64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_loong64.go
index edf1be597..c4c8390f3 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_loong64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_loong64.go
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_linux.go
//go:build linux && loong64
-// +build linux,loong64
package host
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips.go
index 50207e5bc..8aa049cae 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64.go
index 50207e5bc..8aa049cae 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64le.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64le.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64le.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64le.go
index 50207e5bc..8aa049cae 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mips64le.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mips64le.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mipsle.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mipsle.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_mipsle.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_mipsle.go
index 50207e5bc..8aa049cae 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_mipsle.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_mipsle.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64.go
index 5b324effa..23f5cb9d8 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux && ppc64
-// +build linux,ppc64
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64le.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64le.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64le.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64le.go
index 51f5bee11..e81f12392 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_ppc64le.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_ppc64le.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux && ppc64le
-// +build linux,ppc64le
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_riscv64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_riscv64.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_riscv64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_riscv64.go
index bb03a0b39..080fdb8dc 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_riscv64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_riscv64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_s390x.go b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_s390x.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_linux_s390x.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_linux_s390x.go
index 6ea432a61..738af6018 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_linux_s390x.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_linux_s390x.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux && s390x
-// +build linux,s390x
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_linux.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_netbsd.go b/vendor/github.com/shirou/gopsutil/v4/host/host_netbsd.go
similarity index 83%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_netbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_netbsd.go
index 488f1dfc2..f3cddb7be 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_netbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_netbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build netbsd
-// +build netbsd
package host
@@ -7,7 +7,7 @@ import (
"context"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/unix"
)
@@ -45,10 +45,6 @@ func UsersWithContext(ctx context.Context) ([]UserStat, error) {
return ret, common.ErrNotImplementedError
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- return []TemperatureStat{}, common.ErrNotImplementedError
-}
-
func KernelVersionWithContext(ctx context.Context) (string, error) {
_, _, version, err := PlatformInformationWithContext(ctx)
return version, err
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd.go
similarity index 88%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd.go
index 325015c23..f21c5e859 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package host
@@ -12,8 +12,8 @@ import (
"strings"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/process"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/process"
"golang.org/x/sys/unix"
)
@@ -95,10 +95,6 @@ func UsersWithContext(ctx context.Context) ([]UserStat, error) {
return ret, nil
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- return []TemperatureStat{}, common.ErrNotImplementedError
-}
-
func KernelVersionWithContext(ctx context.Context) (string, error) {
_, _, version, err := PlatformInformationWithContext(ctx)
return version, err
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_386.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_386.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_386.go
index b299d7ae4..df820a4ab 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_386.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && 386
-// +build openbsd,386
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_amd64.go
similarity index 91%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_amd64.go
index 2d23b9b71..b1d674e8c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm.go
index f0ac57d0b..e5f1590fe 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm
-// +build openbsd,arm
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm64.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm64.go
index 20fb42dd7..d8c1061f7 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm64
-// +build openbsd,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_riscv64.go b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_riscv64.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_riscv64.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_riscv64.go
index 7a123b649..584004b2f 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_openbsd_riscv64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_openbsd_riscv64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && riscv64
-// +build openbsd,riscv64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs host/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_posix.go b/vendor/github.com/shirou/gopsutil/v4/host/host_posix.go
similarity index 84%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_posix.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_posix.go
index e7e0d837f..91ab6aee8 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_posix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_posix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux || freebsd || openbsd || netbsd || darwin || solaris
-// +build linux freebsd openbsd netbsd darwin solaris
package host
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_solaris.go b/vendor/github.com/shirou/gopsutil/v4/host/host_solaris.go
similarity index 80%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_solaris.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_solaris.go
index fef67f835..371cc98e8 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_solaris.go
@@ -1,18 +1,19 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build solaris
+
package host
import (
"bufio"
"bytes"
"context"
- "encoding/csv"
"fmt"
- "io"
"os"
"regexp"
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func HostIDWithContext(ctx context.Context) (string, error) {
@@ -94,43 +95,6 @@ func UsersWithContext(ctx context.Context) ([]UserStat, error) {
return []UserStat{}, common.ErrNotImplementedError
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- var ret []TemperatureStat
-
- out, err := invoke.CommandWithContext(ctx, "ipmitool", "-c", "sdr", "list")
- if err != nil {
- return ret, err
- }
-
- r := csv.NewReader(strings.NewReader(string(out)))
- // Output may contain errors, e.g. "bmc_send_cmd: Permission denied", don't expect a consistent number of records
- r.FieldsPerRecord = -1
- for {
- record, err := r.Read()
- if err == io.EOF {
- break
- }
- if err != nil {
- return ret, err
- }
- // CPU1 Temp,40,degrees C,ok
- if len(record) < 3 || record[1] == "" || record[2] != "degrees C" {
- continue
- }
- v, err := strconv.ParseFloat(record[1], 64)
- if err != nil {
- return ret, err
- }
- ts := TemperatureStat{
- SensorKey: strings.TrimSuffix(record[0], " Temp"),
- Temperature: v,
- }
- ret = append(ret, ts)
- }
-
- return ret, nil
-}
-
func VirtualizationWithContext(ctx context.Context) (string, string, error) {
return "", "", common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/host/host_windows.go b/vendor/github.com/shirou/gopsutil/v4/host/host_windows.go
similarity index 88%
rename from vendor/github.com/shirou/gopsutil/v3/host/host_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/host/host_windows.go
index b83ad6db1..7daad6f94 100644
--- a/vendor/github.com/shirou/gopsutil/v3/host/host_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/host/host_windows.go
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package host
import (
"context"
"fmt"
- "math"
"strconv"
"strings"
"sync/atomic"
@@ -14,9 +13,8 @@ import (
"time"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/process"
- "github.com/yusufpapurcu/wmi"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/process"
"golang.org/x/sys/windows"
)
@@ -57,13 +55,6 @@ type systemInfo struct {
wProcessorRevision uint16
}
-type msAcpi_ThermalZoneTemperature struct {
- Active bool
- CriticalTripPoint uint32
- CurrentTemperature uint32
- InstanceName string
-}
-
func HostIDWithContext(ctx context.Context) (string, error) {
// there has been reports of issues on 32bit using golang.org/x/sys/windows/registry, see https://github.com/shirou/gopsutil/pull/312#issuecomment-277422612
// for rationale of using windows.RegOpenKeyEx/RegQueryValueEx instead of registry.OpenKey/GetStringValue
@@ -145,6 +136,14 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
}
func PlatformInformationWithContext(ctx context.Context) (platform string, family string, version string, err error) {
+ platform, family, _, displayVersion, err := platformInformation(ctx)
+ if err != nil {
+ return "", "", "", err
+ }
+ return platform, family, displayVersion, nil
+}
+
+func platformInformation(ctx context.Context) (platform, family, version, displayVersion string, err error) {
// GetVersionEx lies on Windows 8.1 and returns as Windows 8 if we don't declare compatibility in manifest
// RtlGetVersion bypasses this lying layer and returns the true Windows version
// https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/content/wdm/nf-wdm-rtlgetversion
@@ -208,6 +207,14 @@ func PlatformInformationWithContext(ctx context.Context) (platform string, famil
copy((*[4]byte)(unsafe.Pointer(&UBR))[:], regBuf)
}
+ // Get DisplayVersion(ex: 23H2) as platformVersion
+ err = windows.RegQueryValueEx(h, windows.StringToUTF16Ptr(`DisplayVersion`), nil, &valType, nil, &bufLen)
+ if err == nil {
+ regBuf := make([]uint16, bufLen/2+1)
+ err = windows.RegQueryValueEx(h, windows.StringToUTF16Ptr(`DisplayVersion`), nil, &valType, (*byte)(unsafe.Pointer(®Buf[0])), &bufLen)
+ displayVersion = windows.UTF16ToString(regBuf[:])
+ }
+
// PlatformFamily
switch osInfo.wProductType {
case 1:
@@ -223,7 +230,7 @@ func PlatformInformationWithContext(ctx context.Context) (platform string, famil
osInfo.dwMajorVersion, osInfo.dwMinorVersion, osInfo.dwBuildNumber, UBR,
osInfo.dwBuildNumber, UBR)
- return platform, family, version, nil
+ return platform, family, version, displayVersion, nil
}
func UsersWithContext(ctx context.Context) ([]UserStat, error) {
@@ -232,39 +239,12 @@ func UsersWithContext(ctx context.Context) ([]UserStat, error) {
return ret, common.ErrNotImplementedError
}
-func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, error) {
- var ret []TemperatureStat
- var dst []msAcpi_ThermalZoneTemperature
- q := wmi.CreateQuery(&dst, "")
- if err := common.WMIQueryWithContext(ctx, q, &dst, nil, "root/wmi"); err != nil {
- return ret, err
- }
-
- for _, v := range dst {
- ts := TemperatureStat{
- SensorKey: v.InstanceName,
- Temperature: kelvinToCelsius(v.CurrentTemperature, 2),
- }
- ret = append(ret, ts)
- }
-
- return ret, nil
-}
-
-func kelvinToCelsius(temp uint32, n int) float64 {
- // wmi return temperature Kelvin * 10, so need to divide the result by 10,
- // and then minus 273.15 to get °Celsius.
- t := float64(temp/10) - 273.15
- n10 := math.Pow10(n)
- return math.Trunc((t+0.5/n10)*n10) / n10
-}
-
func VirtualizationWithContext(ctx context.Context) (string, string, error) {
return "", "", common.ErrNotImplementedError
}
func KernelVersionWithContext(ctx context.Context) (string, error) {
- _, _, version, err := PlatformInformationWithContext(ctx)
+ _, _, version, _, err := platformInformation(ctx)
return version, err
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/binary.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/binary.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go
index 5e8d43db8..6e75e74b0 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/binary.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/binary.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
// Copyright 2009 The Go Authors. All rights reserved.
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
index 5e25e507b..642aabc55 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
//
@@ -25,7 +26,7 @@ import (
"strings"
"time"
- "github.com/shirou/gopsutil/v3/common"
+ "github.com/shirou/gopsutil/v4/common"
)
var (
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_darwin.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_darwin.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_darwin.go
index f1a784597..53f9ae8d9 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_freebsd.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_freebsd.go
index f590e2e67..53cdceeb6 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_freebsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd || openbsd
-// +build freebsd openbsd
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_linux.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
index a429e16a2..85802dcb0 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_netbsd.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_netbsd.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_netbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_netbsd.go
index efbc710a5..206532126 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_netbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_netbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build netbsd
-// +build netbsd
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_openbsd.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_openbsd.go
index 58d76f334..00fa19a2f 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_unix.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_unix.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
index 4af7e5c2a..2715b890b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_unix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux || freebsd || darwin || openbsd
-// +build linux freebsd darwin openbsd
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_windows.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_windows.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/common_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/common_windows.go
index 301b2315b..766ed2fcb 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/common_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_windows.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package common
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/endian.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/endian.go
similarity index 88%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/endian.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/endian.go
index 147cfdc4b..113ff2e9f 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/endian.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/endian.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
import "unsafe"
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/sleep.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/sleep.go
similarity index 89%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/sleep.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/sleep.go
index 94cedfd34..504f13ffd 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/sleep.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/sleep.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
import (
diff --git a/vendor/github.com/shirou/gopsutil/v3/internal/common/warnings.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/warnings.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/internal/common/warnings.go
rename to vendor/github.com/shirou/gopsutil/v4/internal/common/warnings.go
index a4aaadaf5..888cc57fa 100644
--- a/vendor/github.com/shirou/gopsutil/v3/internal/common/warnings.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/warnings.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package common
import "fmt"
diff --git a/vendor/github.com/shirou/gopsutil/v4/mem/ex_linux.go b/vendor/github.com/shirou/gopsutil/v4/mem/ex_linux.go
new file mode 100644
index 000000000..0a12fe2fe
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/ex_linux.go
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build linux
+
+package mem
+
+import (
+ "context"
+ "encoding/json"
+)
+
+type ExVirtualMemory struct {
+ ActiveFile uint64 `json:"activefile"`
+ InactiveFile uint64 `json:"inactivefile"`
+ ActiveAnon uint64 `json:"activeanon"`
+ InactiveAnon uint64 `json:"inactiveanon"`
+ Unevictable uint64 `json:"unevictable"`
+}
+
+func (v ExVirtualMemory) String() string {
+ s, _ := json.Marshal(v)
+ return string(s)
+}
+
+type ExLinux struct{}
+
+func NewExLinux() *ExLinux {
+ return &ExLinux{}
+}
+
+func (ex *ExLinux) VirtualMemory() (*ExVirtualMemory, error) {
+ return ex.VirtualMemoryWithContext(context.Background())
+}
+
+func (ex *ExLinux) VirtualMemoryWithContext(ctx context.Context) (*ExVirtualMemory, error) {
+ _, vmEx, err := fillFromMeminfoWithContext(ctx)
+ if err != nil {
+ return nil, err
+ }
+ return vmEx, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go b/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go
new file mode 100644
index 000000000..4f1573b3c
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: BSD-3-Clause
+//go:build windows
+
+package mem
+
+import (
+ "unsafe"
+
+ "golang.org/x/sys/windows"
+)
+
+// ExVirtualMemory represents Windows specific information
+// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
+type ExVirtualMemory struct {
+ VirtualTotal uint64 `json:"virtualTotal"`
+ VirtualAvail uint64 `json:"virtualAvail"`
+}
+
+type ExWindows struct{}
+
+func NewExWindows() *ExWindows {
+ return &ExWindows{}
+}
+
+func (e *ExWindows) VirtualMemory() (*ExVirtualMemory, error) {
+ var memInfo memoryStatusEx
+ memInfo.cbSize = uint32(unsafe.Sizeof(memInfo))
+ mem, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(&memInfo)))
+ if mem == 0 {
+ return nil, windows.GetLastError()
+ }
+
+ ret := &ExVirtualMemory{
+ VirtualTotal: memInfo.ullTotalVirtual,
+ VirtualAvail: memInfo.ullAvailVirtual,
+ }
+
+ return ret, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem.go
index edaf268bb..0da71a988 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem.go
@@ -1,9 +1,10 @@
+// SPDX-License-Identifier: BSD-3-Clause
package mem
import (
"encoding/json"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
var invoke common.Invoker = common.Invoke{}
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix.go
similarity index 86%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_aix.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_aix.go
index 22a6a4e92..916bff30d 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix
-// +build aix
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_cgo.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_cgo.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_cgo.go
index 67e11dff8..2d03dd0c3 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix && cgo
-// +build aix,cgo
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_nocgo.go
similarity index 83%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_nocgo.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_nocgo.go
index cc6a76d2f..bc3c0ed3b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_aix_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_aix_nocgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix && !cgo
-// +build aix,!cgo
package mem
@@ -8,11 +8,11 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
- vmem, swap, err := callSVMon(ctx)
+ vmem, swap, err := callSVMon(ctx, true)
if err != nil {
return nil, err
}
@@ -25,7 +25,7 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
}
func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
- _, swap, err := callSVMon(ctx)
+ _, swap, err := callSVMon(ctx, false)
if err != nil {
return nil, err
}
@@ -35,7 +35,7 @@ func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
return swap, nil
}
-func callSVMon(ctx context.Context) (*VirtualMemoryStat, *SwapMemoryStat, error) {
+func callSVMon(ctx context.Context, virt bool) (*VirtualMemoryStat, *SwapMemoryStat, error) {
out, err := invoke.CommandWithContext(ctx, "svmon", "-G")
if err != nil {
return nil, nil, err
@@ -45,7 +45,7 @@ func callSVMon(ctx context.Context) (*VirtualMemoryStat, *SwapMemoryStat, error)
vmem := &VirtualMemoryStat{}
swap := &SwapMemoryStat{}
for _, line := range strings.Split(string(out), "\n") {
- if strings.HasPrefix(line, "memory") {
+ if virt && strings.HasPrefix(line, "memory") {
p := strings.Fields(line)
if len(p) > 2 {
if t, err := strconv.ParseUint(p[1], 10, 64); err == nil {
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_bsd.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_bsd.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_bsd.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_bsd.go
index ef867d742..4f3e57c03 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_bsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_bsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd || openbsd || netbsd
-// +build freebsd openbsd netbsd
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin.go
index a05a0faba..a33c5f125 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package mem
@@ -10,7 +10,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func getHwMemsize() (uint64, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_cgo.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_cgo.go
index e5da7dcdb..cc6657d04 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && cgo
-// +build darwin,cgo
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_nocgo.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_nocgo.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_nocgo.go
index c93931680..097a93e63 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_darwin_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_darwin_nocgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && !cgo
-// +build darwin,!cgo
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_fallback.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_fallback.go
similarity index 86%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_fallback.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_fallback.go
index 697fd8709..ba882c8be 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_fallback.go
@@ -1,12 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build !darwin && !linux && !freebsd && !openbsd && !solaris && !windows && !plan9 && !aix && !netbsd
-// +build !darwin,!linux,!freebsd,!openbsd,!solaris,!windows,!plan9,!aix,!netbsd
package mem
import (
"context"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_freebsd.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_freebsd.go
index 9a56785b3..d9cae7116 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_freebsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd
-// +build freebsd
package mem
@@ -8,7 +8,7 @@ import (
"errors"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_linux.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_linux.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_linux.go
index 214a91e47..05bfdaf4e 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_linux.go
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package mem
import (
"bufio"
"context"
- "encoding/json"
"fmt"
"io"
"math"
@@ -16,22 +15,9 @@ import (
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
-type VirtualMemoryExStat struct {
- ActiveFile uint64 `json:"activefile"`
- InactiveFile uint64 `json:"inactivefile"`
- ActiveAnon uint64 `json:"activeanon"`
- InactiveAnon uint64 `json:"inactiveanon"`
- Unevictable uint64 `json:"unevictable"`
-}
-
-func (v VirtualMemoryExStat) String() string {
- s, _ := json.Marshal(v)
- return string(s)
-}
-
func VirtualMemory() (*VirtualMemoryStat, error) {
return VirtualMemoryWithContext(context.Background())
}
@@ -44,19 +30,7 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
return vm, nil
}
-func VirtualMemoryEx() (*VirtualMemoryExStat, error) {
- return VirtualMemoryExWithContext(context.Background())
-}
-
-func VirtualMemoryExWithContext(ctx context.Context) (*VirtualMemoryExStat, error) {
- _, vmEx, err := fillFromMeminfoWithContext(ctx)
- if err != nil {
- return nil, err
- }
- return vmEx, nil
-}
-
-func fillFromMeminfoWithContext(ctx context.Context) (*VirtualMemoryStat, *VirtualMemoryExStat, error) {
+func fillFromMeminfoWithContext(ctx context.Context) (*VirtualMemoryStat, *ExVirtualMemory, error) {
filename := common.HostProcWithContext(ctx, "meminfo")
lines, _ := common.ReadLines(filename)
@@ -67,7 +41,7 @@ func fillFromMeminfoWithContext(ctx context.Context) (*VirtualMemoryStat, *Virtu
sReclaimable := false // "Sreclaimable:" not available: 2.6.19 / Nov 2006
ret := &VirtualMemoryStat{}
- retEx := &VirtualMemoryExStat{}
+ retEx := &ExVirtualMemory{}
for _, line := range lines {
fields := strings.Split(line, ":")
@@ -409,7 +383,7 @@ func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) {
// calculateAvailVmem is a fallback under kernel 3.14 where /proc/meminfo does not provide
// "MemAvailable:" column. It reimplements an algorithm from the link below
// https://github.com/giampaolo/psutil/pull/890
-func calculateAvailVmem(ctx context.Context, ret *VirtualMemoryStat, retEx *VirtualMemoryExStat) uint64 {
+func calculateAvailVmem(ctx context.Context, ret *VirtualMemoryStat, retEx *ExVirtualMemory) uint64 {
var watermarkLow uint64
fn := common.HostProcWithContext(ctx, "zoneinfo")
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_netbsd.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_netbsd.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_netbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_netbsd.go
index d1f54ecaf..0a41b3e34 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_netbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_netbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build netbsd
-// +build netbsd
package mem
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd.go
index e37d5abe0..2510bb0d3 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package mem
@@ -10,7 +10,7 @@ import (
"errors"
"fmt"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/unix"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_386.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_386.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_386.go
index de2b26ca4..552e93f4a 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_386.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && 386
-// +build openbsd,386
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs mem/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_amd64.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_amd64.go
index d187abf01..73e5b72aa 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm.go
index 2488f1851..57b5861de 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm
-// +build openbsd,arm
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs mem/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm64.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm64.go
index 3661b16fb..f39a6456b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm64
-// +build openbsd,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs mem/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_riscv64.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_riscv64.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_riscv64.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_riscv64.go
index 7a7b48038..f9f838f54 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_openbsd_riscv64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_openbsd_riscv64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && riscv64
-// +build openbsd,riscv64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs mem/types_openbsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_plan9.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_plan9.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_plan9.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_plan9.go
index b5259f844..c17a102ee 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_plan9.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_plan9.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build plan9
-// +build plan9
package mem
@@ -8,7 +8,7 @@ import (
"os"
stats "github.com/lufia/plan9stats"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func SwapMemory() (*SwapMemoryStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_solaris.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_solaris.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_solaris.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_solaris.go
index c911267e1..06d0d9a00 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_solaris.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build solaris
-// +build solaris
package mem
@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"github.com/tklauser/go-sysconf"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/mem/mem_windows.go b/vendor/github.com/shirou/gopsutil/v4/mem/mem_windows.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/mem/mem_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/mem/mem_windows.go
index 8c7fb1a13..4666cbd01 100644
--- a/vendor/github.com/shirou/gopsutil/v3/mem/mem_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/mem_windows.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package mem
@@ -9,7 +9,7 @@ import (
"syscall"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/windows"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net.go b/vendor/github.com/shirou/gopsutil/v4/net/net.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net.go
index 0f3a62f39..3890eda53 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package net
import (
@@ -5,7 +6,7 @@ import (
"encoding/json"
"net"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
var invoke common.Invoker = common.Invoke{}
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_aix.go b/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_aix.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
index 81feaa8d7..df59abecb 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_aix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix
-// +build aix
package net
@@ -11,7 +11,7 @@ import (
"strings"
"syscall"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func IOCounters(pernic bool) ([]IOCountersStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_aix_cgo.go b/vendor/github.com/shirou/gopsutil/v4/net/net_aix_cgo.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_aix_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_aix_cgo.go
index 8c34f881c..a45a5b75c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_aix_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_aix_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix && cgo
-// +build aix,cgo
package net
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_aix_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/net/net_aix_nocgo.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_aix_nocgo.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_aix_nocgo.go
index e3fce9021..f63a21e73 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_aix_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_aix_nocgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build aix && !cgo
-// +build aix,!cgo
package net
@@ -9,7 +9,7 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func parseNetstatI(output string) ([]IOCountersStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_darwin.go b/vendor/github.com/shirou/gopsutil/v4/net/net_darwin.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_darwin.go
index 8a7b63744..f86b7bf9e 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package net
@@ -12,7 +12,7 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
var (
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_fallback.go b/vendor/github.com/shirou/gopsutil/v4/net/net_fallback.go
similarity index 96%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_fallback.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_fallback.go
index e136be1ba..e62deeeed 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_fallback.go
@@ -1,12 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build !aix && !darwin && !linux && !freebsd && !openbsd && !windows && !solaris
-// +build !aix,!darwin,!linux,!freebsd,!openbsd,!windows,!solaris
package net
import (
"context"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func IOCounters(pernic bool) ([]IOCountersStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/net/net_freebsd.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_freebsd.go
index bf8baf094..155a49c40 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_freebsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd
-// +build freebsd
package net
@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func IOCounters(pernic bool) ([]IOCountersStat, error) {
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_linux.go b/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
index 20ca5470a..a46f1b9dc 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package net
@@ -16,7 +16,7 @@ import (
"strings"
"syscall"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
const ( // Conntrack Column numbers
@@ -552,7 +552,7 @@ func getProcInodes(root string, pid int32, max int) (map[string][]inodeMap, erro
return ret, err
}
defer f.Close()
- dirEntries, err := readDir(f, max)
+ dirEntries, err := f.ReadDir(max)
if err != nil {
return ret, err
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
index 25bbe49ca..b6c31dd35 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package net
@@ -12,13 +12,14 @@ import (
"strings"
"syscall"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
var portMatch = regexp.MustCompile(`(.*)\.(\d+)$`)
func ParseNetstat(output string, mode string,
- iocs map[string]IOCountersStat) error {
+ iocs map[string]IOCountersStat,
+) error {
lines := strings.Split(output, "\n")
exists := make([]string, 0, len(lines)-1)
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_solaris.go b/vendor/github.com/shirou/gopsutil/v4/net/net_solaris.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_solaris.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_solaris.go
index 79d8ac30e..b886066e8 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_solaris.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build solaris
-// +build solaris
package net
@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
// NetIOCounters returnes network I/O statistics for every network
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_unix.go b/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_unix.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
index cb846e28a..71fc3b972 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_unix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd || darwin
-// +build freebsd darwin
package net
@@ -11,7 +11,7 @@ import (
"strings"
"syscall"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
// Return a list of network connections opened.
diff --git a/vendor/github.com/shirou/gopsutil/v3/net/net_windows.go b/vendor/github.com/shirou/gopsutil/v4/net/net_windows.go
similarity index 99%
rename from vendor/github.com/shirou/gopsutil/v3/net/net_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/net/net_windows.go
index 5d384342f..12f62cda0 100644
--- a/vendor/github.com/shirou/gopsutil/v3/net/net_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_windows.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package net
@@ -11,7 +11,7 @@ import (
"syscall"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/windows"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process.go b/vendor/github.com/shirou/gopsutil/v4/process/process.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/process/process.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process.go
index 1bb27abf8..ba2766252 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package process
import (
@@ -9,10 +10,10 @@ import (
"sync"
"time"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/mem"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/mem"
+ "github.com/shirou/gopsutil/v4/net"
)
var (
@@ -29,9 +30,9 @@ type Process struct {
parent int32
parentMutex sync.RWMutex // for windows ppid cache
numCtxSwitches *NumCtxSwitchesStat
- uids []int32
- gids []int32
- groups []int32
+ uids []uint32
+ gids []uint32
+ groups []uint32
numThreads int32
memInfo *MemoryInfoStat
sigInfo *SignalInfoStat
@@ -102,10 +103,18 @@ type RlimitStat struct {
}
type IOCountersStat struct {
- ReadCount uint64 `json:"readCount"`
+ // ReadCount is a number of read I/O operations such as syscalls.
+ ReadCount uint64 `json:"readCount"`
+ // WriteCount is a number of read I/O operations such as syscalls.
WriteCount uint64 `json:"writeCount"`
- ReadBytes uint64 `json:"readBytes"`
+ // ReadBytes is a number of all I/O read in bytes. This includes disk I/O on Linux and Windows.
+ ReadBytes uint64 `json:"readBytes"`
+ // WriteBytes is a number of all I/O write in bytes. This includes disk I/O on Linux and Windows.
WriteBytes uint64 `json:"writeBytes"`
+ // DiskReadBytes is a number of disk I/O write in bytes. Currently only Linux has this value.
+ DiskReadBytes uint64 `json:"diskReadBytes"`
+ // DiskWriteBytes is a number of disk I/O read in bytes. Currently only Linux has this value.
+ DiskWriteBytes uint64 `json:"diskWriteBytes"`
}
type NumCtxSwitchesStat struct {
@@ -368,7 +377,7 @@ func (p *Process) CPUPercentWithContext(ctx context.Context) (float64, error) {
}
// Groups returns all group IDs(include supplementary groups) of the process as a slice of the int
-func (p *Process) Groups() ([]int32, error) {
+func (p *Process) Groups() ([]uint32, error) {
return p.GroupsWithContext(context.Background())
}
@@ -433,12 +442,12 @@ func (p *Process) Foreground() (bool, error) {
}
// Uids returns user ids of the process as a slice of the int
-func (p *Process) Uids() ([]int32, error) {
+func (p *Process) Uids() ([]uint32, error) {
return p.UidsWithContext(context.Background())
}
// Gids returns group ids of the process as a slice of the int
-func (p *Process) Gids() ([]int32, error) {
+func (p *Process) Gids() ([]uint32, error) {
return p.GidsWithContext(context.Background())
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_bsd.go b/vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go
similarity index 94%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_bsd.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go
index 263829ffa..dcc056101 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_bsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_bsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin || freebsd || openbsd
-// +build darwin freebsd openbsd
package process
@@ -8,8 +8,8 @@ import (
"context"
"encoding/binary"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
type MemoryInfoExStat struct{}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_darwin.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
index 176661cbd..5231007c3 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin
-// +build darwin
package process
@@ -13,8 +13,8 @@ import (
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
)
// copied from sys/sysctl.h
@@ -117,31 +117,31 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return strings.IndexByte(string(out), '+') != -1, nil
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
// See: http://unix.superglobalmegacorp.com/Net2/newsrc/sys/ucred.h.html
- userEffectiveUID := int32(k.Eproc.Ucred.Uid)
+ userEffectiveUID := uint32(k.Eproc.Ucred.Uid)
- return []int32{userEffectiveUID}, nil
+ return []uint32{userEffectiveUID}, nil
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- gids := make([]int32, 0, 3)
- gids = append(gids, int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Pcred.P_rgid), int32(k.Eproc.Pcred.P_svgid))
+ gids := make([]uint32, 0, 3)
+ gids = append(gids, uint32(k.Eproc.Pcred.P_rgid), uint32(k.Eproc.Pcred.P_rgid), uint32(k.Eproc.Pcred.P_svgid))
return gids, nil
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
// k, err := p.getKProc()
// if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_amd64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_amd64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_darwin_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_darwin_amd64.go
index b353e5eac..a13522473 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_darwin.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_arm64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_arm64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_darwin_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_darwin_arm64.go
index cbd6bdc79..f1f3df365 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && arm64
-// +build darwin,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs process/types_darwin.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_cgo.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_cgo.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_darwin_cgo.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_darwin_cgo.go
index 858f08e7a..bbdfc963e 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_cgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_cgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && cgo
-// +build darwin,cgo
package process
@@ -20,7 +20,7 @@ import (
"syscall"
"unsafe"
- "github.com/shirou/gopsutil/v3/cpu"
+ "github.com/shirou/gopsutil/v4/cpu"
)
var (
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_nocgo.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_nocgo.go
similarity index 92%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_darwin_nocgo.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_darwin_nocgo.go
index bc1d357df..129bb6098 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_darwin_nocgo.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin_nocgo.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build darwin && !cgo
-// +build darwin,!cgo
package process
@@ -9,8 +9,8 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
func (p *Process) CwdWithContext(ctx context.Context) (string, error) {
@@ -24,14 +24,21 @@ func (p *Process) ExeWithContext(ctx context.Context) (string, error) {
}
txtFound := 0
lines := strings.Split(string(out), "\n")
+ fallback := ""
for i := 1; i < len(lines); i++ {
if lines[i] == "ftxt" {
txtFound++
+ if txtFound == 1 {
+ fallback = lines[i-1][1:]
+ }
if txtFound == 2 {
return lines[i-1][1:], nil
}
}
}
+ if fallback != "" {
+ return fallback, nil
+ }
return "", fmt.Errorf("missing txt data returned by lsof")
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_fallback.go b/vendor/github.com/shirou/gopsutil/v4/process/process_fallback.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_fallback.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_fallback.go
index 1a5d0c4b4..23793e92c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_fallback.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_fallback.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build !darwin && !linux && !freebsd && !openbsd && !windows && !solaris && !plan9
-// +build !darwin,!linux,!freebsd,!openbsd,!windows,!solaris,!plan9
package process
@@ -7,9 +7,9 @@ import (
"context"
"syscall"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
)
type Signal = syscall.Signal
@@ -82,15 +82,15 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return false, common.ErrNotImplementedError
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go
similarity index 90%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go
index 40b10e14f..3d21183d6 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd
-// +build freebsd
package process
@@ -10,9 +10,9 @@ import (
"strconv"
"strings"
- cpu "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- net "github.com/shirou/gopsutil/v3/net"
+ cpu "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ net "github.com/shirou/gopsutil/v4/net"
"golang.org/x/sys/unix"
)
@@ -157,40 +157,40 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return strings.IndexByte(string(out), '+') != -1, nil
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- uids := make([]int32, 0, 3)
+ uids := make([]uint32, 0, 3)
- uids = append(uids, int32(k.Ruid), int32(k.Uid), int32(k.Svuid))
+ uids = append(uids, uint32(k.Ruid), uint32(k.Uid), uint32(k.Svuid))
return uids, nil
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- gids := make([]int32, 0, 3)
- gids = append(gids, int32(k.Rgid), int32(k.Ngroups), int32(k.Svgid))
+ gids := make([]uint32, 0, 3)
+ gids = append(gids, uint32(k.Rgid), uint32(k.Ngroups), uint32(k.Svgid))
return gids, nil
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- groups := make([]int32, k.Ngroups)
+ groups := make([]uint32, k.Ngroups)
for i := int16(0); i < k.Ngroups; i++ {
- groups[i] = int32(k.Groups[i])
+ groups[i] = uint32(k.Groups[i])
}
return groups, nil
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_386.go b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_386.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_386.go
index 08ab333b4..279ba9fbb 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_386.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_amd64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_amd64.go
index 560e627d2..f3b70ec1b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm.go
index 81ae0b9a8..75ed30630 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_freebsd.go
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm64.go
index 73ac08201..3dc301c02 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_freebsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_freebsd_arm64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build freebsd && arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_linux.go b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_linux.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
index 557435b34..8f1d6c89c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux
-// +build linux
package process
@@ -18,9 +18,9 @@ import (
"github.com/tklauser/go-sysconf"
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
)
var pageSize = uint64(os.Getpagesize())
@@ -148,26 +148,26 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return pgid == tpgid, nil
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
err := p.fillFromStatusWithContext(ctx)
if err != nil {
- return []int32{}, err
+ return []uint32{}, err
}
return p.uids, nil
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
err := p.fillFromStatusWithContext(ctx)
if err != nil {
- return []int32{}, err
+ return []uint32{}, err
}
return p.gids, nil
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
err := p.fillFromStatusWithContext(ctx)
if err != nil {
- return []int32{}, err
+ return []uint32{}, err
}
return p.groups, nil
}
@@ -727,8 +727,12 @@ func (p *Process) fillFromIOWithContext(ctx context.Context) (*IOCountersStat, e
case "syscw":
ret.WriteCount = t
case "read_bytes":
- ret.ReadBytes = t
+ ret.DiskReadBytes = t
case "write_bytes":
+ ret.DiskWriteBytes = t
+ case "rchar":
+ ret.ReadBytes = t
+ case "wchar":
ret.WriteBytes = t
}
}
@@ -866,32 +870,32 @@ func (p *Process) fillFromStatusWithContext(ctx context.Context) error {
}
p.tgid = int32(pval)
case "Uid":
- p.uids = make([]int32, 0, 4)
+ p.uids = make([]uint32, 0, 4)
for _, i := range strings.Split(value, "\t") {
v, err := strconv.ParseInt(i, 10, 32)
if err != nil {
return err
}
- p.uids = append(p.uids, int32(v))
+ p.uids = append(p.uids, uint32(v))
}
case "Gid":
- p.gids = make([]int32, 0, 4)
+ p.gids = make([]uint32, 0, 4)
for _, i := range strings.Split(value, "\t") {
v, err := strconv.ParseInt(i, 10, 32)
if err != nil {
return err
}
- p.gids = append(p.gids, int32(v))
+ p.gids = append(p.gids, uint32(v))
}
case "Groups":
groups := strings.Fields(value)
- p.groups = make([]int32, 0, len(groups))
+ p.groups = make([]uint32, 0, len(groups))
for _, i := range groups {
- v, err := strconv.ParseInt(i, 10, 32)
+ v, err := strconv.ParseUint(i, 10, 32)
if err != nil {
return err
}
- p.groups = append(p.groups, int32(v))
+ p.groups = append(p.groups, uint32(v))
}
case "Threads":
v, err := strconv.ParseInt(value, 10, 32)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
similarity index 90%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
index a58c5eb11..7f85facb5 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd
-// +build openbsd
package process
@@ -14,10 +14,10 @@ import (
"strings"
"unsafe"
- cpu "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- mem "github.com/shirou/gopsutil/v3/mem"
- net "github.com/shirou/gopsutil/v3/net"
+ cpu "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ mem "github.com/shirou/gopsutil/v4/mem"
+ net "github.com/shirou/gopsutil/v4/net"
"golang.org/x/sys/unix"
)
@@ -68,7 +68,12 @@ func (p *Process) NameWithContext(ctx context.Context) (string, error) {
}
func (p *Process) CwdWithContext(ctx context.Context) (string, error) {
- return "", common.ErrNotImplementedError
+ mib := []int32{CTLKern, KernProcCwd, p.Pid}
+ buf, _, err := common.CallSyscall(mib)
+ if err != nil {
+ return "", err
+ }
+ return common.ByteToString(buf), nil
}
func (p *Process) ExeWithContext(ctx context.Context) (string, error) {
@@ -171,40 +176,40 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return strings.IndexByte(string(out), '+') != -1, nil
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- uids := make([]int32, 0, 3)
+ uids := make([]uint32, 0, 3)
- uids = append(uids, int32(k.Ruid), int32(k.Uid), int32(k.Svuid))
+ uids = append(uids, uint32(k.Ruid), uint32(k.Uid), uint32(k.Svuid))
return uids, nil
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- gids := make([]int32, 0, 3)
- gids = append(gids, int32(k.Rgid), int32(k.Ngroups), int32(k.Svgid))
+ gids := make([]uint32, 0, 3)
+ gids = append(gids, uint32(k.Rgid), uint32(k.Ngroups), uint32(k.Svgid))
return gids, nil
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
k, err := p.getKProc()
if err != nil {
return nil, err
}
- groups := make([]int32, k.Ngroups)
+ groups := make([]uint32, k.Ngroups)
for i := int16(0); i < k.Ngroups; i++ {
- groups[i] = int32(k.Groups[i])
+ groups[i] = uint32(k.Groups[i])
}
return groups, nil
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_386.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_386.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_386.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_386.go
index f4ed02491..5b84706a7 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_386.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_386.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && 386
-// +build openbsd,386
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs process/types_openbsd.go
@@ -14,6 +14,7 @@ const (
KernProcProc = 8
KernProcPathname = 12
KernProcArgs = 55
+ KernProcCwd = 78
KernProcArgv = 1
KernProcEnv = 3
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_amd64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_amd64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_amd64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_amd64.go
index 8607422b5..3229bb32c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_amd64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_amd64.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs types_openbsd.go
@@ -11,6 +12,7 @@ const (
KernProcProc = 8
KernProcPathname = 12
KernProcArgs = 55
+ KernProcCwd = 78
KernProcArgv = 1
KernProcEnv = 3
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm.go
index b94429f2e..6f74ce756 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm
-// +build openbsd,arm
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs process/types_openbsd.go
@@ -14,6 +14,7 @@ const (
KernProcProc = 8
KernProcPathname = 12
KernProcArgs = 55
+ KernProcCwd = 78
KernProcArgv = 1
KernProcEnv = 3
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm64.go
index a3291b8ca..910454562 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_arm64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_arm64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && arm64
-// +build openbsd,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs process/types_openbsd.go
@@ -14,6 +14,7 @@ const (
KernProcProc = 8
KernProcPathname = 12
KernProcArgs = 55
+ KernProcCwd = 78
KernProcArgv = 1
KernProcEnv = 3
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_riscv64.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_riscv64.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_riscv64.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_riscv64.go
index 076f095ea..e3e0d36a0 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_openbsd_riscv64.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd_riscv64.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build openbsd && riscv64
-// +build openbsd,riscv64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs process/types_openbsd.go
@@ -14,6 +14,7 @@ const (
KernProcProc = 8
KernProcPathname = 12
KernProcArgs = 55
+ KernProcCwd = 78
KernProcArgv = 1
KernProcEnv = 3
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_plan9.go b/vendor/github.com/shirou/gopsutil/v4/process/process_plan9.go
similarity index 93%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_plan9.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_plan9.go
index bc4bc062a..726758cae 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_plan9.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_plan9.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build plan9
-// +build plan9
package process
@@ -7,9 +7,9 @@ import (
"context"
"syscall"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
)
type Signal = syscall.Note
@@ -82,15 +82,15 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return false, common.ErrNotImplementedError
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_posix.go b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_posix.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
index a01f9ecfc..caa9d3f7c 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_posix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build linux || freebsd || openbsd || darwin || solaris
-// +build linux freebsd openbsd darwin solaris
package process
@@ -16,7 +16,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
)
type Signal = syscall.Signal
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_solaris.go b/vendor/github.com/shirou/gopsutil/v4/process/process_solaris.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_solaris.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_solaris.go
index dd4bd4760..04f86f16b 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_solaris.go
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
package process
import (
@@ -7,9 +8,9 @@ import (
"strconv"
"strings"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
)
type MemoryMapsStat struct {
@@ -95,15 +96,15 @@ func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
return false, common.ErrNotImplementedError
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_windows.go b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
similarity index 98%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_windows.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
index f2053d985..f3111649a 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build windows
-// +build windows
package process
@@ -18,9 +18,9 @@ import (
"unicode/utf16"
"unsafe"
- "github.com/shirou/gopsutil/v3/cpu"
- "github.com/shirou/gopsutil/v3/internal/common"
- "github.com/shirou/gopsutil/v3/net"
+ "github.com/shirou/gopsutil/v4/cpu"
+ "github.com/shirou/gopsutil/v4/internal/common"
+ "github.com/shirou/gopsutil/v4/net"
"golang.org/x/sys/windows"
)
@@ -466,15 +466,15 @@ func (p *Process) UsernameWithContext(ctx context.Context) (string, error) {
return domain + "\\" + user, err
}
-func (p *Process) UidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) UidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GidsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GidsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
-func (p *Process) GroupsWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) GroupsWithContext(ctx context.Context) ([]uint32, error) {
return nil, common.ErrNotImplementedError
}
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_windows_32bit.go b/vendor/github.com/shirou/gopsutil/v4/process/process_windows_32bit.go
similarity index 97%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_windows_32bit.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_windows_32bit.go
index db4d45334..2b231c79d 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_windows_32bit.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_windows_32bit.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build (windows && 386) || (windows && arm)
-// +build windows,386 windows,arm
package process
@@ -8,7 +8,7 @@ import (
"syscall"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/windows"
)
diff --git a/vendor/github.com/shirou/gopsutil/v3/process/process_windows_64bit.go b/vendor/github.com/shirou/gopsutil/v4/process/process_windows_64bit.go
similarity index 95%
rename from vendor/github.com/shirou/gopsutil/v3/process/process_windows_64bit.go
rename to vendor/github.com/shirou/gopsutil/v4/process/process_windows_64bit.go
index 74c6212cf..befe52139 100644
--- a/vendor/github.com/shirou/gopsutil/v3/process/process_windows_64bit.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_windows_64bit.go
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
//go:build (windows && amd64) || (windows && arm64)
-// +build windows,amd64 windows,arm64
package process
@@ -7,7 +7,7 @@ import (
"syscall"
"unsafe"
- "github.com/shirou/gopsutil/v3/internal/common"
+ "github.com/shirou/gopsutil/v4/internal/common"
"golang.org/x/sys/windows"
)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4da1a6e72..33b27a221 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -21,7 +21,7 @@ github.com/inconshreveable/mousetrap
# github.com/josharian/intern v1.0.0
## explicit; go 1.5
github.com/josharian/intern
-# github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74
+# github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae
## explicit; go 1.16
github.com/lufia/plan9stats
# github.com/mailru/easyjson v0.7.7
@@ -50,15 +50,15 @@ github.com/rs/zerolog
github.com/rs/zerolog/internal/cbor
github.com/rs/zerolog/internal/json
github.com/rs/zerolog/log
-# github.com/shirou/gopsutil/v3 v3.24.4
-## explicit; go 1.15
-github.com/shirou/gopsutil/v3/common
-github.com/shirou/gopsutil/v3/cpu
-github.com/shirou/gopsutil/v3/host
-github.com/shirou/gopsutil/v3/internal/common
-github.com/shirou/gopsutil/v3/mem
-github.com/shirou/gopsutil/v3/net
-github.com/shirou/gopsutil/v3/process
+# github.com/shirou/gopsutil/v4 v4.24.5
+## explicit; go 1.18
+github.com/shirou/gopsutil/v4/common
+github.com/shirou/gopsutil/v4/cpu
+github.com/shirou/gopsutil/v4/host
+github.com/shirou/gopsutil/v4/internal/common
+github.com/shirou/gopsutil/v4/mem
+github.com/shirou/gopsutil/v4/net
+github.com/shirou/gopsutil/v4/process
# github.com/shoenig/go-m1cpu v0.1.6
## explicit; go 1.20
github.com/shoenig/go-m1cpu
@@ -68,6 +68,8 @@ github.com/spf13/cobra
# github.com/spf13/pflag v1.0.5
## explicit; go 1.12
github.com/spf13/pflag
+# github.com/stretchr/objx v0.5.2
+## explicit; go 1.20
# github.com/tidwall/gjson v1.17.1
## explicit; go 1.12
github.com/tidwall/gjson
@@ -89,9 +91,7 @@ github.com/yusufpapurcu/wmi
# github.com/zekroTJA/timedmap v1.5.2
## explicit; go 1.13
github.com/zekroTJA/timedmap
-# github.com/zekroTJA/timedmap/v2 v2.0.0
-## explicit; go 1.19
-# golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d
+# golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc
## explicit; go 1.20
golang.org/x/exp/maps
# golang.org/x/sys v0.20.0