Merge pull request #1332 from mickem/linux_parity_take_2

feature: More Linux parity

Author: mickem

docs/docs/reference/check/CheckNet.md

@@ -34,15 +34,17 @@ PythonScript = enabled
 
 
 
-| Key                           | Default Value | Description  |
-|-------------------------------|---------------|--------------|
-| [python cache](#python-cache) |               | Python cache |
+| Key                           | Default Value    | Description  |
+|-------------------------------|------------------|--------------|
+| [python cache](#python-cache) |                  | Python cache |
+| [python lib](#python-lib)     | libpython3.12.so | Python lib   |
 
 
 
 ```ini
 # 
 [/settings/python]
+python lib=libpython3.12.so
 
 ```
 
@@ -75,6 +77,31 @@ python cache=
 ```
 
 
+
+#### Python lib <a id="/settings/python/python lib"></a>
+
+The python DLL to load
+
+
+
+
+
+| Key            | Description                           |
+|----------------|---------------------------------------|
+| Path:          | [/settings/python](#/settings/python) |
+| Key:           | python lib                            |
+| Default value: | `libpython3.12.so`                    |
+
+
+**Sample:**
+
+```
+[/settings/python]
+# Python lib
+python lib=libpython3.12.so
+```
+
+
 ### Python scripts <a id="/settings/python/scripts"></a>
 
 A list of scripts available to run from the PythonScript module.

docs/docs/reference/generic/PythonScript.md

@@ -23,27 +23,31 @@ CollectdClient = enabled
 | Path / Section                                                  | Description               |
 |-----------------------------------------------------------------|---------------------------|
 | [/settings/collectd/client](#collectd-client-section)           | COLLECTD CLIENT SECTION   |
+| [/settings/collectd/client/metrics](#metric-mappings)           | METRIC MAPPINGS           |
 | [/settings/collectd/client/targets](#remote-target-definitions) | REMOTE TARGET DEFINITIONS |
+| [/settings/collectd/client/variables](#variable-definitions)    | VARIABLE DEFINITIONS      |
 
 
 
 ### COLLECTD CLIENT SECTION <a id="/settings/collectd/client"></a>
 
-Section for NSCA passive check module.
+Section for the collectd client; forwards NSClient++ metrics to a collectd server.
 
 
 
 
-| Key                   | Default Value | Description |
-|-----------------------|---------------|-------------|
-| [hostname](#hostname) | auto          | HOSTNAME    |
+| Key                           | Default Value | Description      |
+|-------------------------------|---------------|------------------|
+| [hostname](#hostname)         | auto          | HOSTNAME         |
+| [interval](#metrics-interval) | 10            | METRICS INTERVAL |
 
 
 
 ```ini
-# Section for NSCA passive check module.
+# Section for the collectd client; forwards NSClient++ metrics to a collectd server.
 [/settings/collectd/client]
 hostname=auto
+interval=10
 
 ```
 
@@ -53,13 +57,12 @@ hostname=auto
 
 #### HOSTNAME <a id="/settings/collectd/client/hostname"></a>
 
-The host name of the monitored computer.
-Set this to auto (default) to use the windows name of the computer.
+The host name reported to collectd.
+Set this to auto (default) to use the name of this computer.
 
 auto	Hostname
 ${host}	Hostname
-${host_lc}
-Hostname in lowercase
+${host_lc}	Hostname in lowercase
 ${host_uc}	Hostname in uppercase
 ${domain}	Domainname
 ${domain_lc}	Domainname in lowercase
@@ -86,6 +89,50 @@ hostname=auto
 ```
 
 
+
+#### METRICS INTERVAL <a id="/settings/collectd/client/interval"></a>
+
+The interval (in seconds) reported to collectd. Should match the core 'metrics interval' so collectd computes rates correctly.
+
+
+
+
+
+| Key            | Description                                             |
+|----------------|---------------------------------------------------------|
+| Path:          | [/settings/collectd/client](#/settings/collectd/client) |
+| Key:           | interval                                                |
+| Default value: | `10`                                                    |
+
+
+**Sample:**
+
+```
+[/settings/collectd/client]
+# METRICS INTERVAL
+interval=10
+```
+
+
+### METRIC MAPPINGS <a id="/settings/collectd/client/metrics"></a>
+
+Mapping of collectd keys (e.g. cpu-total/cpu-user) to value expressions (e.g. derive:system.cpu.total.user). When empty a built-in default set is used.
+
+
+
+
+
+
+
+```ini
+# Mapping of collectd keys (e.g. cpu-total/cpu-user) to value expressions (e.g. derive:system.cpu.total.user). When empty a built-in default set is used.
+[/settings/collectd/client/metrics]
+
+```
+
+
+
+
 ### REMOTE TARGET DEFINITIONS <a id="/settings/collectd/client/targets"></a>
 
 
@@ -97,13 +144,14 @@ This is a section of objects. This means that you will create objects below this
 **Keys:**
 
 
-| Key     | Default Value | Description    |
-|---------|---------------|----------------|
-| address |               | TARGET ADDRESS |
-| host    |               | TARGET HOST    |
-| port    |               | TARGET PORT    |
-| retries | 3             | RETRIES        |
-| timeout | 30            | TIMEOUT        |
+| Key      | Default Value | Description      |
+|----------|---------------|------------------|
+| address  |               | TARGET ADDRESS   |
+| host     |               | TARGET HOST      |
+| interval |               | METRICS INTERVAL |
+| port     |               | TARGET PORT      |
+| retries  | 3             | RETRIES          |
+| timeout  | 30            | TIMEOUT          |
 
 
 **Sample:**
@@ -113,6 +161,7 @@ This is a section of objects. This means that you will create objects below this
 [/settings/collectd/client/targets/sample]
 #address=...
 #host=...
+#interval=...
 #port=...
 retries=3
 timeout=30
@@ -124,3 +173,22 @@ timeout=30
 
 
 
+### VARIABLE DEFINITIONS <a id="/settings/collectd/client/variables"></a>
+
+Variables used to expand ${...} placeholders in metric keys. Each value is a regular expression matched against metric names; the captured groups become the variable's values. When empty a built-in default set is used.
+
+
+
+
+
+
+
+```ini
+# Variables used to expand ${...} placeholders in metric keys. Each value is a regular expression matched against metric names; the captured groups become the variable's values. When empty a built-in default set is used.
+[/settings/collectd/client/variables]
+
+```
+
+
+
+