Skip to content

Commit

Permalink
Merge pull request #25 from RIPE-NCC/update-readme-about-conflicts
Browse files Browse the repository at this point in the history
Describe how to suppress resource conflicts
  • Loading branch information
lolepezy authored Oct 2, 2024
2 parents 5c669cd + 166a909 commit 86e64a3
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ For `notify` operation you need to provide `base-url` to fetch previous conflict
Other application configuration that are not supplied via command line are provided in this [application.conf](https://github.com/RIPE-NCC/nro-delegated-stats/blob/main/src/main/resources/application.conf)
which by default is bundled, but can be overriden using `-Dconfig.file=<application.conf>`.


## Adding conflict exceptions

There are conflicts in certain resource attribution and these conflicts are mentioned in the `conflicts` generated
in the result directory for every date. Some of these conflicts are historically justified in some way or the other
and are pretty hard to get rid of administratively. If RS gives up on some of the conflicts, we have `allowedlist`
file to add them to. After adding resources to `allowedlist` they are not mentioned in the notification email sent
to RS on the daily basis. The easiest way of suppressing conflict notifications is to copy-paste the line (any of
the two conflicting lines) from `conflicts` to the `allowedlist` and rebuild the docker image by creating a new release.

## License

Copyright (c) 2019-2022 RIPE NCC All rights reserved.
Expand Down

0 comments on commit 86e64a3

Please sign in to comment.