From e7b18f20ed46b5b47b88379d3c881f2b5c56be9c Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Sat, 25 Apr 2020 19:44:14 +0100 Subject: [PATCH] Rebase rsyslog-container changes --- roles/log-collector/tasks/main.yml | 14 -------------- services.yml.loki | 30 +++++++++++------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/roles/log-collector/tasks/main.yml b/roles/log-collector/tasks/main.yml index c89c0388..98c2f27f 100644 --- a/roles/log-collector/tasks/main.yml +++ b/roles/log-collector/tasks/main.yml @@ -1,11 +1,5 @@ --- -- user: - name: "log-collector" - system: yes - home: "/var/log/remote" - groups: ["log-collector-credentials"] - # Example playbook using fail and when together - fail: msg: You cannot have enable_elasticsearch and enable_loki at the same time. @@ -19,14 +13,6 @@ - include_tasks: loki.yml when: enable_loki -# Setup the rsyslog-collector instance. Needs packages from -# stretch-backports, to support modern versions of Elasticsearch. -- name: Install rsyslog-elasticsearch package from backports - apt: - name: rsyslog-elasticsearch - default_release: "{{ 'stretch-backports' if float_debian_dist == 'stretch' else '' }}" - state: present - - name: Create the rsyslog-collector logs dir file: path: "/var/log/remote" diff --git a/services.yml.loki b/services.yml.loki index 0f225411..377bdb35 100644 --- a/services.yml.loki +++ b/services.yml.loki @@ -33,23 +33,7 @@ log-collector: - job_name: rsyslog-collector port: 9105 scheme: http - - job_name: elasticsearch - port: 9201 - scheme: http - public_endpoints: - - name: logs - port: 5601 - scheme: http - enable_sso_proxy: true containers: - - name: kibana - image: registry.git.autistici.org/ai3/docker/kibana:master - port: 5061 - volumes: - - /etc/kibana/kibana.yml: /etc/kibana/kibana.yml - - /var/lib/kibana: /var/lib/kibana - env: - BABEL_CACHE_PATH: "/var/lib/kibana/.babelcache.json" - name: loki image: grafana/loki:1.4.1 ports: @@ -58,9 +42,17 @@ log-collector: volumes: - /etc/loki: /etc/loki - /var/lib/loki: /var/lib/loki -#https://github.com/ricoberger/loki_exporter - systemd_services: - - rsyslog-collector.service + #https://github.com/ricoberger/loki_exporter + - name: rsyslog + image: registry.git.autistici.org/ai3/docker/rsyslog:master + ports: + - 6514 + - 9105 + volumes: + - /etc/rsyslog-collector.conf: /etc/rsyslog.conf + - /etc/rsyslog-collector-lognorm: /etc/rsyslog-collector-lognorm + - /var/spool/rsyslog-collector: /var/spool/rsyslog + - /var/log/remote: /var/log/remote ports: - 6514 - 3100 -- GitLab