From b58c71bb74bd5f5c836f88daa3d7806ff68cea47 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Mon, 16 Mar 2020 13:34:49 -0400 Subject: [PATCH] remove broadcast websockets view --- awx/api/urls/urls.py | 2 -- awx/api/views/metrics.py | 16 ---------------- awx/api/views/root.py | 1 - 3 files changed, 19 deletions(-) diff --git a/awx/api/urls/urls.py b/awx/api/urls/urls.py index 4e5aa5b2f5..ac1182ddca 100644 --- a/awx/api/urls/urls.py +++ b/awx/api/urls/urls.py @@ -36,7 +36,6 @@ from awx.api.views import ( from awx.api.views.metrics import ( MetricsView, - BroadcastWebsocketMetricsView, ) from .organization import urls as organization_urls @@ -96,7 +95,6 @@ v2_urls = [ url(r'^tokens/$', OAuth2TokenList.as_view(), name='o_auth2_token_list'), url(r'^', include(oauth2_urls)), url(r'^metrics/$', MetricsView.as_view(), name='metrics_view'), - url(r'^broadcast_websocket_metrics/$', BroadcastWebsocketMetricsView.as_view(), name='broadcast_websocket_metrics_view'), url(r'^ping/$', ApiV2PingView.as_view(), name='api_v2_ping_view'), url(r'^config/$', ApiV2ConfigView.as_view(), name='api_v2_config_view'), url(r'^config/subscriptions/$', ApiV2SubscriptionView.as_view(), name='api_v2_subscription_view'), diff --git a/awx/api/views/metrics.py b/awx/api/views/metrics.py index cc6a3e3994..8d78dea21f 100644 --- a/awx/api/views/metrics.py +++ b/awx/api/views/metrics.py @@ -15,7 +15,6 @@ from rest_framework.exceptions import PermissionDenied # AWX # from awx.main.analytics import collectors from awx.main.analytics.metrics import metrics -from awx.main.analytics.broadcast_websocket import BroadcastWebsocketStatsManager from awx.api import renderers from awx.api.generics import ( @@ -41,18 +40,3 @@ class MetricsView(APIView): return Response(metrics().decode('UTF-8')) raise PermissionDenied() - -class BroadcastWebsocketMetricsView(APIView): - name = _('Broadcast Websockets') - swagger_topic = 'Broadcast Websockets' - - renderer_classes = [renderers.PlainTextRenderer, - renderers.PrometheusJSONRenderer, - renderers.BrowsableAPIRenderer,] - - def get(self, request): - ''' Show Metrics Details ''' - if (request.user.is_superuser or request.user.is_system_auditor): - stats_str = BroadcastWebsocketStatsManager.get_stats_sync() or b'' - return Response(stats_str.decode('UTF-8')) - raise PermissionDenied() diff --git a/awx/api/views/root.py b/awx/api/views/root.py index 3ac0759530..4a15936e9b 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -107,7 +107,6 @@ class ApiVersionRootView(APIView): data['applications'] = reverse('api:o_auth2_application_list', request=request) data['tokens'] = reverse('api:o_auth2_token_list', request=request) data['metrics'] = reverse('api:metrics_view', request=request) - data['broadcast_websocket_metrics'] = reverse('api:broadcast_websocket_metrics_view', request=request) data['inventory'] = reverse('api:inventory_list', request=request) data['inventory_scripts'] = reverse('api:inventory_script_list', request=request) data['inventory_sources'] = reverse('api:inventory_source_list', request=request)