Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RI from upstream/master into origin/release #75

Merged
merged 54 commits into from
Sep 29, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
cee2328
FW: Fixing the documentation of the properties in the generated code …
gucalder Apr 8, 2015
83d9cec
FW: [Sdk] Rename skuDefinitions to skus
george-moussa Apr 16, 2015
e73d650
WORK: 3595593: [Sdk] Add Milliseconds unit
george-moussa Apr 20, 2015
af3411d
WORK: 3644439: [Sdk][Sku] Remove antares workarounds
george-moussa Apr 20, 2015
2bea3c9
Revert "WORK: 3644439: [Sdk][Sku] Remove antares workarounds"
george-moussa Apr 21, 2015
0c8adf7
WORK: 3587839 [SDK] Support storage analytic metric schema natively i…
davmc Apr 21, 2015
4c18888
Update SDK version
davmc Apr 21, 2015
2c8e250
Fix exception due to TIMESTAMP field type
davmc Apr 23, 2015
f94730e
WORK: 3644439: [Sdk][Sku] Remove antares workarounds
george-moussa Apr 23, 2015
f0ab40d
Azure SDK changes for the hydra changes
jagadisk Apr 24, 2015
d06a022
Revert "WORK: 3587839 [SDK] Support storage analytic metric schema na…
jagadisk Apr 24, 2015
b892a27
Update the SDK version to 0.8.2
jagadisk Apr 24, 2015
9da58c3
Revert "Revert "WORK: 3587839 [SDK] Support storage analytic metric s…
jagadisk Apr 24, 2015
75a43b8
Reverting the revert of the storage analytics.
jagadisk Apr 24, 2015
5479fab
GetMetrics query instance metrics when they are present and aggregate…
vcanaa May 5, 2015
c962957
Increase Insights version to 0.8.4.0
vcanaa May 6, 2015
bbcff80
1. API to get the event categories
jagadisk May 22, 2015
124f3d0
Including the model classes in the project.
jagadisk May 22, 2015
8a322a6
Update the version to 0.8.5-preview
jagadisk May 22, 2015
8783495
API to get Tenant-level events
davmc Jun 5, 2015
97a96d2
Removing files that are not referenced
vcanaa Jul 20, 2015
a41bf6d
Keeping OnetimeGenerated structure the same as generated
vcanaa Jul 20, 2015
57109e4
WORK: 4057941: [Lastest Sku contract][Sdk] Part1: Update non-breaking…
george-moussa Jul 21, 2015
82ee5a8
Fix timestamp parsing in shoebox metrics
vcanaa Jul 22, 2015
773fa54
[ShoeboxV2] MetricsDefinitionsOperations and MetricsOperations
vcanaa Jul 23, 2015
1ae410b
[ShoeboxV2] Fix null pointer exception when aggregating the data from…
vcanaa Jul 29, 2015
3a32541
Disable encoding for GetMetrics (Generated files)
davmc Jul 31, 2015
3a95b1d
BUG: 4305815 : [SDK][legacy passthrough] move towards using extension…
jagadisk Aug 12, 2015
3dc38c9
WORK: 4057941: [SDK][Generic autoscale] Ensure generic autoscale supp…
george-moussa Aug 18, 2015
bf9fcbe
Merge remote-tracking branch 'origin/dev' into dev
davmc Aug 28, 2015
8a7b436
BUG: 4390874 [SDK] Add missing Id field to UsageMetric
davmc Aug 28, 2015
c66ee16
BUG: 4486642 : [ShoeboxV1] Make sure that the new sdk with extensions…
jagadisk Sep 2, 2015
858e324
Version increment
jagadisk Sep 8, 2015
aafa708
Adding support for webhook actions to the Alert sdk
LeoVannelli Sep 10, 2015
a1a6377
BUG: Call to get the metric definition fails.
jagadisk Sep 11, 2015
77fd924
BUG: Call to get the metric definition fails.
jagadisk Sep 11, 2015
b07d61f
Merge branch 'dev' of https://github.com/AuxMon/azure-sdk-for-net int…
jagadisk Sep 11, 2015
db53eb4
Merge branch 'dev' into shoeboxv2
jagadisk Sep 11, 2015
02be46b
Removing the duplicate entries in the csproj (due to merge conflicts)
jagadisk Sep 11, 2015
dc94348
Update the version
jagadisk Sep 11, 2015
5bbd18c
Update the version
jagadisk Sep 11, 2015
829dca6
Merge branch 'dev'
jagadisk Sep 15, 2015
327f123
Remove the code from the old location
jagadisk Sep 15, 2015
7506cde
Overwriting the Insights folder with the latest from the dev branch
jagadisk Sep 15, 2015
9dc40aa
Fix build break with pragma; Account for types supported by AppInsights
jagadisk Sep 16, 2015
0fa6cda
Removing event tests that are not relavant.
jagadisk Sep 16, 2015
8ff3568
Refreshing the SDK with the latest hydra generated files
jagadisk Sep 21, 2015
82adfdc
Search SDK: Removing dependency on JsonConvert.DefaultSettings
brjohnstmsft Sep 24, 2015
3a880ab
Increment the SDK version
jagadisk Sep 24, 2015
a9d90be
Add ListLocations to subscriptions client
vivsriaus Sep 24, 2015
f849555
Merge pull request #1451 from brjohnstmsft/jsonfix-pr
Sep 25, 2015
21db6e5
Merge pull request #1452 from vivsriaus/master
Sep 25, 2015
7eb1056
Merge pull request #1454 from MabOneSdk/release
ogail Sep 28, 2015
2cc2860
Merge pull request #1456 from AuxMon/master
stankovski Sep 28, 2015
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
Prev Previous commit
Next Next commit
Refreshing the SDK with the latest hydra generated files
  • Loading branch information
jagadisk committed Sep 21, 2015
commit 8ff35686e8752d1cfdf6473484eb42248707ec90
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ public async Task<LogDefinitionListResponse> GetLogDefinitionsAsync(string resou
}
}

JToken resourceUriValue = valueValue["resourceUri"];
if (resourceUriValue != null && resourceUriValue.Type != JTokenType.Null)
JToken resourceIdValue = valueValue["resourceId"];
if (resourceIdValue != null && resourceIdValue.Type != JTokenType.Null)
{
string resourceUriInstance = ((string)resourceUriValue);
logDefinitionInstance.ResourceUri = resourceUriInstance;
string resourceIdInstance = ((string)resourceIdValue);
logDefinitionInstance.ResourceId = resourceIdInstance;
}

JToken retentionValue = valueValue["retention"];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsAsync(string
url = url + resourceUri;
url = url + "/metricDefinitions";
List<string> queryParameters = new List<string>();
queryParameters.Add("api-version=2014-04-01");
queryParameters.Add("api-version=2015-07-01");
List<string> odataFilter = new List<string>();
if (filterString != null)
{
Expand Down Expand Up @@ -237,11 +237,11 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsAsync(string
metricDefinitionInstance.PrimaryAggregationType = primaryAggregationTypeInstance;
}

JToken resourceUriValue = valueValue["resourceUri"];
if (resourceUriValue != null && resourceUriValue.Type != JTokenType.Null)
JToken resourceIdValue = valueValue["resourceId"];
if (resourceIdValue != null && resourceIdValue.Type != JTokenType.Null)
{
string resourceUriInstance = ((string)resourceUriValue);
metricDefinitionInstance.ResourceUri = resourceUriInstance;
string resourceIdInstance = ((string)resourceIdValue);
metricDefinitionInstance.ResourceId = resourceIdInstance;
}

JToken metricAvailabilitiesArray = valueValue["metricAvailabilities"];
Expand Down Expand Up @@ -331,6 +331,58 @@ public async Task<MetricDefinitionListResponse> GetMetricDefinitionsAsync(string
locationInstance.PartitionKey = partitionKeyInstance;
}
}

JToken blobLocationValue = metricAvailabilitiesValue["blobLocation"];
if (blobLocationValue != null && blobLocationValue.Type != JTokenType.Null)
{
BlobLocation blobLocationInstance = new BlobLocation();
metricAvailabilityInstance.BlobLocation = blobLocationInstance;

JToken blobEndpointValue = blobLocationValue["blobEndpoint"];
if (blobEndpointValue != null && blobEndpointValue.Type != JTokenType.Null)
{
string blobEndpointInstance = ((string)blobEndpointValue);
blobLocationInstance.BlobEndpoint = blobEndpointInstance;
}

JToken blobInfoArray = blobLocationValue["blobInfo"];
if (blobInfoArray != null && blobInfoArray.Type != JTokenType.Null)
{
foreach (JToken blobInfoValue in ((JArray)blobInfoArray))
{
BlobInfo blobInfoInstance = new BlobInfo();
blobLocationInstance.BlobInfo.Add(blobInfoInstance);

JToken blobUriValue = blobInfoValue["blobUri"];
if (blobUriValue != null && blobUriValue.Type != JTokenType.Null)
{
string blobUriInstance = ((string)blobUriValue);
blobInfoInstance.BlobUri = blobUriInstance;
}

JToken startTimeValue2 = blobInfoValue["startTime"];
if (startTimeValue2 != null && startTimeValue2.Type != JTokenType.Null)
{
DateTime startTimeInstance2 = ((DateTime)startTimeValue2);
blobInfoInstance.StartTime = startTimeInstance2;
}

JToken endTimeValue2 = blobInfoValue["endTime"];
if (endTimeValue2 != null && endTimeValue2.Type != JTokenType.Null)
{
DateTime endTimeInstance2 = ((DateTime)endTimeValue2);
blobInfoInstance.EndTime = endTimeInstance2;
}

JToken sasTokenValue2 = blobInfoValue["sasToken"];
if (sasTokenValue2 != null && sasTokenValue2.Type != JTokenType.Null)
{
string sasTokenInstance2 = ((string)sasTokenValue2);
blobInfoInstance.SasToken = sasTokenInstance2;
}
}
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
namespace Microsoft.Azure.Insights.Models
{
/// <summary>
/// Contains the Table information for N-day Tables, each table is used for
/// a specific date range.
/// Contains the information for blobs. Each one is used for a specific
/// time range.
/// </summary>
public partial class BlobInfo
{
private string _blobUri;

/// <summary>
/// Optional. Gets or sets the table info.
/// Optional. Gets or sets the blob info.
/// </summary>
public string BlobUri
{
Expand All @@ -44,7 +44,7 @@ public string BlobUri
private DateTime _endTime;

/// <summary>
/// Optional. Gets or sets the end time of the range for this table.
/// Optional. Gets or sets the end time of the range for this blob.
/// </summary>
public DateTime EndTime
{
Expand All @@ -55,7 +55,7 @@ public DateTime EndTime
private string _sasToken;

/// <summary>
/// Optional. Gets or sets the SAS Key for accessing Table Storage.
/// Optional. Gets or sets the SAS Key for accessing Blob Storage.
/// </summary>
public string SasToken
{
Expand All @@ -77,7 +77,7 @@ public DateTime SasTokenExpirationTime
private DateTime _startTime;

/// <summary>
/// Optional. Gets or sets the start time of the range for this table.
/// Optional. Gets or sets the start time of the range for this blob.
/// </summary>
public DateTime StartTime
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
namespace Microsoft.Azure.Insights.Models
{
/// <summary>
/// Details the location of the Metrics and contains the SAS Key.
/// Details about the set of blobs containing data split by time.
/// </summary>
public partial class BlobLocation
{
private string _blobEndpoint;

/// <summary>
/// Optional. Gets or sets the table endpoint.
/// Optional. Gets or sets the blob endpoint.
/// </summary>
public string BlobEndpoint
{
Expand All @@ -46,7 +46,7 @@ public string BlobEndpoint
private IList<BlobInfo> _blobInfo;

/// <summary>
/// Optional. Gets or sets the table info.
/// Optional. Gets or sets the blob info.
/// </summary>
public IList<BlobInfo> BlobInfo
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ public LocalizableString Category
set { this._category = value; }
}

private string _resourceUri;
private string _resourceId;

/// <summary>
/// Optional. Gets or sets the resource identifier of the resource that
/// has emitted the log.
/// </summary>
public string ResourceUri
public string ResourceId
{
get { return this._resourceUri; }
set { this._resourceUri = value; }
get { return this._resourceId; }
set { this._resourceId = value; }
}

private TimeSpan _retention;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ public IDictionary<string, string> Properties
set { this._properties = value; }
}

private string _resourceUri;
private string _resourceId;

/// <summary>
/// Optional. Gets or sets the resource identifier of the resource that
/// has emitted the metric.
/// </summary>
public string ResourceUri
public string ResourceId
{
get { return this._resourceUri; }
set { this._resourceUri = value; }
get { return this._resourceId; }
set { this._resourceId = value; }
}

private Unit _unit;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ public RetentionPolicy RetentionPolicy
set { this._retentionPolicy = value; }
}

private string _timegrain;
private TimeSpan _timeGrain;

/// <summary>
/// Optional. Gets or sets the timegrain of the metric.
/// </summary>
public string Timegrain
public TimeSpan TimeGrain
{
get { return this._timegrain; }
set { this._timegrain = value; }
get { return this._timeGrain; }
set { this._timeGrain = value; }
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ public string StorageAccountId
private string _storageAccountName;

/// <summary>
/// Optional. Gets or sets the name of the storage account.
/// Optional. [Deprecated] Use StorageAccountId instead. Gets or sets
/// the name of the storage account.
/// </summary>
public string StorageAccountName
{
Expand Down
Loading