Skip to content

MON-4625: add support for the nvmesubsystem collector #2960

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
simonpasquier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MON-4625: add support for the nvmesubsystem collector #2960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions config/v1alpha1/types_cluster_monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,13 @@ type NodeExporterCollectorConfig struct {
// which is subject to change over time. The current default is enabled.
// +optional
DeviceMapperMultipath NodeExporterCollectorDeviceMapperMultipathConfig `json:"deviceMapperMultipath,omitzero"`
// nvmExpressSubsystem configures the nvmesubsystem collector, which
// collects statistics about NVM Express (NVMe) subsystem devices.
// nvmExpressSubsystem is optional.
// When omitted, this means no opinion and the platform is left to choose a reasonable default,
// which is subject to change over time. The current default is enabled.
// +optional
NVMExpressSubsystem NodeExporterCollectorNVMExpressSubsystemConfig `json:"nvmExpressSubsystem,omitzero"`
}

// NodeExporterCollectorCpufreqConfig provides configuration for the cpufreq collector
Expand Down Expand Up @@ -710,6 +717,20 @@ type NodeExporterCollectorDeviceMapperMultipathConfig struct {
CollectionPolicy NodeExporterCollectorCollectionPolicy `json:"collectionPolicy,omitempty"`
}

// NodeExporterCollectorNVMExpressSubsystemConfig provides configuration for
// the nvmesubsystem collector of the node-exporter agent. The nvmesubsystem
// collector collects statistics about NVM Express (NVMe) subsystem devices.
// It is enabled by default.
type NodeExporterCollectorNVMExpressSubsystemConfig struct {
// collectionPolicy declares whether the nvmesubsystem collector collects metrics.
// This field is required.
// Valid values are "Collect" and "DoNotCollect".
// When set to "Collect", the nvmesubsystem collector is active and NVMe subsystem statistics are collected.
// When set to "DoNotCollect", the nvmesubsystem collector is inactive and the corresponding metrics become unavailable.
// +required
CollectionPolicy NodeExporterCollectorCollectionPolicy `json:"collectionPolicy,omitempty"`
}

// MonitoringPluginConfig provides configuration options for the monitoring plugin
// that runs as a dynamic plugin of the OpenShift web console.
// The monitoring plugin provides the monitoring UI in the OpenShift web console
Expand Down
22 changes: 22 additions & 0 deletions ...1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2326,6 +2326,28 @@ spec:
required:
- collectionPolicy
type: object
nvmExpressSubsystem:
description: |-
nvmExpressSubsystem configures the nvmesubsystem collector, which
collects statistics about NVM Express (NVMe) subsystem devices.
nvmExpressSubsystem is optional.
When omitted, this means no opinion and the platform is left to choose a reasonable default,
which is subject to change over time. The current default is enabled.
properties:
collectionPolicy:
description: |-
collectionPolicy declares whether the nvmesubsystem collector collects metrics.
This field is required.
Valid values are "Collect" and "DoNotCollect".
When set to "Collect", the nvmesubsystem collector is active and NVMe subsystem statistics are collected.
When set to "DoNotCollect", the nvmesubsystem collector is inactive and the corresponding metrics become unavailable.
enum:
- Collect
- DoNotCollect
type: string
required:
- collectionPolicy
type: object
processes:
description: |-
processes configures the processes collector, which collects statistics from processes and
Expand Down
17 changes: 17 additions & 0 deletions config/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions ...regated-crd-manifests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2326,6 +2326,28 @@ spec:
required:
- collectionPolicy
type: object
nvmExpressSubsystem:
description: |-
nvmExpressSubsystem configures the nvmesubsystem collector, which
collects statistics about NVM Express (NVMe) subsystem devices.
nvmExpressSubsystem is optional.
When omitted, this means no opinion and the platform is left to choose a reasonable default,
which is subject to change over time. The current default is enabled.
properties:
collectionPolicy:
description: |-
collectionPolicy declares whether the nvmesubsystem collector collects metrics.
This field is required.
Valid values are "Collect" and "DoNotCollect".
When set to "Collect", the nvmesubsystem collector is active and NVMe subsystem statistics are collected.
When set to "DoNotCollect", the nvmesubsystem collector is inactive and the corresponding metrics become unavailable.
enum:
- Collect
- DoNotCollect
type: string
required:
- collectionPolicy
type: object
processes:
description: |-
processes configures the processes collector, which collects statistics from processes and
Expand Down
5 changes: 5 additions & 0 deletions config/v1alpha1/zz_generated.model_name.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions config/v1alpha1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 31 additions & 1 deletion openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13778,6 +13778,11 @@
"default": {},
"$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.NodeExporterCollectorNetDevConfig"
},
"nvmExpressSubsystem": {
"description": "nvmExpressSubsystem configures the nvmesubsystem collector, which collects statistics about NVM Express (NVMe) subsystem devices. nvmExpressSubsystem is optional. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is enabled.",
"default": {},
"$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.NodeExporterCollectorNVMExpressSubsystemConfig"
},
"processes": {
"description": "processes configures the processes collector, which collects statistics from processes and threads running in the system. processes is optional. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is disabled. Enable for process/thread-level insight; can be expensive on busy nodes.",
"default": {},
Expand Down Expand Up @@ -13885,6 +13890,23 @@
}
}
},
"com.github.openshift.api.config.v1alpha1.NodeExporterCollectorNVMExpressSubsystemConfig": {
"description": "NodeExporterCollectorNVMExpressSubsystemConfig provides configuration for the nvmesubsystem collector of the node-exporter agent. The nvmesubsystem collector collects statistics about NVM Express (NVMe) subsystem devices. It is enabled by default.",
"type": "object",
"required": [
"collectionPolicy"
],
"properties": {
"collectionPolicy": {
"description": "collectionPolicy declares whether the nvmesubsystem collector collects metrics. This field is required. Valid values are \"Collect\" and \"DoNotCollect\". When set to \"Collect\", the nvmesubsystem collector is active and NVMe subsystem statistics are collected. When set to \"DoNotCollect\", the nvmesubsystem collector is inactive and the corresponding metrics become unavailable.\n\nPossible enum values:\n - `\"Collect\"` means the collector is active and will produce metrics.\n - `\"DoNotCollect\"` means the collector is inactive and will not produce metrics.",
"type": "string",
"enum": [
"Collect",
"DoNotCollect"
]
}
}
},
"com.github.openshift.api.config.v1alpha1.NodeExporterCollectorNetClassCollectConfig": {
"description": "NodeExporterCollectorNetClassCollectConfig holds configuration options for the netclass collector when it is actively collecting metrics. At least one field must be specified.",
"type": "object",
Expand Down
Loading