import 15.2.0 Octopus source

[ceph.git] / ceph / src / pybind / mgr / dashboard / grafana.py

diff --git a/ceph/src/pybind/mgr/dashboard/grafana.py b/ceph/src/pybind/mgr/dashboard/grafana.py
index 1399dce3c4b2348e92ca7342b5975845002de2ea..163df1942e05f7c77d25c6ae40fe50afef75c805 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/grafana.py
+++ b/ceph/src/pybind/mgr/dashboard/grafana.py
@@ -2,23 +2,26 @@
 from __future__ import absolute_import
 
 import json
+import logging
 import os
 import time
 import requests
 
-from . import logger
 from .exceptions import GrafanaError
 from .settings import Settings
 
 
+logger = logging.getLogger('grafana')
+
+
 class GrafanaRestClient(object):
 
     @staticmethod
     def url_validation(method, path):
         response = requests.request(
             method,
-            path)
-
+            path,
+            verify=Settings.GRAFANA_API_SSL_VERIFY)
         return response.status_code
 
     @staticmethod
@@ -48,6 +51,7 @@ class GrafanaRestClient(object):
                 data=json.dumps(payload),
                 auth=(Settings.GRAFANA_API_USERNAME,
                       Settings.GRAFANA_API_PASSWORD),
+                verify=Settings.GRAFANA_API_SSL_VERIFY
             )
         except requests.ConnectionError:
             raise GrafanaError("Could not connect to Grafana server")