From dd3d6821481626bfa4066c4546fe690f2250673c Mon Sep 17 00:00:00 2001 From: "Ernest W. Durbin III" Date: Fri, 14 Jul 2017 22:40:25 -0400 Subject: [PATCH] add datadog_tags for pypi --- .../salt/roots/prod-pillar/monitoring/server/init.sls | 4 ++++ provisioning/salt/roots/prod-pillar/pypi-mirror/init.sls | 4 ++++ provisioning/salt/roots/prod-pillar/pypi/log.sls | 4 ++++ provisioning/salt/roots/prod-pillar/pypi/web.sls | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/provisioning/salt/roots/prod-pillar/monitoring/server/init.sls b/provisioning/salt/roots/prod-pillar/monitoring/server/init.sls index 0f2054d..d74b677 100644 --- a/provisioning/salt/roots/prod-pillar/monitoring/server/init.sls +++ b/provisioning/salt/roots/prod-pillar/monitoring/server/init.sls @@ -6,6 +6,10 @@ include: secret_key: deadbeef key: monitoring_secrets +datadog_tags: + - service: pypi + - role: monitoring + firewall: riemann_ports: port: 5555:5556 diff --git a/provisioning/salt/roots/prod-pillar/pypi-mirror/init.sls b/provisioning/salt/roots/prod-pillar/pypi-mirror/init.sls index c522214..6b8268e 100644 --- a/provisioning/salt/roots/prod-pillar/pypi-mirror/init.sls +++ b/provisioning/salt/roots/prod-pillar/pypi-mirror/init.sls @@ -1,4 +1,8 @@ +datadog_tags: + - service: pypi + - role: mirror + firewall: http: port: 80 diff --git a/provisioning/salt/roots/prod-pillar/pypi/log.sls b/provisioning/salt/roots/prod-pillar/pypi/log.sls index 3e43bd3..94b47c3 100644 --- a/provisioning/salt/roots/prod-pillar/pypi/log.sls +++ b/provisioning/salt/roots/prod-pillar/pypi/log.sls @@ -1,4 +1,8 @@ +datadog_tags: + - service: pypi + - role: counter + firewall: syslog_tcp_72: source: 199.27.72.0/24 diff --git a/provisioning/salt/roots/prod-pillar/pypi/web.sls b/provisioning/salt/roots/prod-pillar/pypi/web.sls index 6ffcf61..19a6145 100644 --- a/provisioning/salt/roots/prod-pillar/pypi/web.sls +++ b/provisioning/salt/roots/prod-pillar/pypi/web.sls @@ -1,4 +1,8 @@ +datadog_tags: + - service: pypi + - role: web + firewall: http: port: 80