diff --git a/sysutils/data-prepper/Makefile b/sysutils/data-prepper/Makefile index df02dac8ab31..54e58f6fc6f7 100644 --- a/sysutils/data-prepper/Makefile +++ b/sysutils/data-prepper/Makefile @@ -1,50 +1,51 @@ PORTNAME= data-prepper -DISTVERSION= 2.10.2 +DISTVERSION= 2.11.0 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= sysutils java -MASTER_SITES= https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/ +MASTER_SITES= https://artifacts.opensearch.org/${PORTNAME}/${DISTVERSION}/ DISTNAME= opensearch-${PORTNAME}-jdk-${DISTVERSIONFULL} MAINTAINER= opensearch@FreeBSD.org -COMMENT= A server-side data collector for OpenSearch +COMMENT= Server-side data collector for OpenSearch WWW= https://opensearch.org LICENSE= APACHE20 RUN_DEPENDS= bash>0:shells/bash USES= cpe shebangfix java JAVA_VERSION= 17+ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/data-prepper +NO_ARCH= yes NO_BUILD= yes -SUB_FILES= data-prepper +SUB_FILES= data-prepper pkg-message SUB_LIST= SEARCHUSER=${SEARCHUSER} SEARCHGROUP=${SEARCHGROUP} JAVA_HOME=${JAVA_HOME} BINS= data-prepper CONFIG_FILES= data-prepper-config.yaml log4j2-rolling.properties -SEARCHUSER?= opensearch -SEARCHGROUP?= ${SEARCHUSER} +SEARCHUSER= opensearch +SEARCHGROUP= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} .for f in ${CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/bin .for f in ${BINS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${DATADIR}/bin .endfor ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) ${MKDIR} ${STAGEDIR}${DATADIR}/lib ${MKDIR} ${STAGEDIR}${DATADIR}/pipelines (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "lib pipelines" ${STAGEDIR}${DATADIR}/) ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/config .include diff --git a/sysutils/data-prepper/distinfo b/sysutils/data-prepper/distinfo index a619f9653921..55b1d1d8a08b 100644 --- a/sysutils/data-prepper/distinfo +++ b/sysutils/data-prepper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739976294 -SHA256 (opensearch-data-prepper-jdk-2.10.2-linux-x64.tar.gz) = 332a5331bd5308fb30d8c542c055588df4232a0d3a263af41b59b9be7e31a1b0 -SIZE (opensearch-data-prepper-jdk-2.10.2-linux-x64.tar.gz) = 448867160 +TIMESTAMP = 1746624078 +SHA256 (opensearch-data-prepper-jdk-2.11.0-linux-x64.tar.gz) = c29c6100121448cb2dac2b4d1d3917bd2eb027d9b315a2001f49880020085673 +SIZE (opensearch-data-prepper-jdk-2.11.0-linux-x64.tar.gz) = 459840646 diff --git a/sysutils/data-prepper/files/data-prepper.in b/sysutils/data-prepper/files/data-prepper.in index a2bdcac5dbb1..fd2d995d61d0 100644 --- a/sysutils/data-prepper/files/data-prepper.in +++ b/sysutils/data-prepper/files/data-prepper.in @@ -1,54 +1,54 @@ #!/bin/sh # PROVIDE: data-prepper # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable opensearch: # # data_prepper_enable="YES" # # data_prepper_user (username): Set to opensearch by default. # Set it to required username. # data_prepper_group (group): Set to opensearch by default. # Set it to required group. # data_prepper_config (path): Set to %%PREFIX%%/etc/data-prepper/data-prepper.yaml by default. # Set it to the config file location. # data_prepper_java_home (path): Set to %%JAVA_HOME%% by default. # Set it to the root of the JDK to use. # . /etc/rc.subr name=data_prepper rcvar=data_prepper_enable load_rc_config ${name} : ${data_prepper_enable:=NO} : ${data_prepper_user:=%%SEARCHUSER%%} : ${data_prepper_group:=%%SEARCHGROUP%%} : ${data_prepper_config:=%%PREFIX%%/etc/data-prepper/data-prepper-config.yaml} : ${data_prepper_config_dir:=%%PREFIX%%/etc/data-prepper} : ${data_prepper_java_home:="%%JAVA_HOME%%"} -: ${data_prepper_home:="%%PREFIX%%/lib/data-prepper"} +: ${data_prepper_home:="%%DATADIR%%"} export JAVA_HOME=${data_prepper_java_home} required_files="${data_prepper_config}" pidfile=/var/run/${name}/${name}.pid procname=${data_prepper_home}/bin/data-prepper command="/usr/sbin/daemon" command_args="-P ${pidfile} -r -f ${procname}" start_precmd="data_prepper_precmd" data_prepper_precmd() { if [ ! -d /var/run/${name} ]; then install -d -o ${data_prepper_user} -g ${data_prepper_group} /var/run/${name} fi } run_rc_command "$1" diff --git a/sysutils/data-prepper/files/pkg-message.in b/sysutils/data-prepper/files/pkg-message.in new file mode 100644 index 000000000000..a7c370317d03 --- /dev/null +++ b/sysutils/data-prepper/files/pkg-message.in @@ -0,0 +1,10 @@ +[ +{ type: install + message: <