Merge pull request #1729 from AdityaSrikanth/topic-performance

RLIndia · web-flow · commit bcc2b621858f · 2021-09-03T10:53:12.000+05:30
Removed sensu-client installation for CFT blueprint
diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js
@@ -2618,7 +2618,8 @@ var MasterUtil = function () {
     };
     this.getSensuCookbooks = function(){
         //var cookbooks = ['recipe[sensu-client]','recipe[sensu_check_load]','recipe[sensu_check_disk]','recipe[sensu_check_cpu]','recipe[sensu_check_memory]','recipe[consul-client-demo]'];
-        var cookbooks = ['recipe[sensu-client]','recipe[consul-client-demo]','recipe[cft-rlc-demo]'];
+        // var cookbooks = ['recipe[sensu-client]','recipe[consul-client-demo]','recipe[cft-rlc-demo]'];
+        var cookbooks = ['recipe[consul-client-demo]','recipe[cft-rlc-demo]'];
         return cookbooks;
     };
 
diff --git a/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js b/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
@@ -782,9 +782,9 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)
                                                                                 if(launchParams.stackName)
                                                                                 {
                                                                                     launchParams.monitor.parameters.stackName = launchParams.stackName;
-                                                                                    jsonAttributes['sensu-client'] = {
-                                                                                        "service-name": launchParams.stackName
-                                                                                    }                                                                                
+                                                                                    // jsonAttributes['sensu-client'] = {
+                                                                                    //     "service-name": launchParams.stackName
+                                                                                    // }                                                                                
                                                                                 }
                                                                                 if(launchParams.orgName)
                                                                                 {
@@ -793,7 +793,7 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)
                                                                                         orgNameString = orgNameString[0];
                                                                                     launchParams.monitor.parameters.orgName = orgNameString;
                                                                                     //Adding to sensu-client cookbook attribute.
-                                                                                    jsonAttributes['sensu-client']['check-tenant-id'] =  orgNameString
+                                                                                    // jsonAttributes['sensu-client']['check-tenant-id'] =  orgNameString
                                                                                     
                                                                                 }
                                                                                 //jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);
diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
@@ -690,7 +690,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
                                             var sensuCookBook = sensuCookBooks[0];
                                             if (runlist.indexOf(sensuCookBook) === -1 && launchParams.monitor && launchParams.monitor.parameters.transportProtocol === 'rabbitmq') {
                                                 runlist = sensuCookBooks.concat(runlist);
-                                                jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);
+                                                //jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);
                                             }
 
                                             //logger.debug("runlist: ", JSON.stringify(runlist));
diff --git a/server/app/routes/v1.0/routes_chef.js b/server/app/routes/v1.0/routes_chef.js
@@ -357,7 +357,7 @@ module.exports.setRoutes = function (app, verificationFunc) {
                                                     var sensuCookBooks = MasterUtils.getSensuCookbooks();
                                                     var runlist = sensuCookBooks;
                                                     var jsonAttributes = {};
-                                                    jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);
+                                                    //jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);
 
                                                     runOptions = {
                                                         username: decryptedCredentials.username,
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
@@ -1495,7 +1495,7 @@ module.exports.setRoutes = function (app, sessionVerification) {
                             var runlist = sensuCookBooks;
                             var jsonAttributes = {};
 
-                            jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(instance.monitor, instance.id);
+                            //jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(instance.monitor, instance.id);
 
                             bootstarpOption['runlist'] = runlist;
                             bootstarpOption['jsonAttributes'] = jsonAttributes;
diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js
@@ -574,7 +574,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) {
                                                                                 var sensuCookBooks = MasterUtils.getSensuCookbooks();
                                                                                 var runlist = sensuCookBooks;
                                                                                 var jsonAttributes = {};
-                                                                                jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);
+                                                                                //jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);
                                                                                 ;
 
                                                                                 bootstarpOption['runlist'] = runlist;

Original file line number	Diff line number	Diff line change
`@@ -782,9 +782,9 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)`
`782`	`782`	`if(launchParams.stackName)`
`783`	`783`	`{`
`784`	`784`	`launchParams.monitor.parameters.stackName = launchParams.stackName;`
`785`		`- jsonAttributes['sensu-client'] = {`
`786`		`- "service-name": launchParams.stackName`
`787`		`- }`
	`785`	`+ // jsonAttributes['sensu-client'] = {`
	`786`	`+ // "service-name": launchParams.stackName`
	`787`	`+ // }`
`788`	`788`	`}`
`789`	`789`	`if(launchParams.orgName)`
`790`	`790`	`{`
`@@ -793,7 +793,7 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)`
`793`	`793`	`orgNameString = orgNameString[0];`
`794`	`794`	`launchParams.monitor.parameters.orgName = orgNameString;`
`795`	`795`	`//Adding to sensu-client cookbook attribute.`
`796`		`- jsonAttributes['sensu-client']['check-tenant-id'] = orgNameString`
	`796`	`+ // jsonAttributes['sensu-client']['check-tenant-id'] = orgNameString`
`797`	`797`
`798`	`798`	`}`
`799`	`799`	`//jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {`
`690`	`690`	`var sensuCookBook = sensuCookBooks[0];`
`691`	`691`	`if (runlist.indexOf(sensuCookBook) === -1 && launchParams.monitor && launchParams.monitor.parameters.transportProtocol === 'rabbitmq') {`
`692`	`692`	`runlist = sensuCookBooks.concat(runlist);`
`693`		`- jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);`
	`693`	`+ //jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(launchParams.monitor, instance.id);`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`//logger.debug("runlist: ", JSON.stringify(runlist));`
Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) {`
`574`	`574`	`var sensuCookBooks = MasterUtils.getSensuCookbooks();`
`575`	`575`	`var runlist = sensuCookBooks;`
`576`	`576`	`var jsonAttributes = {};`
`577`		`- jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);`
	`577`	`+ //jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(instance.monitor, instance.id);`
`578`	`578`	`;`
`579`	`579`
`580`	`580`	`bootstarpOption['runlist'] = runlist;`