The branch, master has been updated
via cdb9fa71db3 source3/wscript: Remove extra config
WITH_PROMETHEUS_EXPORTER
via b543aa99e24 source3/wscript: Configure prometheus exporter only
with profiling
via 4c946acb40d docs-xml: only generate prometheus manpage when
configured
from ea4dcbdc26b smbd: Simplify synthetic_smb_fname_split()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cdb9fa71db37b45c83a4ff576dc684cb6685e131
Author: Anoop C S <[email protected]>
Date: Thu May 8 13:20:08 2025 +0530
source3/wscript: Remove extra config WITH_PROMETHEUS_EXPORTER
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Anoop C S <[email protected]>
Autobuild-Date(master): Fri May 9 12:04:16 UTC 2025 on atb-devel-224
commit b543aa99e24588d8a442cc9be6ab8b81ded7cbd9
Author: Anoop C S <[email protected]>
Date: Thu May 8 13:08:13 2025 +0530
source3/wscript: Configure prometheus exporter only with profiling
Prometheus endpoint is only built when profiling is enabled during
configure step. Therefore bail out early if this is not the case.
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit 4c946acb40d616cacbee02bbdb195b629f7f5cd3
Author: Günther Deschner <[email protected]>
Date: Tue Apr 22 11:45:15 2025 +0200
docs-xml: only generate prometheus manpage when configured
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/wscript_build | 6 +++++-
script/autobuild.py | 5 +++--
source3/selftest/tests.py | 2 +-
source3/wscript | 4 +++-
4 files changed, 12 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 90f5d57ffc4..42833a964c0 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -48,7 +48,6 @@ manpages='''
manpages/smbstatus.1
manpages/smbtar.1
manpages/smbtree.1
- manpages/smb_prometheus_endpoint.8
manpages/testparm.1
manpages/traffic_learner.7
manpages/traffic_replay.7
@@ -68,6 +67,8 @@ krb5_localauth_manpages = 'manpages/winbind_krb5_localauth.8'
winexe_manpages = 'manpages/winexe.1'
+prometheus_manpages = 'manpages/smb_prometheus_endpoint.8'
+
vfs_module_manpages = ['vfs_acl_tdb',
'vfs_acl_xattr',
'vfs_aio_fork',
@@ -201,6 +202,9 @@ if ('XSLTPROC_MANPAGES' in bld.env and
bld.env['XSLTPROC_MANPAGES']):
if conf.env.build_winexe == True:
bld.SAMBAMANPAGES(winexe_manpages)
+ if bld.CONFIG_SET('HAVE_EVHTTP_NEW') and bld.CONFIG_SET('WITH_PROFILE'):
+ bld.SAMBAMANPAGES(prometheus_manpages)
+
if bld.CONFIG_SET('ENABLE_SELFTEST'):
bld.SAMBAMANPAGES('manpages/vfstest.1')
diff --git a/script/autobuild.py b/script/autobuild.py
index 0283ec6754b..85f2d324659 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -879,6 +879,7 @@ tasks = {
"./configure.developer ${PREFIX} "
"--with-selftest-prefix=./bin/ab "
"--with-cluster-support "
+ "--with-profiling-data "
"--with-prometheus-exporter "
"--bundled-libraries=!tdb"),
("samba-make", "make"),
@@ -1040,7 +1041,7 @@ tasks = {
"sequence": [
# build the fuzzers (static) via the oss-fuzz script
("fuzzers-mkdir-prefix", "mkdir -p ${PREFIX_DIR}"),
- ("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE=
SANITIZER=address CXX= CFLAGS= ADDITIONAL_LDFLAGS='-fuse-ld=bfd'
./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl-fuzzer
--with-prometheus-exporter"),
+ ("fuzzers-build", "OUT=${PREFIX_DIR} LIB_FUZZING_ENGINE=
SANITIZER=address CXX= CFLAGS= ADDITIONAL_LDFLAGS='-fuse-ld=bfd'
./lib/fuzzing/oss-fuzz/build_samba.sh --enable-afl-fuzzer --with-profiling-data
--with-prometheus-exporter"),
],
},
@@ -1119,7 +1120,7 @@ tasks = {
"sequence": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX}
--with-profiling-data --disable-python --without-ad-dc
--with-prometheus-exporter"),
+ ("configure", "./configure.developer " + samba_configure_params +
" --disable-python --without-ad-dc"),
("make", "make -j"),
("find-python", "script/find_python.sh ${PREFIX}"),
("test", "make test-nopython"),
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index bf7e699c912..ce176450a87 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -951,7 +951,7 @@ plantestsuite("samba3.blackbox.smbclient_old_dir",
"fileserver_smb1",
"script/tests/test_old_dirlisting.sh"),
timelimit, smbclient3])
-with_prometheus_exporter = ("WITH_PROMETHEUS_EXPORTER" in config_hash)
+with_prometheus_exporter = ("HAVE_EVHTTP_NEW" and "WITH_PROFILE" in
config_hash)
for env in ["fileserver:local"]:
plantestsuite("samba3.blackbox.net_usershare", env,
[os.path.join(samba3srcdir, "script/tests/test_net_usershare.sh"), '$SERVER',
'$SERVER_IP', '$USERNAME', '$PASSWORD', smbclient3])
diff --git a/source3/wscript b/source3/wscript
index dfd11ca3b44..9d7fc013041 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -208,10 +208,12 @@ long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
# check for libevent, needed for prometheus http endpoint
conf.SET_TARGET_TYPE('event', 'EMPTY')
if Options.options.with_prometheus_exporter is True:
+ if not Options.options.with_profiling_data:
+ conf.fatal("Building --with-prometheus-exporter also require "
+ "building --with-profiling-data.")
Logs.info("Checking for libevent existence")
if conf.CHECK_HEADERS('event2/http.h') and conf.CHECK_LIB('event',
shlib=True):
conf.CHECK_FUNCS_IN('evhttp_new', 'event')
- conf.DEFINE('WITH_PROMETHEUS_EXPORTER', 1)
if not conf.CONFIG_SET('HAVE_EVHTTP_NEW'):
conf.fatal("libevent support not found. "
"Try installing libevent-dev or libevent-devel. "
--
Samba Shared Repository
