influxdata · rhajek · Sep 16, 2019 · Sep 16, 2019 · Sep 16, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,7 +31,7 @@ commands:
                    --volume ${PWD}/.cache:/root/.cache/pip/ \
                    --workdir /usr/src/project \
                    --network influx_network \
-                   --env INFLUXDB_V2_URL="http://192.168.0.2:9999/api/v2" \
+                   --env INFLUXDB_V2_URL="http://192.168.0.2:9999" \
                    python:<< parameters.python-version >> /bin/bash -c "./scripts/ci-test.sh"
       - save_cache:
           name: Saving Pip Cache

diff --git a/README.md b/README.md
@@ -112,7 +112,7 @@ from influxdb2.client.influxdb_client import InfluxDBClient
 from influxdb2.client.write_api import WriteOptions
 from influxdb2.client.write.point import Point
 
-_client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org")
+_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org")
 _write_client = _client.write_api(write_options=WriteOptions(batch_size=500, 
                                                              flush_interval=10_000, 
                                                              jitter_interval=2_000, 
@@ -156,7 +156,7 @@ Data are writes in an asynchronous HTTP request.
 from influxdb2.client.influxdb_client import InfluxDBClient
 from influxdb2.client.write_api import ASYNCHRONOUS
 
-client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org")
+client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org")
 write_client = client.write_api(write_options=ASYNCHRONOUS)
 
 ...
@@ -172,7 +172,7 @@ Data are writes in a synchronous HTTP request.
 from influxdb2.client.influxdb_client import InfluxDBClient
 from influxdb2.client.write_api import SYNCHRONOUS
 
-client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org")
+client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org")
 write_client = client.write_api(write_options=SYNCHRONOUS)
 
 ...
@@ -237,7 +237,7 @@ data = rx \
     .from_iterable(DictReader(open('vix-daily.csv', 'r'))) \
     .pipe(ops.map(lambda row: parse_row(row)))
 
-client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org", debug=True)
+client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True)
 
 """
 Create client that writes data in batches with 500 items.
@@ -344,7 +344,7 @@ data = rx\
           ops.distinct_until_changed(),
           ops.map(lambda temperature: line_protocol(temperature)))
 
-_db_client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org", debug=True)
+_db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", debug=True)
 
 """
 Create client that writes data into InfluxDB
@@ -369,5 +369,5 @@ input()
 ```python
 from influxdb2.client.influxdb_client import InfluxDBClient
 
-_db_client = InfluxDBClient(url="http://localhost:9999/api/v2", token="my-token", org="my-org", enable_gzip=True)
+_db_client = InfluxDBClient(url="http://localhost:9999", token="my-token", org="my-org", enable_gzip=True)
 ```
diff --git a/influxdb2/client/influxdb_client.py b/influxdb2/client/influxdb_client.py
@@ -116,18 +116,23 @@ def health(self) -> HealthCheck:
         :return:
         """
         health_service = HealthService(self.api_client)
-        return health_service.get_health()
+
+        try:
+            health = health_service.get_health()
+            return health
+        except Exception as e:
+            print(e)
+            return HealthCheck(name="influxdb", message=str(e), status="fail")
 
     def ready(self) -> Ready:
         """
         Gets The readiness of the InfluxDB 2.0.
         :return:
         """
-        ready_service = ReadyService(api_client=self)
+        ready_service = ReadyService(self.api_client)
         return ready_service.get_ready()
 
 
-
 class _Configuration(Configuration):
     def __init__(self):
         Configuration.__init__(self)
@@ -137,12 +142,12 @@ def update_request_header_params(self, path: str, params: dict):
         super().update_request_header_params(path, params)
         if self.enable_gzip:
             # GZIP Request
-            if path == '/write':
+            if path == '/api/v2/write':
                 params["Content-Encoding"] = "gzip"
                 params["Accept-Encoding"] = "identity"
                 pass
             # GZIP Response
-            if path == '/query':
+            if path == '/api/v2/query':
                 # params["Content-Encoding"] = "gzip"
                 params["Accept-Encoding"] = "gzip"
                 pass
@@ -153,7 +158,7 @@ def update_request_body(self, path: str, body):
         _body = super().update_request_body(path, body)
         if self.enable_gzip:
             # GZIP Request
-            if path == '/write':
+            if path == '/api/v2/write':
                 import gzip
                 if isinstance(_body, bytes):
                     return gzip.compress(data=_body)

diff --git a/influxdb2/service/authorizations_service.py b/influxdb2/service/authorizations_service.py
@@ -12,8 +12,6 @@
 
 from __future__ import absolute_import
 
-import re  # noqa: F401
-
 # python 2 and python 3 compatibility library
 import six
 
@@ -115,7 +113,7 @@ def delete_authorizations_id_with_http_info(self, auth_id, **kwargs):  # noqa: E
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/authorizations/{authID}', 'DELETE',
+            '/api/v2/authorizations/{authID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -221,7 +219,7 @@ def get_authorizations_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/authorizations', 'GET',
+            '/api/v2/authorizations', 'GET',
             path_params,
             query_params,
             header_params,
@@ -319,7 +317,7 @@ def get_authorizations_id_with_http_info(self, auth_id, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/authorizations/{authID}', 'GET',
+            '/api/v2/authorizations/{authID}', 'GET',
             path_params,
             query_params,
             header_params,
@@ -429,7 +427,7 @@ def patch_authorizations_id_with_http_info(self, auth_id, authorization_update_r
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/authorizations/{authID}', 'PATCH',
+            '/api/v2/authorizations/{authID}', 'PATCH',
             path_params,
             query_params,
             header_params,
@@ -531,7 +529,7 @@ def post_authorizations_with_http_info(self, authorization, **kwargs):  # noqa:
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/authorizations', 'POST',
+            '/api/v2/authorizations', 'POST',
             path_params,
             query_params,
             header_params,

diff --git a/influxdb2/service/buckets_service.py b/influxdb2/service/buckets_service.py
@@ -12,8 +12,6 @@
 
 from __future__ import absolute_import
 
-import re  # noqa: F401
-
 # python 2 and python 3 compatibility library
 import six
 
@@ -115,7 +113,7 @@ def delete_buckets_id_with_http_info(self, bucket_id, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}', 'DELETE',
+            '/api/v2/buckets/{bucketID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -221,7 +219,7 @@ def delete_buckets_id_labels_id_with_http_info(self, bucket_id, label_id, **kwar
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/labels/{labelID}', 'DELETE',
+            '/api/v2/buckets/{bucketID}/labels/{labelID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -327,7 +325,7 @@ def delete_buckets_id_members_id_with_http_info(self, user_id, bucket_id, **kwar
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/members/{userID}', 'DELETE',
+            '/api/v2/buckets/{bucketID}/members/{userID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -433,7 +431,7 @@ def delete_buckets_id_owners_id_with_http_info(self, user_id, bucket_id, **kwarg
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/owners/{userID}', 'DELETE',
+            '/api/v2/buckets/{bucketID}/owners/{userID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -549,7 +547,7 @@ def get_buckets_with_http_info(self, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets', 'GET',
+            '/api/v2/buckets', 'GET',
             path_params,
             query_params,
             header_params,
@@ -647,7 +645,7 @@ def get_buckets_id_with_http_info(self, bucket_id, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}', 'GET',
+            '/api/v2/buckets/{bucketID}', 'GET',
             path_params,
             query_params,
             header_params,
@@ -745,7 +743,7 @@ def get_buckets_id_labels_with_http_info(self, bucket_id, **kwargs):  # noqa: E5
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/labels', 'GET',
+            '/api/v2/buckets/{bucketID}/labels', 'GET',
             path_params,
             query_params,
             header_params,
@@ -857,7 +855,7 @@ def get_buckets_id_logs_with_http_info(self, bucket_id, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/logs', 'GET',
+            '/api/v2/buckets/{bucketID}/logs', 'GET',
             path_params,
             query_params,
             header_params,
@@ -955,7 +953,7 @@ def get_buckets_id_members_with_http_info(self, bucket_id, **kwargs):  # noqa: E
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/members', 'GET',
+            '/api/v2/buckets/{bucketID}/members', 'GET',
             path_params,
             query_params,
             header_params,
@@ -1053,7 +1051,7 @@ def get_buckets_id_owners_with_http_info(self, bucket_id, **kwargs):  # noqa: E5
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/owners', 'GET',
+            '/api/v2/buckets/{bucketID}/owners', 'GET',
             path_params,
             query_params,
             header_params,
@@ -1155,7 +1153,7 @@ def get_sources_id_buckets_with_http_info(self, source_id, **kwargs):  # noqa: E
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/sources/{sourceID}/buckets', 'GET',
+            '/api/v2/sources/{sourceID}/buckets', 'GET',
             path_params,
             query_params,
             header_params,
@@ -1265,7 +1263,7 @@ def patch_buckets_id_with_http_info(self, bucket_id, bucket, **kwargs):  # noqa:
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}', 'PATCH',
+            '/api/v2/buckets/{bucketID}', 'PATCH',
             path_params,
             query_params,
             header_params,
@@ -1367,7 +1365,7 @@ def post_buckets_with_http_info(self, bucket, **kwargs):  # noqa: E501
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets', 'POST',
+            '/api/v2/buckets', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1477,7 +1475,7 @@ def post_buckets_id_labels_with_http_info(self, bucket_id, label_mapping, **kwar
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/labels', 'POST',
+            '/api/v2/buckets/{bucketID}/labels', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1587,7 +1585,7 @@ def post_buckets_id_members_with_http_info(self, bucket_id, add_resource_member_
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/members', 'POST',
+            '/api/v2/buckets/{bucketID}/members', 'POST',
             path_params,
             query_params,
             header_params,
@@ -1697,7 +1695,7 @@ def post_buckets_id_owners_with_http_info(self, bucket_id, add_resource_member_r
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/buckets/{bucketID}/owners', 'POST',
+            '/api/v2/buckets/{bucketID}/owners', 'POST',
             path_params,
             query_params,
             header_params,

diff --git a/influxdb2/service/cells_service.py b/influxdb2/service/cells_service.py
@@ -12,8 +12,6 @@
 
 from __future__ import absolute_import
 
-import re  # noqa: F401
-
 # python 2 and python 3 compatibility library
 import six
 
@@ -123,7 +121,7 @@ def delete_dashboards_id_cells_id_with_http_info(self, dashboard_id, cell_id, **
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells/{cellID}', 'DELETE',
+            '/api/v2/dashboards/{dashboardID}/cells/{cellID}', 'DELETE',
             path_params,
             query_params,
             header_params,
@@ -229,7 +227,7 @@ def get_dashboards_id_cells_id_view_with_http_info(self, dashboard_id, cell_id,
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells/{cellID}/view', 'GET',
+            '/api/v2/dashboards/{dashboardID}/cells/{cellID}/view', 'GET',
             path_params,
             query_params,
             header_params,
@@ -347,7 +345,7 @@ def patch_dashboards_id_cells_id_with_http_info(self, dashboard_id, cell_id, cel
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells/{cellID}', 'PATCH',
+            '/api/v2/dashboards/{dashboardID}/cells/{cellID}', 'PATCH',
             path_params,
             query_params,
             header_params,
@@ -465,7 +463,7 @@ def patch_dashboards_id_cells_id_view_with_http_info(self, dashboard_id, cell_id
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells/{cellID}/view', 'PATCH',
+            '/api/v2/dashboards/{dashboardID}/cells/{cellID}/view', 'PATCH',
             path_params,
             query_params,
             header_params,
@@ -575,7 +573,7 @@ def post_dashboards_id_cells_with_http_info(self, dashboard_id, create_cell, **k
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells', 'POST',
+            '/api/v2/dashboards/{dashboardID}/cells', 'POST',
             path_params,
             query_params,
             header_params,
@@ -685,7 +683,7 @@ def put_dashboards_id_cells_with_http_info(self, dashboard_id, cell, **kwargs):
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/dashboards/{dashboardID}/cells', 'PUT',
+            '/api/v2/dashboards/{dashboardID}/cells', 'PUT',
             path_params,
             query_params,
             header_params,