Skip to content
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

Build HAProxy Package with buildin Prometheus exporter. Implement #10500 #861

Merged
merged 1 commit into from May 20, 2020

Conversation

vktg
Copy link
Contributor

@vktg vktg commented May 15, 2020

Redmine Issue: https://redmine.pfsense.org/issues/10500
Ready for review

However, PROMEX is not built by default with HAProxy. It is provided as an extra
component for everyone want to use it. So you need to explicitly build HAProxy
with the PROMEX service, using the Makefile variable "EXTRA_OBJS". For instance:
make TARGET=linux-glibc EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"

if HAProxy provides the PROMEX service, the following build option will be
reported by the command "haproxy -vv":

Built with the Prometheus exporter as a service

https://github.com/haproxy/haproxy/blob/master/contrib/prometheus-exporter/README

needs testing on 2.5 first

Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to me this should be added as a configurable option for the FreeBSD port and that should be submitted upstream to FreeBSD first.

@vktg
Copy link
Contributor Author

vktg commented May 16, 2020

Seems to me this should be added as a configurable option for the FreeBSD port and that should be submitted upstream to FreeBSD first.

it is already there

PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"

PR updated

Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is already an option for it, then this PR is unnecessary for this repo. See my note inline.

@@ -28,7 +28,7 @@ DPCRE_DESC= Link dynamically
SPCRE_DESC= Link statically
DEVICEATLAS_DESC= DeviceAtlas Device Detection support
PROMEX_DESC= Enable Prometheus exporter
OPTIONS_DEFAULT= SPCRE OPENSSL
OPTIONS_DEFAULT= SPCRE OPENSSL PROMEX
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change the default options. Add/change the relevant lines in the pfSense repository in https://github.com/pfsense/pfsense/blob/master/tools/conf/pfPorts/make.conf

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need to make sure this gets merged after the make.conf change in #4320

@netgate-git-updates netgate-git-updates merged commit 1d2f318 into pfsense:devel May 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants