refactor(tools): rename check2basket to build-basket and remove-uuids to basket-remove-uuids

Two renames to bring the `tools/` directory onto a more consistent
naming scheme (four prefix groups: `run-*`, `build-*`, `update-*`,
`basket-*`):

- `check2basket` -> `build-basket`. Only one basket is built per
  invocation, so the singular form matches what the tool actually
  produces. The new name also groups it with `build-docs` as the
  two "generate an artifact from scratch" entries.
- `remove-uuids` -> `basket-remove-uuids`. The old name left the
  "what uuids?" question unanswered and did not cluster with the
  other `basket-*` helpers in `ls tools/`. The new name is
  explicit about the object it operates on and matches
  `basket-compare` / `basket-join`.

Also update the DESCRIPTION strings in both tools (the old
basket-remove-uuids docstring was a stale copy of basket-join's)
and update the user-facing references in CONTRIBUTING.md,
ICINGA.md and the CHANGELOG Unreleased section. Historical
CHANGELOG entries under earlier release headings are left alone
so the release notes still reflect the names in use at the time
of those releases.

Follow-up commits will modernise the test-runner, doc and basket
tools themselves (swap to `tools/_common.py`, drop the optional
colorama dependency, unify the argparse / module docstring /
version header).

Author: markuslf

CHANGELOG.md

@@ -76,7 +76,7 @@ Grafana:
 
 Icinga Director:
 
-* Service Templates: the "Notes URL" field now opens the rendered plugin page on <https://linuxfabrik.github.io/monitoring-plugins/> instead of the raw source listing on GitHub; regenerate your basket with `tools/check2basket --auto` to pick up the new URL
+* Service Templates: the "Notes URL" field now opens the rendered plugin page on <https://linuxfabrik.github.io/monitoring-plugins/> instead of the raw source listing on GitHub; regenerate your basket with `tools/build-basket --auto` to pick up the new URL
 
 
 Monitoring Plugins:
@@ -104,6 +104,11 @@ Monitoring Plugins:
 * updates: adapt to updated powershell.py library
 
 
+Tools:
+
+* rename `tools/check2basket` to `tools/build-basket` (one basket is built per run, so the singular name matches what the tool does) and `tools/remove-uuids` to `tools/basket-remove-uuids` (prefix-group consistency with `basket-compare` / `basket-join`). Update any scripts, wrappers or documentation that invoked the old names.
+
+
 ### Removed
 
 Monitoring Plugins:
@@ -126,9 +131,9 @@ Build, CI/CD:
 
 Tools:
 
-* check2basket: fix missing `importlib.machinery` and `importlib.util` imports
-* check2basket: strip argparse `%%` escaping in Icinga Director basket descriptions
-* check2basket: write `[]` as default value for `append` parameters with `default=None` in the Icinga Director basket
+* build-basket (formerly `check2basket`): fix missing `importlib.machinery` and `importlib.util` imports
+* build-basket (formerly `check2basket`): strip argparse `%%` escaping in Icinga Director basket descriptions
+* build-basket (formerly `check2basket`): write `[]` as default value for `append` parameters with `default=None` in the Icinga Director basket
 
 
 Grafana:

CONTRIBUTING.md

@@ -119,7 +119,7 @@ Checklist:
 * Optional: `unit-test/run` - the unittest file (see [Unit Tests](#unit-tests))
 * Optional: `requirements.txt`
 * If providing performance data: Grafana dashboard (see [GRAFANA](https://github.com/Linuxfabrik/monitoring-plugins/blob/main/GRAFANA.md)) and `.ini` file for the Icinga Web 2 Grafana Module
-* Icinga Director Basket Config for the check plugin (`check2basket`)
+* Icinga Director Basket Config for the check plugin (`build-basket`)
 * Icinga Service Set in `all-the-rest.json`
 * Optional: sudoers file (see [sudoers File](#sudoers-file))
 * Optional: A screenshot of the plugins' output from within Icinga, resized to 423x106, using background-color `#f5f9fa`, hosted on [download.linuxfabrik.ch](https://download.linuxfabrik.ch/monitoring-plugins/assets/screenshots/), and listed alphabetically in the projects [README](https://github.com/Linuxfabrik/monitoring-plugins/blob/main/README.md).
@@ -979,7 +979,7 @@ If the plugin requires `sudo`-permissions to run, please add the plugin to the `
 
 Each plugin should provide its required Director config in form of a Director basket. The basket usually contains at least one Command, one Service Template and some associated Datafields. The rest of the Icinga Director configuration (Host Templates, Service Sets, Notification Templates, Tag Lists, etc) can be placed in the `assets/icingaweb2-module-director/all-the-rest.json` file.
 
-The Icinga Director Basket for one or all plugins can be created using the `check2basket` tool.
+The Icinga Director Basket for one or all plugins can be created using the `build-basket` tool.
 
 > **Always review the basket before committing.**
 
@@ -989,7 +989,7 @@ The Icinga Director Basket for one or all plugins can be created using the `chec
 After writing a new check called `new-check`, generate a basket file using:
 
 ```bash
-./tools/check2basket --plugin-file check-plugins/new-check/new-check
+./tools/build-basket --plugin-file check-plugins/new-check/new-check
 ```
 
 The basket will be saved as `check-plugins/new-check/icingaweb2-module-director/new-check.json`. Inspect the basket, paying special attention to:
@@ -1004,7 +1004,7 @@ The basket will be saved as `check-plugins/new-check/icingaweb2-module-director/
 
 #### Fine-tune a Basket File
 
-**Never directly edit a basket JSON file.** If adjustments must be made to the basket, create a YML/YAML config file for `check2basket`.
+**Never directly edit a basket JSON file.** If adjustments must be made to the basket, create a YML/YAML config file for `build-basket`.
 
 For example, to set the timeout to 30s, to enable notifications and some other options, the config in `check-plugins/new-check/icingaweb2-module-director/new-check.yml` should look as follows:
 
@@ -1026,18 +1026,18 @@ overwrites:
   '["ServiceTemplate"]["tpl-service-new-check"]["vars"]["criticality"]': 'C'
 ```
 
-Then, re-run `check2basket` to apply the overwrites:
+Then, re-run `build-basket` to apply the overwrites:
 
 ```bash
-./tools/check2basket --plugin-file check-plugins/new-check/new-check
+./tools/build-basket --plugin-file check-plugins/new-check/new-check
 ```
 
-If a parameter was added, changed or deleted in the plugin, simply re-run the `check2basket` to update the basket file.
+If a parameter was added, changed or deleted in the plugin, simply re-run the `build-basket` to update the basket file.
 
 
 #### Basket File for different OS
 
-The `check2basket` tool also offers to generate so-called `variants` of the checks (different flavours of the check command call to run on different operating systems):
+The `build-basket` tool also offers to generate so-called `variants` of the checks (different flavours of the check command call to run on different operating systems):
 
 * `linux`: This is the default, and will be used if no other variant is defined. It generates a `cmd-check-...`, `tpl-service-...` and the associated datafields.
 * `windows`: Generates a `cmd-check-...-windows`, `cmd-check-...-windows-python`, `tpl-service-...-windows` and the associated datafields.
@@ -1058,10 +1058,10 @@ variants:
 
 #### Create Basket Files for all Check Plugins
 
-To run `check2basket` against all checks, for example due to a change in the `check2basket` script itself, use:
+To run `build-basket` against all checks, for example due to a change in the `build-basket` script itself, use:
 
 ```bash
-./tools/check2basket --auto
+./tools/build-basket --auto
 ```
 
 

ICINGA.md

@@ -60,7 +60,7 @@ Create the Icinga Director Basket JSON file:
 
 ```bash
 ./tools/basket-join
-./tools/remove-uuids \
+./tools/basket-remove-uuids \
     --input-file icingaweb2-module-director-basket.json \
     --output-file icingaweb2-module-director-basket-no-uuids.json
 ```

tools/remove-uuids tools/basket-remove-uuidstools/remove-uuids renamed to tools/basket-remove-uuids

@@ -20,9 +20,14 @@ except ImportError:
     colorama = False
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026040801'
-
-DESCRIPTION = 'A tool to join icingaweb2 director baskets (with or without uuids).'
+__version__ = '2026041301'
+
+DESCRIPTION = (
+    'Strip the `uuid` fields from an Icinga Director basket JSON so it can '
+    'be imported into a Director that uses the upstream schema. Linuxfabrik '
+    'uses a forked Director that keeps uuids; the upstream version does not, '
+    'and rejects imports that contain them.'
+)
 
 
 skip_plugins = [

tools/check2basket tools/build-baskettools/check2basket renamed to tools/build-basket

@@ -28,9 +28,15 @@ except ImportError:
     colorama = False
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2026041201'
-
-DESCRIPTION = 'A tool to generate Icinga Director baskets from a check plugin.'
+__version__ = '2026041301'
+
+DESCRIPTION = (
+    'Generate an Icinga Director basket JSON from a check plugin. Walks '
+    'the plugin`s argparse definition, turns each parameter into a Director '
+    'datafield, emits a command and service-template pair, and writes the '
+    'result into the plugin`s `icingaweb2-module-director/` subdirectory. '
+    'Use `--auto` to regenerate baskets for every plugin in the repo.'
+)
 
 DEFAULT_VARIANTS = [
     'linux',