Skip to content

Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab #1007

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 8 commits into from
Dec 5, 2016
Merged

Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b9bcfc
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
1b2fcfc
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
da40788
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 1, 2016
5ab8fa9
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
db11d2b
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 2, 2016
d66b946
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
cb39b4a
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 5, 2016
52f566b
cost aggregation fixes
Dec 5, 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
45 changes: 34 additions & 11 deletions server/app/model/resource-costs/resource-costs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var Schema = mongoose.Schema
// @TODO Date field types to be revised
var ResourceCostsSchema = new Schema({
cost: {
type: SchemaTypes.Double,
type: Number,
required: true
},
currency: {
Expand Down Expand Up @@ -70,6 +70,11 @@ var ResourceCostsSchema = new Schema({
required: false,
trim: true
},
billIntervalId: {
type: String,
required: true,
trim: true
},
billLineItemId: {
type: Number,
required: true,
Expand Down Expand Up @@ -132,38 +137,56 @@ var ResourceCostsSchema = new Schema({
})

ResourceCostsSchema.index({'platformDetails.serviceId' : 1})
ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'billLineItemId': 1,
'startTime': 1, 'interval': 1}, {'unique': true})
ResourceCostsSchema.index({'organizationId': 1, 'providerId': 1, 'startTime': 1,
'billIntervalId': 1, 'billLineItemId': 1, 'interval': 1}, {'unique': true})

ResourceCostsSchema.statics.saveResourceCost = function saveResourceCost(resourceCostData, callback) {
ResourceCostsSchema.statics.save = function save(resourceCostData, callback) {
var resourceCosts = new ResourceCosts(resourceCostData)
resourceCosts.save(function(err, data) {
resourceCosts.save(function(err, result) {
if (err) {
callback(err)
} else {
callback(null)
callback(null, result)
}
})
}

ResourceCostsSchema.statics.upsertResourceCost = function upsertResourceCost(resourceCostData, callback) {
ResourceCostsSchema.statics.remove
= function remove(organizationId, providerId, billIntervalId, callback) {
var query = {
organizationId: organizationId,
providerId: providerId,
billIntervalId: billIntervalId
}

this.find(query).remove(function(err, result) {
if (err) {
callback(err)
} else {
callback(null, result)
}
})
}

ResourceCostsSchema.statics.upsert = function upsert(resourceCostData, callback) {
var query = {
organizationId: resourceCostData.organizationId,
providerId: resourceCostData.providerId,
billLineItemId: resourceCostData.billLineItemId,
startTime: resourceCostData.startTime,
billIntervalId: resourceCostData.billIntervalId,
billLineItemId: resourceCostData.billLineItemId,
interval: resourceCostData.interval
}

this.findOneAndUpdate(query, resourceCostData, {upsert:true},
this.findOneAndUpdate(query, resourceCostData, {upsert: true},
function(err, result){
if (err) {
callback(null)
} else {
callback(null, result)
}
});
})
}

var ResourceCosts = mongoose.model('ResourceCosts', ResourceCostsSchema)
module.exports = ResourceCosts
module.exports = ResourceCosts
161 changes: 91 additions & 70 deletions server/app/services/resourceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,91 +91,112 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u
var awsZones = appConfig.aws.zones
var lineNumber = 0

var stream = fs.createReadStream(downlaodedCSVPath)
csv.fromStream(stream, {headers: false}).on('data', function(data) {
if(data[awsBillIndexes.totalCost] == 'LineItem') {
var resourceCostEntry = {platformDetails: {}}

resourceCostEntry.organizationId = provider.orgId
resourceCostEntry.providerId = provider._id
resourceCostEntry.providerType = provider.providerType
resourceCostEntry.cost = data[awsBillIndexes.cost]
resourceCostEntry.startTime = Date.parse(data[awsBillIndexes.startDate])
resourceCostEntry.endTime = Date.parse(data[awsBillIndexes.endDate])
resourceCostEntry.lastUpdateTime = Date.parse(updateTime)
resourceCostEntry.interval = 3600
resourceCostEntry.platformDetails.serviceName = data[awsBillIndexes.prod]
resourceCostEntry.billLineItemId = ++lineNumber
resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId]

resourceCostEntry.platformDetails.serviceId
= (data[awsBillIndexes.prod] in awsServices)?awsServices[data[awsBillIndexes.prod]]
:resourceCostEntry.platformDetails.serviceId = 'Other'

resourceCostEntry.platformDetails.zone = (data[awsBillIndexes.zone] == null)
? 'Global' : data[awsBillIndexes.zone]

resourceCostEntry.platformDetails.region = (data[awsBillIndexes.zone] in awsZones)
? awsZones[data[awsBillIndexes.zone]] : 'Global'

if (data[awsBillIndexes.instanceId] != null) {
resourceCostEntry.platformDetails.instanceId = data[awsBillIndexes.instanceId]
}
var date = new Date()
var billIntervalId = date.getFullYear() + '-' + (date.getMonth() + 1)

if(data[awsBillIndexes.usageType] != null) {
resourceCostEntry.platformDetails.usageType = data[awsBillIndexes.usageType]
}
async.waterfall([
function(next) {
resourceCost.remove(provider.orgId, provider._id, billIntervalId, next)
},
function(count, next) {
/*var lineNumber = (count == 0)?0:count
var startingLineNumber = (count == 0)?1:(count+2)*/

if (data[awsBillIndexes.instanceId] in resources) {
var resource = resources[data[awsBillIndexes.instanceId]]
var stream = fs.createReadStream(downlaodedCSVPath)
csv.fromStream(stream).on('data', function(data) {
if(data[awsBillIndexes.totalCost] == 'LineItem') {
var resourceCostEntry = {platformDetails: {}}

resourceCostEntry.resourceId = resource._id
resourceCostEntry.organizationId = provider.orgId
resourceCostEntry.providerId = provider._id
resourceCostEntry.providerType = provider.providerType
resourceCostEntry.cost = data[awsBillIndexes.cost]
resourceCostEntry.startTime = Date.parse(data[awsBillIndexes.startDate])
resourceCostEntry.endTime = Date.parse(data[awsBillIndexes.endDate])
resourceCostEntry.lastUpdateTime = Date.parse(updateTime)
resourceCostEntry.interval = 3600
resourceCostEntry.platformDetails.serviceName = data[awsBillIndexes.prod]
resourceCostEntry.billIntervalId = billIntervalId
resourceCostEntry.billLineItemId = ++lineNumber
resourceCostEntry.platformDetails.billRecordId = data[awsBillIndexes.recordId]

if (('bgId' in resource) && (resource.bgId != null)) {
resourceCostEntry.businessGroupId = resource['bgId']
}
resourceCostEntry.platformDetails.serviceId
= (data[awsBillIndexes.prod] in awsServices)?awsServices[data[awsBillIndexes.prod]]
:resourceCostEntry.platformDetails.serviceId = 'Other'

if (('projectId' in resource) && (resource.projectId != null)) {
resourceCostEntry.projectId = resource['projectId']
}
resourceCostEntry.platformDetails.zone = (data[awsBillIndexes.zone] == null)
? 'Global' : data[awsBillIndexes.zone]

if (('environmentId' in resource) && (resource.environmentId != null)) {
resourceCostEntry.environmentId = resource['environmentId']
}
resourceCostEntry.platformDetails.region = (data[awsBillIndexes.zone] in awsZones)
? awsZones[data[awsBillIndexes.zone]] : 'Global'

if (('masterDetails.bgId' in resource) && (resource.masterDetails.bgId != null)) {
console.log("BG: " + resource['bgId'])
resourceCostEntry.businessGroupId = resource['bgId']
}
if (data[awsBillIndexes.instanceId] != null) {
resourceCostEntry.platformDetails.instanceId = data[awsBillIndexes.instanceId]
}

if (('masterDetails.projectId' in resource)
&& (resource.masterDetails.projectId != null)) {
resourceCostEntry.projectId = resource['projectId']
}
if(data[awsBillIndexes.usageType] != null) {
resourceCostEntry.platformDetails.usageType = data[awsBillIndexes.usageType]
}

if (('masterDetails.environmentId' in resource)
&& (resource.masterDetails.environmentId != null)) {
resourceCostEntry.environmentId = resource['environmentId']
}
}
if (data[awsBillIndexes.instanceId] in resources) {
var resource = resources[data[awsBillIndexes.instanceId]]

resourceCostEntry.businessGroupId
= ('businessGroupId' in resourceCostEntry)?resourceCostEntry.businessGroupId:'Unassigned'
resourceCostEntry.projectId
= ('projectId' in resourceCostEntry)?resourceCostEntry.projectId:'Unassigned'
resourceCostEntry.environmentId
= ('environmentId' in resourceCostEntry)?resourceCostEntry.environmentId:'Unassigned'
resourceCostEntry.resourceId = resource._id

resourceCost.upsertResourceCost(resourceCostEntry, function (err, costEntry) {
if (err) {
logger.error(err)
return callback(new Error('Database Error'))
if (('bgId' in resource) && (resource.bgId != null)) {
resourceCostEntry.businessGroupId = resource['bgId']
}

if (('projectId' in resource) && (resource.projectId != null)) {
resourceCostEntry.projectId = resource['projectId']
}

if (('environmentId' in resource) && (resource.environmentId != null)) {
resourceCostEntry.environmentId = resource['environmentId']
}

if (('masterDetails.bgId' in resource) && (resource.masterDetails.bgId != null)) {
console.log("BG: " + resource['bgId'])
resourceCostEntry.businessGroupId = resource['bgId']
}

if (('masterDetails.projectId' in resource)
&& (resource.masterDetails.projectId != null)) {
resourceCostEntry.projectId = resource['projectId']
}

if (('masterDetails.environmentId' in resource)
&& (resource.masterDetails.environmentId != null)) {
resourceCostEntry.environmentId = resource['environmentId']
}
}

resourceCostEntry.businessGroupId
= ('businessGroupId' in resourceCostEntry)?resourceCostEntry.businessGroupId:'Unassigned'
resourceCostEntry.projectId
= ('projectId' in resourceCostEntry)?resourceCostEntry.projectId:'Unassigned'
resourceCostEntry.environmentId
= ('environmentId' in resourceCostEntry)?resourceCostEntry.environmentId:'Unassigned'

resourceCost.save(resourceCostEntry, function (err, costEntry) {
if (err) {
logger.error(err)
return next(new Error('Database Error'))
}
})
}
}).on('end', function() {
next()
})
}
}).on('end', function() {
callback(null)
], function(err) {
if(err) {
callback(err)
} else {
callback()
}
})

}

function getCostForServices_deprecated(provider,callback) {
Expand Down