From e55403ed71282d7bfd8b56df219de3c28a8af064 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Nov 2024 15:45:37 +0100 Subject: Merging upstream version 2.0.3+dfsg: - does not include dygraphs anymore (Closes: #923993) - does not include pako anymore (Closes: #1042533) - does not include dashboard binaries anymore (Closes: #1045145) Signed-off-by: Daniel Baumann --- packaging/dag/files/child_stream.conf | 4 ++-- packaging/dag/files/parent_stream.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packaging/dag/files') diff --git a/packaging/dag/files/child_stream.conf b/packaging/dag/files/child_stream.conf index ed78bd3fb..4e37d0a91 100644 --- a/packaging/dag/files/child_stream.conf +++ b/packaging/dag/files/child_stream.conf @@ -2,9 +2,9 @@ enabled = {{ enabled }} destination = {{ destination }} api key = {{ api_key }} - timeout seconds = {{ timeout_seconds }} + timeout = {{ timeout_seconds }} default port = {{ default_port }} send charts matching = {{ send_charts_matching }} buffer size bytes = {{ buffer_size_bytes }} - reconnect delay seconds = {{ reconnect_delay_seconds }} + reconnect delay = {{ reconnect_delay_seconds }} initial clock resync iterations = {{ initial_clock_resync_iterations }} diff --git a/packaging/dag/files/parent_stream.conf b/packaging/dag/files/parent_stream.conf index 15f303f97..4c190a758 100644 --- a/packaging/dag/files/parent_stream.conf +++ b/packaging/dag/files/parent_stream.conf @@ -1,7 +1,7 @@ [{{ api_key }}] enabled = {{ enabled }} allow from = {{ allow_from }} - default history = {{ default_history }} + retention = {{ default_history }} health enabled by default = {{ health_enabled_by_default }} - default postpone alarms on connect seconds = {{ default_postpone_alarms_on_connect_seconds }} + postpone alerts on connect = {{ default_postpone_alarms_on_connect_seconds }} multiple connections = {{ multiple_connections }} -- cgit v1.2.3