Merge pull request #3721 from dimagi/sk/metrics-providers

metrics providers
dimagi · Mar 18, 2020 · f8826e6 · f8826e6
2 parents cbea522 + 0223238
commit f8826e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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 }}'

diff --git 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