Merge branch 'master' into release-1.8

dbrepo-dashboard-service/init.py

@@ -57,7 +57,6 @@ def upsert_dashboard(database: Database) -> None:
     if db is None:
         db = dashboard_client().create(database.internal_name, database.dashboard_uid)
         rest_client().update_database_dashboard(database.id, db['uid'])
-        return
     dashboard_client().update(database)
 
 

dbrepo-dashboard-ui/provisioning/datasources/infinity.yaml

@@ -6,12 +6,12 @@ datasources:
     type: yesoreyeram-infinity-datasource
     basicAuth: true
     basicAuthUser: user
-    url: http://localhost
+    url: $BASE_URL
     jsonData:
       auth_method: 'basicAuth'
       httpHeaderName1: Accept
       allowedHosts:
-        - 'http://localhost'
+        - '$BASE_URL'
     secureJsonData:
       basicAuthPassword: user
       httpHeaderValue1: application/json