From 459a8bd4e44eb55da5b30b5fce142e7770ad97ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 2 Feb 2024 08:21:46 +0000 Subject: [PATCH] Remove deployment of EFK stack on IDR systems Unlike the Prometheus/Grafana stack, this experimental stack seems to be largely unused at the moment. Additionally, the versions of the different components are out-of-date. Rather than looking into their upgrade with the migration to Rocky Linux 9, this proposes to remove the EFK stack from the monitoring playbook. --- ansible/files/fluentd-server/fluent.conf.j2 | 182 ------------------ ansible/files/fluentd/forward-conf.j2 | 39 ---- ansible/files/fluentd/nginx-proxy.conf | 31 --- ansible/files/fluentd/omero.conf | 120 ------------ ansible/group_vars/omero-hosts.yml | 7 - ansible/group_vars/proxy-hosts.yml | 6 - ansible/idr-09-monitoring.yml | 1 - ansible/management-fluentd.yml | 198 -------------------- ansible/requirements.yml | 3 - docs/deployment.md | 2 +- docs/monitoring.md | 20 -- 11 files changed, 1 insertion(+), 608 deletions(-) delete mode 100644 ansible/files/fluentd-server/fluent.conf.j2 delete mode 100644 ansible/files/fluentd/forward-conf.j2 delete mode 100644 ansible/files/fluentd/nginx-proxy.conf delete mode 100644 ansible/files/fluentd/omero.conf delete mode 100644 ansible/management-fluentd.yml diff --git a/ansible/files/fluentd-server/fluent.conf.j2 b/ansible/files/fluentd-server/fluent.conf.j2 deleted file mode 100644 index 50a56a7d..00000000 --- a/ansible/files/fluentd-server/fluent.conf.j2 +++ /dev/null @@ -1,182 +0,0 @@ -########################################################################### -# Receive TCP logs. -########################################################################### - -# TODO: Secure with client/server SSL certs - - @type forward - @id input1 - port 24224 - - self_hostname {{ ansible_hostname }} - shared_key {{ fluentd_shared_key }} - - - -# For debugging only -# -# @type stdout -# - - -########################################################################### -# Store logs -# WARNING: OMERO logs will take up a lot of space! -########################################################################### - - - - -########################################################################### -# Send to Elasticsearch -########################################################################### - - - - -########################################################################### -# nginx-proxy -########################################################################### - -# In future more log routes can be added - - @type copy - - @type relabel - @label @STORE_LOGS - - - @type relabel - @label @ELASTICSEARCH - - - @type relabel - @label @NGINX_NOTIFICATION - - - -# Notify 5XX and all error logs apart from known warnings - - - -########################################################################### -# omero -########################################################################### - -# In future more log routes can be added - - @type copy - - @type relabel - @label @STORE_LOGS - - - @type relabel - @label @ELASTICSEARCH - - - @type relabel - @label @OMERO_NOTIFICATION - - - -# Send slack notifications for error and critical -# Exclude known errors - diff --git a/ansible/files/fluentd/forward-conf.j2 b/ansible/files/fluentd/forward-conf.j2 deleted file mode 100644 index 82f64646..00000000 --- a/ansible/files/fluentd/forward-conf.j2 +++ /dev/null @@ -1,39 +0,0 @@ -# Forward all logs labelled FORWARD to a central server -# https://docs.fluentd.org/v1.0/articles/out_forward -# TODO: Add multiple central servers for HA - - diff --git a/ansible/files/fluentd/nginx-proxy.conf b/ansible/files/fluentd/nginx-proxy.conf deleted file mode 100644 index 7604444a..00000000 --- a/ansible/files/fluentd/nginx-proxy.conf +++ /dev/null @@ -1,31 +0,0 @@ -# Slack alerts for nginx access.log 5XX and all error.log - -# Log format: main_timed_cache_upstream -# https://github.com/openmicroscopy/ansible-role-nginx-proxy/blob/1.6.0/templates/nginx-conf.j2#L39 - - @type tail - path /var/log/nginx/access.log - pos_file /var/log/td-agent/nginx-access.log.pos - tag nginx.access - - format /^(?[^ ]*) - (?[^ ]*) \[(?