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.

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

[pull] master from netdata:master #357

Merged
merged 3 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion packaging/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ RUN mkdir -p /opt/src /var/log/netdata && \
ln -sf /dev/stderr /var/log/netdata/error.log && \
ln -sf /dev/stderr /var/log/netdata/daemon.log && \
ln -sf /dev/stdout /var/log/netdata/collector.log && \
ln -sf /dev/stdout /var/log/netdata/fluentbit.log && \
ln -sf /dev/stdout /var/log/netdata/health.log

COPY --from=builder /app /
Expand Down
3 changes: 3 additions & 0 deletions src/daemon/daemon-shutdown.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ void netdata_cleanup_and_exit(int ret, const char *action, const char *action_re

#ifdef ENABLE_SENTRY
if (ret) {
if (action_data) {
nd_sentry_add_breadcrumb(action_data);
}
abort();
} else {
nd_sentry_fini();
Expand Down
9 changes: 9 additions & 0 deletions src/daemon/sentry-native/sentry-native.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,12 @@ void nd_sentry_set_user(const char *guid)
sentry_value_set_by_key(user, "id", sentry_value_new_string(guid));
sentry_set_user(user);
}

void nd_sentry_add_breadcrumb(const char *message)
{
if (sentry_telemetry_disabled())
return;

sentry_value_t crumb = sentry_value_new_breadcrumb("fatal", message);
sentry_add_breadcrumb(crumb);
}
1 change: 1 addition & 0 deletions src/daemon/sentry-native/sentry-native.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ void nd_sentry_init(void);
void nd_sentry_fini(void);

void nd_sentry_set_user(const char *guid);
void nd_sentry_add_breadcrumb(const char *message);

#endif /* ND_SENTRY_H */
2 changes: 1 addition & 1 deletion src/health/health.d/clickhouse.conf
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ component: ClickHouse
warn: $this > 0
delay: down 5m multiplier 1.5 max 1h
summary: ClickHouse replicated tables in readonly state detected
info: ClickHouse has replicated tables in readonly state due to ZooKeeper session loss/startup without ZooKeeper configured
info: ClickHouse replicated tables are read-only due to startup without ZooKeeper configured or ZooKeeper session loss.
to: dba

template: clickhouse_max_part_count_for_partition
Expand Down
Loading