sensu client at instance level

client/cat3/main.html

@@ -175,6 +175,7 @@
 		<script src="src/partials/sections/dashboard/workzone/instance/popups/updateChefRunlistConfirmationCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/workzone/instance/popups/viewRunListCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/workzone/orchestration/orchestrationCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/workzone/orchestration/popups/addJenkinsParamsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/workzone/orchestration/popups/addJobLinksCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/workzone/orchestration/popups/addScriptParamsCtrl.js"></script>

client/cat3/src/factory/chefDataFormatterService.js

@@ -101,6 +101,19 @@
 					}
 					return list;
 				},
+				formatInstanceList: function (obj) {
+					var list = [];
+					for (var i = 0; i < obj.length; i++) {
+						if (obj[i].instanceState === "running" || obj[i].instanceState === "pending" || obj[i].instanceState === "unknown") {
+							list.push({
+								className: 'chef',
+								value: obj[i].name,
+								data: obj[i]._id
+							});
+						}
+					}
+					return list;
+				},
 				formatRunListFromComponent: function (nodesList) {
 					var reqBody = {
 						cookbooks: [],

client/cat3/src/partials/global.scss

@@ -724,6 +724,10 @@ accordion .panel-heading {
     margin-top: 15px;
 }
 
+.margintop10 {
+    margin-top: 10px;
+}
+
 .marginleft15 {
     margin-left: 15px;
 }
@@ -1365,20 +1369,22 @@ label {
         line-height: 34;
         font-size: 13px !important;
     }
-    .btnDay{
-        border-radius: 15px;
-        margin: 0 3px;
-        height: 24px;
-        width: 24px;
-        font-weight: 600;
-        padding: 1px 5px;
 
-    }
-    .activeDay {
-        background: #0B5475 !important;
-    }
+}
+
+.btnDay{
+    border-radius: 15px;
+    margin: 0 3px;
+    height: 24px;
+    width: 24px;
+    font-weight: 600;
+    padding: 1px 5px;
 
 }
+.activeDay {
+    background: #0B5475 !important;
+}
+
 .form-control-date{
     display: block;
     width: 100%;

client/cat3/src/partials/sections/dashboard/bots/bots.scss

@@ -20,16 +20,18 @@
   height: 50px;
 }
 
-#botLibraryPage {
+#botAuditTrailPage {
+  .ui-grid-column-menu-button {
+    display: none;
+  }
+}
+
+#botLibraryPage, #botAuditTrailPage {
   .page-name {
       font-size: 18px;
       margin: 5px 0 5px 10px;
   }
 
-  .borderTop {
-      border-top: 1px dashed #ddd;
-  }
-
   .btn-xs {
       padding: 1px 5px;
       font-size: 12px;
@@ -39,23 +41,44 @@
     margin: 2px 10px 0 0;
   }
 
+  .borderTop {
+      border-top: 1px dashed #ddd;
+  }
+}
+
+#botLibraryPage {
   .summary-container {
     width: 100%;
   }
 
   .selected {
-    border: 2px solid #000;
-    height: 94px !important;
-    margin-top: 13px !important;
+    height: 92px !important;
+    margin-top: 14px !important;
+  }
+
+  .selected-blue {
+    color: #00c0ef !important;
+    border: 1px solid #00c0ef !important;
+  }
+
+  .selected-green {
+    color: #00a65a !important;
+    border: 1px solid #00a65a !important;
+  }
+
+  .selected-red {
+    color: #dd4b39 !important;
+    border: 1px solid #dd4b39 !important;
   }
 
   .info-box {
     display: block;
     min-height: 90px;
-    background: #ecf0f5;
+    background: #fff;
     width: 100%;
     box-shadow: 0 1px 1px rgba(0,0,0,0.1);
     margin: 15px 0;
+    border: 1px solid #ccc;
   }
 
   .info-box-content {
@@ -84,8 +107,8 @@
   .info-box-icon {
     display: block;
     float: left;
-    height: 90px;
-    width: 90px;
+    height: 88px;
+    width: 88px;
     text-align: center;
     font-size: 45px;
     line-height: 90px;

client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js

@@ -45,7 +45,7 @@
             ],
             data:[]
         };
-        var gridBottomSpace = 5;
+        var gridBottomSpace = 40;
         $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botAuditTrailPage') - gridBottomSpace;
 
         $scope.botAuditTrailLogs=function(hist) {
@@ -68,6 +68,10 @@
             });
         };
 
+        $scope.RefreshBotsAuditTrail = function() {
+            audit.init();
+        };
+
         audit.init =function(){
             audit.gridOptions.data=[];
             var param={

client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js

@@ -33,8 +33,10 @@
             }
         };
         $scope.instanceChange =function(){
+            $scope.isBotLogsLoading = true;
             $scope.botLogs=[];
             var param={
+                inlineLoader: true,
                 url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs'
             };
             genSevs.promiseGet(param).then(function (response) {
@@ -65,14 +67,15 @@
         });
         if($scope.taskType === 'jenkins') {
             var param={
+                inlineLoader: true,
                 url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output'
             };
             genSevs.promiseGet(param).then(function (response) {
-                if (response.data) {
-                    $scope.jenkinsLogs = helper.formatLogs(response.data.output);
+                if (response) {
+                    $scope.jenkinsLogs = helper.formatLogs(response.output);
                     $scope.isBotLogsLoading = false;
                 } else {
-                    $scope.jenkinsLogs = helper.formatLogs(response.output);
+                    $scope.jenkinsLogs = helper.formatLogs(response.data.output);
                     $scope.isBotLogsLoading = false;
                 }
             });

client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js

@@ -21,7 +21,7 @@
                 multiSelect :false,
             },
             columnDefs: [
-                { name:'Task Type', width:100,field:'taskType' ,cellTemplate:'<img src="images/orchestration/chef.png" ng-show="row.entity.taskType==\'chef\'" alt="row.entity.taskType" title="Chef" class="task-type-img" />'+
+                { name:'Task Type', field:'taskType' ,cellTemplate:'<img src="images/orchestration/chef.png" ng-show="row.entity.taskType==\'chef\'" alt="row.entity.taskType" title="Chef" class="task-type-img" />'+
                     '<img src="images/orchestration/jenkins.png" ng-show="row.entity.taskType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
                     '<img src="images/orchestration/script.jpg" ng-show="row.entity.taskType==\'script\'" alt="row.entity.taskType" title="Script" class="task-type-img" />'+
                     '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.blueprintType" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
@@ -30,7 +30,7 @@
                 { name: 'Category',field:'botCategory'},
                 { name: 'description',field:'shortDesc'},
                 { name: 'BOT History',displayName: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
-                        '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
+                    '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
                 { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
                     '<span class="btn btn-danger control-panel-button" title="Delete Task" ng-show="row.entity.taskType" ng-click="grid.appScope.deleteBotTask(row.entity);"><i class="fa fa-trash-o white"></i></span>' + 
                     '<span class="btn btn-danger control-panel-button" title="Delete Blueprint" ng-show="row.entity.blueprintType" ng-click="grid.appScope.deleteBotBP(row.entity);"><i class="fa fa-trash-o white"></i></span>'
@@ -95,12 +95,14 @@
             });
         };
         $rootScope.$on('BOTS_LIBRARY_REFRESH', function() {
+            lib.summary();
             lib.init();
         });
         $scope.RefreshBotsLibrary = function() {
             $scope.totalBotsSelected = true;
             $scope.runningBotsselected = false;
             $scope.failedBotsselected = false;
+            lib.summary();
             lib.init();
         };
         $scope.showBotsRunning = function() {

client/cat3/src/partials/sections/dashboard/bots/view/audittrail.html

@@ -1,6 +1,14 @@
 <link rel='stylesheet' href='catalyst/partials/sections/dashboard/bots/bots.css'>
 
 <div id="botAuditTrailPage">
+	<div class="page-name">
+		BOTs Audit Trail&nbsp;
+		<button type="button" title="Refresh" class="btn btn-xs btn-primary pull-right refresh-btn" ng-click="RefreshBotsAuditTrail();">
+			<i class="fa fa-refresh" style="color: #fff"></i>
+		</button>
+	</div>
+	<div class="borderTop"></div>
+
 	<div id="grid1" ng-if="audit.gridOptions.data.length > 0" ui-grid="audit.gridOptions" ui-grid-pagination class="grid" style="height: {{gridHeight}}px"></div>
 	<div class="alert alert-info text-center" ng-if="!audit.gridOptions.data.length > 0">
 	    No data Available

client/cat3/src/partials/sections/dashboard/bots/view/botLogs.html

@@ -7,30 +7,32 @@ <h4 class="modal-title">
 	</div>
 
 	<div class="modal-body">
-		<div class="logsArea">
-			<loading size="large" name="isBotLogsLoading" align="center" type="block"></loading>
-			<div ng-show="!isBotLogsLoading">
-				<div ng-show="taskType !== 'jenkins'">
-					<div id="selectInstanceFromDropdown">
-	                    <label class="col-md-3 col-sm-3 col-xs-4 text-padding control-label margintop8">Select Instance<sup class="red">*</sup>
-	                    </label>
-	                    <span class="col-md-4 col-sm-4 col-xs-8 no-padding">
-		                    	<select class="form-control" ng-model="selectedInstance" ng-change="instanceChange()" ng-options="chefInstance as chefInstance.uiNodeName for chefInstance in nodeIdsWithActionLog">
-	    					</select>
-	    				</span>
-	                </div>
-				   	<div class="rowSpacing col-lg-12 col-sm-12 {{log.err ? 'logErrorMsg':'logMsg'}}" ng-repeat="log in botLogs">
-					    <span class="timeStamp"> {{log.timestamp | timestampToLocaleTime}} </span>
-					    <span class="logInfo"> {{log.log}} </span>
-				   	</div>
-				</div>
-				<div ng-show="taskType === 'jenkins'">
-				   	<div class="rowSpacing col-lg-12 col-sm-12">
-					    <p ng-bind-html="jenkinsLogs"></p>
-				   	</div>
+		<fieldset>
+			<div class="logsArea">
+				<loading size="large" name="isBotLogsLoading" align="center" type="block"></loading>
+				<div ng-show="!isBotLogsLoading">
+					<div ng-show="taskType !== 'jenkins'">
+						<div id="selectInstanceFromDropdown">
+		                    <label class="col-md-3 col-sm-3 col-xs-4 text-padding control-label margintop8">Select Instance<sup class="red">*</sup>
+		                    </label>
+		                    <span class="col-md-4 col-sm-4 col-xs-8 no-padding">
+			                    	<select class="form-control" ng-model="selectedInstance" ng-change="instanceChange()" ng-options="chefInstance as chefInstance.uiNodeName for chefInstance in nodeIdsWithActionLog">
+		    					</select>
+		    				</span>
+		                </div>
+					   	<div class="rowSpacing col-lg-12 col-sm-12 {{log.err ? 'logErrorMsg':'logMsg'}}" ng-repeat="log in botLogs">
+						    <span class="timeStamp"> {{log.timestamp | timestampToLocaleTime}} </span>
+						    <span class="logInfo"> {{log.log}} </span>
+					   	</div>
+					</div>
+					<div ng-show="taskType === 'jenkins'">
+					   	<div class="rowSpacing col-lg-12 col-sm-12">
+						    <p ng-bind-html="jenkinsLogs"></p>
+					   	</div>
+					</div>
 				</div>
 			</div>
-		</div>
+		</fieldset>
 	</div>
 
 	<div class="modal-footer">

client/cat3/src/partials/sections/dashboard/bots/view/library.html

@@ -11,9 +11,9 @@
 	<div class="container summary-container">
 		<div class="panel-group text-center">
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box cursor" ng-click="RefreshBotsLibrary()" ng-class="{'selected':totalBotsSelected === true}">
+				<div class="info-box cursor" ng-click="RefreshBotsLibrary()" ng-class="{'selected-blue':totalBotsSelected}">
 					<span class="info-box-icon bg-aqua">
-						<i class="fa fa-th" style="color: #ecf0f5"></i>
+						<i class="fa fa-list-ol" style="color: #fff"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Total Number of BOTs</span>
@@ -22,9 +22,9 @@
 				</div>
 			</div>
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box cursor" ng-click="showBotsRunning()" ng-class="{'selected':runningBotsselected === true}">
+				<div class="info-box cursor" ng-click="showBotsRunning()" ng-class="{'selected-green':runningBotsselected}">
 					<span class="info-box-icon bg-green">
-						<i class="fa fa-laptop" style="color: #ecf0f5"></i>
+						<i class="fa fa-cogs" style="color: #fff"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Number of BOTs running</span>
@@ -35,7 +35,7 @@
 			<div class="col-md-3 col-sm-6 col-xs-12">
 				<div class="info-box">
 					<span class="info-box-icon bg-yellow">
-						<i class="fa fa-cube" style="color: #ecf0f5"></i>
+						<i class="fa fa-save" style="color: #fff"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Total Time saved</span>
@@ -44,9 +44,9 @@
 				</div>
 			</div>
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box cursor" ng-click="showFailedBots()" ng-class="{'selected':failedBotsselected === true}">
+				<div class="info-box cursor" ng-click="showFailedBots()" ng-class="{'selected-red':failedBotsselected}">
 					<span class="info-box-icon bg-red">
-						<i class="fa fa-external-link" style="color: #ecf0f5"></i>
+						<i class="fa fa-remove" style="color: #fff"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Number of failed runs</span>

client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss

@@ -66,6 +66,12 @@ $imagePath : "../../../../../../images";
 			padding-right: 0px;
 		}
 	}
+
+	.my-modal-popup {
+		.modal-lg {
+			width:1056px;
+		}
+	}
 }
 
 #orchestrationPage {
@@ -187,7 +193,17 @@ $imagePath : "../../../../../../images";
 	.select-nodes {
 		border: 1px solid #dddddd;
 		list-style: none outside none;
-		height: 235px;
+		height: 150px;
+		overflow-y: auto;
+		margin-top: 5px;
+		margin-bottom: 10px;
+		padding: 5px;
+	}
+
+	.select-nodeInstance {
+		border: 1px solid #dddddd;
+		list-style: none outside none;
+		height: 350px;
 		overflow-y: auto;
 		margin-top: 5px;
 		margin-bottom: 10px;
@@ -454,4 +470,8 @@ a.marginleft23 {
 	float: right;
 	margin-right: 14px !important;
 	margin-top: 2px !important;
+}
+
+.margintop7 {
+	margin-top: 7px;
 }