Add new Integration environment

mattbostock · mattbostock · commit 33134278ead9 · 2015-11-16T10:12:02.000Z
The new 'Integration' environment will soon replace 'Preview'; add
support for it so that we can start running Fabric scripts against it.

I'd added a FIXME to remove the code for Preview once we've migrated
away from that environment.
diff --git a/fabfile.py b/fabfile.py
@@ -249,6 +249,14 @@ def staging():
     _set_gateway('staging.publishing.service.gov.uk')
 
 
+@task
+def integration():
+    """Select integration environment"""
+    env['environment'] = 'integration'
+    _set_gateway('integration.publishing.service.gov.uk')
+
+
+# FIXME: Remove once Preview environment is deleted
 @task
 def preview():
     """Select preview environment"""
diff --git a/nagios.py b/nagios.py
@@ -14,12 +14,12 @@ def submit_nagios_cmd(command):
 
 def _monitoring_hostname(host):
     """Returns the canonical name (according to our monitoring) for a host"""
-    if env['environment'] == 'preview':
+    if env['environment'] == 'production':
+        return "{0}.publishing.service.gov.uk".format(host)
+    elif env['environment'] == 'preview': # FIXME: Remove once Preview is deleted
         return "%s.production" % host
-    elif env['environment'] == 'staging':
-        return "{0}.staging.publishing.service.gov.uk".format(host)
     else:
-        return "{0}.publishing.service.gov.uk".format(host)
+        return "{0}.{1}.publishing.service.gov.uk".format(host, env['environment'])
 
 
 @task
