From 695d1a5b9166b00e2749bf91b97b9e92db67a0c9 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 5 Jun 2020 14:58:45 +0200 Subject: [PATCH] Increase periods and decrease cache, fix permissions --- monitoring.yml | 15 +++++++++------ roles/pleroma | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/monitoring.yml b/monitoring.yml index f30128d..a35e6e9 100644 --- a/monitoring.yml +++ b/monitoring.yml @@ -1,6 +1,8 @@ --- - hosts: monitoring vars: + file: + - { path: "/etc/telegraf/telegraf.conf", owner: "telegraf", group: "root", mode: "700", state: file } apt: sign_keys: - "https://packages.grafana.com/gpg.key" @@ -42,12 +44,12 @@ region: "eu-central-1", access_key: "{{ vault_telegraf.aws.access_key }}", secret_key: "{{ vault_telegraf.aws.secret_key }}", - period: "24h", - interval: "6h", + period: "48h", + interval: "12h", namespace: "AWS/S3", ratelimit: 50, statistic_include: ["average"], - cache_ttl: "12h" + cache_ttl: "1h" } - { region: "eu-west-1", @@ -58,18 +60,18 @@ namespace: "AWS/SES", ratelimit: 15, statistic_include: ["average"], - cache_ttl: "12h" + cache_ttl: "1h" } - { region: "us-east-1", access_key: "{{ vault_telegraf.aws.access_key }}", secret_key: "{{ vault_telegraf.aws.secret_key }}", - period: "12h", + period: "24h", interval: "6h", namespace: "AWS/Billing", ratelimit: 15, statistic_include: ["average"], - cache_ttl: "6h" + cache_ttl: "1h" } grafana: listen: @@ -105,4 +107,5 @@ - apt - grafana - telegraf + - file - systemd diff --git a/roles/pleroma b/roles/pleroma index b1b681d..4fc8822 160000 --- a/roles/pleroma +++ b/roles/pleroma @@ -1 +1 @@ -Subproject commit b1b681d8a0e373a70d4d92a4103b38ce4b5131d7 +Subproject commit 4fc8822849cb753d95dfbceb086f00c0103a4f21