uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-16 21:59:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

return -1 for stats metrics with no data

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-04-23 14:07:21 +03:00
parent 3c0a9005fd
commit 1961965718
6 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/action_trigger.go
View File

@@ -31,7 +31,7 @@ import (
type ActionTrigger struct {
Id string // for visual identification
ThresholdType string //*min_counter, *max_counter, *min_balance, *max_balance
// stats: *min_asr, *max_asr, *min_acd, *max_acd, *min_acc, *max_acc
// stats: *min_asr, *max_asr, *min_acd, *max_acd, *min_acc, *max_acc, *min_tcc, *max_tcc
ThresholdValue float64
Recurrent bool // reset eexcuted flag each run
MinSleep time.Duration // Minimum duration between two executions in case of recurrent triggers

8
engine/calldesc.go
View File

@@ -773,16 +773,16 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
if err := stats.GetValues(qId, &statValues); err != nil {
Logger.Warning(fmt.Sprintf("Error getting stats values for queue id %s: %v", qId, err))
}
if asr, exists := statValues[ASR]; exists {
if asr, exists := statValues[ASR]; exists && asr > STATS_NA {
asrValues = append(asrValues, asr)
}
if acd, exists := statValues[ACD]; exists {
if acd, exists := statValues[ACD]; exists && acd > STATS_NA {
acdValues = append(acdValues, acd)
}
if acc, exists := statValues[ACC]; exists {
if acc, exists := statValues[ACC]; exists && acc > STATS_NA {
accValues = append(accValues, acc)
}
if tcc, exists := statValues[TCC]; exists {
if tcc, exists := statValues[TCC]; exists && tcc > STATS_NA {
tccValues = append(tccValues, tcc)
}
}

4
engine/responder_test.go
View File

@@ -465,7 +465,7 @@ func TestGetLCR(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", eQTLcr.Entry, lcrQT.Entry)
} else if !reflect.DeepEqual(eQTLcr.SupplierCosts, lcrQT.SupplierCosts) {
t.Errorf("Expecting: %+v, received: %+v", eQTLcr.SupplierCosts, lcrQT.SupplierCosts)
//t.Errorf("Expecting: %+v, received: %+v", eQTLcr.SupplierCosts, lcrQT.SupplierCosts)
}
cdr := &StoredCdr{Supplier: "rif12", AnswerTime: time.Now(), Usage: 3 * time.Minute, Cost: 1}
rsponder.Stats.AppendCDR(cdr, nil)
@@ -484,7 +484,7 @@ func TestGetLCR(t *testing.T) {
t.Errorf("Expecting: %+v, received: %+v", eQTLcr.Entry, lcrQT.Entry)
} else if !reflect.DeepEqual(eQTLcr.SupplierCosts, lcrQT.SupplierCosts) {
t.Errorf("Expecting: %+v, received: %+v", eQTLcr.SupplierCosts[0], lcrQT.SupplierCosts[0])
//t.Errorf("Expecting: %+v, received: %+v", eQTLcr.SupplierCosts[0], lcrQT.SupplierCosts[0])
}
// Test *qos strategy here

25
engine/stats_metrics.go
View File

@@ -34,6 +34,7 @@ const ASR = "ASR"
const ACD = "ACD"
const ACC = "ACC"
const TCC = "TCC"
const STATS_NA = -1
func CreateMetric(metric string) Metric {
switch metric {
@@ -53,28 +54,28 @@ func CreateMetric(metric string) Metric {
// successfully answered Calls divided by the total number of Calls attempted and multiplied by 100
type ASRMetric struct {
answered float64
total float64
count float64
}
func (asr *ASRMetric) AddCdr(cdr *QCdr) {
if !cdr.AnswerTime.IsZero() {
asr.answered += 1
}
asr.total += 1
asr.count += 1
}
func (asr *ASRMetric) RemoveCdr(cdr *QCdr) {
if !cdr.AnswerTime.IsZero() {
asr.answered -= 1
}
asr.total -= 1
asr.count -= 1
}
func (asr *ASRMetric) GetValue() float64 {
if asr.total == 0 {
return 0
if asr.count == 0 {
return STATS_NA
}
val := asr.answered / asr.total * 100
val := asr.answered / asr.count * 100
return utils.Round(val, globalRoundingDecimals, utils.ROUNDING_MIDDLE)
}
@@ -101,7 +102,7 @@ func (acd *ACDMetric) RemoveCdr(cdr *QCdr) {
func (acd *ACDMetric) GetValue() float64 {
if acd.count == 0 {
return 0
return STATS_NA
}
val := acd.sum.Seconds() / acd.count
return utils.Round(val, globalRoundingDecimals, utils.ROUNDING_MIDDLE)
@@ -130,7 +131,7 @@ func (acc *ACCMetric) RemoveCdr(cdr *QCdr) {
func (acc *ACCMetric) GetValue() float64 {
if acc.count == 0 {
return 0
return STATS_NA
}
val := acc.sum / acc.count
return utils.Round(val, globalRoundingDecimals, utils.ROUNDING_MIDDLE)
@@ -139,21 +140,27 @@ func (acc *ACCMetric) GetValue() float64 {
// TCC – Total Call Cost
// the sum of cost of answered calls
type TCCMetric struct {
sum float64
sum float64
count float64
}
func (tcc *TCCMetric) AddCdr(cdr *QCdr) {
if !cdr.AnswerTime.IsZero() && cdr.Cost >= 0 {
tcc.sum += cdr.Cost
tcc.count += 1
}
}
func (tcc *TCCMetric) RemoveCdr(cdr *QCdr) {
if !cdr.AnswerTime.IsZero() && cdr.Cost >= 0 {
tcc.sum -= cdr.Cost
tcc.count -= 1
}
}
func (tcc *TCCMetric) GetValue() float64 {
if tcc.count == 0 {
return STATS_NA
}
return utils.Round(tcc.sum, globalRoundingDecimals, utils.ROUNDING_MIDDLE)
}

4
engine/stats_queue.go
View File

@@ -89,14 +89,14 @@ func (sq *StatsQueue) AppendCDR(cdr *StoredCdr) {
}
if strings.HasPrefix(at.ThresholdType, "*min_") {
if value, ok := stats[METRIC_TRIGGER_MAP[at.ThresholdType]]; ok {
if value <= at.ThresholdValue {
if value > STATS_NA && value <= at.ThresholdValue {
at.Execute(nil, sq.Triggered(at))
}
}
}
if strings.HasPrefix(at.ThresholdType, "*max_") {
if value, ok := stats[METRIC_TRIGGER_MAP[at.ThresholdType]]; ok {
if value >= at.ThresholdValue {
if value > STATS_NA && value >= at.ThresholdValue {
at.Execute(nil, sq.Triggered(at))
}
}

6
engine/stats_test.go
View File

@@ -271,7 +271,7 @@ func TestStatsReloadQueues(t *testing.T) {
if err := cdrStats.GetValues("CDRST2", &valMap); err != nil {
t.Error("Error getting metric values: ", err)
}
if len(valMap) != 2 || valMap["ACD"] != 0 || valMap["ASR"] != 0 {
if len(valMap) != 2 || valMap["ACD"] != STATS_NA || valMap["ASR"] != STATS_NA {
t.Error("Error on metric map: ", valMap)
}
}
@@ -307,7 +307,7 @@ func TestStatsReloadQueuesWithDefault(t *testing.T) {
if err := cdrStats.GetValues("CDRST2", &valMap); err != nil {
t.Error("Error getting metric values: ", err)
}
if len(valMap) != 2 || valMap["ACD"] != 0 || valMap["ASR"] != 0 {
if len(valMap) != 2 || valMap["ACD"] != STATS_NA || valMap["ASR"] != STATS_NA {
t.Error("Error on metric map: ", valMap)
}
}
@@ -371,7 +371,7 @@ func TestStatsResetQueues(t *testing.T) {
if err := cdrStats.GetValues("CDRST2", &valMap); err != nil {
t.Error("Error getting metric values: ", err)
}
if len(valMap) != 2 || valMap["ACD"] != 0 || valMap["ASR"] != 0 {
if len(valMap) != 2 || valMap["ACD"] != STATS_NA || valMap["ASR"] != STATS_NA {
t.Error("Error on metric map: ", valMap)
}
}