From 57dc29f6209c2db4fedb772886a96431d712494b Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Wed, 21 Oct 2020 17:21:31 +0200 Subject: [PATCH] Revert "monitoring: use netdata for internal monitoring" This reverts commit 5e320a1780de6b11cef784ee29bf559a0f22c4bf. --- docker-compose.yml | 24 ------------------- etcher-pro-monitoring/netdata/Dockerfile | 5 ---- etcher-pro-monitoring/netdata/balenad.conf | 2 -- .../netdata/httpcheck-supervisor.yml | 3 --- 4 files changed, 34 deletions(-) delete mode 100644 etcher-pro-monitoring/netdata/Dockerfile delete mode 100644 etcher-pro-monitoring/netdata/balenad.conf delete mode 100644 etcher-pro-monitoring/netdata/httpcheck-supervisor.yml diff --git a/docker-compose.yml b/docker-compose.yml index efc2703e..be121128 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,6 @@ volumes: etcher_bash_history: etcher_config_electron: etcher_config_balena_etcher: - netdatalib: - netdatacache: services: influxdb: restart: always @@ -92,25 +90,3 @@ services: echo 1 > /sys/devices/system/cpu/cpu3/online && dbus-send --system --dest=org.freedesktop.systemd1 --type=method_call --print-reply /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager.StartUnit string:gov-switch.service string:replace " - netdata: - build: ./etcher-pro-monitoring/netdata - # this could be removed if we could simply use env vars in our configuration (only to pass in supervisor API URL) - network_mode: 'host' - ports: - - '19999:19999' - environment: - - PGID=988 - # we get this injected as unix:///...sock, but netdata doesn't like that - - DOCKER_HOST=/var/run/balena-engine.sock - cap_add: - - SYS_PTRACE - security_opt: - - apparmor:unconfined - labels: - io.balena.features.balena-socket: 1 - io.balena.features.procfs: 1 - io.balena.features.supervisor-api: 1 - io.balena.features.sysfs: 1 - volumes: - - netdatalib:/var/lib/netdata - - netdatacache:/var/cache/netdata diff --git a/etcher-pro-monitoring/netdata/Dockerfile b/etcher-pro-monitoring/netdata/Dockerfile deleted file mode 100644 index 7b02f01d..00000000 --- a/etcher-pro-monitoring/netdata/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM netdata/netdata - -WORKDIR /etc/netdata -COPY httpcheck-supervisor.yml ./go.d/httpcheck.conf -COPY balenad.conf ./python.d/dockerd.conf diff --git a/etcher-pro-monitoring/netdata/balenad.conf b/etcher-pro-monitoring/netdata/balenad.conf deleted file mode 100644 index ae5c13e7..00000000 --- a/etcher-pro-monitoring/netdata/balenad.conf +++ /dev/null @@ -1,2 +0,0 @@ - update_every : 1 - priority : 60000 diff --git a/etcher-pro-monitoring/netdata/httpcheck-supervisor.yml b/etcher-pro-monitoring/netdata/httpcheck-supervisor.yml deleted file mode 100644 index 3bdd98c2..00000000 --- a/etcher-pro-monitoring/netdata/httpcheck-supervisor.yml +++ /dev/null @@ -1,3 +0,0 @@ -jobs: - - name: balena-supervisor - url: http://localhost:48484/ping