- allows custom tags to be added to prometheus metrics - Addresses GH issue #4021
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #4021
#### Description <!-- Describe your changes in detail --> This change adds a new parameter `xhttp_prom_tags`. It allows the user to append tags to the prometheus metrics. This makes those metrics a lot more useful when having multiple kamailio instances running on a single host.
This is done by 2 shared memory helper variables which contain the parameter in different formats. This way it is easy to print them out with minimal changes. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4073
-- Commit Summary --
* xhttp_prom: new xhttp_prom_tags paramete
-- File Changes --
M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (25) M src/modules/xhttp_prom/prom.c (30) M src/modules/xhttp_prom/xhttp_prom.c (50) M src/modules/xhttp_prom/xhttp_prom.h (15)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4073.patch https://github.com/kamailio/kamailio/pull/4073.diff
Hey @ChristianBergerSipgate,
The commit itself should be fixed with `clang-format --style=file -i [filename]` iirc the command or use the `pre-commit` python package to not let you push if it fails the `pre-commit` config and it fixes this for you.
The format check is per commit therefore, pushing a new commit with a format fix won't do it.
After fixing the format, rebase and fixup the changes into 1 commit and then force push, so it can pass the checks.
@ChristianBergerSipgate pushed 1 commit.
dee479370b9bea526f61fd5a856e378ad49e8897 xhttp_prom: new xhttp_prom_tags parameter
@vhernando any comments to this PR from your side?
There seems to be no more comments, merging it. Thanks again. There is one corner case where memory is not properly freed during startup errors (don't think it would cause issues) but I will fix it in another commit.
Merged #4073 into master.