Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions azure-kusto-data/azure/kusto/data/wellKnownKustoEndpoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,28 @@
"adx.loganalytics.azure.fr",
"adx.monitor.azure.fr"
]
},
"https://login.sovcloud-identity.de": {
"AllowedKustoSuffixes": [
".kusto.sovcloud-api.de",
".kustomfa.sovcloud-api.de"
],
"AllowedKustoHostnames": [
"adx.applicationinsights.azure.de",
"adx.loganalytics.azure.de",
"adx.monitor.azure.de"
]
},
"https://login.sovcloud-identity.sg": {
"AllowedKustoSuffixes": [
".kusto.sovcloud-api.sg",
".kustomfa.sovcloud-api.sg"
],
"AllowedKustoHostnames": [
"adx.applicationinsights.azure.sg",
"adx.loganalytics.azure.sg",
"adx.monitor.azure.sg"
]
}
}
}
7 changes: 3 additions & 4 deletions azure-kusto-data/tests/test_well_known_kusto_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,9 @@ def test_well_known_kusto_endpoints_national_clouds():
"https://kustofrbwrznltavls.kusto.usgovcloudapi.net,https://login.microsoftonline.us",
"https://kusto7j53clqswr4he.kusto.core.eaglex.ic.gov,https://login.microsoftonline.eaglex.ic.gov",
"https://rpe2e0422132101fct2.kusto.core.microsoft.scloud,https://login.microsoftonline.microsoft.scloud",
"https://kustozszokb5yrauyq.kusto.chinacloudapi.cn,{0}".format(CHINA_CLOUD_LOGIN),
"https://kustofrbwrznltavls.kusto.usgovcloudapi.net,https://login.microsoftonline.us",
"https://kusto7j53clqswr4he.kusto.core.eaglex.ic.gov,https://login.microsoftonline.eaglex.ic.gov",
"https://rpe2e0422132101fct2.kusto.core.microsoft.scloud,https://login.microsoftonline.microsoft.scloud",
"https://abc.kusto.sovcloud-api.fr,https://login.sovcloud-identity.fr",
"https://efg.kusto.sovcloud-api.de,https://login.sovcloud-identity.de",
"https://hij.kusto.sovcloud-api.sg,https://login.sovcloud-identity.sg"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"https://hij.kusto.sovcloud-api.sg,https://login.sovcloud-identity.sg"
"https://hij.kusto.sovcloud-api.sg,https://login.sovcloud-identity.sg",

]:
cluster_and_login_endpoint = c.split(",")
_validate_endpoint(cluster_and_login_endpoint[0], cluster_and_login_endpoint[1])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from azure.core.tracing import SpanKind

from azure.kusto.data import KustoConnectionStringBuilder
from azure.kusto.data.exceptions import KustoApiError, KustoClosedError
from azure.kusto.data.exceptions import KustoApiError, KustoClosedError, KustoThrottlingError
from azure.kusto.data._telemetry import MonitoredActivity

from . import BlobDescriptor, FileDescriptor, IngestionProperties, StreamDescriptor
Expand Down Expand Up @@ -99,6 +99,8 @@ def ingest_from_stream(self, stream_descriptor: Union[StreamDescriptor, IO[AnySt
if error.permanent:
raise
buffered_stream.seek(0, SEEK_SET)
except KustoThrottlingError:
_ = buffered_stream.seek(0, SEEK_SET)

return self.queued_client.ingest_from_stream(stream_descriptor, ingestion_properties)

Expand Down Expand Up @@ -127,6 +129,8 @@ def ingest_from_blob(self, blob_descriptor: BlobDescriptor, ingestion_properties
error = ex.get_api_error()
if error.permanent:
raise
except KustoThrottlingError:
pass

return self.queued_client.ingest_from_blob(blob_descriptor, ingestion_properties)

Expand Down
Loading