Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce extra knobs to control on-boot behavior #13

Merged
merged 1 commit into from
Dec 22, 2024
Merged

Introduce extra knobs to control on-boot behavior #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ run-test-exporter-onetime: create-test-env ## Run one-time cycle of mocking logr
LOKI_AUTH_HEADER="none" \
MAX_FOLLOW_CYCLES=3 \
AUTOTEST=1 \
START_DELAY_ON_BOOT=3 \
/bin/bash -u loki_exporter.sh
touch $@

Expand All @@ -164,6 +165,7 @@ run-test-exporter-timeshifted-onetime: tests/default-timeshifted.log create-test
LOKI_AUTH_HEADER="none" \
MAX_FOLLOW_CYCLES=3 \
AUTOTEST=1 \
START_DELAY_ON_BOOT=3 \
/bin/bash -u loki_exporter.sh
touch $@

Expand Down
2 changes: 2 additions & 0 deletions loki_exporter.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
config loki_exporter
option loki_push_url 'http://127.0.0.1/loki/api/v1/push'
option loki_auth_header 'ADDME'
option start_delay_on_boot '120'
option skewed_timestamps_delta_threshold '3600'

6 changes: 4 additions & 2 deletions loki_exporter.init
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh /etc/rc.common

# delayed start to ensure network and NTP sync are done
# delayed start to ensure network and NTP services go first
START=99
# stop before stopping network
STOP=89
Expand All @@ -13,10 +13,12 @@ BOOT=0
start_service() {
local loki_push_url=$(uci -q get loki_exporter.@loki_exporter[0].loki_push_url)
local loki_auth_header=$(uci -q get loki_exporter.@loki_exporter[0].loki_auth_header)
local start_delay_on_boot=$(uci -q get loki_exporter.@loki_exporter[0].start_delay_on_boot)
local skewed_timestamps_delta_threshold=$(uci -q get loki_exporter.@loki_exporter[0].skewed_timestamps_delta_threshold)

procd_open_instance
procd_set_param command "$PROG"
procd_set_param env BOOT="${BOOT}" LOGREAD="/sbin/logread" LOKI_PUSH_URL="${loki_push_url}" LOKI_AUTH_HEADER="${loki_auth_header}"
procd_set_param env BOOT="${BOOT}" LOGREAD="/sbin/logread" LOKI_PUSH_URL="${loki_push_url}" LOKI_AUTH_HEADER="${loki_auth_header}" START_DELAY_ON_BOOT="${start_delay_on_boot}" SKEWED_TIMESTAMP_DELTA_THRESHOLD="${skewed_timestamps_delta_threshold}"
procd_set_param stderr 1
procd_close_instance
}
Expand Down
12 changes: 10 additions & 2 deletions loki_exporter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ _do_bulk_post() {
_check_for_skewed_timestamp() {
_log_file="$1"

# maximum threshold for comparing timestamps between 2 subsequent log lines (ns)
delta_threshold=86400000000000
# maximum threshold for comparing timestamps between 2 subsequent log lines (s, ns)
delta_threshold_seconds="${SKEWED_TIMESTAMP_DELTA_THRESHOLD-3600}"
delta_threshold=$((delta_threshold_seconds * 10**9))

# incremental step for substituting timestamps of unsynchronized log lines (ns)
step=25000000
Expand Down Expand Up @@ -250,6 +251,13 @@ _main_loop() {
done <"${PIPE_NAME}"
}

if [ "${BOOT}" -eq 1 ]; then
if [ "${START_DELAY_ON_BOOT-0}" -gt 0 ]; then
echo "sleeping ${START_DELAY_ON_BOOT-0} seconds before proceeding" >&2
sleep "${START_DELAY_ON_BOOT-0}"
fi
fi

_setup

MIN_TIMESTAMP=0
Expand Down