On Wed, Mar 29, 2023 at 09:51:56AM +0200, Claudio Jeker wrote:
> In the metrics file the TA is currently reported as:
> rpki_client_repository_objects{type="cert",state="valid",name="ripe",carepo="ripe"}
> 1
>
> The carepo which is a rsync URI for other repositories is just the TAL
> name. Instead it may be better to display the first URI from the TAL,
> like:
>
> rpki_client_repository_objects{type="cert",state="valid",name="ripe",carepo="https://rpki.ripe.net/ta/ripe-ncc-ta.cer"}
> 1
>
> Other objects point to the base name of the repository:
> rpki_client_repository_objects{type="vrp",state="unique",name="ripe",carepo="rsync://rpki.ripe.net/repository",notify="https://rrdp.ripe.net/notification.xml"}
> 189062
>
> I think this adds a bit of consistency to the metrics output.
Isn't it a bit strange that repouri contains something that isn't a URI?
Feels like a trap.
Regardless, I agree with the intention of this diff so it's ok
> --
> :wq Claudio
>
> Index: repo.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/repo.c,v
> retrieving revision 1.41
> diff -u -p -r1.41 repo.c
> --- repo.c 28 Dec 2022 21:30:18 -0000 1.41
> +++ repo.c 29 Mar 2023 07:43:29 -0000
> @@ -1189,7 +1189,10 @@ void
> repo_fetch_uris(const struct repo *rp, const char **carepo,
> const char **notifyuri)
> {
> - *carepo = rp->repouri;
> + if (rp->ta)
> + *carepo = rp->ta->uri[0];
> + else
> + *carepo = rp->repouri;
> *notifyuri = rp->notifyuri;
> }
>
>
