Remove statsd

We don't expose these metrics anywhere anyway and we want to move to
prometheus too (which will be done in the next commit)
This commit is contained in:
David McDonald
2020-06-30 11:08:11 +01:00
parent ee8270aa2c
commit 6958c0d677
4 changed files with 3 additions and 24 deletions

View File

@@ -45,12 +45,7 @@ from app import proxy_fix
from app.asset_fingerprinter import asset_fingerprinter
from app.commands import setup_commands
from app.config import configs
from app.extensions import (
antivirus_client,
redis_client,
statsd_client,
zendesk_client,
)
from app.extensions import antivirus_client, redis_client, zendesk_client
from app.models.organisation import Organisation
from app.models.service import Service
from app.models.user import AnonymousUser, User
@@ -166,14 +161,13 @@ def create_app(application):
# External API clients
antivirus_client,
statsd_client,
redis_client,
zendesk_client,
redis_client
):
client.init_app(application)
logging.init_app(application, statsd_client)
logging.init_app(application)
login_manager.login_view = 'main.sign_in'
login_manager.login_message_category = 'default'

View File

@@ -20,11 +20,6 @@ class Config(object):
TEMPLATE_PREVIEW_API_HOST = os.environ.get('TEMPLATE_PREVIEW_API_HOST', 'http://localhost:6013')
TEMPLATE_PREVIEW_API_KEY = os.environ.get('TEMPLATE_PREVIEW_API_KEY', 'my-secret-key')
# Hosted graphite statsd prefix
STATSD_ENABLED = False
STATSD_HOST = os.getenv('STATSD_HOST')
STATSD_PORT = 8125
# Logging
DEBUG = False
NOTIFY_LOG_PATH = os.getenv('NOTIFY_LOG_PATH')
@@ -97,7 +92,6 @@ class Development(Config):
DEBUG = True
SESSION_COOKIE_SECURE = False
SESSION_PROTECTION = None
STATSD_ENABLED = False
CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'development-contact-list'
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-tools'
@@ -120,7 +114,6 @@ class Development(Config):
class Test(Development):
DEBUG = True
TESTING = True
STATSD_ENABLED = False
WTF_CSRF_ENABLED = False
CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'test-contact-list'
@@ -141,7 +134,6 @@ class Test(Development):
class Preview(Config):
HTTP_PROTOCOL = 'https'
HEADER_COLOUR = '#F499BE' # $baby-pink
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'preview-contact-list'
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-preview'
@@ -160,7 +152,6 @@ class Staging(Config):
SHOW_STYLEGUIDE = False
HTTP_PROTOCOL = 'https'
HEADER_COLOUR = '#6F72AF' # $mauve
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'staging-contact-list'
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-staging'
@@ -176,7 +167,6 @@ class Live(Config):
SHOW_STYLEGUIDE = False
HEADER_COLOUR = '#005EA5' # $govuk-blue
HTTP_PROTOCOL = 'https'
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
CONTACT_LIST_UPLOAD_BUCKET_NAME = 'production-contact-list'
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-production'
@@ -196,7 +186,6 @@ class CloudFoundryConfig(Config):
class Sandbox(CloudFoundryConfig):
HTTP_PROTOCOL = 'https'
HEADER_COLOUR = '#F499BE' # $baby-pink
STATSD_ENABLED = True
CSV_UPLOAD_BUCKET_NAME = 'cf-sandbox-notifications-csv-upload'
LOGO_UPLOAD_BUCKET_NAME = 'cf-sandbox-notifications-logo-upload'
NOTIFY_ENVIRONMENT = 'sandbox'

View File

@@ -2,10 +2,8 @@ from notifications_utils.clients.antivirus.antivirus_client import (
AntivirusClient,
)
from notifications_utils.clients.redis.redis_client import RedisClient
from notifications_utils.clients.statsd.statsd_client import StatsdClient
from notifications_utils.clients.zendesk.zendesk_client import ZendeskClient
antivirus_client = AntivirusClient()
statsd_client = StatsdClient()
zendesk_client = ZendeskClient()
redis_client = RedisClient()

View File

@@ -50,8 +50,6 @@ applications:
ANTIVIRUS_API_HOST: '{{ ANTIVIRUS_API_HOST }}'
ANTIVIRUS_API_KEY: '{{ ANTIVIRUS_API_KEY }}'
STATSD_HOST: 'notify-statsd-exporter-{{ environment }}.apps.internal'
ZENDESK_API_KEY: '{{ ZENDESK_API_KEY }}'
TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}'