diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index a29dcbae6..97e2002ed 100755 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -260,20 +260,20 @@ // "field_separator": ",", // used field separator in some export formats, eg: *file_csv // "attributes_context": "", // attributes context - empty disables attributes processing // "fields": [ // template of the exported content fields -// {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, -// {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, -// {"path": "*exp.ToR", "type": "*composed", "value": "~*req.ToR"}, -// {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, -// {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, -// {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, -// {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, -// {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, -// {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, -// {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, -// {"path": "*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, -// {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, -// {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, -// {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, +// {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, +// {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, +// {"path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, +// {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, +// {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, +// {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, +// {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, +// {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, +// {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, +// {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, +// {"path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, +// {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, +// {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, +// {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, // ], // }, // }, diff --git a/data/conf/samples/acc_balance_keep_internal/cgrates.json b/data/conf/samples/acc_balance_keep_internal/cgrates.json index b48866c37..5f05952c3 100644 --- a/data/conf/samples/acc_balance_keep_internal/cgrates.json +++ b/data/conf/samples/acc_balance_keep_internal/cgrates.json @@ -48,18 +48,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json b/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json index 29aac065c..062cd5c03 100644 --- a/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json @@ -54,18 +54,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/acc_balance_keep_mongo/cgrates.json b/data/conf/samples/acc_balance_keep_mongo/cgrates.json index c2fc50c50..1ae0620b5 100644 --- a/data/conf/samples/acc_balance_keep_mongo/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mongo/cgrates.json @@ -49,18 +49,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json b/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json index a9afc2569..9f09b6529 100644 --- a/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json @@ -58,18 +58,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/acc_balance_keep_mysql/cgrates.json b/data/conf/samples/acc_balance_keep_mysql/cgrates.json index b720cef15..d04f57f7e 100644 --- a/data/conf/samples/acc_balance_keep_mysql/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mysql/cgrates.json @@ -48,18 +48,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json b/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json index 02a4292b7..adf11802f 100644 --- a/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json @@ -55,18 +55,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/cdrewithattributes/cgrates.json b/data/conf/samples/cdrewithattributes/cgrates.json index 486884a2f..2b83d94b9 100755 --- a/data/conf/samples/cdrewithattributes/cgrates.json +++ b/data/conf/samples/cdrewithattributes/cgrates.json @@ -48,17 +48,17 @@ "attributes_context":"*cdre", "filters" :["*string:~*req.Source:test2"], "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.Source", "type": "*composed", "value": "~*req.Source"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.Source", "type": "*variable", "value": "~*req.Source"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, ], }, }, diff --git a/data/conf/samples/cdrewithfilter_internal/cgrates.json b/data/conf/samples/cdrewithfilter_internal/cgrates.json index 145f2935b..d94e72c2b 100755 --- a/data/conf/samples/cdrewithfilter_internal/cgrates.json +++ b/data/conf/samples/cdrewithfilter_internal/cgrates.json @@ -47,16 +47,16 @@ "export_path": "/tmp/", "filters" :["*string:~*req.Source:test2"], "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.Source", "type": "*composed", "value": "~*req.Source"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.Source", "type": "*variable", "value": "~*req.Source"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, ], }, }, diff --git a/data/conf/samples/cdrewithfilter_mongo/cgrates.json b/data/conf/samples/cdrewithfilter_mongo/cgrates.json index d453d842f..f6f9ca826 100755 --- a/data/conf/samples/cdrewithfilter_mongo/cgrates.json +++ b/data/conf/samples/cdrewithfilter_mongo/cgrates.json @@ -51,16 +51,16 @@ "export_path": "/tmp/", "filters" :["*string:~*req.Source:test2"], "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.Source", "type": "*composed", "value": "~*req.Source"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.Source", "type": "*variable", "value": "~*req.Source"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, ], }, }, diff --git a/data/conf/samples/cdrewithfilter_mysql/cgrates.json b/data/conf/samples/cdrewithfilter_mysql/cgrates.json index 39ccc8fdb..49e81f925 100755 --- a/data/conf/samples/cdrewithfilter_mysql/cgrates.json +++ b/data/conf/samples/cdrewithfilter_mysql/cgrates.json @@ -49,16 +49,16 @@ "export_path": "/tmp/", "filters" :["*string:~*req.Source:test2"], "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.Source", "type": "*composed", "value": "~*req.Source"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.Source", "type": "*variable", "value": "~*req.Source"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, ], }, }, diff --git a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json index 49a7c0442..25f101ba9 100644 --- a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json @@ -45,21 +45,21 @@ "export_format": "*http_post", "export_path": "http://127.0.0.1:12080/cdr_http", "fields": [ // template of the exported content fields - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.ToR", "type": "*composed", "value": "~*req.ToR"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.OriginHost", "type": "*composed", "value": "~*req.OriginHost"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.OriginHost", "type": "*variable", "value": "~*req.OriginHost"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost"}, ], }, "amqp_localhost": { @@ -67,35 +67,35 @@ "export_path": "amqp://guest:guest@localhost:5672/?queue_id=cgrates_cdrs&exchange=exchangename&exchange_type=fanout&routing_key=cgr_cdrs", "attempts": 3, "fields": [ // template of the exported content fields - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.ToR", "type": "*composed", "value": "~*req.ToR"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.OriginHost", "type": "*composed", "value": "~*req.OriginHost"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.OriginHost", "type": "*variable", "value": "~*req.OriginHost"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost"}, ], }, "http_test_file": { "export_format": "*http_post", "export_path": "http://127.0.0.1:12080/invalid", "fields": [ - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, ], }, "aws_test_file": { "export_format": "*amqpv1_json_map", "export_path": "amqps://guest:guest@localhost:25672/?queue_id=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "sqs_test_file": { @@ -103,21 +103,21 @@ // export_path for sqs: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://sqs.eu-west-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "amqp_test_file": { "export_format": "*amqp_json_map", "export_path": "amqp://guest:guest@localhost:25672/?queue_id=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "kafka_localhost": { "export_format": "*kafka_json_map", "export_path": "localhost:9092?topic=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "s3_test_file": { @@ -125,7 +125,7 @@ // export_path for s3: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://s3.us-east-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json index 91e992a34..b3f52a3ce 100644 --- a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json @@ -43,21 +43,21 @@ "export_format": "*http_post", "export_path": "http://127.0.0.1:12080/cdr_http", "fields": [ // template of the exported content fields - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.ToR", "type": "*composed", "value": "~*req.ToR"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.OriginHost", "type": "*composed", "value": "~*req.OriginHost"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.OriginHost", "type": "*variable", "value": "~*req.OriginHost"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost"}, ], }, "amqp_localhost": { @@ -65,35 +65,35 @@ "export_path": "amqp://guest:guest@localhost:5672/?queue_id=cgrates_cdrs&exchange=exchangename&exchange_type=fanout&routing_key=cgr_cdrs", "attempts": 3, "fields": [ // template of the exported content fields - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.ToR", "type": "*composed", "value": "~*req.ToR"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.OriginHost", "type": "*composed", "value": "~*req.OriginHost"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Subject", "type": "*composed", "value": "~*req.Subject"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.OriginHost", "type": "*variable", "value": "~*req.OriginHost"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Subject", "type": "*variable", "value": "~*req.Subject"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost"}, ], }, "http_test_file": { "export_format": "*http_post", "export_path": "http://127.0.0.1:12080/invalid", "fields": [ - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, ], }, "aws_test_file": { "export_format": "*amqpv1_json_map", "export_path": "amqps://guest:guest@localhost:25672/?queue_id=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "sqs_test_file": { @@ -101,21 +101,21 @@ // export_path for sqs: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://sqs.eu-west-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "amqp_test_file": { "export_format": "*amqp_json_map", "export_path": "amqp://guest:guest@localhost:25672/?queue_id=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "kafka_localhost": { "export_format": "*kafka_json_map", "export_path": "localhost:9092?topic=cgrates_cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, "s3_test_file": { @@ -123,7 +123,7 @@ // export_path for s3: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://s3.us-east-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index cf6a7da73..3dd7a43ab 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -34,7 +34,7 @@ "attempts": 1, // export attempts "synchronous": true, // block processing until export has a result "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv1processeventmongo/cgrates.json b/data/conf/samples/cdrsv1processeventmongo/cgrates.json index fe6debf86..35dc0f955 100644 --- a/data/conf/samples/cdrsv1processeventmongo/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmongo/cgrates.json @@ -38,7 +38,7 @@ "attempts": 1, // export attempts "synchronous": true, // block processing until export has a result "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv1processeventmysql/cgrates.json b/data/conf/samples/cdrsv1processeventmysql/cgrates.json index e32c78bc3..86df4df7c 100644 --- a/data/conf/samples/cdrsv1processeventmysql/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmysql/cgrates.json @@ -35,7 +35,7 @@ "attempts": 1, // export attempts "synchronous": true, // block processing until export has a result "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv_failover_internal/cgrates.json b/data/conf/samples/cdrsv_failover_internal/cgrates.json index 540638296..de7b14751 100644 --- a/data/conf/samples/cdrsv_failover_internal/cgrates.json +++ b/data/conf/samples/cdrsv_failover_internal/cgrates.json @@ -65,7 +65,7 @@ // export_path for s3: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://s3.us-east-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*expCGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*expCGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv_failover_mongo/cgrates.json b/data/conf/samples/cdrsv_failover_mongo/cgrates.json index 3fbf96553..4b4cf9ac3 100644 --- a/data/conf/samples/cdrsv_failover_mongo/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mongo/cgrates.json @@ -74,7 +74,7 @@ // export_path for s3: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://s3.us-east-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/cdrsv_failover_mysql/cgrates.json b/data/conf/samples/cdrsv_failover_mysql/cgrates.json index b02c48e30..67f0db678 100644 --- a/data/conf/samples/cdrsv_failover_mysql/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mysql/cgrates.json @@ -72,7 +72,7 @@ // export_path for s3: "endpoint?aws_region=region&aws_key=IDkey&aws_secret=secret&aws_token=sessionToken&queue_id=cgrates-cdrs" "export_path": "http://s3.us-east-2.amazonaws.com/?aws_region=eu-west-2&aws_key=testkey&aws_secret=testsecret&queue_id=cgrates-cdrs", "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, ], }, }, diff --git a/data/conf/samples/diamagent_internal/data.json b/data/conf/samples/diamagent_internal/data.json index aa11150d8..9066f4254 100644 --- a/data/conf/samples/diamagent_internal/data.json +++ b/data/conf/samples/diamagent_internal/data.json @@ -111,14 +111,14 @@ { "tag": "OriginID", "path": "*cgreq.OriginID", - "type": "*composed", + "type": "*variable", "value": "~*req.Session-Id", "mandatory": true }, { "tag": "OriginID", "path": "*cgreq.OriginID", - "type": "*composed", + "type": "*variable", "value": "_grp1" }, { @@ -215,7 +215,7 @@ { "tag": "OriginID", "path": "OriginID", - "type": "*composed", + "type": "*variable", "value": "~*req.Session-Id", "mandatory": true }, diff --git a/data/conf/samples/diamagent_mongo/data.json b/data/conf/samples/diamagent_mongo/data.json index aa11150d8..9066f4254 100644 --- a/data/conf/samples/diamagent_mongo/data.json +++ b/data/conf/samples/diamagent_mongo/data.json @@ -111,14 +111,14 @@ { "tag": "OriginID", "path": "*cgreq.OriginID", - "type": "*composed", + "type": "*variable", "value": "~*req.Session-Id", "mandatory": true }, { "tag": "OriginID", "path": "*cgreq.OriginID", - "type": "*composed", + "type": "*variable", "value": "_grp1" }, { @@ -215,7 +215,7 @@ { "tag": "OriginID", "path": "OriginID", - "type": "*composed", + "type": "*variable", "value": "~*req.Session-Id", "mandatory": true }, diff --git a/data/conf/samples/diamagent_mysql/data.json b/data/conf/samples/diamagent_mysql/data.json index aa11150d8..59e80982d 100644 --- a/data/conf/samples/diamagent_mysql/data.json +++ b/data/conf/samples/diamagent_mysql/data.json @@ -215,7 +215,7 @@ { "tag": "OriginID", "path": "OriginID", - "type": "*composed", + "type": "*variable", "value": "~*req.Session-Id", "mandatory": true }, diff --git a/data/conf/samples/dispatchers/radagent/cgrates.json b/data/conf/samples/dispatchers/radagent/cgrates.json index ab4044c8d..d482d33c7 100644 --- a/data/conf/samples/dispatchers/radagent/cgrates.json +++ b/data/conf/samples/dispatchers/radagent/cgrates.json @@ -64,21 +64,21 @@ // {"tag": "*api_key", "path": "*api_key", "type": "*constant", "value": "ses12345"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -91,19 +91,19 @@ // {"tag": "*api_key", "path": "*api_key", "type": "*constant", "value": "ses12345"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -118,19 +118,19 @@ // {"tag": "*api_key", "path": "*api_key", "type": "*constant", "value": "ses12345"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index 14357ce01..273fd4c6e 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -282,15 +282,15 @@ {"tag": "Partial", "path": "*cgreq.Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "path":"*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"tag": "OrderID", "path":"*exp.OrderID", "type": "*composed", "value": "~*req.OrderID"}, - {"tag": "RequestType", "path":"*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"tag": "Account", "path":"*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"tag": "Destination", "path":"*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "path":"*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"tag": "Cost", "path":"*exp.Cost", "type": "*composed", "value": "~*req.Cost","rounding_decimals":5}, + {"tag": "OriginID", "path":"*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"tag": "OrderID", "path":"*exp.OrderID", "type": "*variable", "value": "~*req.OrderID"}, + {"tag": "RequestType", "path":"*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"tag": "Account", "path":"*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"tag": "Destination", "path":"*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "path":"*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"tag": "Cost", "path":"*exp.Cost", "type": "*variable", "value": "~*req.Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index 21b9f3eea..8846da270 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -283,15 +283,15 @@ {"tag": "Partial", "path": "*cgreq.Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "path":"*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"tag": "OrderID", "path":"*exp.OrderID", "type": "*composed", "value": "~*req.OrderID"}, - {"tag": "RequestType", "path":"*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"tag": "Account", "path":"*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"tag": "Destination", "path":"*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "path":"*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"tag": "Cost", "path":"*exp.Cost", "type": "*composed", "value": "~*req.Cost","rounding_decimals":5}, + {"tag": "OriginID", "path":"*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"tag": "OrderID", "path":"*exp.OrderID", "type": "*variable", "value": "~*req.OrderID"}, + {"tag": "RequestType", "path":"*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"tag": "Account", "path":"*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"tag": "Destination", "path":"*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "path":"*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"tag": "Cost", "path":"*exp.Cost", "type": "*variable", "value": "~*req.Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index e1e3d674d..538f083e3 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -280,15 +280,15 @@ {"tag": "Partial", "path": "*cgreq.Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "path":"*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"tag": "OrderID", "path":"*exp.OrderID", "type": "*composed", "value": "~*req.OrderID"}, - {"tag": "RequestType", "path":"*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"tag": "Account", "path":"*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"tag": "Destination", "path":"*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "path":"*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"tag": "Cost", "path":"*exp.Cost", "type": "*composed", "value": "~*req.Cost","rounding_decimals":5}, + {"tag": "OriginID", "path":"*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"tag": "OrderID", "path":"*exp.OrderID", "type": "*variable", "value": "~*req.OrderID"}, + {"tag": "RequestType", "path":"*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"tag": "Account", "path":"*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"tag": "Destination", "path":"*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "path":"*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"tag": "Cost", "path":"*exp.Cost", "type": "*variable", "value": "~*req.Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index 5eb366552..9aaff93e0 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -277,15 +277,15 @@ {"tag": "Partial", "path": "*cgreq.Partial", "type": "*constant", "value": "true", "filters":["*string:~*req.10:partial"]}, ], "cache_dump_fields": [ - {"tag": "OriginID", "path":"*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"tag": "OrderID", "path":"*exp.OrderID", "type": "*composed", "value": "~*req.OrderID"}, - {"tag": "RequestType", "path":"*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"tag": "Account", "path":"*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"tag": "Destination", "path":"*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*composed", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"tag": "Usage", "path":"*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"tag": "Cost", "path":"*exp.Cost", "type": "*composed", "value": "~*req.Cost","rounding_decimals":5}, + {"tag": "OriginID", "path":"*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"tag": "OrderID", "path":"*exp.OrderID", "type": "*variable", "value": "~*req.OrderID"}, + {"tag": "RequestType", "path":"*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"tag": "Account", "path":"*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"tag": "Destination", "path":"*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"tag": "SetupTime", "path":"*exp.SetupTime", "type": "*variable", "value": "~*req.SetupTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "AnswerTime", "path":"*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"tag": "Usage", "path":"*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"tag": "Cost", "path":"*exp.Cost", "type": "*variable", "value": "~*req.Cost","rounding_decimals":5}, ], }, { diff --git a/data/conf/samples/loaders/tutmongo/cgrates.json b/data/conf/samples/loaders/tutmongo/cgrates.json index f57590c8d..1e7209131 100644 --- a/data/conf/samples/loaders/tutmongo/cgrates.json +++ b/data/conf/samples/loaders/tutmongo/cgrates.json @@ -49,18 +49,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/loaders/tutmysql/cgrates.json b/data/conf/samples/loaders/tutmysql/cgrates.json index 469f4fdd1..d149d24bd 100644 --- a/data/conf/samples/loaders/tutmysql/cgrates.json +++ b/data/conf/samples/loaders/tutmysql/cgrates.json @@ -47,18 +47,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/mongoatlas/cgrates.json b/data/conf/samples/mongoatlas/cgrates.json index 7e446d6e8..27dcdabb4 100755 --- a/data/conf/samples/mongoatlas/cgrates.json +++ b/data/conf/samples/mongoatlas/cgrates.json @@ -82,18 +82,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/mongoreplica/cgrates.json b/data/conf/samples/mongoreplica/cgrates.json index 724850fa0..87bf8c3be 100755 --- a/data/conf/samples/mongoreplica/cgrates.json +++ b/data/conf/samples/mongoreplica/cgrates.json @@ -54,18 +54,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/multifiles/b/b.json b/data/conf/samples/multifiles/b/b.json index 95f48a318..e6282ceff 100644 --- a/data/conf/samples/multifiles/b/b.json +++ b/data/conf/samples/multifiles/b/b.json @@ -31,7 +31,7 @@ "value": "*pseudoprepaid", "mandatory": true}, ], "reply_fields":[ - {"tag": "CDR_ID", "path": "CDR_RESPONSE.CDR_ID", "type": "*composed", + {"tag": "CDR_ID", "path": "CDR_RESPONSE.CDR_ID", "type": "*variable", "value": "~*req.CDR_ID", "mandatory": true}, ], } diff --git a/data/conf/samples/radagent_internal/cgrates.json b/data/conf/samples/radagent_internal/cgrates.json index db7657611..613e40dc8 100644 --- a/data/conf/samples/radagent_internal/cgrates.json +++ b/data/conf/samples/radagent_internal/cgrates.json @@ -75,21 +75,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -101,19 +101,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -127,19 +127,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/radagent_internal_gob/cgrates.json b/data/conf/samples/radagent_internal_gob/cgrates.json index 879d7c30a..3f45a7dea 100644 --- a/data/conf/samples/radagent_internal_gob/cgrates.json +++ b/data/conf/samples/radagent_internal_gob/cgrates.json @@ -83,21 +83,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -109,19 +109,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -135,19 +135,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/radagent_mongo/cgrates.json b/data/conf/samples/radagent_mongo/cgrates.json index 49eb6fb05..c785c72bc 100644 --- a/data/conf/samples/radagent_mongo/cgrates.json +++ b/data/conf/samples/radagent_mongo/cgrates.json @@ -78,21 +78,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -104,19 +104,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -130,19 +130,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/radagent_mongo_gob/cgrates.json b/data/conf/samples/radagent_mongo_gob/cgrates.json index 755bfdcd7..39fc975f4 100644 --- a/data/conf/samples/radagent_mongo_gob/cgrates.json +++ b/data/conf/samples/radagent_mongo_gob/cgrates.json @@ -86,21 +86,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -112,19 +112,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -138,19 +138,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/radagent_mysql/cgrates.json b/data/conf/samples/radagent_mysql/cgrates.json index 62e6d141b..96146374c 100644 --- a/data/conf/samples/radagent_mysql/cgrates.json +++ b/data/conf/samples/radagent_mysql/cgrates.json @@ -74,21 +74,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -100,19 +100,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -126,19 +126,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/radagent_mysql_gob/cgrates.json b/data/conf/samples/radagent_mysql_gob/cgrates.json index ada9be6cc..706449776 100644 --- a/data/conf/samples/radagent_mysql_gob/cgrates.json +++ b/data/conf/samples/radagent_mysql_gob/cgrates.json @@ -81,21 +81,21 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Event-Timestamp", "mandatory": true}, ], "reply_fields":[ - {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*composed", + {"tag": "MaxUsage", "path": "*rep.SIP-AVP", "type": "*variable", "value": "session_max_time#;~*cgrep.MaxUsage{*duration_seconds}", "mandatory": true}, ], }, @@ -107,19 +107,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "RemoteAddr" , "path": "*cgreq.RemoteAddr", "type": "*remote_host"}, ], @@ -133,19 +133,19 @@ {"tag": "Category", "path": "*cgreq.Category", "type": "*constant", "value": "call"}, {"tag": "RequestType", "path": "*cgreq.RequestType", "type": "*constant", "value": "*prepaid", "mandatory": true}, - {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*composed", + {"tag": "OriginID", "path": "*cgreq.OriginID", "type": "*variable", "value": "~*req.Acct-Session-Id;-;~*req.Sip-From-Tag;-;~*req.Sip-To-Tag", "mandatory": true}, - {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*composed", + {"tag": "OriginHost", "path": "*cgreq.OriginHost", "type": "*variable", "value": "~*req.NAS-IP-Address", "mandatory": true}, - {"tag": "Account", "path": "*cgreq.Account", "type": "*composed", + {"tag": "Account", "path": "*cgreq.Account", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Subject", "path": "*cgreq.Subject", "type": "*composed", + {"tag": "Subject", "path": "*cgreq.Subject", "type": "*variable", "value": "~*req.User-Name", "mandatory": true}, - {"tag": "Destination", "path": "*cgreq.Destination", "type": "*composed", + {"tag": "Destination", "path": "*cgreq.Destination", "type": "*variable", "value": "~*req.Called-Station-Id", "mandatory": true}, - {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*composed", + {"tag": "SetupTime", "path": "*cgreq.SetupTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, - {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*composed", + {"tag": "AnswerTime", "path": "*cgreq.AnswerTime", "type": "*variable", "value": "~*req.Ascend-User-Acct-Time", "mandatory": true}, {"tag": "Usage", "path": "*cgreq.Usage", "type": "*usage_difference", "value": "~*req.Event-Timestamp;~*req.Ascend-User-Acct-Time", "mandatory": true}, diff --git a/data/conf/samples/tutinternal_new/cgrates.json b/data/conf/samples/tutinternal_new/cgrates.json index 71412ae7f..2b79ade4c 100644 --- a/data/conf/samples/tutinternal_new/cgrates.json +++ b/data/conf/samples/tutinternal_new/cgrates.json @@ -42,18 +42,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index 6186338d7..aebc146da 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -50,18 +50,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/tutmongo_gob/cgrates.json b/data/conf/samples/tutmongo_gob/cgrates.json index 76c81af02..0ba6c2ca5 100644 --- a/data/conf/samples/tutmongo_gob/cgrates.json +++ b/data/conf/samples/tutmongo_gob/cgrates.json @@ -57,18 +57,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/tutmongonew/cgrates.json b/data/conf/samples/tutmongonew/cgrates.json index b27fe36b6..8b9792559 100644 --- a/data/conf/samples/tutmongonew/cgrates.json +++ b/data/conf/samples/tutmongonew/cgrates.json @@ -49,18 +49,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/tutmysql/cgrates.json b/data/conf/samples/tutmysql/cgrates.json index 4efaefe59..0da9d7540 100644 --- a/data/conf/samples/tutmysql/cgrates.json +++ b/data/conf/samples/tutmysql/cgrates.json @@ -48,18 +48,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, }, diff --git a/data/conf/samples/tutmysql_internal/cgrates.json b/data/conf/samples/tutmysql_internal/cgrates.json index baa3c8019..77c05e97a 100644 --- a/data/conf/samples/tutmysql_internal/cgrates.json +++ b/data/conf/samples/tutmysql_internal/cgrates.json @@ -46,18 +46,18 @@ "cdre": { "TestTutITExportCDR": { "fields": [ - {"path": "*exp.CGRID", "type": "*composed", "value": "~*req.CGRID"}, - {"path": "*exp.RunID", "type": "*composed", "value": "~*req.RunID"}, - {"path": "*exp.OriginID", "type": "*composed", "value": "~*req.OriginID"}, - {"path": "*exp.RequestType", "type": "*composed", "value": "~*req.RequestType"}, - {"path": "*exp.Tenant", "type": "*composed", "value": "~*req.Tenant"}, - {"path": "*exp.Category", "type": "*composed", "value": "~*req.Category"}, - {"path": "*exp.Account", "type": "*composed", "value": "~*req.Account"}, - {"path": "*exp.Destination", "type": "*composed", "value": "~*req.Destination"}, - {"path": "*exp.AnswerTime", "type": "*composed", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, - {"path": "*exp.Usage", "type": "*composed", "value": "~*req.Usage"}, - {"path": "*exp.Cost", "type": "*composed", "value": "~*req.Cost", "rounding_decimals": 4}, - {"path": "*exp.MatchedDestinationID", "type": "*composed", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, + {"path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, + {"path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, + {"path": "*exp.RequestType", "type": "*variable", "value": "~*req.RequestType"}, + {"path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, + {"path": "*exp.Category", "type": "*variable", "value": "~*req.Category"}, + {"path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, + {"path": "*exp.Destination", "type": "*variable", "value": "~*req.Destination"}, + {"path": "*exp.AnswerTime", "type": "*variable", "value": "~*req.AnswerTime", "layout": "2006-01-02T15:04:05Z07:00"}, + {"path": "*exp.Usage", "type": "*variable", "value": "~*req.Usage"}, + {"path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, + {"path": "*exp.MatchedDestinationID", "type": "*variable", "value": "~*req.CostDetails:s/\"MatchedDestId\":.*_(\\w{4})/${1}/:s/\"MatchedDestId\":\"INTERNAL\"/ON010/"}, ], }, },