Remove old search metrics collection system. (#1274)

CONTRIBUTING.rst

@@ -324,26 +324,6 @@ OK, go for it! Your Galaxy web site is available at: `http://localhost:8000 <htt
 Post build setup
 ----------------
 
-Metrics
-^^^^^^^
-
-From the root of the project tree, run ``make dev/setup-metrics`` to initialize
-InfluxDB and import data sources and dashboards for Prometheus and InfluxDB into Grafana.
-
-.. code-block:: console
-
-    $ make dev/setup-metrics
-
-Log into Grafana at `http://localhost:3000 <http://localhost:3000>`_ using the admin user with
-password ``admin``. Navigate to ``Galaxy Search Metrics - InfluxDB`` and
-``Galaxy Search Metrics - Prometheus`` dashboards.
-
-Search metrics are exposed at `http://localhost:8000/metrics <http://localhost:8000/metrics>`_. From
-there, the metrics are being scraped by Prometheus
-(`http://localhost:9090/ <http://localhost:9090/>`_). Prometheus serves as a short-term storage.
-For a long-term metrics storage, the metrics are being sent from
-Prometheus to InfluxDB.
-
 Create an admin user
 ^^^^^^^^^^^^^^^^^^^^
 

galaxy/api/serializers/influx.py

@@ -65,6 +65,9 @@ class BaseMeasurement(drf_serializers.Serializer):
     measurement = drf_serializers.CharField()
 
     def save(self):
+        if not settings.GALAXY_METRICS_ENABLED:
+            return
+
         global influx_insert_buffer
         if len(influx_insert_buffer) < settings.INFLUX_INSERT_BUFFER_COUNT:
             influx_insert_buffer.append(self.data)

galaxy/api/views/search.py

@@ -33,7 +33,6 @@
 from galaxy.api import filters
 from galaxy.api import serializers
 from galaxy.api.views import base_views as base
-from galaxy.common import metrics
 from galaxy.main import models
 
 __all__ = [
@@ -80,7 +79,6 @@ def get_queryset(self):
                     repository__provider_namespace__namespace__active=True))
 
     # TODO(cutwater): Use serializer to parse request arguments
-    @metrics.send('search')
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
 

galaxy/settings/default.py

@@ -19,8 +19,6 @@
 import os
 
 import djcelery
-import prometheus_client
-
 
 djcelery.setup_loader()
 
@@ -297,26 +295,6 @@
 If set to `None`, system temporary directory is used.
 """
 
-# =========================================================
-# Metrics Settings
-# =========================================================
-
-METRICS_ENABLED = False
-
-PROM_CNTR_SEARCH = prometheus_client.Counter(
-    'galaxy_search',
-    '',
-    ['keywords', 'platforms', 'cloud_platforms', 'tags'],
-    registry=prometheus_client.REGISTRY
-)
-
-PROM_CNTR_SEARCH_CRITERIA = prometheus_client.Counter(
-    'galaxy_search_criteria',
-    '',
-    ['ctype', 'cvalue'],
-    registry=prometheus_client.REGISTRY
-)
-
 # =========================================================
 # Logging
 # =========================================================
@@ -440,6 +418,8 @@
 # more data will potentially be lost when galaxy restarts.
 INFLUX_INSERT_BUFFER_COUNT = 5
 
+GALAXY_METRICS_ENABLED = True
+
 
 # =========================================================
 # Domain Settings

galaxy/settings/development.py

@@ -92,9 +92,3 @@
 ]
 
 STATIC_ROOT = ''
-
-# =========================================================
-# Metrics Settings
-# =========================================================
-
-METRICS_ENABLED = True

galaxy/settings/production.py

@@ -209,13 +209,6 @@ def _set_logging():
 
 LOGGING = _set_logging()
 
-# =========================================================
-# Metrics Settings
-# =========================================================
-
-METRICS_ENABLED = True
-
-
 # =========================================================
 # InfluxDB Settings
 # =========================================================