azure-monitoring - npm Package Compare versions

Comparing version 0.9.1-pre.4 to 0.9.1-pre.5

lib/alertsClient.js

@@ -134,3 +134,3 @@ /* jshint latedef:false */
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '/incidents/' + incidentName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '/incidents/' + incidentName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -246,3 +246,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '/incidents?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '/incidents?';
     url2 = url2 + 'api-version=2014-04';
@@ -412,3 +412,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + parameters.properties.name.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + (parameters.properties.name ? parameters.properties.name.trim() : '') + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -472,4 +472,4 @@ // Trim '/' character from the end of baseUrl and beginning of url.
         propertiesValue['condition'] = conditionValue;
-        conditionValue['odata.type'] = parameters.properties.condition.type;
         if (parameters.properties.condition.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.ThresholdRuleCondition') {
+          conditionValue['odata.type'] = parameters.properties.condition.type;
           var derived = parameters.properties.condition;
@@ -480,4 +480,4 @@
             conditionValue['dataSource'] = dataSourceValue;
-            dataSourceValue['odata.type'] = derived.dataSource.type;
             if (derived.dataSource.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleMetricDataSource') {
+              dataSourceValue['odata.type'] = derived.dataSource.type;
               var derived2 = derived.dataSource;
@@ -506,2 +506,3 @@
         if (parameters.properties.condition.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.LocationThresholdRuleCondition') {
+          conditionValue['odata.type'] = parameters.properties.condition.type;
           var derived3 = parameters.properties.condition;
@@ -512,4 +513,4 @@
             conditionValue['dataSource'] = dataSourceValue2;
-            dataSourceValue2['odata.type'] = derived3.dataSource.type;
             if (derived3.dataSource.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleMetricDataSource') {
+              dataSourceValue2['odata.type'] = derived3.dataSource.type;
               var derived4 = derived3.dataSource;
@@ -540,4 +541,4 @@
         propertiesValue['action'] = actionValue;
-        actionValue['odata.type'] = parameters.properties.action.type;
         if (parameters.properties.action.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleEmailAction') {
+          actionValue['odata.type'] = parameters.properties.action.type;
           var derived5 = parameters.properties.action;
@@ -612,3 +613,3 @@
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -682,3 +683,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + ruleName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -937,6 +938,6 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules?';
     url2 = url2 + 'api-version=2014-04';
     if (targetResourceUri) {
-      url2 = url2 + '&$filter=targetResourceUri eq ' + encodeURIComponent(targetResourceUri.trim());
+      url2 = url2 + '&$filter=targetResourceUri eq ' + encodeURIComponent(targetResourceUri ? targetResourceUri.trim() : '');
     }
@@ -1236,3 +1237,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + parameters.properties.name.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/alertrules/' + (parameters.properties.name ? parameters.properties.name.trim() : '') + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -1296,4 +1297,4 @@ // Trim '/' character from the end of baseUrl and beginning of url.
         propertiesValue['condition'] = conditionValue;
-        conditionValue['odata.type'] = parameters.properties.condition.type;
         if (parameters.properties.condition.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.ThresholdRuleCondition') {
+          conditionValue['odata.type'] = parameters.properties.condition.type;
           var derived = parameters.properties.condition;
@@ -1304,4 +1305,4 @@
             conditionValue['dataSource'] = dataSourceValue;
-            dataSourceValue['odata.type'] = derived.dataSource.type;
             if (derived.dataSource.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleMetricDataSource') {
+              dataSourceValue['odata.type'] = derived.dataSource.type;
               var derived2 = derived.dataSource;
@@ -1330,2 +1331,3 @@
         if (parameters.properties.condition.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.LocationThresholdRuleCondition') {
+          conditionValue['odata.type'] = parameters.properties.condition.type;
           var derived3 = parameters.properties.condition;
@@ -1336,4 +1338,4 @@
             conditionValue['dataSource'] = dataSourceValue2;
-            dataSourceValue2['odata.type'] = derived3.dataSource.type;
             if (derived3.dataSource.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleMetricDataSource') {
+              dataSourceValue2['odata.type'] = derived3.dataSource.type;
               var derived4 = derived3.dataSource;
@@ -1364,4 +1366,4 @@
         propertiesValue['action'] = actionValue;
-        actionValue['odata.type'] = parameters.properties.action.type;
         if (parameters.properties.action.type === 'Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.RuleEmailAction') {
+          actionValue['odata.type'] = parameters.properties.action.type;
           var derived5 = parameters.properties.action;
@@ -1368,0 +1370,0 @@

lib/autoscaleClient.js

@@ -183,3 +183,3 @@ /* jshint latedef:false */
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -433,3 +433,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -503,3 +503,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -841,6 +841,6 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings?';
     url2 = url2 + 'api-version=2014-04';
     if (targetResourceUri) {
-      url2 = url2 + '&$filter=targetResourceUri eq ' + encodeURIComponent(targetResourceUri.trim());
+      url2 = url2 + '&$filter=targetResourceUri eq ' + encodeURIComponent(targetResourceUri ? targetResourceUri.trim() : '');
     }
@@ -1256,3 +1256,3 @@ // Trim '/' character from the end of baseUrl and beginning of url.
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/resourcegroups/' + resourceGroupName.trim() + '/providers/microsoft.insights/autoscalesettings/' + autoscaleSettingName.trim() + '?';
     url2 = url2 + 'api-version=2014-04';
@@ -1259,0 +1259,0 @@ // Trim '/' character from the end of baseUrl and beginning of url.

lib/metricsClient.js

@@ -137,3 +137,3 @@ /* jshint latedef:false */
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/providers/microsoft.insights/metricDefinitions/resource/' + parameters.resourceId.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/providers/microsoft.insights/metricDefinitions/resource/' + parameters.resourceId.trim() + '?';
     url2 = url2 + 'api-version=2014-01';
@@ -336,3 +336,3 @@ url2 = url2 + '&names=' + encodeURIComponent(parameters.metricNames.join(','));
     var baseUrl = this.client.baseUri;
-    var url2 = '/' + this.client.credentials.subscriptionId.trim() + '/services/monitoring/metricsettings';
+    var url2 = '/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/services/monitoring/metricsettings';
     // Trim '/' character from the end of baseUrl and beginning of url.
@@ -373,4 +373,4 @@ if (baseUrl[baseUrl.length - 1] === '/') {
     metricSettingValue['Value'] = valueValue;
-    valueValue['odata.type'] = parameters.metricSetting.value.type;
     if (parameters.metricSetting.value.type === 'Microsoft.WindowsAzure.Management.Monitoring.Metrics.Models.AvailabilityMetricSettingValue') {
+      valueValue['odata.type'] = parameters.metricSetting.value.type;
       var derived = parameters.metricSetting.value;
@@ -476,3 +476,3 @@
     var baseUrl = this.client.baseUri;
-    var url2 = '/' + this.client.credentials.subscriptionId.trim() + '/services/monitoring/metricsettings?';
+    var url2 = '/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/services/monitoring/metricsettings?';
     url2 = url2 + '&resourceId=' + encodeURIComponent(resourceId.trim());
@@ -686,3 +686,3 @@ url2 = url2 + '&namespace=' + encodeURIComponent(metricNamespace.trim());
     var baseUrl = this.client.baseUri;
-    var url2 = '/subscriptions/' + this.client.credentials.subscriptionId.trim() + '/providers/microsoft.insights/metrics/resource/' + parameters.resourceId.trim() + '?';
+    var url2 = '/subscriptions/' + (this.client.credentials.subscriptionId ? this.client.credentials.subscriptionId.trim() : '') + '/providers/microsoft.insights/metrics/resource/' + parameters.resourceId.trim() + '?';
     url2 = url2 + 'api-version=2014-01';
@@ -689,0 +689,0 @@ url2 = url2 + '&names=' + encodeURIComponent(parameters.metricNames.join(','));

package.json

@@ -13,3 +13,3 @@ {
   ],
-  "version": "0.9.1-pre.4",
+  "version": "0.9.1-pre.5",
   "description": "Windows Azure Monitoring Client Library for node",
@@ -35,3 +35,3 @@ "tags": [
   "dependencies": {
-    "azure-common": "0.9.4",
+    "azure-common": "0.9.5",
     "underscore": "1.4.x",
@@ -38,0 +38,0 @@ "moment": "2.6.0"

No alert changes

Improved metrics

Total package byte prevSize

262041

increased by0.58%

Lines of code

5289

increased by0.09%

Dependency changes

• + Addedazure-common@0.9.5(transitive)

• - Removedazure-common@0.9.4(transitive)

• Updatedazure-common@0.9.5