From 4f2c9b6effa29d89532016fac6d4847c2f2050db Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 21 Feb 2022 18:40:29 +0100 Subject: [PATCH] [IMP]Netdata : use docker cmd instead of overwrite --- netdata/Dockerfile | 5 ++--- netdata/netdata.conf | 6 +++--- netdata/run.sh | 31 ------------------------------- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 netdata/run.sh diff --git a/netdata/Dockerfile b/netdata/Dockerfile index b392681..e3720b1 100644 --- a/netdata/Dockerfile +++ b/netdata/Dockerfile @@ -2,6 +2,5 @@ FROM netdata/netdata MAINTAINER Yaltik - Fabien Bourgeois # Override default configuration -COPY netdata.conf / -COPY run.sh /usr/sbin/run.sh -RUN chmod +x /usr/sbin/run.sh +COPY netdata.conf /netdata.conf +CMD ["-c", "/netdata.conf"] diff --git a/netdata/netdata.conf b/netdata/netdata.conf index e4c0b15..2f84829 100644 --- a/netdata/netdata.conf +++ b/netdata/netdata.conf @@ -18,7 +18,7 @@ # glibc malloc arena max for plugins = 1 # hostname = netdata.dalby # history = 3996 - history = 86400 + history = 259200 # update every = 1 update every = 5 # config directory = /etc/netdata @@ -32,10 +32,10 @@ # plugins directory = "/usr/libexec/netdata/plugins.d" "/etc/netdata/custom-plugins.d" # memory mode = dbengine # page cache size = 32 - page cache size = 128 + page cache size = 64 # dbengine disk space = 256 # dbengine multihost disk space = 256 - dbengine multihost disk space = 2048 + dbengine multihost disk space = 1024 # memory deduplication (ksm) = yes # timezone = Europe/Paris # debug flags = 0x0000000000000000 diff --git a/netdata/run.sh b/netdata/run.sh deleted file mode 100644 index 9510607..0000000 --- a/netdata/run.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -# -# Entry point script for netdata -# -# Copyright: 2018 and later Netdata Inc. -# SPDX-License-Identifier: GPL-3.0-or-later -# -# Author : Pavlos Emm. Katsoulakis -# Author : Austin S. Hemmelgarn -set -e - -if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then - touch /etc/netdata/.opt-out-from-anonymous-statistics -fi - -if [ -n "${PGID}" ]; then - echo "Creating docker group ${PGID}" - addgroup -g "${PGID}" "docker" || echo >&2 "Could not add group docker with ID ${PGID}, its already there probably" - echo "Assign netdata user to docker group ${PGID}" - usermod -a -G "${PGID}" "${DOCKER_USR}" || echo >&2 "Could not add netdata user to group docker with ID ${PGID}" -fi - -if [ -n "${NETDATA_CLAIM_URL}" ] && [ -n "${NETDATA_CLAIM_TOKEN}" ] && [ ! -f /var/lib/netdata/cloud.d/claimed_id ]; then - /usr/sbin/netdata-claim.sh -token="${NETDATA_CLAIM_TOKEN}" \ - -url="${NETDATA_CLAIM_URL}" \ - ${NETDATA_CLAIM_ROOMS:+-rooms="${NETDATA_CLAIM_ROOMS}"} \ - ${NETDATA_CLAIM_PROXY:+-proxy="${NETDATA_CLAIM_PROXY}"} \ - -daemon-not-running -fi - -exec /usr/sbin/netdata -u "${DOCKER_USR}" -D -s /host -p "${NETDATA_LISTENER_PORT}" -c /netdata.conf -W set web "web files group" root -W set web "web files owner" root "$@"