Skip to content

Commit f095ff5

Browse files
himanshu219himanshu219
authored
Merge pull request #69 from SumoLogic/SUMO-233810-fix-unit-testing-automation
Sumo 233810 fix unit testing automation
2 parents c5f4421 + c64b52f commit f095ff5

File tree

13 files changed

+247
-235
lines changed

13 files changed

+247
-235
lines changed

‎EventHubs/requirements.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
requests==2.20.0
2-
azure-mgmt-resource==1.2.2
3-
azure-mgmt-eventhub==1.2.0
4-
azure-servicebus==0.21.1
5-
azure-cosmosdb-table==1.0.2
6-
azure-mgmt-storage==1.0.0
7-
1+
requests==2.31.0
2+
azure-monitor-query==1.2.0
3+
azure-identity==1.15.0
4+
azure-core==1.29.6
5+
azure-mgmt-resource==23.0.1
6+
azure-mgmt-eventhub==11.0.0
7+
azure-eventhub==5.11.5
8+
azure-mgmt-storage==21.1.0
9+
zure-mgmt-loganalytics==12.0.0

‎EventHubs/src/azuredeploy_metrics.json‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"sites_SumoMetricsFunctionApp_name": {
6-
"defaultValue": "[concat('SumoMetricsFuncApp', uniqueString(resourceGroup().id))]",
6+
"defaultValue": "[concat('SMFuncApp', uniqueString(resourceGroup().id))]",
77
"type": "String"
88
},
9-
"namespaces_SumoMetNamespace_name": {
10-
"defaultValue": "[concat('SumoMetricsNamespace', uniqueString(resourceGroup().id))]",
9+
"namespaces_SumoMetricsNamespace_name": {
10+
"defaultValue": "[concat('SMNamespace', uniqueString(resourceGroup().id))]",
1111
"type": "String"
1212
},
13-
"storageAccounts_sumometapplogs_name": {
14-
"defaultValue": "[concat('sumometlogs', uniqueString(resourceGroup().id))]",
13+
"storageAccounts_SumoMetricsAppLogs_name": {
14+
"defaultValue": "[concat('smapplogs', uniqueString(resourceGroup().id))]",
1515
"type": "String"
1616
},
17-
"serverfarms_SumoMetricsAppServicePlan_name": {
18-
"defaultValue": "[concat('SumoMetricsAppServicePlan', uniqueString(resourceGroup().id))]",
17+
"storageAccounts_SumoMetricsFailedLogs_name": {
18+
"defaultValue": "[concat('smfaillogs', uniqueString(resourceGroup().id))]",
1919
"type": "String"
2020
},
21-
"storageAccounts_sumometricsfailedmsg": {
22-
"defaultValue": "[concat('sumometfail', uniqueString(resourceGroup().id))]",
21+
"serverfarms_SumoMetricsAppServicePlan_name": {
22+
"defaultValue": "[concat('SMAppServicePlan', uniqueString(resourceGroup().id))]",
2323
"type": "String"
2424
},
25-
"eventhubs_insights_metrics_pt1m_name": {
25+
"eventhubs_InsightsMetrics_name": {
2626
"defaultValue": "insights-metrics-pt1m",
2727
"type": "String"
2828
},
29-
"AuthorizationRules_RootManageSharedAccessKey_name": {
29+
"authorizationRules_RootManageSharedAccessKey_name": {
3030
"defaultValue": "RootManageSharedAccessKey",
3131
"type": "String"
3232
},
@@ -46,16 +46,16 @@
4646
"defaultValue": "true",
4747
"type": "String"
4848
},
49-
"SumoEndpointURL": {
49+
"sumoEndpointURL": {
5050
"defaultValue": "Enter HTTP Source URL",
5151
"type": "String"
5252
},
5353
"appInsightsName": {
54-
"defaultValue": "[concat('SumoMetricsAppInsights', uniqueString(resourceGroup().id))]",
54+
"defaultValue": "[concat('SMAppInsights', uniqueString(resourceGroup().id))]",
5555
"type": "String"
5656
},
5757
"logAnalyticsWorkspaceName": {
58-
"defaultValue": "[concat('SumoMetricsWorkspace', uniqueString(resourceGroup().id))]",
58+
"defaultValue": "[concat('SMWorkspace', uniqueString(resourceGroup().id))]",
5959
"type": "String"
6060
},
6161
"location": {
@@ -73,7 +73,9 @@
7373
}
7474
}
7575
},
76-
"variables": {},
76+
"variables": {
77+
"appInsightsResourceType": "[concat('microsoft.insights/components/', parameters('appInsightsName'))]"
78+
},
7779
"resources": [
7880
{
7981
"type": "Microsoft.EventHub/namespaces",
@@ -82,7 +84,7 @@
8284
"tier": "Standard",
8385
"capacity": 1
8486
},
85-
"name": "[parameters('namespaces_SumoMetNamespace_name')]",
87+
"name": "[parameters('namespaces_SumoMetricsNamespace_name')]",
8688
"apiVersion": "2022-10-01-preview",
8789
"location": "[parameters('location')]",
8890
"tags": {},
@@ -100,7 +102,7 @@
100102
"tier": "Standard"
101103
},
102104
"kind": "Storage",
103-
"name": "[parameters('storageAccounts_sumometapplogs_name')]",
105+
"name": "[parameters('storageAccounts_SumoMetricsAppLogs_name')]",
104106
"apiVersion": "2022-09-01",
105107
"location": "[parameters('location')]",
106108
"tags": {},
@@ -132,7 +134,7 @@
132134
"tier": "Standard"
133135
},
134136
"kind": "Storage",
135-
"name": "[parameters('storageAccounts_sumometricsfailedmsg')]",
137+
"name": "[parameters('storageAccounts_SumoMetricsFailedLogs_name')]",
136138
"apiVersion": "2022-09-01",
137139
"location": "[parameters('location')]",
138140
"tags": {},
@@ -201,14 +203,14 @@
201203
{ "name": "FUNCTIONS_WORKER_RUNTIME", "value": "node"},
202204
{ "name": "WEBSITE_NODE_DEFAULT_VERSION", "value": "~18"},
203205
{ "name": "Project", "value": "EventHubs/target/metrics_build/" },
204-
{ "name": "AzureWebJobsStorage", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]" },
205-
{ "name": "APPLICATIONINSIGHTS_CONNECTION_STRING", "value": "[reference(concat('microsoft.insights/components/', parameters('appInsightsName')), '2015-05-01').ConnectionString]" },
206-
{ "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", "value" : "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometapplogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]"},
206+
{ "name": "AzureWebJobsStorage", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_SumoMetricsAppLogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_SumoMetricsAppLogs_name')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]" },
207+
{ "name": "APPLICATIONINSIGHTS_CONNECTION_STRING", "value": "[reference(variables('appInsightsResourceType'), '2015-05-01').ConnectionString]" },
208+
{ "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", "value" : "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_SumoMetricsAppLogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_SumoMetricsAppLogs_name')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]"},
207209
{ "name": "WEBSITE_CONTENTSHARE", "value": "[toLower(parameters('sites_SumoMetricsFunctionApp_name'))]" },
208210
{ "name": "FUNCTION_APP_EDIT_MODE", "value": "readwrite"},
209-
{ "name": "SumoLabsMetricEndpoint", "value": "[parameters('SumoEndpointURL')]" },
210-
{ "name": "AzureEventHubConnectionString", "value": "[concat(listkeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('namespaces_SumoMetNamespace_name'),parameters('AuthorizationRules_RootManageSharedAccessKey_name')), '2022-10-01-preview').primaryConnectionString,';EntityPath=',parameters('eventhubs_insights_metrics_pt1m_name'))]" },
211-
{ "name": "StorageConnectionString", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_sumometricsfailedmsg'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometricsfailedmsg')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]" }
211+
{ "name": "SumoLabsMetricEndpoint", "value": "[parameters('sumoEndpointURL')]" },
212+
{ "name": "AzureEventHubConnectionString", "value": "[concat(listkeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('namespaces_SumoMetricsNamespace_name'),parameters('authorizationRules_RootManageSharedAccessKey_name')), '2022-10-01-preview').primaryConnectionString,';EntityPath=',parameters('eventhubs_InsightsMetrics_name'))]" },
213+
{ "name": "StorageConnectionString", "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('storageAccounts_SumoMetricsFailedLogs_name'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_SumoMetricsFailedLogs_name')),'2022-09-01').keys[0].value,';EndpointSuffix=', parameters('storageEndpointSuffix'))]" }
212214
]
213215
}
214216
},
@@ -229,14 +231,14 @@
229231
],
230232
"dependsOn": [
231233
"[resourceId('Microsoft.Web/serverfarms', parameters('serverfarms_SumoMetricsAppServicePlan_name'))]",
232-
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_sumometapplogs_name'))]",
233-
"[resourceId('Microsoft.EventHub/namespaces/', parameters('namespaces_SumoMetNamespace_name'))]",
234+
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_SumoMetricsAppLogs_name'))]",
235+
"[resourceId('Microsoft.EventHub/namespaces/', parameters('namespaces_SumoMetricsNamespace_name'))]",
234236
"[resourceId('Microsoft.Insights/components', parameters('appInsightsName'))]"
235237
]
236238
},
237239
{
238240
"type": "Microsoft.EventHub/namespaces/AuthorizationRules",
239-
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('AuthorizationRules_RootManageSharedAccessKey_name'))]",
241+
"name": "[concat(parameters('namespaces_SumoMetricsNamespace_name'), '/', parameters('authorizationRules_RootManageSharedAccessKey_name'))]",
240242
"apiVersion": "2022-10-01-preview",
241243
"location": "[parameters('location')]",
242244
"scale": null,
@@ -248,12 +250,12 @@
248250
]
249251
},
250252
"dependsOn": [
251-
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetNamespace_name'))]"
253+
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetricsNamespace_name'))]"
252254
]
253255
},
254256
{
255257
"type": "Microsoft.EventHub/namespaces/eventhubs",
256-
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('eventhubs_insights_metrics_pt1m_name'))]",
258+
"name": "[concat(parameters('namespaces_SumoMetricsNamespace_name'), '/', parameters('eventhubs_InsightsMetrics_name'))]",
257259
"apiVersion": "2022-10-01-preview",
258260
"location": "[parameters('location')]",
259261
"scale": null,
@@ -263,19 +265,19 @@
263265
"status": "Active"
264266
},
265267
"dependsOn": [
266-
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetNamespace_name'))]"
268+
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetricsNamespace_name'))]"
267269
]
268270
},
269271
{
270272
"type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups",
271-
"name": "[concat(parameters('namespaces_SumoMetNamespace_name'), '/', parameters('eventhubs_insights_metrics_pt1m_name'), '/', parameters('consumerGroupName'))]",
273+
"name": "[concat(parameters('namespaces_SumoMetricsNamespace_name'), '/', parameters('eventhubs_InsightsMetrics_name'), '/', parameters('consumerGroupName'))]",
272274
"apiVersion": "2022-10-01-preview",
273275
"location": "[parameters('location')]",
274276
"scale": null,
275277
"properties": {},
276278
"dependsOn": [
277-
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetNamespace_name'))]",
278-
"[resourceId('Microsoft.EventHub/namespaces/eventhubs', parameters('namespaces_SumoMetNamespace_name'), parameters('eventhubs_insights_metrics_pt1m_name'))]"
279+
"[resourceId('Microsoft.EventHub/namespaces', parameters('namespaces_SumoMetricsNamespace_name'))]",
280+
"[resourceId('Microsoft.EventHub/namespaces/eventhubs', parameters('namespaces_SumoMetricsNamespace_name'), parameters('eventhubs_InsightsMetrics_name'))]"
279281
]
280282
},
281283
{
@@ -311,4 +313,4 @@
311313
}
312314
}
313315
]
314-
}
316+
}

‎EventHubs/target/logs_build/EventHubs_Logs/sumoclient.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
125125
var self = this;
126126
let curOptions = Object.assign({},this.options);
127127

128-
this.context.debug("Flush buffer for metaKey:"+metaKey);
128+
this.context.log.verbose("Flush buffer for metaKey:"+metaKey);
129129

130130
function httpSend(messageArray,data) {
131131
return new Promise( (resolve,reject) => {
@@ -175,10 +175,10 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
175175

176176
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
177177
if (!e) {
178-
self.context.debug("gzip successful");
178+
self.context.log.verbose("gzip successful");
179179
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
180180
.then(()=> {
181-
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
181+
self.context.log.verbose("Successfully sent to Sumo after "+self.MaxAttempts);
182182
self.success_callback(self.context);}
183183
)
184184
.catch((err) => {

‎EventHubs/target/logs_build/EventHubs_Logs/sumometricclient.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ var sumoclient = require('./sumoclient');
1010
var bucket = require('./messagebucket');
1111
var sumoutils = require('./sumoutils.js');
1212

13-
14-
1513
var metadataMap = {"category":"X-Sumo-Category","sourceName":"X-Sumo-Name","sourceHost":"X-Sumo-Host"};
1614
/**
1715
* Class to receive metrics to a designated Sumo endpoint. Similar to the Log client is best used independently with a batch of messages so one can track the number
@@ -119,7 +117,7 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
119117
var self = this;
120118
let curOptions = Object.assign({},this.options);
121119

122-
this.context.debug("Flush METRIC buffer for metaKey:"+metaKey);
120+
this.context.log.verbose("Flush METRIC buffer for metaKey:"+metaKey);
123121

124122
function httpSend(messageArray,data) {
125123

@@ -172,10 +170,10 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
172170

173171
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
174172
if (!e) {
175-
self.context.debug("gzip successful");
173+
self.context.log.verbose("gzip successful");
176174
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
177175
.then(()=> {
178-
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
176+
self.context.log.verbose("Successfully sent to Sumo after "+self.MaxAttempts);
179177
self.success_callback(self.context);}
180178
)
181179
.catch((err) => {

‎EventHubs/target/metrics_build/EventHubs_Metrics/sumoclient.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
125125
var self = this;
126126
let curOptions = Object.assign({},this.options);
127127

128-
this.context.debug("Flush buffer for metaKey:"+metaKey);
128+
this.context.log.verbose("Flush buffer for metaKey:"+metaKey);
129129

130130
function httpSend(messageArray,data) {
131131
return new Promise( (resolve,reject) => {
@@ -175,10 +175,10 @@ SumoClient.prototype.flushBucketToSumo = function(metaKey) {
175175

176176
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
177177
if (!e) {
178-
self.context.debug("gzip successful");
178+
self.context.log.verbose("gzip successful");
179179
return sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
180180
.then(()=> {
181-
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
181+
self.context.log.verbose("Successfully sent to Sumo after "+self.MaxAttempts);
182182
self.success_callback(self.context);}
183183
)
184184
.catch((err) => {

‎EventHubs/target/metrics_build/EventHubs_Metrics/sumometricclient.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ var sumoclient = require('./sumoclient');
1010
var bucket = require('./messagebucket');
1111
var sumoutils = require('./sumoutils.js');
1212

13-
14-
1513
var metadataMap = {"category":"X-Sumo-Category","sourceName":"X-Sumo-Name","sourceHost":"X-Sumo-Host"};
1614
/**
1715
* Class to receive metrics to a designated Sumo endpoint. Similar to the Log client is best used independently with a batch of messages so one can track the number
@@ -119,7 +117,7 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
119117
var self = this;
120118
let curOptions = Object.assign({},this.options);
121119

122-
this.context.debug("Flush METRIC buffer for metaKey:"+metaKey);
120+
this.context.log.verbose("Flush METRIC buffer for metaKey:"+metaKey);
123121

124122
function httpSend(messageArray,data) {
125123

@@ -172,10 +170,10 @@ SumoMetricClient.prototype.flushBucketToSumo = function(metaKey) {
172170

173171
return zlib.gzip(msgArray.join('\n'),function(e,compressed_data){
174172
if (!e) {
175-
self.context.debug("gzip successful");
173+
self.context.log.verbose("gzip successful");
176174
sumoutils.p_retryMax(httpSend,self.MaxAttempts,self.RetryInterval,[msgArray,compressed_data])
177175
.then(()=> {
178-
self.context.debug("Successfully sent to Sumo after "+self.MaxAttempts);
176+
self.context.log.verbose("Successfully sent to Sumo after "+self.MaxAttempts);
179177
self.success_callback(self.context);}
180178
)
181179
.catch((err) => {

‎EventHubs/target/metrics_build/host.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"default": "Warning",
2121
"Host.Aggregator": "Trace",
2222
"Host.Results": "Information",
23-
"Function": "Trace"
23+
"Function": "Information"
2424
}
2525
},
2626
"functions": [

0 commit comments

Comments
 (0)