diff --git a/sysutils/tempo/Makefile b/sysutils/tempo/Makefile index 04a175a7bd49..ad0e1190ceae 100644 --- a/sysutils/tempo/Makefile +++ b/sysutils/tempo/Makefile @@ -1,54 +1,57 @@ PORTNAME= tempo DISTVERSIONPREFIX= v -DISTVERSION= 2.7.2 -PORTREVISION= 13 +DISTVERSION= 2.10.5 CATEGORIES= sysutils MASTER_SITES+= https://raw.githubusercontent.com/${GH_ACCOUNT}/${PORTNAME}/${DISTVERSIONFULL}/ PKGNAMEPREFIX= grafana- DISTFILES= go.mod MAINTAINER= daniel@morante.net COMMENT= High volume, minimal dependency distributed tracing backend WWW= https://github.com/grafana/tempo LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:modules +USES= go:1.26,modules USE_GITHUB= yes GH_ACCOUNT= grafana GH_PROJECT= tempo USE_RC_SUBR= tempo GO_MODULE= github.com/${GH_ACCOUNT}/${GH_PROJECT} GO_TARGET= ./cmd/tempo ./cmd/tempo-query ./cmd/tempo-cli ./cmd/tempo-vulture GO_BUILDFLAGS= -v -ldflags "${LD_FLAG_STRING}" LD_FLAG_STRING= -s \ ${LD_FLAG_X_PREFIX}.Version=${DISTVERSION} \ ${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \ ${LD_FLAG_X_PREFIX}.Branch=HEAD \ ${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER} \ ${LD_FLAG_X_PREFIX}.BuildDate=$$(date -u +"%Y-%m-%dT%H:%M:%SZ") LD_FLAG_X_PREFIX= -X github.com/grafana/tempo/pkg/util/build BUILD_USER?= ${USER} -TEMPO_USER?= tempo -TEMPO_GROUP?= tempo +TEMPO_USER?= ${PORTNAME} +TEMPO_GROUP?= ${PORTNAME} TEMPO_DATADIR?= /var/db/${PORTNAME} SUB_LIST= TEMPO_USER=${TEMPO_USER} \ TEMPO_GROUP=${TEMPO_GROUP} \ TEMPO_DATADIR=${TEMPO_DATADIR} \ +.if ${TEMPO_USER} == ${PORTNAME} USERS= ${TEMPO_USER} +.endif +.if ${TEMPO_GROUP} == ${PORTNAME} GROUPS= ${TEMPO_GROUP} +.endif PLIST_SUB= ${SUB_LIST} post-install: @${CP} ${WRKSRC}/example/docker-compose/shared/tempo.yaml ${STAGEDIR}${PREFIX}/etc/tempo.yaml.sample @${MKDIR} ${STAGEDIR}${TEMPO_DATADIR} .include diff --git a/sysutils/tempo/distinfo b/sysutils/tempo/distinfo index 4ef316f4e658..27e4ae3967cd 100644 --- a/sysutils/tempo/distinfo +++ b/sysutils/tempo/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1749348766 -SHA256 (go/sysutils_tempo/grafana-tempo-v2.7.2_GH0/go.mod) = 36fa642b1297b2c703e2a2a68908ec554b9b745ccc1b4b89a8bfb72f22d79262 -SIZE (go/sysutils_tempo/grafana-tempo-v2.7.2_GH0/go.mod) = 20614 -SHA256 (go/sysutils_tempo/grafana-tempo-v2.7.2_GH0/grafana-tempo-v2.7.2_GH0.tar.gz) = 17c66d1d101a08166777ff35f7937a7ab50e1fa6bb07e7dfc0ac229f235700bf -SIZE (go/sysutils_tempo/grafana-tempo-v2.7.2_GH0/grafana-tempo-v2.7.2_GH0.tar.gz) = 28123040 +TIMESTAMP = 1779561193 +SHA256 (go/sysutils_tempo/grafana-tempo-v2.10.5_GH0/go.mod) = 052e16bd8cd1be8fec66456c51da087e70c057210f80fa2883fde16e825e0f84 +SIZE (go/sysutils_tempo/grafana-tempo-v2.10.5_GH0/go.mod) = 24032 +SHA256 (go/sysutils_tempo/grafana-tempo-v2.10.5_GH0/grafana-tempo-v2.10.5_GH0.tar.gz) = a861edd57b72aeae753d5110aa38de54078a42e71dd77c3112f2487b2a85b317 +SIZE (go/sysutils_tempo/grafana-tempo-v2.10.5_GH0/grafana-tempo-v2.10.5_GH0.tar.gz) = 28486326 diff --git a/sysutils/tempo/files/patch-example_docker-compose_shared_tempo.yaml b/sysutils/tempo/files/patch-example_docker-compose_shared_tempo.yaml index 599c59d5f87a..7b968f39b83d 100644 --- a/sysutils/tempo/files/patch-example_docker-compose_shared_tempo.yaml +++ b/sysutils/tempo/files/patch-example_docker-compose_shared_tempo.yaml @@ -1,30 +1,30 @@ ---- example/docker-compose/shared/tempo.yaml.orig 2024-10-22 18:23:02 UTC +--- example/docker-compose/shared/tempo.yaml.orig 2025-01-01 00:00:00 UTC +++ example/docker-compose/shared/tempo.yaml -@@ -36,22 +36,22 @@ metrics_generator: +@@ -33,20 +33,20 @@ metrics_generator: registry: external_labels: source: tempo - cluster: docker-compose + cluster: freebsd storage: - path: /var/tempo/generator/wal + path: /var/db/tempo/generator/wal remote_write: - url: http://prometheus:9090/api/v1/write send_exemplars: true traces_storage: - path: /var/tempo/generator/traces + path: /var/db/tempo/generator/traces storage: trace: - backend: local # backend configuration to use + backend: local # backend configuration to use wal: -- path: /var/tempo/wal # where to store the wal locally -+ path: /var/db/tempo/wal # where to store the wal locally +- path: /var/tempo/wal # where to store the wal locally ++ path: /var/db/tempo/wal # where to store the wal locally local: - path: /var/tempo/blocks + path: /var/db/tempo/blocks overrides: defaults: diff --git a/sysutils/tempo/files/tempo.in b/sysutils/tempo/files/tempo.in index 0182b8956280..ae64236e2188 100644 --- a/sysutils/tempo/files/tempo.in +++ b/sysutils/tempo/files/tempo.in @@ -1,71 +1,71 @@ #!/bin/sh # PROVIDE: tempo # REQUIRE: LOGIN # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable tempo # tempo_enable="YES" # # tempo_enable (bool): # Set it to YES to enable grafana # Set to NO by default # tempo_user (string): # Set user that grafana will run under -# Default is "%%tempo_USER%%" +# Default is "%%TEMPO_USER%%" # tempo_group (string): # Set group that own grafana files -# Default is "%%tempo_GROUP%%" +# Default is "%%TEMPO_GROUP%%" # tempo_config (string) # Set full path to config file # Default is "%%PREFIX%%/etc/tempo.yaml" # tempo_logfile (string) # Set full path to log file # Default is "/var/log/tempo/tempo.log" # tempo_loglevel (string) # Set log level. Only log messages with the given severity or above. # Valid levels: [debug, info, warn, error] # Default is "warn" # tempo_args (string) # Set additional command line arguments # Default is "" . /etc/rc.subr name=tempo rcvar=tempo_enable load_rc_config $name : ${tempo_enable:="NO"} : ${tempo_user:="%%TEMPO_USER%%"} : ${tempo_group:="%%TEMPO_GROUP%%"} : ${tempo_config:="%%PREFIX%%/etc/tempo.yaml"} : ${tempo_logfile:="/var/log/tempo/tempo.log"} : ${tempo_loglevel:="warn"} pidfile="/var/run/${name}/${name}.pid" required_files="${tempo_config}" procname="%%PREFIX%%/bin/tempo" command="/usr/sbin/daemon" command_args="-p ${pidfile} -t ${name} -o ${tempo_logfile} \ ${procname} \ -config.file=${tempo_config} \ -log.level=${tempo_loglevel} \ ${tempo_args}" start_precmd="tempo_start_precmd" tempo_start_precmd() { if [ ! -d "/var/run/${name}" ]; then install -d -m 0750 -o ${tempo_user} -g ${tempo_group} "/var/run/${name}" fi if [ ! -d "/var/log/tempo" ]; then install -d -m 0750 -o ${tempo_user} -g ${tempo_group} "/var/log/tempo" fi } run_rc_command "$1"