Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7738543
Monitoring server crud operations in settings
srikanthv02 Oct 25, 2016
2e15529
Monitoring Services in settings
srikanthv02 Oct 25, 2016
8eecbde
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 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
55311a9
Monitoring server
srikanthv02 Oct 26, 2016
db3dc7d
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 27, 2016
16c63fb
Added schedule , start, stop, function for instance
Oct 28, 2016
5fa553a
Added schedule , start, stop, function for instance
Oct 28, 2016
9c46da5
Implemented the parameter passing for BOTS Library
VIJAYKUMARNINGANURE Oct 28, 2016
043ba93
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 28, 2016
3369307
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Oct 28, 2016
9673a87
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 2, 2016
9033ee5
Merge pull request #867 from hrushikesh07/newDev
udeshrl Nov 2, 2016
39d0ed6
added check for file extension and monitoring type added while creati…
srikanthv02 Nov 2, 2016
dd08a43
Merge pull request #869 from VIJAYKUMARNINGANURE/vijayDev
Nov 2, 2016
733c76c
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 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
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
1 change: 1 addition & 0 deletions client/cat3/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<script src="src/partials/globals/ui-gridOptions/uiGridOptionsServices.js"></script>
<script src="src/partials/sections/dashboard/dashboardCtrl.js"></script>
<script src="src/partials/sections/dashboard/genericServices.js"></script>
<script src="src/partials/sections/dashboard/popups/controller/scheduleCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/analytics.js"></script>
<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion client/cat3/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
'ui.grid.autoResize','ui.grid.exporter',
'ui.grid.resizeColumns',
'global.uiGridOptions',
'global.messages'
'global.messages',
'ui.grid.selection'
]);

angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
Expand Down
32 changes: 15 additions & 17 deletions client/cat3/src/partials/sections/dashboard/genericServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,25 @@

});
};
/*genericServices.editRunlist = function(chefRunlist, chefAttribute) {
genericServices.scheduleTime=function (ids) {
$modal.open({
templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationUpdateChefRunlist.html',
controller: 'orchestrationUpdateChefRunlistCtrl',
animate: true,
templateUrl: "src/partials/sections/dashboard/popups/view/schedule.html",
controller: "scheduleCtrl as sch",
backdrop: 'static',
keyboard: false,
resolve : {
cookbookRunlistAttr: function(){
return {
chefrunlist: chefRunlist,
attributes: chefAttribute
};
resolve: {
items: function() {
return ids;
}
}
}).result.then(function (selectedCookBooks) {
//$rootScope.editRunListAttributes = false;
// $rootScope.chefrunlist = selectedCookBooks.list;
// $rootScope.cookbookAttributes = selectedCookBooks.cbAttributes;
}, function () {
console.log('Dismiss time is ' + new Date());
});
};*/
})
};
genericServices.instanceStart=function (ids) {

};
genericServices.instanceStop=function () {

};
}]);
})(angular);
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
(function(){
"use strict";
angular.module('dashboard')
.controller('scheduleCtrl', ['$scope', '$modalInstance', 'items','$filter',function($scope, $modalInstance, items,$filter) {
var sch=this;
sch.schedule={
repeat:'Daily',
repeatTimes:'1',
startsOn:new Date(),
ends:'Never'
}
sch.cancel = function() {
$modalInstance.dismiss('cancel');
};
sch.ok=function(){

};
}]);
})();
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<div id='addJenkinsParamsPage'>
<form name="scheduleForm" novalidate>
<div class="modal-header">
<span class="close" ng-click="sch.cancel()">×</span>
<h4 class="modal-title"><i class="fa fa-calendar"></i> Manage Schedule</h4>
</div>

<div class="modal-body">

<div class="col-lg-6 col-md-6 margintop15">
<label>Starts on: <span class="red">*</span>
</label>
<input required type="text" ng-model="sch.schedule.startsOn" class="form-control" >
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Ends:
</label>
<input type="text" ng-model="sch.schedule.ends" class="form-control" >
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Repeats: <span class="red">*</span>
</label>
<select class="form-control" ng-model="sch.schedule.repeat" required>
<option value="Daily" title="Hourly">Hourly</option>
<option value="Daily" title="Daily">Daily</option>
<option value="Weekly" title="Weekly">Weekly</option>
<option value="Monthly" title="Monthly">Monthly</option>
<option value="Yearly" title="Yearly">Yearly</option>
</select>
</div>
<div class="col-lg-6 col-md-6 margintop15">
<label>Repeat every: <span class="red">*</span>
</label>
<select class="form-control" ng-model="sch.schedule.repeatTimes" required>
<option value="1" selected="selected" title="Daily">1</option>
<option value="2" title="Daily">2</option>
<option value="3" title="Daily">3</option>
<option value="4" title="Daily">4</option>
<option value="5" title="Daily">5</option>
<option value="6" title="Daily">6</option>
<option value="7" title="Daily">7</option>
<option value="8" title="Daily">8</option>
<option value="9" title="Daily">9</option>
<option value="10" title="Daily">10</option>
</select>
</div>


<div class="clearfix"></div>
</div>

<div class="modal-footer">
<button type="button" class="btn cat-btn-close" ng-click="sch.cancel()">
<i class="fa fa-times black"></i> Cancel
</button>
<button type="button" class="btn cat-btn-update" ng-disabled="scheduleForm.$invalid" ng-click="sch.ok()">
<i class="fa fa-check white"></i> Save
</button>
</div>
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
</button>
</span>
<span class="pull-right">
<span ng-show="selectedInstanceId.length >0">
<button type="button" title="Schedule" class="btn btn-xs cat-btn-update" ng-click="scheduleInt()">
<i class="fa fa-calendar white"></i>
</button>
<button type="button" title="Stope" class="btn btn-xs cat-btn-update" ng-click="instanceStop()">
Stop
</button>
<button type="button" title="Start" class="btn btn-xs cat-btn-update" ng-click="instanceStart()">
Start
</button>
</span>
<span ng-if="filterBy">
<span ng-repeat="chip in filterChips" class="chip"><strong>{{chip.key}}:&nbsp;</strong>{{chip.value}}</span>
<span class="chip"><i class="fa fa-fw fa-close black cursor" ng-click="resetFilter()"></i></span>
Expand Down Expand Up @@ -103,7 +114,7 @@ <h3 class="box-title"><i class="fa fa-fw fa-filter"></i>Filter By</h3>

<section id="cardView" class="scrollContent" ng-show="isCardViewActive">
<div class="card-wrapper" ng-repeat="inst in instanceList" ng-mouseover="overHandler()" ng-mouseout="outHandler()">
<div class="card" ng-click="selectCard(inst._id);" ng-class="{'card-border' :inst._id == selectedCard}">
<div class="card" ng-click="selectCard(inst._id);" ng-class="{'card-border' :selectedInstanceId.indexOf(inst._id) !== -1}">
<div class="card-title">
<div class="card-title-role">
<img class="instanceRoleLogo" ng-src="{{getRoleLogo(inst)}}" />
Expand Down Expand Up @@ -242,7 +253,7 @@ <h3 class="box-title"><i class="fa fa-fw fa-filter"></i>Filter By</h3>
<section id="tableView" ng-show="!isCardViewActive">
<div class="instance-grid-wrapper">
<!-- <loading size="large" name="isinstancesTableLoading" type="block"></loading>-->
<div id="grid2" ng-if="tabData.length >0" ui-grid="instancesGridOptions" ui-grid-pagination ui-grid-auto-resize class="grid instance-status" style="height: {{gridHeight}}px"></div>
<div id="grid2" ng-if="tabData.length >0" ui-grid="instancesGridOptions" ui-grid-selection ui-grid-pagination ui-grid-auto-resize class="grid instance-status" style="height: {{gridHeight}}px"></div>
</div>
</section>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"use strict";
angular.module('workzone.instance', ['ui.bootstrap', 'utility.validation', 'filter.currentTime', 'apis.workzone', 'utility.array', 'workzonePermission', 'instanceServices', 'chefDataFormatter', 'utility.pagination', 'ngFileUpload'])
.controller('instanceCtrl', ['chefSelectorComponent', '$scope', '$rootScope', '$modal', '$q', 'workzoneServices', 'arrayUtil', 'instancePermission',
'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox',
function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox) {
'instanceActions', 'instanceOperations', 'workzoneEnvironment', '$timeout', 'workzoneUIUtils', 'uiGridOptionsService', 'confirmbox','genericServices',
function(chefSelectorComponent, $scope, $rootScope, $modal, $q, workzoneServices, arrayUtil, instancePerms, instanceActions, instanceOperations, workzoneEnvironment, $timeout, workzoneUIUtils, uiGridOptionsService, confirmbox,genericServices) {
var helper = {
attachListOfTaskWithInstance: function(completeData) {
var instanceList = completeData.instances;
Expand Down Expand Up @@ -73,6 +73,7 @@
}
}
};
$scope.selectedInstanceId=[];
$scope.instancePageLevelLoader = true;
$scope.instStartStopFlag = false;
$scope.isImportClickEnabled = true;
Expand All @@ -91,7 +92,15 @@
$scope.filterChips = [];
$scope.providerLoading = false;
$scope.regionLoading = false;

$scope.scheduleInt = function(){
genericServices.scheduleTime($scope.selectedInstanceId);
};
$scope.instanceStop=function () {
genericServices.instanceStop($scope.selectedInstanceId);
};
$scope.instanceStart=function () {
genericServices.instanceStart($scope.selectedInstanceId);
};
$scope.openContainersTab = function() {
$scope.$parent.$parent.activateTab('Containers');
};
Expand All @@ -112,6 +121,9 @@
$scope.isInstancePageLoading = true;
var gridBottomSpace = 5;
var instanceUIGridDefaults = uiGridOptionsService.options();
angular.extend(instanceUIGridDefaults.gridOption, {enableRowSelection: true,
enableSelectAll: true,
selectionRowHeaderWidth: 35,multiSelect:true,enableRowHeaderSelection: true});
$scope.paginationParams = instanceUIGridDefaults.pagination;
$scope.currentCardPage = instanceUIGridDefaults.pagination.page;
$scope.cardsPerPage = instanceUIGridDefaults.pagination.pageSize;
Expand Down Expand Up @@ -180,7 +192,23 @@
$scope.instancesGridOptions = angular.extend(instanceUIGridDefaults.gridOption, {
onRegisterApi: function(gridApi) {
$scope.gridApi = gridApi;
gridApi.selection.on.rowSelectionChanged($scope,function(row){
if(row.isSelected){
$scope.selectedInstanceId.push(row.entity._id);
} else {
$scope.selectedInstanceId.splice(row.entity._id,1);
}

});
gridApi.selection.on.rowSelectionChangedBatch($scope,function(rows){
angular.forEach(rows,function(row){
if(row.isSelected){
$scope.selectedInstanceId.push(row.entity._id);
} else {
$scope.selectedInstanceId.splice(row.entity._id,1);
}
});
});
//Sorting for sortBy and sortOrder
gridApi.core.on.sortChanged($scope, function(grid, sortColumns) {
if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) {
Expand Down Expand Up @@ -545,8 +573,15 @@
};
$scope.selectCard = function(identi) {
$scope.selectedCard = identi;
console.log($scope.selectedInstanceId.indexOf(identi));
if($scope.selectedInstanceId.indexOf(identi) === -1){
$scope.selectedInstanceId.push(identi);
} else {
$scope.selectedInstanceId.splice($scope.selectedInstanceId.indexOf(identi),1);
}
};
$scope.setCardView = function() {
$scope.selectedInstanceId=[];
$scope.isCardViewActive = true;
$scope.instanceCardViewSelection = "instance-tab-active";
$scope.instanceTableViewSelection = "";
Expand Down Expand Up @@ -581,6 +616,7 @@
});
};
$scope.instanceTableView = function() {
$scope.selectedInstanceId=[];
$scope.isCardViewActive = false;
$scope.instanceTableViewSelection = "instance-tab-active";
$scope.instanceCardViewSelection = "";
Expand Down
70 changes: 49 additions & 21 deletions client/htmls/private/ajax/Settings/CreateConfigManagement.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,13 @@ <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> -->
<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" class="hidden chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
<option value="">Select Monitor</option>
</select>
</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 @@ -155,6 +157,31 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management <sp
// alert(folderpath);
$('#folderpath').val(folderpath);
}

$('select#orgname').change(function(e){
getMonitorValues();
});

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

$('input[name="updateMonitoringInfo"]').change(function(e){
if(this.checked){
$('#monitorId').removeClass('hidden');
} else {
$('#monitorId').addClass('hidden');
}
});

function isUserTypeSuperAdmin(){
$.get('/d4dMasters/loggedInUser',function(data){
Expand Down Expand Up @@ -201,26 +228,27 @@ <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');
$('#monitorId').empty().append('<option value="'+data.monitor.id+'">'+data.monitor.name+'</option>').select2().attr('disabled','disabled');
}
});
}
$("#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
Loading