Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
698b9b5
Monitor API changes
udeshrl Oct 18, 2016
7951871
monitor api changes
udeshrl Oct 20, 2016
db898a7
rebased with dev
udeshrl Oct 20, 2016
3956b08
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 21, 2016
77d0e5f
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 24, 2016
62a4a1c
response format changes
udeshrl Oct 24, 2016
09e09be
changed function name
udeshrl Oct 24, 2016
a7d5646
Merge pull request #854 from udeshrl/Feature-CAT-2417
udeshrl Oct 24, 2016
cd809b5
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 25, 2016
12eb4a9
added name
udeshrl Oct 25, 2016
69a9042
changed save/update logic
udeshrl Oct 25, 2016
7738543
Monitoring server crud operations in settings
srikanthv02 Oct 25, 2016
2e15529
Monitoring Services in settings
srikanthv02 Oct 25, 2016
c026790
Merge pull request #861 from udeshrl/Feature-CAT-2417
liteverge-bot Oct 26, 2016
8eecbde
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 26, 2016
4b53c03
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 26, 2016
987d8fc
fix for certificate file id
udeshrl Oct 26, 2016
02ee956
Merge pull request #863 from udeshrl/Feature-CAT-2417
udeshrl Oct 26, 2016
a4ab80d
name field added for monitoring server
srikanthv02 Oct 26, 2016
3acc3e5
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 26, 2016
17961a0
added certificate file name in response
udeshrl Oct 26, 2016
a22965c
added instance api support for monitorid
udeshrl Oct 26, 2016
55311a9
Monitoring server
srikanthv02 Oct 26, 2016
99e2a23
added monitor support for provider
udeshrl Oct 27, 2016
1052f93
Merge pull request #865 from udeshrl/Feature-CAT-2417
udeshrl Oct 27, 2016
db3dc7d
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 27, 2016
8f8d81e
added monitor support for chef
udeshrl Oct 28, 2016
4383a26
removed unwanted files
udeshrl Oct 28, 2016
222445d
Merge pull request #868 from udeshrl/Feature-CAT-2417
udeshrl Oct 28, 2016
3369307
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 28, 2016
e8f8620
bug fix for provider list api
udeshrl Oct 28, 2016
8ce8e90
Merge pull request #870 from udeshrl/Feature-CAT-2417
udeshrl Oct 28, 2016
9673a87
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 2, 2016
39d0ed6
added check for file extension and monitoring type added while creati…
srikanthv02 Nov 2, 2016
d668af4
monitor import for import by ip instance
udeshrl Nov 2, 2016
d1de7dc
Merge pull request #871 from udeshrl/Feature-CAT-2417
RLIndia Nov 2, 2016
733c76c
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 2, 2016
7fffe5e
fix for fileid issue
udeshrl Nov 2, 2016
076ed49
Merge pull request #872 from udeshrl/Feature-CAT-2417
Nov 2, 2016
b0f8f15
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 2, 2016
8c60f3e
Monitoring services changes and file display
srikanthv02 Nov 2, 2016
dd4e69f
Chef COnfirg for monitoring implemented
srikanthv02 Nov 2, 2016
363cbdb
Merge remote-tracking branch 'upstream/dev' into srikanth-telemetry
srikanthv02 Nov 2, 2016
979e168
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 3, 2016
516f0f4
Merge pull request #873 from srikanthv02/srikanth-telemetry
udeshrl Nov 3, 2016
5ef028e
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 3, 2016
8181910
Added monitoring for edit of provider and chef and small UI Changes
srikanthv02 Nov 3, 2016
fa714f7
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 3, 2016
2acf778
removed console.log
srikanthv02 Nov 3, 2016
47cff32
Merge pull request #874 from srikanthv02/srikanth-telemetry
udeshrl Nov 3, 2016
5685105
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 4, 2016
19a5e68
removed monitor from import by ip instance
udeshrl Nov 4, 2016
b2bf655
Merge pull request #875 from udeshrl/Feature-CAT-2417
liteverge-bot Nov 7, 2016
214936c
Revert "removed monitor from import by ip instance"
udeshrl Nov 7, 2016
e6fecf1
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 8, 2016
575e786
Commments regarding monitoring server taken care
srikanthv02 Nov 9, 2016
7b249de
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 9, 2016
5adbe9c
Position of checkbox changed while creating chef server and select un…
srikanthv02 Nov 9, 2016
9ec2a6b
Merge pull request #888 from srikanthv02/srikanth-telemetry
udeshrl Nov 9, 2016
812be87
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 9, 2016
cc99180
rebase with dev
udeshrl Nov 10, 2016
d684e8a
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 11, 2016
528c72c
Monitoring Server Changes
srikanthv02 Nov 11, 2016
f02630f
Merge pull request #905 from srikanthv02/srikanth-telemetry
udeshrl Nov 11, 2016
0c2b240
rebase with dev
udeshrl Nov 22, 2016
e710c97
rebase with dev
udeshrl Nov 23, 2016
7b14a25
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 23, 2016
8b88ae2
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 23, 2016
1cab700
installing sensu cookbook with instance bootstrap
udeshrl Nov 24, 2016
2fcb335
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 24, 2016
0cc4d8f
Merge pull request #971 from udeshrl/Feature-CAT-2417
udeshrl Nov 24, 2016
fe0373f
Installing sensu client for provider import and import by ip
udeshrl Nov 24, 2016
940fcfe
Merge pull request #972 from udeshrl/Feature-CAT-2417
udeshrl Nov 24, 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
93 changes: 70 additions & 23 deletions client/htmls/private/ajax/Settings/CreateConfigManagement.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
</select>
<span data-val-controltovalidate="domainname" id="MainContent_Req_domainname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
</div>

<hr/>
<!-- <div class="col-lg-6 col-md-6 display:none" >
<input name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control" type="text" cdata="catalyst" hidden>
</div> -->
<input type="hidden" name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control" cdata="catalyst">

<div class="col-lg-6 col-md-6" id="frmconfigmanagement" style="margin-top:20px">
Expand Down Expand Up @@ -105,7 +100,13 @@ <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 -->
Expand Down Expand Up @@ -152,9 +153,42 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
}
function setfolderpath(){
var folderpath = '/' + $('#loginname').val() + "/.chef/";
// alert(folderpath);
$('#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 @@ -201,26 +235,39 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
</script>
<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() {

// $(this).validate();

// if($(this).valid){
// /*alert('valid form submitted'); // for demo*/
//
// }else{
// alert('invalid valid form submitted'); // for demo
// }
// alert('in 1');
var isEditActivate= location.href.toString().split('?')[1]==="new"?false:true;
// var operationType='';

if(isEditActivate){
$('#userpemfile').removeAttr('cat-validation');
$('#validatorpemfile').removeAttr('cat-validation');
$('#kniferbfile').removeAttr('cat-validation');
}
if(isEditActivateLocation){
$('#userpemfile').removeAttr('cat-validation');
$('#validatorpemfile').removeAttr('cat-validation');
$('#kniferbfile').removeAttr('cat-validation');
}
if(validateForm()) {setfolderpath(); saveform('10');};
return false; // for demo
});
Expand Down
75 changes: 71 additions & 4 deletions client/htmls/private/ajax/Settings/CreateProviders.html
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,14 @@ <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 @@ -279,7 +287,42 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
<!--Popup for selecting a cloud provider before proceeding-->
<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 @@ -478,7 +521,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
str = str + '<option value="' + val[i].KeyName + '">' + val[i].KeyName + '</option>';
}
$region.parents('.addNewRegion').find('select.keyvalue').html(str).val('').select2().each(function() {
console.log($(this).attr('answer'));
$(this).attr('answer') ? $(this).val($(this).attr('answer')).select2() : "";
});
$('#btnsubmit').removeAttr('disabled');
Expand Down Expand Up @@ -630,7 +672,27 @@ <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 @@ -716,7 +778,13 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
beforeSubmit: function(arr, $form, options) {
if (location.toString().indexOf('?new') === -1) {
var orgValue = $('#orgId').val();
arr.push({name:'orgId',value:orgValue,type:'select-one',required:false})
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 All @@ -743,7 +811,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
return false;
} else {
if (isFormValid()) {
console.log(arr);
appendLoader();
return true;
} else {
Expand Down
Loading