Skip to content

Changes for Chef Server #981

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Dec 1, 2016
Merged

Changes for Chef Server #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
02ed642
Making the monitorId value as null for chef server
srikanthv02 Nov 28, 2016
6b58eea
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 28, 2016
d97b53d
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 30, 2016
df3ba4f
Changes for monitoring server in blueprint launch,Import by Ip,provid…
srikanthv02 Nov 30, 2016
b7c68b7
Changes for monitorId while blueprintlaunch
srikanthv02 Dec 1, 2016
f52f144
For blueprint Launch
srikanthv02 Dec 1, 2016
97d27b6
Review comments handled
srikanthv02 Dec 1, 2016
0ed8d76
Changed a condition
srikanthv02 Dec 1, 2016
5ed57f2
Removed find from js
srikanthv02 Dec 1, 2016
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
11 changes: 9 additions & 2 deletions client/cat3/src/factory/workzoneServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
var url = '/blueprints/' + blueprintID;
return $http.delete(fullUrl(url), Auth.getHeaderObject());
},
launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) {
launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer, monitorId) {
var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer;
'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer + '&monitorId=' + monitorId;
return $http.get(fullUrl(url), Auth.getHeaderObject());
Copy link
Contributor

@udeshrl udeshrl Dec 1, 2016

Choose a reason for hiding this comment

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

it shoule be + '&monitorId=' + monitorId

},
getBlueprintById: function(blueprintId) {
Expand Down Expand Up @@ -542,6 +542,13 @@
getBotCategoryList:function () {
var url ='/config-data/category-type';
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getMonitorList:function (orgId) {
var url = '/monitors';
if(orgId){
url += '&filterBy=orgId:' + orgId;
}
return $http.get(fullUrl(url),Auth.getHeaderObject());
}
};
return serviceInterface;
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
}
}
var selectedVersionBpId = bpItem.bp.selectedVersionBpId;
var monitorId = bpItem.monitorId;
if(bpItem && bpItem.bp && bpItem.bp.selectedVersionBpId){
selectedVersionBpId = bpItem.bp.selectedVersionBpId;
} else {
Expand All @@ -94,7 +95,7 @@
if(bpItem.launchEnv){
lEnv=bpItem.launchEnv;
}
workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, lEnv, bpItem.stackName,bpItem.domainName,bpItem.tagServer).then(function(bpLaunchResponse) {
workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, lEnv, bpItem.stackName,bpItem.domainName,bpItem.tagServer,monitorId).then(function(bpLaunchResponse) {
$scope.isBPLogsLoading = false;
var launchingInstance;
if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){
Expand Down
10 changes: 10 additions & 0 deletions ...cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ <h4 class="modal-title" ng-show="showARMInputs"> Enter ARM Deployment Name</h4>
</select>
</div>

<div ng-show="showMonitor" class="col-lg-6 col-md-6 projectRepo margintop15">
<label for="">Monitoring:</label>
<select name="monitorId" ng-model="monitorId" class="form-control width-100">
<option value="null">None</option>
<option ng-repeat="monitor in monitorList" value="{{monitor._id}}">
{{monitor.name}}
</option>
</select>
</div>

</div>
<div ng-show="showCFTInputs || showARMInputs" class="CFTInputs-block">
<span class="acknowledge-text">(Only numbers,letters allowed. No spaces and underscores)</span>
Expand Down
17 changes: 15 additions & 2 deletions ...t3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,41 @@
angular.module('workzone.blueprint')
.controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'toastr', 'items','workzoneServices','genericServices','workzoneEnvironment', function($scope, $modalInstance, toastr, items,workzoneServices,genericServices,workzoneEnvironment) {
console.log(items);
$scope.showMonitor = true;
if(items.blueprintType === 'azure_arm' || items.blueprintType === 'azure_launch') {
$scope.showMonitor = false;
}
var launchHelper = {
launch : function(){
$modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName,tagServer:$scope.tagSerSelected,launchEnv:$scope.envSeleted});
$modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName,tagServer:$scope.tagSerSelected,launchEnv:$scope.envSeleted,monitorId:$scope.monitorId});
}
};
//var bPLP=this;
$scope.taggingServerList=[];
$scope.envOptions=[];
$scope.monitorList = [];
workzoneServices.getTaggingServer().then(function (topSer) {
$scope.taggingServerList=topSer.data;
});
$scope.monitorId = 'null';
$scope.getMonitorList = function(orgId) {
workzoneServices.getMonitorList(orgId).then(function (response) {
$scope.monitorList = response.data;
});
}
genericServices.getTreeNew().then(function (envData) {
angular.forEach(envData,function(val){
var orgID,bgID,projID;
if(items.organizationId === undefined) {
orgID = (items.orgId)?items.orgId:items.organization.id;
bgID = (items.bgId)?items.bgId:items.businessGroup.id;
projID = (items.projectId)?items.projectId:items.project.id;
$scope.getMonitorList(orgID);
} else {
orgID = items.organizationId;
bgID = items.businessGroupId;
projID = items.projectId;
$scope.getMonitorList(orgID);
}
if(val.rowid === orgID){
$scope.orgSeleted=val.name;
Expand All @@ -58,7 +71,7 @@
});
$scope.stackName='';
$scope.domainName='';
$scope.tagSerSelected = "";
$scope.tagSerSelected = '';
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
Expand Down
7 changes: 7 additions & 0 deletions ...t/cat3/src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
var osList = items[1].data;
var configList = items[2].data;
var reqBody = {};
$scope.monitorList = [];
//$scope.tagSerSelected = 'Monitoring';
if (!configAvailable.length) {
$scope.cancel();
Expand All @@ -22,6 +23,11 @@
$scope.taggingServerList=[];
workzoneServices.getTaggingServer().then(function (topSer) {
$scope.taggingServerList=topSer.data;
});
$scope.monitorId = 'null';
var p = workzoneEnvironment.getEnvParams();
workzoneServices.getMonitorList(p.org).then(function (response) {
$scope.monitorList = response.data;
});
$scope.tagServerChecking = function() {
if($scope.tagServerCheck){
Expand Down Expand Up @@ -60,6 +66,7 @@
reqBody.fqdn = $scope.ipAddress;
reqBody.os = $scope.os;
reqBody.configManagmentId = $scope.selectedConfig;
reqBody.monitorId = $scope.monitorId;
if($scope.tagServerCheck) {
reqBody.tagServer = $scope.tagSerSelected;
}
Expand Down
13 changes: 12 additions & 1 deletion client/cat3/src/partials/sections/dashboard/workzone/instance/popups/instanceImportByIp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ <h4 class="modal-title">
</div>
</div>
</div>
<div class="col-lg-12 col-md-12 no-padding">
<div class="col-lg-6 col-md-6 control-margin">
<label for="">Monitoring:</label>
<select name="monitorId" ng-model="monitorId" class="form-control width-100">
<option value="null">None</option>
<option ng-repeat="monitor in monitorList" value="{{monitor._id}}">
{{monitor.name}}
</option>
</select>
</div>
</div>
<div class="col-lg-12 col-md-12 no-padding">
<div class="applicationURLContainer" id="appSeries12">
<div class="col-lg-6 col-md-6 control-margin">
Expand Down Expand Up @@ -137,7 +148,7 @@ <h4 class="modal-title">
<label class="control-label">Tag Server: </label>
<input type="checkbox" ng-model="tagServerCheck" class="checkbox-list" ng-click="tagServerChecking()" />
</div>
<div class="col-lg-6 col-md-6" ng-show="tagServerStatus">
<div class="col-lg-6 col-md-6" ng-show="tagServerStatus">
<label for="instanceFQDN">Select server
<span class="control-label red">&nbsp;*</span>
</label>
Expand Down
66 changes: 1 addition & 65 deletions client/htmls/private/ajax/Settings/CreateConfigManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
</label>
</div>
</div>
<div class="hidden col-lg-6 col-md-6 margintop20 monitoringCheck">
<input type="checkbox" name="updateMonitoringInfo" style="vertical-align: middle;" id="updateMonitoringInfo"/>
<label for="">Enable Monitoring:</label>
<select id="monitorId" name="monitorId" disabled class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
<option value="">Select Monitor</option>
</select>
</div>

</div>
<!-- end widget content -->
</div>
Expand Down Expand Up @@ -155,40 +147,6 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
var folderpath = '/' + $('#loginname').val() + "/.chef/";
$('#folderpath').val(folderpath);
}

$('select#orgname').change(function(e){
var orgValueSelect = $(this).val();
if(orgValueSelect !== ''){
$('#monitorId').attr('disabled','disabled');
$('input[name="updateMonitoringInfo"]').removeAttr('checked');
getMonitorValues();
} else {
$('.monitoringCheck').addClass('hidden');
}
});

function getMonitorValues(){
$('.monitoringCheck').removeClass('hidden');
$.get('../monitors',function(data){
var orgValue = $('select#orgname option:selected').attr('rowid');
var str = ' <option value="">Select Monitor</option>';
for(var i=0;i<data.length;i++){
if(orgValue === data[i].organization.id){
str = str + '<option value="'+data[i]._id+'">'+data[i].name+'</option>';
}
}
$('#monitorId').html(str);
});
}

$('input[name="updateMonitoringInfo"]').change(function(e){
if(this.checked){
$('#monitorId').removeAttr('disabled').attr('cat-validation','required');
} else {
$('#monitorId').val('').attr('selected', true).change();
$('#monitorId').removeAttr('cat-validation').attr('disabled','disabled');;
}
});

function isUserTypeSuperAdmin(){
$.get('/d4dMasters/loggedInUser',function(data){
Expand Down Expand Up @@ -236,29 +194,7 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
<script>
$(document).ready(function () {
var isEditActivateLocation = location.href.toString().split('?')[1]==="new"?false:true;
var rowid = url.substr(url.indexOf("?") + 1);
if(isEditActivateLocation){
$.get('/d4dMasters/readmasterjsonrecord/10'+ '/' + rowid,function(data){
if(data.monitor !== null){
$('.monitoringCheck').removeClass('hidden');
$("input[name='updateMonitoringInfo']").attr('checked', true);
$('#monitorId').removeClass('hidden');
$.get('../monitors',function(monitorData){
var orgValue = $('select#orgname option:selected').attr('rowid');
var str = '';
for(var i=0;i<monitorData.length;i++){
if(orgValue === monitorData[i].organization.id){
str = '<option value="'+monitorData[i]._id+'">'+monitorData[i].name+'</option>';
$('#monitorId').append(str).removeAttr('disabled');
$("#monitorId").val(data.monitor.id).attr('selected', true).change();
}
}
});
} else {
getMonitorValues();
}
});
}

$("#configname").focus();
$('#myForm22').submit(function() {

Expand Down
71 changes: 1 addition & 70 deletions client/htmls/private/ajax/Settings/CreateProviders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
<option value="">Select Organization</option>
</select>
</div>
<div class="hidden col-lg-6 col-md-6 margintop20 foraws monitoringCheck">
<input type="checkbox" name="updateMonitoringInfo" style="vertical-align: middle;" id="updateMonitoringInfo"/>
<label for="">Enable Monitoring:</label>
<select id="monitorId" unique="true" name="monitorId" disabled class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
<option value="">Select Monitor</option>
</select>
</div>
<input type="hidden" id="hiddenMonitorValue"/>
</div>
</div>
<!-- end widget div -->
Expand Down Expand Up @@ -288,41 +280,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
<script type="text/javascript" src="js/jquery.form.js"></script>
<script>

$('select#orgId').change(function(e){
var orgValueSelect = $(this).val();
if(orgValueSelect !== ''){
$('#monitorId').attr('disabled','disabled');
$('input[name="updateMonitoringInfo"]').removeAttr('checked');
getMonitorValues();
} else {
$('.monitoringCheck').addClass('hidden');
}
});

function getMonitorValues(){
$('.monitoringCheck').removeClass('hidden');
$.get('../monitors',function(data){
var orgValue = $('select#orgId').val();
var str = ' <option value="">Select Monitor</option>';
for(var i=0;i<data.length;i++){
if(orgValue === data[i].organization.id){
str = str + '<option value="'+data[i]._id+'">'+data[i].name+'</option>';
}
}
$('#monitorId').html(str);
});
}

$('input[name="updateMonitoringInfo"]').change(function(e){
if(this.checked){
$('#monitorId').removeAttr('disabled').attr('cat-validation','required');
} else {
$('#hiddenMonitorValue').val('');
$('#monitorId').val('').attr('selected', true).change();
$('#monitorId').removeAttr('cat-validation').attr('disabled','disabled');;
}
});

var UtilityMethods = {
initTooltip: function() {
var $tool = $("[rel=tooltip]");
Expand Down Expand Up @@ -672,27 +629,7 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
$('.aws-secret-info').hide();
$('.secretInfo').removeAttr('cat-validation');
}
if(data.monitor !== null){
$('.monitoringCheck').removeClass('hidden');
$('input[name="updateMonitoringInfo"]').attr('checked', true);
$('#monitorId').removeClass('hidden');
$.get('../monitors',function(monitorData){
var orgValue = $('select#orgId').val();
var str = '';
for(var i=0;i<monitorData.length;i++){
if(orgValue === monitorData[i].organization.id){
str = '<option value="'+monitorData[i]._id+'">'+monitorData[i].name+'</option>';
$('#monitorId').append(str).removeAttr('disabled');
$("#monitorId").val(data.monitor.id).attr('selected', true).change();
}
}
});
var monitorHiddenValue = $('#monitorId').val();
$('#hiddenMonitorValue').val(monitorHiddenValue);
} else {
$('#hiddenMonitorValue').val('');
getMonitorValues();
}

var parentList = $('.addNewRegion');
$('select.region').on('change', checkForKeyPair);
for (var i = 0; i < data.keyPairs.length; i++) {
Expand Down Expand Up @@ -779,12 +716,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
if (location.toString().indexOf('?new') === -1) {
var orgValue = $('#orgId').val();
arr.push({name:'orgId',value:orgValue,type:'select-one',required:false});
var monitorValue = $('#hiddenMonitorValue').val();
if(!monitorValue) {
arr = arr.concat({name:'monitorId',value:monitorValue,type:'select-one',required:false});
} else {
arr.push({name:'monitorId',value:monitorValue,type:'select-one',required:false});
}
}
if (location.toString().indexOf('?new') === -1 && $('#providertype').val() == 'AZURE') {
var azureSubscriptionId = $('#azureSubscriptionId').val();
Expand Down
Loading