From c21c3b0befeb46a51b6bf3758ffa30813bea0ff0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Mar 2024 14:19:22 +0100 Subject: Adding upstream version 1.44.3. Signed-off-by: Daniel Baumann --- collectors/xenstat.plugin/README.md | 2 +- .../xenstat.plugin/integrations/xen-xcp-ng.md | 175 -------------------- .../xenstat.plugin/integrations/xen_xcp-ng.md | 176 +++++++++++++++++++++ collectors/xenstat.plugin/metadata.yaml | 2 +- collectors/xenstat.plugin/xenstat_plugin.c | 12 +- 5 files changed, 180 insertions(+), 187 deletions(-) delete mode 100644 collectors/xenstat.plugin/integrations/xen-xcp-ng.md create mode 100644 collectors/xenstat.plugin/integrations/xen_xcp-ng.md (limited to 'collectors/xenstat.plugin') diff --git a/collectors/xenstat.plugin/README.md b/collectors/xenstat.plugin/README.md index 826e18e41..32fe4d213 120000 --- a/collectors/xenstat.plugin/README.md +++ b/collectors/xenstat.plugin/README.md @@ -1 +1 @@ -integrations/xen-xcp-ng.md \ No newline at end of file +integrations/xen_xcp-ng.md \ No newline at end of file diff --git a/collectors/xenstat.plugin/integrations/xen-xcp-ng.md b/collectors/xenstat.plugin/integrations/xen-xcp-ng.md deleted file mode 100644 index e4aea6fee..000000000 --- a/collectors/xenstat.plugin/integrations/xen-xcp-ng.md +++ /dev/null @@ -1,175 +0,0 @@ - - -# Xen/XCP-ng - - - - - -Plugin: xenstat.plugin -Module: xenstat.plugin - - - -## Overview - -This collector monitors XenServer and XCP-ng host and domains statistics. - - - -This collector is supported on all platforms. - -This collector supports collecting metrics from multiple instances of this integration, including remote instances. - -The plugin needs setuid. - -### Default Behavior - -#### Auto-Detection - -This plugin requires the `xen-dom0-libs-devel` and `yajl-devel` libraries to be installed. - -#### Limits - -The default configuration for this integration does not impose any limits on data collection. - -#### Performance Impact - -The default configuration for this integration is not expected to impose a significant performance impact on the system. - - -## Metrics - -Metrics grouped by *scope*. - -The scope defines the instance that the metric belongs to. An instance is uniquely identified by a set of labels. - - - -### Per Xen/XCP-ng instance - -These metrics refer to the entire monitored application. - -This scope has no labels. - -Metrics: - -| Metric | Dimensions | Unit | -|:------|:----------|:----| -| xenstat.mem | free, used | MiB | -| xenstat.domains | domains | domains | -| xenstat.cpus | cpus | cpus | -| xenstat.cpu_freq | frequency | MHz | - -### Per xendomain - -Metrics related to Xen domains. Each domain provides its own set of the following metrics. - -This scope has no labels. - -Metrics: - -| Metric | Dimensions | Unit | -|:------|:----------|:----| -| xendomain.states | running, blocked, paused, shutdown, crashed, dying | boolean | -| xendomain.cpu | used | percentage | -| xendomain.mem | maximum, current | MiB | -| xendomain.vcpu | a dimension per vcpu | percentage | - -### Per xendomain vbd - -Metrics related to Xen domain Virtual Block Device. Each VBD provides its own set of the following metrics. - -This scope has no labels. - -Metrics: - -| Metric | Dimensions | Unit | -|:------|:----------|:----| -| xendomain.oo_req_vbd | requests | requests/s | -| xendomain.requests_vbd | read, write | requests/s | -| xendomain.sectors_vbd | read, write | sectors/s | - -### Per xendomain network - -Metrics related to Xen domain network interfaces. Each network interface provides its own set of the following metrics. - -This scope has no labels. - -Metrics: - -| Metric | Dimensions | Unit | -|:------|:----------|:----| -| xendomain.bytes_network | received, sent | kilobits/s | -| xendomain.packets_network | received, sent | packets/s | -| xendomain.errors_network | received, sent | errors/s | -| xendomain.drops_network | received, sent | drops/s | - - - -## Alerts - -There are no alerts configured by default for this integration. - - -## Setup - -### Prerequisites - -#### Libraries - -1. Install `xen-dom0-libs-devel` and `yajl-devel` using the package manager of your system. - - Note: On Cent-OS systems you will need `centos-release-xen` repository and the required package for xen is `xen-devel` - -2. Re-install Netdata from source. The installer will detect that the required libraries are now available and will also build xenstat.plugin. - - - -### Configuration - -#### File - -The configuration file name for this integration is `netdata.conf`. -Configuration for this specific integration is located in the `[plugin:xenstat]` section within that file. - -The file format is a modified INI syntax. The general structure is: - -```ini -[section1] - option1 = some value - option2 = some other value - -[section2] - option3 = some third value -``` -You can edit the configuration file using the `edit-config` script from the -Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory). - -```bash -cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata -sudo ./edit-config netdata.conf -``` -#### Options - - - -
Config options - -| Name | Description | Default | Required | -|:----|:-----------|:-------|:--------:| -| update every | Data collection frequency. | 1 | False | - -
- -#### Examples -There are no configuration examples. - - diff --git a/collectors/xenstat.plugin/integrations/xen_xcp-ng.md b/collectors/xenstat.plugin/integrations/xen_xcp-ng.md new file mode 100644 index 000000000..17dc8d785 --- /dev/null +++ b/collectors/xenstat.plugin/integrations/xen_xcp-ng.md @@ -0,0 +1,176 @@ + + +# Xen XCP-ng + + + + + +Plugin: xenstat.plugin +Module: xenstat.plugin + + + +## Overview + +This collector monitors XenServer and XCP-ng host and domains statistics. + + + +This collector is supported on all platforms. + +This collector supports collecting metrics from multiple instances of this integration, including remote instances. + +The plugin needs setuid. + +### Default Behavior + +#### Auto-Detection + +This plugin requires the `xen-dom0-libs-devel` and `yajl-devel` libraries to be installed. + +#### Limits + +The default configuration for this integration does not impose any limits on data collection. + +#### Performance Impact + +The default configuration for this integration is not expected to impose a significant performance impact on the system. + + +## Metrics + +Metrics grouped by *scope*. + +The scope defines the instance that the metric belongs to. An instance is uniquely identified by a set of labels. + + + +### Per Xen XCP-ng instance + +These metrics refer to the entire monitored application. + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| xenstat.mem | free, used | MiB | +| xenstat.domains | domains | domains | +| xenstat.cpus | cpus | cpus | +| xenstat.cpu_freq | frequency | MHz | + +### Per xendomain + +Metrics related to Xen domains. Each domain provides its own set of the following metrics. + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| xendomain.states | running, blocked, paused, shutdown, crashed, dying | boolean | +| xendomain.cpu | used | percentage | +| xendomain.mem | maximum, current | MiB | +| xendomain.vcpu | a dimension per vcpu | percentage | + +### Per xendomain vbd + +Metrics related to Xen domain Virtual Block Device. Each VBD provides its own set of the following metrics. + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| xendomain.oo_req_vbd | requests | requests/s | +| xendomain.requests_vbd | read, write | requests/s | +| xendomain.sectors_vbd | read, write | sectors/s | + +### Per xendomain network + +Metrics related to Xen domain network interfaces. Each network interface provides its own set of the following metrics. + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| xendomain.bytes_network | received, sent | kilobits/s | +| xendomain.packets_network | received, sent | packets/s | +| xendomain.errors_network | received, sent | errors/s | +| xendomain.drops_network | received, sent | drops/s | + + + +## Alerts + +There are no alerts configured by default for this integration. + + +## Setup + +### Prerequisites + +#### Libraries + +1. Install `xen-dom0-libs-devel` and `yajl-devel` using the package manager of your system. + + Note: On Cent-OS systems you will need `centos-release-xen` repository and the required package for xen is `xen-devel` + +2. Re-install Netdata from source. The installer will detect that the required libraries are now available and will also build xenstat.plugin. + + + +### Configuration + +#### File + +The configuration file name for this integration is `netdata.conf`. +Configuration for this specific integration is located in the `[plugin:xenstat]` section within that file. + +The file format is a modified INI syntax. The general structure is: + +```ini +[section1] + option1 = some value + option2 = some other value + +[section2] + option3 = some third value +``` +You can edit the configuration file using the `edit-config` script from the +Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory). + +```bash +cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata +sudo ./edit-config netdata.conf +``` +#### Options + + + +
Config options + +| Name | Description | Default | Required | +|:----|:-----------|:-------|:--------:| +| update every | Data collection frequency. | 1 | no | + +
+ +#### Examples +There are no configuration examples. + + diff --git a/collectors/xenstat.plugin/metadata.yaml b/collectors/xenstat.plugin/metadata.yaml index 493183694..e5527dbb1 100644 --- a/collectors/xenstat.plugin/metadata.yaml +++ b/collectors/xenstat.plugin/metadata.yaml @@ -4,7 +4,7 @@ modules: plugin_name: xenstat.plugin module_name: xenstat.plugin monitored_instance: - name: Xen/XCP-ng + name: Xen XCP-ng link: "https://xenproject.org/" categories: - data-collection.containers-and-vms diff --git a/collectors/xenstat.plugin/xenstat_plugin.c b/collectors/xenstat.plugin/xenstat_plugin.c index c05d5e298..319396d43 100644 --- a/collectors/xenstat.plugin/xenstat_plugin.c +++ b/collectors/xenstat.plugin/xenstat_plugin.c @@ -920,22 +920,14 @@ static void xenstat_send_domain_metrics() { } int main(int argc, char **argv) { - stderror = stderr; clocks_init(); // ------------------------------------------------------------------------ // initialization of netdata plugin - program_name = "xenstat.plugin"; + program_name = PLUGIN_XENSTAT_NAME; - // disable syslog - error_log_syslog = 0; - - // set errors flood protection to 100 logs per hour - error_log_errors_per_period = 100; - error_log_throttle_period = 3600; - - log_set_global_severity_for_external_plugins(); + nd_log_initialize_for_external_plugins(PLUGIN_XENSTAT_NAME); // ------------------------------------------------------------------------ // parse command line parameters -- cgit v1.2.3