From d1494e0f5f6dd1a4a58b0fd681fc539e44279033 Mon Sep 17 00:00:00 2001 From: Ilya Mashchenko Date: Mon, 22 Apr 2024 16:32:51 +0300 Subject: go.d nvidia_smi: use XML format by default (#17481) --- src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf | 2 +- .../go.d.plugin/modules/nvidia_smi/config_schema.json | 2 +- src/go/collectors/go.d.plugin/modules/nvidia_smi/metadata.yaml | 10 +++++----- src/go/collectors/go.d.plugin/modules/nvidia_smi/nvidia_smi.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf b/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf index e933dba462..e166d789a7 100644 --- a/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf +++ b/src/go/collectors/go.d.plugin/config/go.d/nvidia_smi.conf @@ -3,4 +3,4 @@ jobs: - name: nvidia_smi - use_csv_format: yes + use_csv_format: no diff --git a/src/go/collectors/go.d.plugin/modules/nvidia_smi/config_schema.json b/src/go/collectors/go.d.plugin/modules/nvidia_smi/config_schema.json index da9fb251a8..0f4bb5a693 100644 --- a/src/go/collectors/go.d.plugin/modules/nvidia_smi/config_schema.json +++ b/src/go/collectors/go.d.plugin/modules/nvidia_smi/config_schema.json @@ -28,7 +28,7 @@ "title": "Use CSV format", "description": "Determines the format used for requesting GPU information. If set, CSV format is used, otherwise XML.", "type": "boolean", - "default": true + "default": false } }, "required": [ diff --git a/src/go/collectors/go.d.plugin/modules/nvidia_smi/metadata.yaml b/src/go/collectors/go.d.plugin/modules/nvidia_smi/metadata.yaml index e18370bafd..630037d72b 100644 --- a/src/go/collectors/go.d.plugin/modules/nvidia_smi/metadata.yaml +++ b/src/go/collectors/go.d.plugin/modules/nvidia_smi/metadata.yaml @@ -75,10 +75,10 @@ modules: required: false - name: use_csv_format description: Used format when requesting GPU information. XML is used if set to 'no'. - default_value: true + default_value: false required: false details: | - This module supports data collection in CSV and XML formats. The default is CSV. + This module supports data collection in CSV and XML formats. The default is XML. - XML provides more metrics, but requesting GPU information consumes more CPU, especially if there are multiple GPUs in the system. - CSV provides fewer metrics, but is much lighter than XML in terms of CPU usage. @@ -87,12 +87,12 @@ modules: title: Config enabled: true list: - - name: XML format - description: Use XML format when requesting GPU information. + - name: CSV format + description: Use CSV format when requesting GPU information. config: | jobs: - name: nvidia_smi - use_csv_format: no + use_csv_format: yes - name: Custom binary path description: The executable is not in the directories specified in the PATH environment variable. config: | diff --git a/src/go/collectors/go.d.plugin/modules/nvidia_smi/nvidia_smi.go b/src/go/collectors/go.d.plugin/modules/nvidia_smi/nvidia_smi.go index fb1b4bbc95..c5cde49e5f 100644 --- a/src/go/collectors/go.d.plugin/modules/nvidia_smi/nvidia_smi.go +++ b/src/go/collectors/go.d.plugin/modules/nvidia_smi/nvidia_smi.go @@ -29,7 +29,7 @@ func New() *NvidiaSMI { return &NvidiaSMI{ Config: Config{ Timeout: web.Duration(time.Second * 10), - UseCSVFormat: true, + UseCSVFormat: false, }, binName: "nvidia-smi", charts: &module.Charts{}, -- cgit v1.2.3