diff options
| author | avi robusta <avi@robusta.dev> | 2023-05-29 16:05:56 +0300 |
|---|---|---|
| committer | avi robusta <avi@robusta.dev> | 2023-05-29 16:26:41 +0300 |
| commit | fcf5293f6940f8d6b7423f2227ce917bbcd0a23e (patch) | |
| tree | 60d2b5c458d86060207417be2529f103df0acf9b | |
| parent | bffa682f27e7890a17f36c155eabc27c706f9bd0 (diff) | |
removed check connection code
| -rw-r--r-- | robusta_krr/core/integrations/prometheus/metrics_service/thanos_metrics_service.py | 14 | ||||
| -rw-r--r-- | robusta_krr/core/integrations/prometheus/metrics_service/victoria_metrics_service.py | 14 |
2 files changed, 8 insertions, 20 deletions
diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/thanos_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/thanos_metrics_service.py index 9de1cc0..97faa80 100644 --- a/robusta_krr/core/integrations/prometheus/metrics_service/thanos_metrics_service.py +++ b/robusta_krr/core/integrations/prometheus/metrics_service/thanos_metrics_service.py @@ -5,7 +5,7 @@ from requests.exceptions import ConnectionError, HTTPError from robusta_krr.core.models.config import Config from robusta_krr.utils.service_discovery import ServiceDiscovery -from .prometheus_metrics_service import PrometheusMetricsService +from .prometheus_metrics_service import PrometheusMetricsService, PrometheusNotFound class ThanosMetricsDiscovery(ServiceDiscovery): def find_prometheus_url(self, *, api_client: Optional[ApiClient] = None) -> Optional[str]: @@ -35,15 +35,9 @@ class ThanosMetricsService(PrometheusMetricsService): def check_connection(self): try: - response = self.prometheus._session.get( - f"{self.prometheus.url}/api/v1/query", - verify=self.prometheus.ssl_verification, - headers=self.prometheus.headers, - # This query should return empty results, but is correct - params={"query": "example"}, - ) - response.raise_for_status() - except (ConnectionError, HTTPError) as e: + super().check_connection() + except PrometheusNotFound as e: + # This is to clarify which metrics service had the issue and not say its a prometheus issue raise ThanosMetricsNotFound( f"Couldn't connect to Thanos found under {self.prometheus.url}\nCaused by {e.__class__.__name__}: {e})" ) from e diff --git a/robusta_krr/core/integrations/prometheus/metrics_service/victoria_metrics_service.py b/robusta_krr/core/integrations/prometheus/metrics_service/victoria_metrics_service.py index 307364d..b96f1f7 100644 --- a/robusta_krr/core/integrations/prometheus/metrics_service/victoria_metrics_service.py +++ b/robusta_krr/core/integrations/prometheus/metrics_service/victoria_metrics_service.py @@ -5,7 +5,7 @@ from requests.exceptions import ConnectionError, HTTPError from robusta_krr.core.models.config import Config from robusta_krr.utils.service_discovery import ServiceDiscovery -from .prometheus_metrics_service import PrometheusMetricsService +from .prometheus_metrics_service import PrometheusMetricsService, PrometheusNotFound class VictoriaMetricsDiscovery(ServiceDiscovery): def find_prometheus_url(self, *, api_client: Optional[ApiClient] = None) -> Optional[str]: @@ -35,15 +35,9 @@ class VictoriaMetricsService(PrometheusMetricsService): def check_connection(self): try: - response = self.prometheus._session.get( - f"{self.prometheus.url}/api/v1/query", - verify=self.prometheus.ssl_verification, - headers=self.prometheus.headers, - # This query should return empty results, but is correct - params={"query": "example"}, - ) - response.raise_for_status() - except (ConnectionError, HTTPError) as e: + super().check_connection() + except PrometheusNotFound as e: + # This is to clarify which metrics service had the issue and not say its a prometheus issue raise VictoriaMetricsNotFound( f"Couldn't connect to Victoria Metrics found under {self.prometheus.url}\nCaused by {e.__class__.__name__}: {e})" ) from e |
