Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
6c9743e
New sections added under Devops
srikanthv02 Dec 23, 2016
e96a2fe
Changes for settings
srikanthv02 Dec 26, 2016
217b108
Removed one value attribute
srikanthv02 Dec 26, 2016
612fbbf
Merge pull request #1059 from srikanthv02/topic-2569
udeshrl Dec 26, 2016
62fa535
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 4, 2017
61af360
new capacity
Jan 6, 2017
03e09af
Merge pull request #1118 from kkn/topic-cloud-analytics
liteverge-bot Jan 6, 2017
e067fd9
Merge remote-tracking branch 'upstream/topic-discovery' into hkDev
Jan 6, 2017
5b7d6e5
monitor migration
udeshrl Jan 6, 2017
c394aeb
update script message
udeshrl Jan 6, 2017
3c0b42a
monitor migration
udeshrl Jan 6, 2017
179cf73
Monthly resource cost aggregation enabled
Jan 9, 2017
5122b90
Cost aggregation on startup disabled
Jan 9, 2017
7c2033f
Merge pull request #1121 from kkn/topic-cloud-analytics
liteverge-bot Jan 9, 2017
71aa808
Merge remote-tracking branch 'upstream/topic-discovery' into hkDev
Jan 9, 2017
7d9df88
Merge pull request #1120 from udeshrl/stage
liteverge-bot Jan 9, 2017
c951a7e
Resource cost aggregation from CSV updated
Jan 9, 2017
6c0bbb2
capacity filter changed
Jan 9, 2017
b3d7f8d
Merge pull request #1117 from hrushikesh07/hkDev
udeshrl Jan 9, 2017
96fc486
all instance listed
Jan 10, 2017
11f3632
Merge pull request #1124 from hrushikesh07/hkDev
udeshrl Jan 10, 2017
5b1d655
Resource cost aggregation from CSV updated
Jan 9, 2017
e0f8cae
Merge branch 'topic-discovery' of https://github.com/kkn/core into to…
Jan 11, 2017
2e4c1ee
Fix to enable entity cost aggregation
Jan 11, 2017
725bedb
plan cost in business group
udeshrl Jan 11, 2017
ea8f06a
Individual costs for RDS and S3 instances aggregated
Jan 11, 2017
49a134d
Merge pull request #1127 from kkn/topic-discovery
liteverge-bot Jan 11, 2017
2cdc6af
RDS ,S3 listing is done
Jan 12, 2017
d5708dc
RDS ,S3 listing is done
Jan 12, 2017
21564da
Merge pull request #1129 from hrushikesh07/hkDev
udeshrl Jan 12, 2017
baec45a
Merge pull request #1126 from udeshrl/topic-discovery
liteverge-bot Jan 12, 2017
72eb4c5
Merge pull request #1130 from RLOpenCatalyst/topic-discovery
liteverge-bot Jan 12, 2017
9df7223
GIT-REPO-SYNC Implementation
Durgesh1988 Jan 12, 2017
19bebeb
Merge pull request #1131 from RLOpenCatalyst/stage
liteverge-bot Jan 12, 2017
d314ba0
Resolved merge conflicts
Durgesh1988 Jan 12, 2017
e688daf
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 12, 2017
b531b02
Merge branch 'topic-service-delivery' into dev
Durgesh1988 Jan 12, 2017
db4c4f2
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 12, 2017
1c030d4
New BOTs UI enhancements, Added filter functionlity for BOTs.
divakarkonakalla Jan 12, 2017
1ea9112
Instance Scheduler Fixed and CAT-2628 Fixed
Durgesh1988 Jan 12, 2017
7acf20d
date picker added for cost and fixex the bugs
Jan 12, 2017
615ac81
Instance Scheduler Fixed and CAT-2628 Fixed
Durgesh1988 Jan 12, 2017
6e582ca
Implement FilterBy in Bots
Durgesh1988 Jan 12, 2017
369ca4f
Merge pull request #1133 from Durgesh1988/dev
liteverge-bot Jan 12, 2017
343bb2f
Change API End-Point for FilterBy
Durgesh1988 Jan 12, 2017
9f13155
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 12, 2017
2fd97f0
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 12, 2017
5812666
Merge pull request #1135 from Durgesh1988/dev
Jan 12, 2017
6ad01ef
review comments has been taken care.
divakarkonakalla Jan 12, 2017
9f7883e
Fix to aggregate cost for EC2 instances
Jan 12, 2017
acbfb66
Merge pull request #1136 from kkn/dev
liteverge-bot Jan 12, 2017
1ddd826
Revert "Git Hub Integration/CAT-2628 Fixed"
liteverge-bot Jan 12, 2017
f1dd1c5
Merge pull request #1137 from RLOpenCatalyst/revert-1133-dev
liteverge-bot Jan 12, 2017
0e3e723
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 12, 2017
fb55518
Merge pull request #1134 from hrushikesh07/hkDev
udeshrl Jan 13, 2017
d1c4dc0
date range added
Jan 13, 2017
262b0d1
month added
Jan 13, 2017
0ef43ab
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 13, 2017
62be83a
css changed
Jan 13, 2017
553c3d6
css changed
Jan 13, 2017
894637d
Merge pull request #1138 from hrushikesh07/hkDev
udeshrl Jan 13, 2017
b81d4e4
added condition for managed instance and chenged the resources instan…
Jan 13, 2017
61e99a5
GIT Hub Implementation
Durgesh1988 Jan 13, 2017
aba4c57
Merge remote-tracking branch 'upstream/dev' into topic-service-delivery
Durgesh1988 Jan 13, 2017
0146111
GIT Hub Implementation
Durgesh1988 Jan 13, 2017
336947d
GIT Hub Implementation
Durgesh1988 Jan 13, 2017
cd0cd0d
BOTs filter related UI changes, added right side panel for filter hid…
divakarkonakalla Jan 13, 2017
82bb84c
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Jan 13, 2017
ec0f2cf
Merge remote-tracking branch 'upstream/dev' into dev
udeshrl Jan 16, 2017
cbbef22
Merge pull request #1139 from hrushikesh07/hkDev
udeshrl Jan 16, 2017
ab1441b
GIT Hub Implementation
Durgesh1988 Jan 16, 2017
e77d03f
GIT Hub Implementation
Durgesh1988 Jan 16, 2017
787fae3
API changed
Jan 16, 2017
6b998f6
API changed
Jan 16, 2017
ae3720d
Merge pull request #1141 from hrushikesh07/hkDev
Jan 16, 2017
c0d77f8
Remove blank options from the dropdown while assigning tag values Und…
udeshrl Jan 16, 2017
5a21549
used a foreach for creating object in instance list
Jan 16, 2017
1680572
Merge pull request #1143 from hrushikesh07/hkDev
Jan 16, 2017
c65ee36
Merge pull request #1142 from udeshrl/dev
liteverge-bot Jan 16, 2017
c6b6f3a
showSchedule element added
Jan 16, 2017
beb6c38
used a foreach for creating object in instance list
Jan 16, 2017
3efd236
Merge pull request #1144 from hrushikesh07/hkDev
Jan 16, 2017
7441c41
spliteUP select box value changing
Jan 16, 2017
91843ea
Merge pull request #1145 from hrushikesh07/hkDev
Jan 16, 2017
6e3ac76
GIT Hub Implementation
Durgesh1988 Jan 16, 2017
da070ca
split up select box value changed
Jan 16, 2017
e259825
Merge pull request #1146 from hrushikesh07/hkDev
udeshrl Jan 16, 2017
dd58c1d
Removing old cost records on tag mapping change
udeshrl Jan 16, 2017
aac58a9
Changes for monitorId null check
srikanthv02 Jan 16, 2017
bf1f620
Added a new function
srikanthv02 Jan 16, 2017
5b743cd
Resolved CAT-2609,1498
srikanthv02 Jan 17, 2017
9e53261
Merge pull request #1148 from srikanthv02/devSrikanth
udeshrl Jan 17, 2017
b93a6c7
Merge pull request #1147 from udeshrl/dev
liteverge-bot Jan 17, 2017
95b7814
Added ng-submit on search box to support enter key on search.
divakarkonakalla Jan 17, 2017
0cb9749
Merge pull request #1132 from divakarkonakalla/topic-service-deliver
udeshrl Jan 17, 2017
b0020f4
Bots Audit Trail Implementation for CFT
Durgesh1988 Jan 17, 2017
70f48a8
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 17, 2017
9cc8ec6
Bots Audit Trail Implementation for CFT
Durgesh1988 Jan 17, 2017
d67be1c
Resolved JShint errors.
divakarkonakalla Jan 17, 2017
e9f4e1c
Bots Audit Trail Implementation for CFT
Durgesh1988 Jan 18, 2017
3ab665e
Update code accordining to Review Comments
Durgesh1988 Jan 18, 2017
3aaf9de
Merge pull request #1149 from Durgesh1988/dev
udeshrl Jan 18, 2017
d3ca75a
Resolved merge conflicts with Dev branch.
divakarkonakalla Jan 18, 2017
4ef5cf2
big fixed CAT-2640,CAT-2641,CAT-2642
Jan 18, 2017
500d9e4
Merge pull request #1151 from hrushikesh07/hkDev
udeshrl Jan 18, 2017
37e24f0
API end point changed
Jan 18, 2017
2d2da30
Update code accordining to Review Comments
Durgesh1988 Jan 18, 2017
9fb570a
Resolved merge conflicts.
divakarkonakalla Jan 18, 2017
65e6498
Merge pull request #1152 from hrushikesh07/hkDev
udeshrl Jan 18, 2017
eb453a0
Merge pull request #1150 from divakarkonakalla/topic-service-deliver
udeshrl Jan 18, 2017
01e1fc9
Create generic FilterBy and implement in BOTs
Durgesh1988 Jan 18, 2017
afc05ca
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 18, 2017
9349840
Merge pull request #1153 from Durgesh1988/dev
udeshrl Jan 18, 2017
b158b67
Create New Schema for Bots for New Requirement
Durgesh1988 Jan 18, 2017
dfa9f3c
week date added
Jan 18, 2017
998f4b3
changed the logic to delete old cost aggregation data
udeshrl Jan 18, 2017
190dab7
Merge pull request #1154 from hrushikesh07/hkDev
udeshrl Jan 18, 2017
b76a7e8
Merge pull request #1155 from udeshrl/dev
udeshrl Jan 18, 2017
f185789
deleting old records for entity cost
udeshrl Jan 18, 2017
b3b73b5
Merge pull request #1156 from udeshrl/dev
udeshrl Jan 18, 2017
3fea2fa
Resolving merge conflicts
srikanthv02 Jan 19, 2017
d247ed7
select current week
Jan 19, 2017
af28f4b
Merge pull request #1158 from hrushikesh07/hkDev
udeshrl Jan 19, 2017
ee2d706
Merge pull request #1157 from srikanthv02/topic-2569
udeshrl Jan 19, 2017
f5512ca
New Implementation for BOTs
Durgesh1988 Jan 19, 2017
d7727d3
Enable monitoring for cft
udeshrl Jan 19, 2017
94003ef
Merge pull request #1159 from udeshrl/dev
udeshrl Jan 19, 2017
9cd4928
Added clear button in filter section, added section to show selected …
divakarkonakalla Jan 19, 2017
c856d10
Merge pull request #1160 from divakarkonakalla/topic-service-deliver
udeshrl Jan 19, 2017
124769e
New Implementation for BOTs
Durgesh1988 Jan 20, 2017
9b4bac4
bg name added in instance list
Jan 20, 2017
8e17c68
bg name added in instance list
Jan 20, 2017
26fad66
Merge pull request #1161 from hrushikesh07/hkDev
amanpatial Jan 20, 2017
ce19fb8
CAT-2648/CAT-2649 Fixed
Durgesh1988 Jan 20, 2017
ce71c07
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Jan 20, 2017
3c9e80b
Merge pull request #1162 from Durgesh1988/dev
udeshrl Jan 20, 2017
4809182
Change routes files in settings for customer
Durgesh1988 Jan 20, 2017
e508409
Merge pull request #1163 from Durgesh1988/dev
amanpatial Jan 20, 2017
1515d52
removed api call on login page
udeshrl Jan 23, 2017
986a68d
Merge pull request #1165 from udeshrl/dev
udeshrl Jan 23, 2017
d715dee
Resolve merge conflicts
Durgesh1988 Jan 23, 2017
d668cf9
Remove mandatory for Instance Username for CFT
Durgesh1988 Jan 23, 2017
b49a792
Remove mandatory for Instance Username for CFT
Durgesh1988 Jan 23, 2017
22a7743
Merge pull request #1166 from Durgesh1988/dev
udeshrl Jan 23, 2017
1887c90
Removed firebase code
udeshrl Jan 23, 2017
6739903
Merge pull request #1168 from udeshrl/dev
udeshrl Jan 23, 2017
248c96b
Sync with upstream/dev branch
Durgesh1988 Jan 24, 2017
af0d713
New Implementation for BOTs
Durgesh1988 Jan 25, 2017
5db0161
Implement Reading and uploading YML documents from GIT HUB
Durgesh1988 Jan 25, 2017
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
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*/node_modules/
*/*/node_modules/
.git/
.dockerignore
Dockerfile
74 changes: 74 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
3.5.0 - November 10th , 2016
----------------------------
* Cloud Management - Capacity Report
* Telemetry Enhancements - SAE Dashboards
* Improved 'Design' page written in AngularJS
* Bots Library

3.4.0 - SEptember 2nd , 2016
----------------------------
* Cloud Management - Daily/Weekly/Monthly cost and usage reports and trends
* Provider wise listing of unassigned instances in track
* New Wizard for setup
* Audit Trail for docker containers


3.3.0 - August 11th , 2016
----------------------------
* Composite blueprints enhancements
* Audit log trail implementation
* Script executor implementation
* Chef node import improvements
* Critical Bug Fixes

3.2.1 - July 8th , 2016
----------------------------
* Composite blueprints implementation - To design and launch a complete application stack
* Critical Bug Fixes

3.1.0 - June 14th, 2016
----------------------------
* Improved GUI with AngularJS
* Script Executor to enbale execution of shell scripts on selected instances
* Role based discovery of instances
* RDS and S3 Report from AWS Account

3.0.6 - May 10th, 2016
----------------------------
* Update AWS tags from Catalyst
* Instance Level Cost and Usage Dashboards
* Option to edit and clone blueprints
* Attribute Editor for Blueprints

3.0.5 - April 15th, 2016
----------------------------
* AWS tag based allocation of instances
* Promote feature for Application Deployments

3.0.4 - March 21st, 2016
----------------------------
* Introducing IAM based authorization to AWS account
* Import Instances from AWS
* Application Deployment using Blueprints

3.0.3 - March 7th, 2016
----------------------------
* Hardening application deployment history
* Security Fixes

3.0.2 - February 26th, 2016
----------------------------
* Security Fixes
* Dashboards for AWS Summary and Cost

3.0.1 - February 24th, 2016
---------------------------
* VMware Support - VM provisioning and management
* Bootstrap instances with Puppet

3.0.0 - February 22nd, 2016
---------------------------

Docs : http://catalyst.readthedocs.org

* Initial public release
33 changes: 33 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
FROM node:4.6.0
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libkrb5-dev make g++ ruby libstdc++6

RUN npm install -g kerberos

##Client
RUN npm install -g grunt-cli
RUN npm install -g npm
RUN npm install forever --global
RUN gem install sass
RUN curl -L https://www.opscode.com/chef/install.sh | bash

RUN mkdir -p /rlc/client
RUN mkdir -p /rlc/server

## Client
ADD ./client/cat3 /rlc/client/cat3
ADD ./client/htmls /rlc/client/htmls
WORKDIR /rlc/client/cat3
RUN npm install --production
RUN npm run-script build-prod

## Server
WORKDIR /rlc/server
ADD ./server /rlc/server
RUN node install.js

EXPOSE 3001

## Server App
# CMD forever start app.js
WORKDIR /rlc/server/app
CMD node app.js
4 changes: 1 addition & 3 deletions client/cat3/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
<script src="lib/lodash/lodash/lodash.min.js"></script>
<script src="lib/ng-file-upload/ng-file-upload.min.js"></script>
<script src="src/partials/globals/toaster/angular-toastr.tpls.js"></script>
<script src="src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js"></script>
<script src="https://cdn.firebase.com/js/client/1.1.1/firebase.js"></script>
<script src="https://cdn.firebase.com/libs/angularfire/0.8.0/angularfire.min.js"></script>
<!-- Application configuration -->
<script src="uiConfig.js"></script>
<script src="lib/d3/d3.js"></script>
Expand Down Expand Up @@ -111,6 +108,7 @@
<script src="src/partials/sections/dashboard/analytics/analyticsServices.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js"></script>
Expand Down
8 changes: 1 addition & 7 deletions client/cat3/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* All modules/feature will be through
* */

var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','firebase',
var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
'global.login',
'global.breadcrumb',
'authentication',
Expand All @@ -34,12 +34,6 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','fireb
angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
function ($rootScope, Auth, $state, $stateParams,$http) {
'use strict';
$http.get('/organizations/getTreeNew').success(function () {
// if(result.data && result.data.length >0){
// console.log(result);
// $window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
// }
});
$rootScope.$on('$stateChangeStart', function (event, toState) {
//More function params: function (event, toState, toParams, fromState, fromParams)
function checkAuthentication() {
Expand Down
Loading