diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 4d7e0d5a2..441345147 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -532,11 +532,9 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { }, QueueLength: 10, TTL: time.Duration(10) * time.Second, - Metrics: []*engine.MetricWithFilters{ - &engine.MetricWithFilters{ - MetricID: "*sum:~Val", - }, - }, + Metrics: []*engine.MetricWithFilters{{ + MetricID: "*sum:~*req.Val", + }}, ThresholdIDs: []string{"Val1", "Val2"}, Blocker: true, Stored: true, diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 617cf6873..83a5f53dc 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -163,8 +163,8 @@ func testV1STSGetStats(t *testing.T) { utils.MetaTCD: utils.NOT_AVAILABLE, utils.MetaACC: utils.NOT_AVAILABLE, utils.MetaPDD: utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): utils.NOT_AVAILABLE, } if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, &utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, @@ -201,8 +201,8 @@ func testV1STSProcessEvent(t *testing.T) { utils.MetaTCD: utils.NOT_AVAILABLE, utils.MetaACC: utils.NOT_AVAILABLE, utils.MetaPDD: utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): utils.NOT_AVAILABLE, + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): utils.NOT_AVAILABLE, } var metrics map[string]string if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, @@ -220,8 +220,8 @@ func testV1STSProcessEvent(t *testing.T) { utils.MetaTCD: -1.0, utils.MetaACC: -1.0, utils.MetaPDD: -1.0, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): -1.0, - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): -1.0, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): -1.0, + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): -1.0, } var floatMetrics map[string]float64 if err := stsV1Rpc.Call(utils.StatSv1GetQueueFloatMetrics, @@ -266,8 +266,8 @@ func testV1STSProcessEvent(t *testing.T) { utils.MetaTCD: "3m0s", utils.MetaTCC: "135.1", utils.MetaPDD: utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): "180000000000", - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): "60000000000", + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): "180000000000", + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): "60000000000", } var metrics2 map[string]string if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, @@ -284,8 +284,8 @@ func testV1STSProcessEvent(t *testing.T) { utils.MetaTCD: 180, utils.MetaACC: 45.03333, utils.MetaPDD: -1.0, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): 180000000000, - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): 60000000000, + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): 180000000000, + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): 60000000000, } var floatMetrics2 map[string]float64 if err := stsV1Rpc.Call(utils.StatSv1GetQueueFloatMetrics, @@ -320,8 +320,8 @@ func testV1STSGetStatsAfterRestart(t *testing.T) { utils.MetaTCD: "3m0s", utils.MetaTCC: "135.1", utils.MetaPDD: utils.NOT_AVAILABLE, - utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.Usage): "180000000000", - utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.Usage): "60000000000", + utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): "180000000000", + utils.ConcatenatedKey(utils.MetaAverage, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+utils.Usage): "60000000000", } var metrics2 map[string]string if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics, diff --git a/data/tariffplans/oldtutorial/Stats.csv b/data/tariffplans/oldtutorial/Stats.csv index c1b561919..0f8ed9ade 100644 --- a/data/tariffplans/oldtutorial/Stats.csv +++ b/data/tariffplans/oldtutorial/Stats.csv @@ -1,4 +1,4 @@ #Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12] cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*asr;*acc;*tcc;*acd;*tcd,,true,false,20,*none -cgrates.org,Stats1,,,,,,*sum:~Usage;*average:~Usage,,,,, +cgrates.org,Stats1,,,,,,*sum:~*req.Usage;*average:~*req.Usage,,,,, cgrates.org,Stats1,,,,,,*pdd,*exists:~*req.PDD:,,,, \ No newline at end of file diff --git a/data/tariffplans/precache/Stats.csv b/data/tariffplans/precache/Stats.csv index 56fa74a79..75c8e2449 100644 --- a/data/tariffplans/precache/Stats.csv +++ b/data/tariffplans/precache/Stats.csv @@ -1,4 +1,4 @@ #Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12] cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*asr;*acc;*tcc;*acd;*tcd,,true,false,20,*none -cgrates.org,Stats1,,,,,,*sum:~Usage;*average:~Usage,,,,, +cgrates.org,Stats1,,,,,,*sum:~*req.Usage;*average:~*req.Usage,,,,, cgrates.org,Stats1,,,,,,*pdd,*exists:~PDD:,,,, \ No newline at end of file diff --git a/data/tariffplans/testtp/Stats.csv b/data/tariffplans/testtp/Stats.csv index b08722bbc..aea45de8a 100755 --- a/data/tariffplans/testtp/Stats.csv +++ b/data/tariffplans/testtp/Stats.csv @@ -1,3 +1,3 @@ #Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12] cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*asr;*acc;*tcc;*acd;*tcd;*pdd,,true,true,20,THRESH1;THRESH2 -cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*sum:~Value;*average:~Value,,true,true,20,THRESH1;THRESH2 +cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,1s,2,*sum:~*req.Value;*average:~*req.Value,,true,true,20,THRESH1;THRESH2