[PATCH 1/3] MINOR: stats: duplicate 3 fields in bytes in info

2021-01-15 Thread William Dauchy
in order to prepare a possible merge of fields between haproxy stats and prometheus, duplicate 3 fields: INF_MEMMAX INF_POOL_ALLOC INF_POOL_USED Those were specifically named in MB unit which is not what prometheus recommends. We therefore used them but changed the unit while doing the

[PATCH 0/3] prometheus info fields description merge

2021-01-15 Thread William Dauchy
Hello Christopher, Here is a new small patch set which targets the merge of the info fields description. I choose to add new fields to be more coherent and facilitate the merging work. William Dauchy (3): MINOR: stats: duplicate 3 fields in bytes in info MINOR: stats: add new start time

[PATCH 3/3] MINOR: contrib/prometheus-exporter: merge info description from stats

2021-01-15 Thread William Dauchy
Now that units are coherent we can merge the info description from haproxy stats. Description were not always the same, but I guess we may eventually improve them in the future. Signed-off-by: William Dauchy --- .../prometheus-exporter/service-prometheus.c | 89 +++ 1 file

[PATCH 2/3] MINOR: stats: add new start time field

2021-01-15 Thread William Dauchy
Another patch in order to try to reconciliate haproxy stats and prometheus. Here I'm adding a proper start time field in order to make proper use of uptime field. That being done we can move the calculation in `fill_info` Signed-off-by: William Dauchy ---

[PATCH] BUILD/MINOR cpu counter available for affinity fix proposal for Mac

2021-01-15 Thread David CARLIER
Hi here a little patch proposal for the MacOS case. Regards. 0001-BUILD-MINOR-Fixes-the-number-of-possible-cpus-report.patch Description: Binary data

Re: [PR] proto_tcp.c: fix printing of muliple setsockopt errors

2021-01-15 Thread Willy Tarreau
Hi Björne, On Tue, Jan 12, 2021 at 08:40:44PM +0100, Björn Jacke wrote: > Hello, > > okay, the link to the MR patch landed on the list, so I assume I don't > need to attache it here again. Confusing, that the issues are tracked > there... The issues are not tracked here, it's only the code

Re: [PATCH] BUILD/MINOR cpu counter available for affinity fix proposal for Mac

2021-01-15 Thread Willy Tarreau
Hi David, On Fri, Jan 15, 2021 at 08:15:54AM +, David CARLIER wrote: > Hi here a little patch proposal for the MacOS case. Thanks for this one. I'm having a question. > From 93deb10319b713dfede80b4244bb01c65985794c Mon Sep 17 00:00:00 2001 > From: David CARLIER > Date: Fri, 15 Jan 2021

Re: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition

2021-01-15 Thread Willy Tarreau
Hi guys, On Thu, Jan 14, 2021 at 04:00:13PM +0100, William Dauchy wrote: > > Subject: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition > > > > It was introduced in 5a982a7 "MINOR: contrib/prometheus-exporter: ..." > > Lua function core.get_info() was broken, probably some other

Re: [PATCH] BUILD/MINOR cpu counter available for affinity fix proposal for Mac

2021-01-15 Thread David CARLIER
Oh well the number of threads is just 1 for Mac while having 8 cores in my M1, that's about it. I would say backporting to 2.1 should be enough if that possible. On Fri, 15 Jan 2021 at 10:20, Willy Tarreau wrote: > > Hi David, > > On Fri, Jan 15, 2021 at 08:15:54AM +, David CARLIER wrote: >

Re: [PATCH] BUILD/MINOR cpu counter available for affinity fix proposal for Mac

2021-01-15 Thread Willy Tarreau
On Fri, Jan 15, 2021 at 10:51:57AM +, David CARLIER wrote: > Oh well the number of threads is just 1 for Mac while having 8 cores > in my M1, that's about it. I would say backporting to 2.1 should be > enough if that possible. Thank you, I'll put that into your message then. Willy

Re: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition

2021-01-15 Thread William Dauchy
Hey Adis, I had a second look this morning. On Thu, Jan 14, 2021 at 03:41:29PM +0100, Adis Nezirovic wrote: > From 6823e172b71590d4c540bddaa36add217828644c Mon Sep 17 00:00:00 2001 > From: Adis Nezirovic > Date: Wed, 13 Jan 2021 19:02:33 +0100 > Subject: [PATCH] BUG/MEDIUM: stats: Add missing

Re: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition

2021-01-15 Thread William Dauchy
On Fri, Jan 15, 2021 at 11:21:58AM +0100, Willy Tarreau wrote: > So William, does this mean I should take it ? no for now I think it will be more coherent to avoid filling the value outside the prometheus case. (sorry I had a second look this morning, and realise I was not very clear in my

Re: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition

2021-01-15 Thread Willy Tarreau
On Fri, Jan 15, 2021 at 12:10:53PM +0100, William Dauchy wrote: > On Fri, Jan 15, 2021 at 11:21:58AM +0100, Willy Tarreau wrote: > > So William, does this mean I should take it ? > > no for now I think it will be more coherent to avoid filling the value > outside the prometheus case. But my

Re: [PATCH] BUG/MEDIUM: stats: Add missing INF_BUILD_INFO definition

2021-01-15 Thread William Dauchy
On Fri, Jan 15, 2021 at 12:22:16PM +0100, Willy Tarreau wrote: > But my understanding is that it's what's currently breaking Lua, and > who knows maybe other things. Stats were never designed to leave > uninitialized entries :-/ Can't we simply put the same version > string there using mkf_str()

[PATCH v2] BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition

2021-01-15 Thread William Dauchy
From: Adis Nezirovic commit 5a982a71656ce885be4b1d4b90b8db31204788a1 ("MINOR: contrib/prometheus-exporter: export build_info") is breaking lua `core.get_info()`. This patch makes sure build_info is correctly initialised in all cases. Reviewed-by: William Dauchy --- src/stats.c | 3 ++- 1

Re: [PATCH v2] BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition

2021-01-15 Thread Willy Tarreau
On Fri, Jan 15, 2021 at 01:12:33PM +0100, William Dauchy wrote: > From: Adis Nezirovic > > commit 5a982a71656ce885be4b1d4b90b8db31204788a1 ("MINOR: > contrib/prometheus-exporter: export build_info") is breaking lua > `core.get_info()`. > > This patch makes sure build_info is correctly

Re: [PATCH v2] BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition

2021-01-15 Thread Adis Nezirovic
On 1/15/21 5:01 PM, Willy Tarreau wrote: OK thanks. Adis, do you have the ability to recheck for your test case, or do you want me to pick it right now ? Thanks, Willy Sorry, I've missed that patch from William. That works for me, my Lua test case passes. (maybe I'll invest some time to

Re: Great content ideas for your blog

2021-01-15 Thread Stella Evans
Hello Haproxy Editorial Team, Did you receive our last email? I'd really like to hear what you think. Regards, Stella -Original Message- Haproxy Editorial Team, My name is Stella & I am reaching out from datadome.co. Today I came across your post "Bot Protection with

Re: [PATCH v2] BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition

2021-01-15 Thread William Dauchy
On Fri, Jan 15, 2021 at 5:58 PM Adis Nezirovic wrote: > (maybe I'll invest some time to contribute a few basic Lua tests, so > things get noted faster). could be nice, even a few basic ones indeed Thanks! -- William

Re: [PATCH v2] BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition

2021-01-15 Thread Willy Tarreau
On Fri, Jan 15, 2021 at 05:58:13PM +0100, Adis Nezirovic wrote: > On 1/15/21 5:01 PM, Willy Tarreau wrote: > > OK thanks. Adis, do you have the ability to recheck for your test case, > > or do you want me to pick it right now ? > > > > Thanks, > > Willy > > > Sorry, I've missed that patch from