Skip to content

Commit 1e0b9fa

Browse files
authored
Change to monitoring.yaml (#595)
This harmonizes us with Serpent OS. We can now use some of their tooling and we can share monitoring.yaml files.
1 parent 322271c commit 1e0b9fa

5 files changed

+30
-21
lines changed

docs/packaging/monitoring.yml.md docs/packaging/monitoring.yaml.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
22
title: Monitoring YAML
3-
summary: The purpose and format of monitoring.yml
3+
summary: The purpose and format of monitoring.yaml
44
---
55

6-
# `monitoring.yml`
6+
# `monitoring.yaml`
77

88
:::important
99

10-
A `monitoring.yml` file is strongly suggested, but not yet required for Solus packages.
10+
A `monitoring.yaml` file is strongly suggested, but not yet required for Solus packages.
1111

1212
:::
1313

14-
A `monitoring.yml` file is included in the Packages repository directory for every Solus package to enable automatic scanning for new releases and security advisories.
14+
A `monitoring.yaml` file is included in the Packages repository directory for every Solus package to enable automatic scanning for new releases and security advisories.
1515

1616
Checking for new releases is done by mapping the Solus package to an [Anitya](https://github.com/fedora-infra/anitya) ID. _Anitya_ is a Red Hat project, part of [release-monitoring.org](https://release-monitoring.org/)
1717

1818
Checking for security advisories ([CVEs](https://en.wikipedia.org/wiki/Common_Vulnerabilities_and_Exposures)), is done by mapping the Solus package to a _Common Platform Enumeration Name_ ([CPE](https://nvd.nist.gov/products/cpe)) from the National Vulnerability Database.
1919

20-
## Adding monitoring.yml to an existing package
20+
## Adding monitoring.yaml to an existing package
2121

22-
To add a `monitoring.yml` file to an existing package you can use the following `go-task` command to add a template file, starting from within the directory containing the `package.yml` for a given package:
22+
To add a `monitoring.yaml` file to an existing package you can use the following `go-task` command to add a template file, starting from within the directory containing the `package.yml` for a given package:
2323

2424
```bash
2525
go-task add-monitoring
@@ -41,19 +41,19 @@ You must, at minimum, fill out `id` and check if the package has an RSS feed and
4141

4242
## systemd as an example
4343

44-
Let's look at the `monitoring.yml` file for `systemd` as an example.
44+
Let's look at the `monitoring.yaml` file for `systemd` as an example.
4545

4646
The `systemd` directory in the Packages repository looks like this:
4747

4848
```text
4949
systemd
50-
├── monitoring.yml
50+
├── monitoring.yaml
5151
├── package.yml
5252
├── pspec_x86_64.xml
5353
└── *lots of other files we can ignore*
5454
```
5555

56-
The `monitoring.yml` looks like this:
56+
The `monitoring.yaml` looks like this:
5757

5858
```yaml
5959
releases:

docs/packaging/packaging-changes.md

+16-7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ This page is meant to serve as a changelog of sorts for the Solus packaging envi
1111
- This list is not exhaustive
1212
- This list is in _reverse chronological order_ (newest first)
1313

14+
## 2025
15+
16+
### January
17+
18+
#### `monitoring.yml` changed to `monitoring.yaml`
19+
20+
- The file extension used by `monitoring.yml` was changed to `monitoring.yaml`
21+
- This allows us to use some Serpent OS tooling and share the `monitoring.yaml` files
22+
1423
## 2024
1524

1625
### December
@@ -19,12 +28,12 @@ This page is meant to serve as a changelog of sorts for the Solus packaging envi
1928

2029
- To use it, run `go-task updatecheck`
2130
- Makes use of the `ent` tool. See https://github.com/serpent-os/ent
22-
- Only checks packages with `monitoring.yml` files
31+
- Only checks packages with `monitoring.yaml` files
2332
- `ent` has been added to the packaging requirements in [Prepare for Packaging](docs/packaging/prepare-for-packaging.md)
2433

25-
#### Mandatory rss field in monitoring.yml
34+
#### Mandatory rss field in monitoring.yaml
2635

27-
- The `rss` field is now mandatory in monitoring.yml files. See the updated [monitoring.yml page](docs/packaging/monitoring.yml.md)
36+
- The `rss` field is now mandatory in monitoring.yaml files. See the updated [monitoring.yaml page](docs/packaging/monitoring.yaml.md)
2837

2938
### November
3039

@@ -43,9 +52,9 @@ This page is meant to serve as a changelog of sorts for the Solus packaging envi
4352

4453
### October
4554

46-
#### Add check for monitoring.yml
55+
#### Add check for monitoring.yaml
4756

48-
- Commits are now checked for `monitoring.yml` files and their inclusion is strongly recommended. See [monitoring.yml page](docs/packaging/monitoring.yml.md)
57+
- Commits are now checked for `monitoring.yaml` files and their inclusion is strongly recommended. See [monitoring.yaml page](docs/packaging/monitoring.yaml.md)
4958

5059
#### Add check for included static libraries
5160

@@ -94,9 +103,9 @@ This page is meant to serve as a changelog of sorts for the Solus packaging envi
94103

95104
### February
96105

97-
#### Begin adding `monitoring.yml` to packages
106+
#### Begin adding `monitoring.yaml` to packages
98107

99-
- A new per-package file was introduced: `monitoring.yml`. Used to monitor packages for releases and security advisories; see [monitoring.yml](docs/packaging/monitoring.yml.md).
108+
- A new per-package file was introduced: `monitoring.yaml`. Used to monitor packages for releases and security advisories; see [monitoring.yaml](docs/packaging/monitoring.yaml.md).
100109
- This is not enforced by automatic checks yet, but we may ask that it be added.
101110

102111
## 2023

docs/packaging/prepare-for-packaging.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ We need to install a few things in order to get started with packaging:
4040
- `solbuild` is a lightweight container environment for building packages repeatably
4141
- `solbuild-config-unstable` sets up solbuild for working with the `unstable` repository
4242
- `ypkg` is the program that actually builds packages
43-
- `yq` is used by the `go-task add-monitoring` command to create new [`monitoring.yml`](/docs/packaging/monitoring.yml.md) files
43+
- `yq` is used by the `go-task add-monitoring` command to create new [`monitoring.yaml`](/docs/packaging/monitoring.yaml.md) files
4444

4545
```bash
4646
sudo eopkg it ent git github-cli go-task jq solbuild solbuild-config-unstable ypkg yq
@@ -185,7 +185,7 @@ You should now have the following available from your shell:
185185

186186
| Function | Description | Usage |
187187
| ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
188-
| **cpesearch** | Search for CPE Names for packages. For use when writing the[`monitoring.yml`](/docs/packaging/monitoring.yml.md) file for a package | `cpesearch search-term` |
188+
| **cpesearch** | Search for CPE Names for packages. For use when writing the[`monitoring.yaml`](/docs/packaging/monitoring.yaml.md) file for a package | `cpesearch search-term` |
189189
| **goroot** | When in the Solus packages repository, change directory to the root directory. | `goroot` |
190190
| **gotopkg** | Change directory to any Solus package. You can type part of the package name then double press`Tab` to get autocompletion for this function. | `gotopkg firefox` |
191191
| **gotosoluspkgs** | Change directory to the Solus packages repository from anywhere on the filesystem. | `gotosoluspkgs` |

docs/packaging/submitting-a-pull-request.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ At minimum, your pull request will include changes for the following files:
2727
It may also include these files:
2828

2929
- `MAINTAINERS.md`
30-
- `monitoring.yml`
30+
- `monitoring.yaml`
3131

3232
Double check the `package.yml` to make sure the builddeps are in the right order, and that it otherwise adheres to the [standards](package.yml.md) Solus has set.
3333

docs/packaging/updating-an-existing-package.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ In the cases where you are not updating a package to a new version, but simply a
176176
- `package: Add homepage`
177177
- Fix a packaging issue (including adding a patch to fix the package)
178178
- `package: Fix (...)`
179-
- Updating a README, [monitoring.yml file](monitoring.yml.md) or other stuff that does not directly _change_ the package, meaning the package release number didn't need a bump:
180-
- `package: [NFC] Add README.md and monitoring.yml`
179+
- Updating a README, [monitoring.yaml file](monitoring.yaml.md) or other stuff that does not directly _change_ the package, meaning the package release number didn't need a bump:
180+
- `package: [NFC] Add README.md and monitoring.yaml`
181181

182182
As stated previously, `[NFC]` is an abbreviation of "No Functional Change".
183183

0 commit comments

Comments
 (0)