Attachment #245625 for bug #274473

Lines 763-769 foreman_proxy:*:812:812::0:0:Foreman Smart Proxy:/usr/local/share/foreman-proxy: Link Here

(-)b/UIDs (-1 / +1 lines)
763	hitch:*:813:813::0:0:Hitch TLS Proxy:/nonexistent:/usr/sbin/nologin	763	hitch:*:813:813::0:0:Hitch TLS Proxy:/nonexistent:/usr/sbin/nologin
764	puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin	764	puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin
765	uchiwa:*:815:815::0:0:Uchiwa Dashboard:/nonexistent:/usr/sbin/nologin	765	uchiwa:*:815:815::0:0:Uchiwa Dashboard:/nonexistent:/usr/sbin/nologin
766	# free: 816	766	promtail:*:816:967::0:0:Promtail:/var/db/promtail:/usr/sbin/nologin
767	rslsync:*:817:817::0:0:Resilio Sync Daemon:/nonexistent:/usr/sbin/nologin	767	rslsync:*:817:817::0:0:Resilio Sync Daemon:/nonexistent:/usr/sbin/nologin
768	jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/bin/sh	768	jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/bin/sh
769	rundeck:*:819:819::0:0:Rundeck:/usr/local/rundeck:/bin/sh	769	rundeck:*:819:819::0:0:Rundeck:/usr/local/rundeck:/bin/sh

Lines 326-332 GH_TUPLE= \ Link Here

(-)b/sysutils/loki/Makefile (-3 / +9 lines)
326	xdg-go:stringprep:v1.0.4:xdg_go_stringprep/vendor/github.com/xdg-go/stringprep \	326	xdg-go:stringprep:v1.0.4:xdg_go_stringprep/vendor/github.com/xdg-go/stringprep \
327	yuin:gopher-lua:v1.1.0:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua	327	yuin:gopher-lua:v1.1.0:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
328		328
329	USE_RC_SUBR= loki	329	USE_RC_SUBR= loki promtail
330		330
331	GO_TARGET= ./cmd/loki ./cmd/loki-canary ./cmd/logcli ./clients/cmd/promtail	331	GO_TARGET= ./cmd/loki ./cmd/loki-canary ./cmd/logcli ./clients/cmd/promtail
332		332
Lines 334-345 LOKI_USER?= loki Link Here
334	LOKI_GROUP?= loki	334	LOKI_GROUP?= loki
335	LOKI_DATADIR?= /var/db/${PORTNAME}	335	LOKI_DATADIR?= /var/db/${PORTNAME}
336		336
337	USERS= ${LOKI_USER}	337	PROMTAIL_USER?= promtail
		338	PROMTAIL_DATADIR?= /var/db/promtail
		339
		340	USERS= ${LOKI_USER} ${PROMTAIL_USER}
338	GROUPS= ${LOKI_GROUP}	341	GROUPS= ${LOKI_GROUP}
339		342
340	SUB_LIST= LOKI_USER=${LOKI_USER} \	343	SUB_LIST= LOKI_USER=${LOKI_USER} \
341	LOKI_GROUP=${LOKI_GROUP} \	344	LOKI_GROUP=${LOKI_GROUP} \
342	LOKI_DATADIR=${LOKI_DATADIR}	345	LOKI_DATADIR=${LOKI_DATADIR} \
		346	PROMTAIL_USER=${PROMTAIL_USER}
343		347
344	PLIST_SUB= ${SUB_LIST}	348	PLIST_SUB= ${SUB_LIST}
345		349
Lines 372-378 post-extract: Link Here
372		376
373	post-install:	377	post-install:
374	@${CP} ${WRKSRC}/cmd/loki/loki-local-config.yaml ${STAGEDIR}${PREFIX}/etc/loki.yaml.sample	378	@${CP} ${WRKSRC}/cmd/loki/loki-local-config.yaml ${STAGEDIR}${PREFIX}/etc/loki.yaml.sample
		379	@${CP} ${WRKSRC}/clients/cmd/promtail/promtail-local-config.yaml ${STAGEDIR}${PREFIX}/etc/promtail.yaml.sample
375	@${MKDIR} ${STAGEDIR}${LOKI_DATADIR}	380	@${MKDIR} ${STAGEDIR}${LOKI_DATADIR}
376	@${MKDIR} ${STAGEDIR}${LOKI_DATADIR}/rules-temp	381	@${MKDIR} ${STAGEDIR}${LOKI_DATADIR}/rules-temp
		382	@${MKDIR} ${STAGEDIR}${PROMTAIL_DATADIR}
377		383
378	.include <bsd.port.mk>	384	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/loki/files/patch-promtail-local-config.yaml (+11 lines)
1	--- clients/cmd/promtail/promtail-local-config.yaml.orig 2023-10-05 01:40:22.549761000 +0000
2	+++ clients/cmd/promtail/promtail-local-config.yaml 2023-10-05 01:41:28.869261000 +0000
3	@@ -3,7 +3,7 @@
4	grpc_listen_port: 0
5
6	positions:
7	- filename: /tmp/positions.yaml
8	+ filename: /var/db/promtail/positions.yaml
9
10	clients:
11	- url: http://localhost:3100/loki/api/v1/push




#!/bin/sh

# PROVIDE: promtail
# REQUIRE: LOGIN
# KEYWORD: shutdown

# Add the following lines to /etc/rc.conf to enable promtail
# promtail_enable="YES"
#
# promtail_enable (bool):
#     Set it to YES to enable promtail
#     Set to NO by default
# promtail_user (string):
#     Set user that promtail will run under
#     Default is "%%PROMTAIL_USER%%"
# promtail_group (string):
#     Set group that own promtail files
#     Default is "%%LOKI_GROUP%%"
# promtail_config (string)
#     Set full path to config file
#     Default is "%%PREFIX%%/etc/promtail.yaml"
# promtail_logfile (string)
#     Set full path to log file
#     Default is "/var/log/promtail/promtail.log"
# promtail_loglevel (string)
#     Set log level. Only log messages with the given severity or above.
#     Valid levels: [debug, info, warn, error]
#     Default is "warn"
# promtail_args (string)
#     Set additional command line arguments
#     Default is ""

. /etc/rc.subr

name=promtail
rcvar=promtail_enable

load_rc_config $name

: ${promtail_enable:="NO"}
: ${promtail_user:="%%PROMTAIL_USER%%"}
: ${promtail_group:="%%LOKI_GROUP%%"}
: ${promtail_config:="%%PREFIX%%/etc/promtail.yaml"}
: ${promtail_logfile:="/var/log/promtail/promtail.log"}
: ${promtail_loglevel:="warn"}

pidfile="/var/run/${name}/${name}.pid"
required_files="${promtail_config}"

procname="%%PREFIX%%/bin/promtail"
command="/usr/sbin/daemon"
command_args="-p ${pidfile} -t ${name} -o ${promtail_logfile} \
	${procname} \
	--config.file=${promtail_config} \
	--log.level=${promtail_loglevel} \
	${promtail_args}"

start_precmd="promtail_start_precmd"

promtail_start_precmd() {
	if [ ! -d "/var/run/${name}" ]; then
		install -d -m 0750 -o ${promtail_user} -g ${promtail_group} "/var/run/${name}"
	fi

	if [ ! -d "/var/log/promtail" ]; then
		install -d -m 0750 -o ${promtail_user} -g ${promtail_group} "/var/log/promtail"
	fi
}

run_rc_command "$1"

Lines 3-8 bin/loki-canary Link Here

(-)b/sysutils/loki/pkg-plist (-1 / +1 lines)
3	bin/logcli	3	bin/logcli
4	bin/promtail	4	bin/promtail
5	@sample etc/loki.yaml.sample	5	@sample etc/loki.yaml.sample
		6	@sample etc/promtail.yaml.sample
6	@owner %%LOKI_USER%%	7	@owner %%LOKI_USER%%
7	@group %%LOKI_GROUP%%	8	@group %%LOKI_GROUP%%
8	@mode 750	9	@mode 750
9	-

Return to bug 274473

Added Link Here

(-)b/sysutils/loki/files/promtail.in (+70 lines)
1	#!/bin/sh
2
3	# PROVIDE: promtail
4	# REQUIRE: LOGIN
5	# KEYWORD: shutdown
6
7	# Add the following lines to /etc/rc.conf to enable promtail
8	# promtail_enable="YES"
9	#
10	# promtail_enable (bool):
11	# Set it to YES to enable promtail
12	# Set to NO by default
13	# promtail_user (string):
14	# Set user that promtail will run under
15	# Default is "%%PROMTAIL_USER%%"
16	# promtail_group (string):
17	# Set group that own promtail files
18	# Default is "%%LOKI_GROUP%%"
19	# promtail_config (string)
20	# Set full path to config file
21	# Default is "%%PREFIX%%/etc/promtail.yaml"
22	# promtail_logfile (string)
23	# Set full path to log file
24	# Default is "/var/log/promtail/promtail.log"
25	# promtail_loglevel (string)
26	# Set log level. Only log messages with the given severity or above.
27	# Valid levels: [debug, info, warn, error]
28	# Default is "warn"
29	# promtail_args (string)
30	# Set additional command line arguments
31	# Default is ""
32
33	. /etc/rc.subr
34
35	name=promtail
36	rcvar=promtail_enable
37
38	load_rc_config $name
39
40	: ${promtail_enable:="NO"}
41	: ${promtail_user:="%%PROMTAIL_USER%%"}
42	: ${promtail_group:="%%LOKI_GROUP%%"}
43	: ${promtail_config:="%%PREFIX%%/etc/promtail.yaml"}
44	: ${promtail_logfile:="/var/log/promtail/promtail.log"}
45	: ${promtail_loglevel:="warn"}
46
47	pidfile="/var/run/${name}/${name}.pid"
48	required_files="${promtail_config}"
49
50	procname="%%PREFIX%%/bin/promtail"
51	command="/usr/sbin/daemon"
52	command_args="-p ${pidfile} -t ${name} -o ${promtail_logfile} \
53	${procname} \
54	--config.file=${promtail_config} \
55	--log.level=${promtail_loglevel} \
56	${promtail_args}"
57
58	start_precmd="promtail_start_precmd"
59
60	promtail_start_precmd() {
61	if [ ! -d "/var/run/${name}" ]; then
62	install -d -m 0750 -o ${promtail_user} -g ${promtail_group} "/var/run/${name}"
63	fi
64
65	if [ ! -d "/var/log/promtail" ]; then
66	install -d -m 0750 -o ${promtail_user} -g ${promtail_group} "/var/log/promtail"
67	fi
68	}
69
70	run_rc_command "$1"