-
Notifications
You must be signed in to change notification settings - Fork 565
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support for Prometheus exporter in HAProxy #12056
Closed
kgodara912
wants to merge
2
commits into
microsoft:fasttrack/3.0
from
kgodara912:kgodara/haproxy/haproxy_prometheus_support
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Summary: A fast, reliable HA, load balancing, and proxy solution. | ||
| Name: haproxy | ||
| Version: 2.9.11 | ||
| Release: 1%{?dist} | ||
| Release: 2%{?dist} | ||
| License: GPLv2+ | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Azure Linux | ||
|
|
@@ -33,7 +33,7 @@ Requires: %{name} = %{version}-%{release} | |
|
|
||
| %build | ||
| make %{?_smp_mflags} TARGET="linux-glibc" USE_PCRE2=1 USE_OPENSSL=1 \ | ||
| USE_GETADDRINFO=1 USE_ZLIB=1 USE_SYSTEMD=1 | ||
| USE_GETADDRINFO=1 USE_ZLIB=1 USE_SYSTEMD=1 USE_PROMEX=1 | ||
| make %{?_smp_mflags} -C admin/systemd | ||
| sed -i s/"local\/"/""/g admin/systemd/haproxy.service | ||
| sed -i "s/\/run/\/var\/run/g" admin/systemd/haproxy.service | ||
|
|
@@ -59,6 +59,9 @@ install -vDm644 examples/transparent_proxy.cfg %{buildroot}/%{_sysconfdir}/hapr | |
| %{_mandir}/* | ||
|
|
||
| %changelog | ||
| * Thu Jan 23 2025 Kshitiz Godara <[email protected]> - 2.9.11-2 | ||
| - Support for Prometheus exporter in HAProxy | ||
|
|
||
| * Wed Sep 25 2024 Archana Choudhary <[email protected]> - 2.9.11-1 | ||
| - Upgrade to 2.9.11 | ||
| - Fix CVE-2024-45506 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kgodara912 why did we drive this through fast-track? Please target feature change PRs to 3.0-dev.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @jslobodzian for the review, from the workitem comment, I felt that it is required for February release, which is within a week, so raised review for fast-track. I will check with Eric once if it is fine to go with 3.0-dev.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @jslobodzian, as per Eric, it is not that rare exception to be qualified for fast-track branch. I have raised another PR 12095 on 3.0-dev branch. Thanks for your suggestion.