From 2e6997ff6d4fa93b3ec80e0966ec9c82e93a13e6 Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Wed, 11 Mar 2020 10:11:37 +0200 Subject: [PATCH 1/2] don't collect AWS tags --- .../ansible/roles/datadog/templates/datadog.conf.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/commcare_cloud/ansible/roles/datadog/templates/datadog.conf.j2 b/src/commcare_cloud/ansible/roles/datadog/templates/datadog.conf.j2 index 9fc9bb6aa6..b9c6889c5f 100644 --- a/src/commcare_cloud/ansible/roles/datadog/templates/datadog.conf.j2 +++ b/src/commcare_cloud/ansible/roles/datadog/templates/datadog.conf.j2 @@ -53,3 +53,6 @@ apm_config: [trace.analyzed_spans] django|django.request: 1 {% endif %} + +collect_security_groups: no +collect_ec2_tags: no \ No newline at end of file From 02232389d906dc77160bbede5c6fb5e5e2c259f7 Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Tue, 17 Mar 2020 16:14:35 +0200 Subject: [PATCH 2/2] add METRICS_PROVIDERS setting --- .../ansible/roles/commcarehq/templates/localsettings.py.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 index b1423ccaa4..0925096892 100644 --- a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 +++ b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 @@ -699,11 +699,15 @@ HQ_PRIVATE_KEY = \ {{ HQ_PRIVATE_KEY }} {% endif %} +{% set metrics_providers = [] %} {% if DATADOG_ENABLED|default(false) %} +{% set metrics_providers = metrics_providers + ['corehq.util.metrics.datadog.DatadogMetrics'] %} DATADOG_API_KEY = '{{ DATADOG_API_KEY }}' DATADOG_APP_KEY = '{{ DATADOG_APP_KEY }}' {% endif %} +METRICS_PROVIDERS = {{ metrics_providers | to_json }} + {% if localsettings.get('WS4REDIS_CONNECTION_HOST') %} WS4REDIS_CONNECTION = { 'host': '{{ localsettings.WS4REDIS_CONNECTION_HOST }}'