From 386ccdd61e8256c8b21ee27ee2fc12438fc5ca98 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 17 Oct 2023 11:30:20 +0200 Subject: Adding upstream version 1.43.0. Signed-off-by: Daniel Baumann --- collectors/cups.plugin/README.md | 69 +------------- collectors/cups.plugin/cups_plugin.c | 2 + collectors/cups.plugin/integrations/cups.md | 140 ++++++++++++++++++++++++++++ collectors/cups.plugin/metadata.yaml | 2 +- 4 files changed, 144 insertions(+), 69 deletions(-) mode change 100644 => 120000 collectors/cups.plugin/README.md create mode 100644 collectors/cups.plugin/integrations/cups.md (limited to 'collectors/cups.plugin') diff --git a/collectors/cups.plugin/README.md b/collectors/cups.plugin/README.md deleted file mode 100644 index 8652ec575..000000000 --- a/collectors/cups.plugin/README.md +++ /dev/null @@ -1,68 +0,0 @@ - - -# Printers (cups.plugin) - -`cups.plugin` collects Common Unix Printing System (CUPS) metrics. - -## Prerequisites - -This plugin needs a running local CUPS daemon (`cupsd`). This plugin does not need any configuration. Supports cups since version 1.7. - -If you installed Netdata using our native packages, you will have to additionally install `netdata-plugin-cups` to use this plugin for data collection. It is not installed by default due to the large number of dependencies it requires. - -## Charts - -`cups.plugin` provides one common section `destinations` and one section per destination. - -> Destinations in CUPS represent individual printers or classes (collections or pools) of printers () - -The section `server` provides these charts: - -1. **destinations by state** - - - idle - - printing - - stopped - -2. **destinations by options** - - - total - - accepting jobs - - shared - -3. **total job number by status** - - - pending - - processing - - held - -4. **total job size by status** - - - pending - - processing - - held - -For each destination the plugin provides these charts: - -1. **job number by status** - - - pending - - held - - processing - -2. **job size by status** - - - pending - - held - - processing - -At the moment only job status pending, processing, and held are reported because we do not have a method to collect stopped, canceled, aborted and completed jobs which scales. - - diff --git a/collectors/cups.plugin/README.md b/collectors/cups.plugin/README.md new file mode 120000 index 000000000..e32570639 --- /dev/null +++ b/collectors/cups.plugin/README.md @@ -0,0 +1 @@ +integrations/cups.md \ No newline at end of file diff --git a/collectors/cups.plugin/cups_plugin.c b/collectors/cups.plugin/cups_plugin.c index ce7f05d4d..82bc457a1 100644 --- a/collectors/cups.plugin/cups_plugin.c +++ b/collectors/cups.plugin/cups_plugin.c @@ -241,6 +241,8 @@ int main(int argc, char **argv) { error_log_errors_per_period = 100; error_log_throttle_period = 3600; + log_set_global_severity_for_external_plugins(); + parse_command_line(argc, argv); errno = 0; diff --git a/collectors/cups.plugin/integrations/cups.md b/collectors/cups.plugin/integrations/cups.md new file mode 100644 index 000000000..aa981a99e --- /dev/null +++ b/collectors/cups.plugin/integrations/cups.md @@ -0,0 +1,140 @@ + + +# CUPS + + + + + +Plugin: cups.plugin +Module: cups.plugin + + + +## Overview + +Monitor CUPS performance for achieving optimal printing system operations. Monitor job statuses, queue lengths, and error rates to ensure smooth printing tasks. + +The plugin uses CUPS shared library to connect and monitor the server. + +This collector is supported on all platforms. + +This collector supports collecting metrics from multiple instances of this integration, including remote instances. + +The plugin needs to access the server. Netdata sets permissions during installation time to reach the server through its library. + +### Default Behavior + +#### Auto-Detection + +The plugin detects when CUPS server is running and tries to connect to it. + +#### 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 CUPS instance + + + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| cups.dests_state | idle, printing, stopped | dests | +| cups.dests_option | total, acceptingjobs, shared | dests | +| cups.job_num | pending, held, processing | jobs | +| cups.job_size | pending, held, processing | KB | + +### Per destination + + + +This scope has no labels. + +Metrics: + +| Metric | Dimensions | Unit | +|:------|:----------|:----| +| cups.destination_job_num | pending, held, processing | jobs | +| cups.destination_job_size | pending, held, processing | KB | + + + +## Alerts + +There are no alerts configured by default for this integration. + + +## Setup + +### Prerequisites + +#### Minimum setup + +The CUPS server must be installed and running. If you installed `netdata` using a package manager, it is also necessary to install the package `netdata-plugin-cups`. + + +### Configuration + +#### File + +The configuration file name for this integration is `netdata.conf`. +Configuration for this specific integration is located in the `[plugin:cups]` 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 | +| command options | Additional parameters for the collector | | False | + +
+ +#### Examples +There are no configuration examples. + + diff --git a/collectors/cups.plugin/metadata.yaml b/collectors/cups.plugin/metadata.yaml index a416d392e..9ec2f4118 100644 --- a/collectors/cups.plugin/metadata.yaml +++ b/collectors/cups.plugin/metadata.yaml @@ -37,7 +37,7 @@ modules: prerequisites: list: - title: Minimum setup - description: "The CUPS server must be installed and running." + description: "The CUPS server must be installed and running. If you installed `netdata` using a package manager, it is also necessary to install the package `netdata-plugin-cups`." configuration: file: name: "netdata.conf" -- cgit v1.2.3