diff --git a/data/conf/cgrates/cgrates.json b/data/conf/cgrates/cgrates.json index 151a686b2..9d1d1a3a8 100755 --- a/data/conf/cgrates/cgrates.json +++ b/data/conf/cgrates/cgrates.json @@ -1426,7 +1426,7 @@ // "response_group": "03", // determines how taxes are grouped for the response <03|13> // "response_type": "D4", // determines the granularity of taxes and (optionally) the decimal precision for the tax calculations and amounts in the response // "regulatory_code": "03", // provider type -// "client_tracking": "~*req.CGRID", // template extracting client information out of StoredCdr; +// "client_tracking": "~*opts.*originID", // template extracting client information out of StoredCdr; // "customer_number": "~*req.Subject", // template extracting customer number out of StoredCdr; // "orig_number": "~*req.Subject", // template extracting origination number out of StoredCdr; // "term_number": "~*req.Destination", // template extracting termination number out of StoredCdr; diff --git a/data/conf/samples/cdrsexport_internal/cgrates.json b/data/conf/samples/cdrsexport_internal/cgrates.json index 878bff0f7..96e5842bd 100644 --- a/data/conf/samples/cdrsexport_internal/cgrates.json +++ b/data/conf/samples/cdrsexport_internal/cgrates.json @@ -137,7 +137,7 @@ "templates": { "requiredFields": [ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/cdrsexport_mongo/cgrates.json b/data/conf/samples/cdrsexport_mongo/cgrates.json index d5d1b77e5..16369aaf8 100644 --- a/data/conf/samples/cdrsexport_mongo/cgrates.json +++ b/data/conf/samples/cdrsexport_mongo/cgrates.json @@ -142,7 +142,7 @@ "templates": { "requiredFields": [ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/cdrsexport_mysql/cgrates.json b/data/conf/samples/cdrsexport_mysql/cgrates.json index 8f93dd307..f9e5c7507 100644 --- a/data/conf/samples/cdrsexport_mysql/cgrates.json +++ b/data/conf/samples/cdrsexport_mysql/cgrates.json @@ -137,7 +137,7 @@ "templates": { "requiredFields": [ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json index f2f03c01f..5c2c3e4cf 100644 --- a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json @@ -56,7 +56,7 @@ "attempts": 1, "filters":["*string:~*opts.ExporterID:http_localhost"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -84,7 +84,7 @@ }, "attempts": 3, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -120,7 +120,7 @@ "synchronous": true, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"} + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"} ], }, { @@ -134,7 +134,7 @@ "synchronous": true, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"} + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"} ], } ], diff --git a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json index 3b78b36dc..8a24c6246 100644 --- a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json @@ -54,7 +54,7 @@ "attempts": 1, "filters":["*string:~*opts.ExporterID:http_localhost"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -82,7 +82,7 @@ }, "attempts": 3, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -118,7 +118,7 @@ "synchronous": true, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"} + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"} ], }, { @@ -132,7 +132,7 @@ "synchronous": true, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"} + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"} ], } ], diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index e95296648..8f2c53b85 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -39,7 +39,7 @@ "attempts": 1, "synchronous": true, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], } ] diff --git a/data/conf/samples/cdrsv1processeventmongo/cgrates.json b/data/conf/samples/cdrsv1processeventmongo/cgrates.json index 629afcc6d..636eb428d 100644 --- a/data/conf/samples/cdrsv1processeventmongo/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmongo/cgrates.json @@ -42,7 +42,7 @@ "attempts": 1, "synchronous": true, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], } ] diff --git a/data/conf/samples/cdrsv1processeventmysql/cgrates.json b/data/conf/samples/cdrsv1processeventmysql/cgrates.json index 6bab5a2f7..8aec37aea 100644 --- a/data/conf/samples/cdrsv1processeventmysql/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmysql/cgrates.json @@ -39,7 +39,7 @@ "attempts": 1, "synchronous": true, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], } ] diff --git a/data/conf/samples/cdrsv_failover_internal/cgrates.json b/data/conf/samples/cdrsv_failover_internal/cgrates.json index d7b98275d..bc3794eca 100644 --- a/data/conf/samples/cdrsv_failover_internal/cgrates.json +++ b/data/conf/samples/cdrsv_failover_internal/cgrates.json @@ -81,7 +81,7 @@ }, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], }, ] diff --git a/data/conf/samples/cdrsv_failover_mongo/cgrates.json b/data/conf/samples/cdrsv_failover_mongo/cgrates.json index 338e8dfa2..ce821e1c3 100644 --- a/data/conf/samples/cdrsv_failover_mongo/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mongo/cgrates.json @@ -90,7 +90,7 @@ }, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], } ] diff --git a/data/conf/samples/cdrsv_failover_mysql/cgrates.json b/data/conf/samples/cdrsv_failover_mysql/cgrates.json index 5fb62eaad..fa986c2ea 100644 --- a/data/conf/samples/cdrsv_failover_mysql/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mysql/cgrates.json @@ -87,7 +87,7 @@ }, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, ], } ] diff --git a/data/conf/samples/ees/cgrates.json b/data/conf/samples/ees/cgrates.json index 15a4a0e80..3f4e0d4b3 100644 --- a/data/conf/samples/ees/cgrates.json +++ b/data/conf/samples/ees/cgrates.json @@ -81,7 +81,7 @@ "field_separator": ",", "fields":[ {"tag": "Number", "path": "*hdr.Number", "type": "*constant", "value": "NumberOfEvent"}, - {"tag": "CGRID", "path": "*hdr.CGRID", "type": "*constant", "value": "CGRID"}, + {"tag": "*originID", "path": "*hdr.*originID", "type": "*constant", "value": "*originID"}, {"tag": "RunID", "path": "*hdr.RunID", "type": "*constant", "value": "RunID"}, {"tag": "ToR", "path": "*hdr.ToR", "type": "*constant", "value": "ToR"}, {"tag": "OriginID", "path": "*hdr.OriginID", "type": "*constant", "value": "OriginID"}, @@ -97,7 +97,7 @@ {"tag": "Cost", "path": "*hdr.Cost", "type": "*constant", "value": "Cost"}, {"tag": "Number", "path": "*exp.Number", "type": "*variable", "value": "~*dc.NumberOfEvents"}, - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID1", "path": "*exp.OriginID", "type": "*composed", "value": "~*req.ComposedOriginID1"}, @@ -129,7 +129,7 @@ "synchronous": true, "fields":[ {"tag": "Number", "path": "*hdr.Number", "type": "*constant", "value": "NumberOfEvent"}, - {"tag": "CGRID", "path": "*hdr.CGRID", "type": "*constant", "value": "CGRID"}, + {"tag": "*originID", "path": "*hdr.*originID", "type": "*constant", "value": "*originID"}, {"tag": "RunID", "path": "*hdr.RunID", "type": "*constant", "value": "RunID"}, {"tag": "ToR", "path": "*hdr.ToR", "type": "*constant", "value": "ToR"}, {"tag": "OriginID", "path": "*hdr.OriginID", "type": "*constant", "value": "OriginID"}, @@ -145,7 +145,7 @@ {"tag": "Cost", "path": "*hdr.Cost", "type": "*constant", "value": "Cost"}, {"tag": "Number", "path": "*exp.Number", "type": "*variable", "value": "~*dc.NumberOfEvents"}, - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*constant", "value": ""}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, @@ -251,7 +251,7 @@ "attribute_context": "customContext", "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -276,7 +276,7 @@ "attribute_context": "customContext", "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -303,7 +303,7 @@ "attempts": 1, "field_separator": ",", "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -325,11 +325,11 @@ "type": "*virt", "attempts": 1, "fields":[ - {"tag": "Cost", "path": "*uch.<~*req.CGRID;~*req.RunID;-Cost>", "type": "*variable", + {"tag": "Cost", "path": "*uch.<~*opts.*originID;~*req.RunID;-Cost>", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, - {"tag": "Account", "path": "*uch.<~*req.CGRID;~*req.RunID;-Account>", "type": "*variable", "value": "~*req.Account"}, - {"tag": "RunID", "path": "*uch.<~*req.CGRID;~*req.RunID;-RunID>", "type": "*variable", "value": "~*req.RunID"}, - {"tag": "CustomVariable", "path": "*uch.<~*req.CGRID;~*req.RunID;-CustomVariable>", + {"tag": "Account", "path": "*uch.<~*opts.*originID;~*req.RunID;-Account>", "type": "*variable", "value": "~*req.Account"}, + {"tag": "RunID", "path": "*uch.<~*opts.*originID;~*req.RunID;-RunID>", "type": "*variable", "value": "~*req.RunID"}, + {"tag": "CustomVariable", "path": "*uch.<~*opts.*originID;~*req.RunID;-CustomVariable>", "type": "*variable", "value": "CustomValue"} ], }, @@ -342,18 +342,18 @@ "attempts": 1, "field_separator": ",", "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, {"tag": "Tenant", "path": "*exp.Tenant", "type": "*variable", "value": "~*req.Tenant"}, {"tag": "Account", "path": "*exp.Account", "type": "*variable", "value": "~*req.Account"}, {"tag": "Cost", "path": "*exp.Cost", "type": "*variable", "value": "~*req.Cost", "rounding_decimals": 4}, - {"tag": "SupplierCustomVariable","filters": ["*exists:~*uch.<~*req.CGRID;~*req.RunID;-CustomVariable>:"], - "path": "*exp.SupplierCustomVariable", "type": "*variable", "value": "~*uch.<`~*req.CGRID;~*req.RunID;-CustomVariable`>"}, - {"tag": "SupplierCost","filters": ["*exists:~*uch.<~*req.CGRID;~*req.RunID;-Cost>:"], - "path": "*exp.SupplierCost", "type": "*variable", "value": "~*uch.<`~*req.CGRID;~*req.RunID;-Cost`>"}, - {"tag": "SupplierRun","filters": ["*exists:~*uch.<~*req.CGRID;~*req.RunID;-RunID>:"], - "path": "*exp.SupplierRun", "type": "*variable", "value": "~*uch.<`~*req.CGRID;~*req.RunID;-RunID`>"}, + {"tag": "SupplierCustomVariable","filters": ["*exists:~*uch.<~*opts.*originID;~*req.RunID;-CustomVariable>:"], + "path": "*exp.SupplierCustomVariable", "type": "*variable", "value": "~*uch.<`~*opts.*originID;~*req.RunID;-CustomVariable`>"}, + {"tag": "SupplierCost","filters": ["*exists:~*uch.<~*opts.*originID;~*req.RunID;-Cost>:"], + "path": "*exp.SupplierCost", "type": "*variable", "value": "~*uch.<`~*opts.*originID;~*req.RunID;-Cost`>"}, + {"tag": "SupplierRun","filters": ["*exists:~*uch.<~*opts.*originID;~*req.RunID;-RunID>:"], + "path": "*exp.SupplierRun", "type": "*variable", "value": "~*uch.<`~*opts.*originID;~*req.RunID;-RunID`>"}, ], }, { @@ -387,7 +387,7 @@ "elsWaitForActiveShards": "", }, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -443,7 +443,7 @@ }, }, "fields":[ // in case that the path is *exp.*row user must complete all the fields one to one with his sql schema in the correct order - {"tag": "CGRID", "path": "*exp.*row", "type": "*group", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*row", "type": "*group", "value": "~*opts.*originID"}, {"tag": "AnswerTime", "path": "*exp.*row", "type": "*group", "value": "~*req.AnswerTime"}, {"tag": "Usage", "path": "*exp.*row", "type": "*group", "value": "~*req.Usage"}, {"tag": "Cost", "path": "*exp.*row", "type": "*group", "value": "~*req.Cost{*round:4}"}, @@ -463,7 +463,7 @@ "sqlConnMaxLifetime": "0", }, "fields":[ // the path constains *exp.columnName - {"tag": "CGRID", "path": "*exp.cgrid", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "AnswerTime", "path": "*exp.answer_time", "type": "*variable", "value": "~*req.AnswerTime"}, {"tag": "Cost", "path": "*exp.cost", "type": "*variable", "value": "~*req.Cost{*round:4}"}, {"tag": "Usage", "path": "*exp.`usage`", "type": "*variable", "value": "~*req.Usage"}, @@ -497,7 +497,7 @@ "sqlTableName": "cdrs", // tableName is mandatory in opts for sql exporter }, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "OriginHost", "path": "*exp.OriginHost", "type": "*variable", "value": "~*req.OriginHost"}, {"tag": "Source", "path": "*exp.Source", "type": "*variable", "value": "~*req.Source"}, @@ -538,7 +538,7 @@ "templates": { "requiredFields": [ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/ees_internal/cgrates.json b/data/conf/samples/ees_internal/cgrates.json index a12b92e02..32c8d394e 100644 --- a/data/conf/samples/ees_internal/cgrates.json +++ b/data/conf/samples/ees_internal/cgrates.json @@ -69,7 +69,7 @@ "attempts": 1, "field_separator": ",", "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -95,7 +95,7 @@ "field_separator": ",", "filters": ["*string:~*req.RunID:*raw"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -119,9 +119,9 @@ "synchronous": false, "attempts": 1, "field_separator": ",", - "filters": ["*string:~*req.CGRID:Cdr1|Cdr2"], + "filters": ["*string:~*opts.*originID:Cdr1|Cdr2"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/ees_mongo/cgrates.json b/data/conf/samples/ees_mongo/cgrates.json index c602fc425..c43e424e9 100644 --- a/data/conf/samples/ees_mongo/cgrates.json +++ b/data/conf/samples/ees_mongo/cgrates.json @@ -73,7 +73,7 @@ "attempts": 1, "field_separator": ",", "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -99,7 +99,7 @@ "field_separator": ",", "filters": ["*string:~*req.RunID:*raw"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -123,9 +123,9 @@ "synchronous": false, "attempts": 1, "field_separator": ",", - "filters": ["*string:~*req.CGRID:Cdr1|Cdr2"], + "filters": ["*string:~*opts.*originID:Cdr1|Cdr2"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/ees_mysql/cgrates.json b/data/conf/samples/ees_mysql/cgrates.json index c538eb8e6..723eb10fb 100644 --- a/data/conf/samples/ees_mysql/cgrates.json +++ b/data/conf/samples/ees_mysql/cgrates.json @@ -71,7 +71,7 @@ "attempts": 1, "field_separator": ",", "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -97,7 +97,7 @@ "field_separator": ",", "filters": ["*string:~*req.RunID:*raw"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, @@ -121,9 +121,9 @@ "synchronous": false, "attempts": 1, "field_separator": ",", - "filters": ["*string:~*req.CGRID:Cdr1|Cdr2"], + "filters": ["*string:~*opts.*originID:Cdr1|Cdr2"], "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/tutmongo2/cgrates.json b/data/conf/samples/tutmongo2/cgrates.json index 34be630aa..127351efe 100644 --- a/data/conf/samples/tutmongo2/cgrates.json +++ b/data/conf/samples/tutmongo2/cgrates.json @@ -65,7 +65,7 @@ }, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/conf/samples/tutmongo2_gob/cgrates.json b/data/conf/samples/tutmongo2_gob/cgrates.json index cdc11a99e..b4a860400 100644 --- a/data/conf/samples/tutmongo2_gob/cgrates.json +++ b/data/conf/samples/tutmongo2_gob/cgrates.json @@ -72,7 +72,7 @@ }, "attempts": 1, "fields":[ - {"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"}, + {"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}, {"tag": "RunID", "path": "*exp.RunID", "type": "*variable", "value": "~*req.RunID"}, {"tag": "ToR", "path": "*exp.ToR", "type": "*variable", "value": "~*req.ToR"}, {"tag": "OriginID", "path": "*exp.OriginID", "type": "*variable", "value": "~*req.OriginID"}, diff --git a/data/postman/Voiceland/CGRates.postman_collection_v2.1.json b/data/postman/Voiceland/CGRates.postman_collection_v2.1.json index 7d5bef4e4..49288ce6a 100644 --- a/data/postman/Voiceland/CGRates.postman_collection_v2.1.json +++ b/data/postman/Voiceland/CGRates.postman_collection_v2.1.json @@ -1297,7 +1297,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"method\": \"ResourceSv1.AuthorizeResources\",\n \"params\": [\n {\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"114a0d61-fbe8-41dc-a6f2-8f0c081c0c58\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"Authorize_no_such_user_limit\": \"20\",\n \"Authorize_wrong_password_limit\": \"20\",\n \"Block_Incoming_Calls\": \"0\",\n \"CGRID\": \"b6a38f4df90c810cfd86445a490994e1357c7d9c\",\n \"Category\": \"call\",\n \"Country\": \"Greece\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"Forwarding_Service\": \"0\",\n \"Hide_CLI\": \"0\",\n \"MaxCallsPerSecond\": \"1\",\n \"MaxSessionTime\": \"3600\",\n \"MaxSessions\": \"5\",\n \"Max_Incoming_Sessions\": \"5\",\n \"Max_Outgoing_Sessions\": \"5\",\n \"OriginID\": \"313536313034313339303536343939-j1rxhvkxpv7i_user_183964\",\n \"Region\": \"Europe\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1561041392\",\n \"SipPassword\": \"|!xB8H7]}ych&XMY\",\n \"SipUserName\": \"+30xxxxxxxxx\",\n \"Tenant\": \"cgrates.org\",\n \"Usage\": 10800000000000,\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"1.1.1.1\",\n \"Voicemail_Service\": \"0\"\n },\n \"UsageID\": \"313536313034313339303536343939-j1rxhvkxpv7i_user_183964\",\n \"UsageTTL\": null,\n \"Units\": 1\n }\n ],\n \"id\": 3\n}" + "raw": "{\n \"method\": \"ResourceSv1.AuthorizeResources\",\n \"params\": [\n {\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"114a0d61-fbe8-41dc-a6f2-8f0c081c0c58\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"Authorize_no_such_user_limit\": \"20\",\n \"Authorize_wrong_password_limit\": \"20\",\n \"Block_Incoming_Calls\": \"0\",\n \"*originID\": \"b6a38f4df90c810cfd86445a490994e1357c7d9c\",\n \"Category\": \"call\",\n \"Country\": \"Greece\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"Forwarding_Service\": \"0\",\n \"Hide_CLI\": \"0\",\n \"MaxCallsPerSecond\": \"1\",\n \"MaxSessionTime\": \"3600\",\n \"MaxSessions\": \"5\",\n \"Max_Incoming_Sessions\": \"5\",\n \"Max_Outgoing_Sessions\": \"5\",\n \"OriginID\": \"313536313034313339303536343939-j1rxhvkxpv7i_user_183964\",\n \"Region\": \"Europe\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1561041392\",\n \"SipPassword\": \"|!xB8H7]}ych&XMY\",\n \"SipUserName\": \"+30xxxxxxxxx\",\n \"Tenant\": \"cgrates.org\",\n \"Usage\": 10800000000000,\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"1.1.1.1\",\n \"Voicemail_Service\": \"0\"\n },\n \"UsageID\": \"313536313034313339303536343939-j1rxhvkxpv7i_user_183964\",\n \"UsageTTL\": null,\n \"Units\": 1\n }\n ],\n \"id\": 3\n}" }, "url": { "raw": "{{base_url}}/jsonrpc", @@ -3968,7 +3968,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"method\": \"ResourceSv1.AuthorizeResources\",\n \"params\": [\n {\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"91db806d-47b5-4346-b74e-bf699f2dd4d6\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"Authorize_no_such_user_limit\": \"20\",\n \"Authorize_wrong_password_limit\": \"20\",\n \"Block_Incoming_Calls\": \"0\",\n \"CGRID\": \"3a6bb7df0f9c31959b447c865dc3d9ea74b559d8\",\n \"Category\": \"call\",\n \"Country\": \"Greece\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"Forwarding_Service\": \"0\",\n \"Hide_CLI\": \"0\",\n \"MaxCallsPerSecond\": \"1\",\n \"MaxSessionTime\": \"3600\",\n \"MaxSessions\": \"5\",\n \"Max_Incoming_Sessions\": \"5\",\n \"Max_Outgoing_Sessions\": \"5\",\n \"OriginHost\": \"10.156.0.13\",\n \"OriginID\": \"313536313130323331313531373435-11zx3su0dxng_user_860952\",\n \"Region\": \"Europe\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1561102312\",\n \"SipPassword\": \"|!xB8H7]}ych&XMY\",\n \"SipUserName\": \"+30xxxxxxxxx\",\n \"Source\": \"OpenSIPS-01\",\n \"Tenant\": \"cgrates.org\",\n \"Usage\": 10800000000000,\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"1.1.1.1\",\n \"Voicemail_Service\": \"0\"\n },\n \"UsageID\": \"313536313130323331313531373435-11zx3su0dxng_user_860952\",\n \"UsageTTL\": null,\n \"Units\": 1\n }\n ],\n \"id\": 35\n}" + "raw": "{\n \"method\": \"ResourceSv1.AuthorizeResources\",\n \"params\": [\n {\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"91db806d-47b5-4346-b74e-bf699f2dd4d6\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"Authorize_no_such_user_limit\": \"20\",\n \"Authorize_wrong_password_limit\": \"20\",\n \"Block_Incoming_Calls\": \"0\",\n \"*originID\": \"3a6bb7df0f9c31959b447c865dc3d9ea74b559d8\",\n \"Category\": \"call\",\n \"Country\": \"Greece\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"Forwarding_Service\": \"0\",\n \"Hide_CLI\": \"0\",\n \"MaxCallsPerSecond\": \"1\",\n \"MaxSessionTime\": \"3600\",\n \"MaxSessions\": \"5\",\n \"Max_Incoming_Sessions\": \"5\",\n \"Max_Outgoing_Sessions\": \"5\",\n \"OriginHost\": \"10.156.0.13\",\n \"OriginID\": \"313536313130323331313531373435-11zx3su0dxng_user_860952\",\n \"Region\": \"Europe\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1561102312\",\n \"SipPassword\": \"|!xB8H7]}ych&XMY\",\n \"SipUserName\": \"+30xxxxxxxxx\",\n \"Source\": \"OpenSIPS-01\",\n \"Tenant\": \"cgrates.org\",\n \"Usage\": 10800000000000,\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"1.1.1.1\",\n \"Voicemail_Service\": \"0\"\n },\n \"UsageID\": \"313536313130323331313531373435-11zx3su0dxng_user_860952\",\n \"UsageTTL\": null,\n \"Units\": 1\n }\n ],\n \"id\": 35\n}" }, "url": { "raw": "{{base_url}}/jsonrpc", @@ -4413,7 +4413,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"method\": \"StatSv1.ProcessEvent\",\n \"params\": [\n {\n \"StatIDs\": null,\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"7094cd19-c893-41d5-b380-40e3a05fd34d\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"CGRID\": \"d832221ccba8170b69964767a9e82b502ad1f9fd\",\n \"Category\": \"call-out\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"DisconnectCause\": \"\",\n \"OriginHost\": \"10.156.0.13\",\n \"OriginID\": \"Call-ID: 3135363334343432373039393133-ha2s8ioype2o\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1563444271\",\n \"Source\": \"OpenSIPS-01\",\n \"Subject\": \"INTERNAL-OUT\",\n \"Usage\": \"0s\",\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"84.254.47.110\"\n }\n }\n ],\n \"id\": 24\n}" + "raw": "{\n \"method\": \"StatSv1.ProcessEvent\",\n \"params\": [\n {\n \"StatIDs\": null,\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"7094cd19-c893-41d5-b380-40e3a05fd34d\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"*originID\": \"d832221ccba8170b69964767a9e82b502ad1f9fd\",\n \"Category\": \"call-out\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"DisconnectCause\": \"\",\n \"OriginHost\": \"10.156.0.13\",\n \"OriginID\": \"Call-ID: 3135363334343432373039393133-ha2s8ioype2o\",\n \"RequestType\": \"*prepaid\",\n \"SetupTime\": \"1563444271\",\n \"Source\": \"OpenSIPS-01\",\n \"Subject\": \"INTERNAL-OUT\",\n \"Usage\": \"0s\",\n \"User-Agent\": \"snomD120/10.1.33.33\",\n \"User-Agent-IP\": \"84.254.47.110\"\n }\n }\n ],\n \"id\": 24\n}" }, "url": { "raw": "{{base_url}}/jsonrpc", @@ -4892,7 +4892,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"method\": \"SupplierSv1.GetSuppliers\",\n \"params\": [\n {\n \"IgnoreErrors\": false,\n \"MaxCost\": \"\",\n \"Tenant\": \"cgrates.org\",\n \"ID\": \"187e5f2c-6cd4-4796-a435-9ac37399b9b5\",\n \"Time\": null,\n \"Event\": {\n \"Account\": \"+30xxxxxxxxx\",\n \"Authorize_no_such_user_limit\": \"20\",\n \"Authorize_wrong_password_limit\": \"20\",\n \"Block_Incoming_Calls\": \"0\",\n \"CGRID\": \"5401e8710ac20f53b04d176766a6aaf05a6832ac\",\n \"Category\": \"call-out\",\n \"Country\": \"Greece\",\n \"Destination\": \"+30xxxxxxxxxx\",\n \"Forwarding_Service\": \"0\",\n \"Hide_CLI\": \"0\",\n \"ID\": \"CHECK_USER_BALANCE_OUT\",\n \"MaxCallsPerSecond\": \"1\",\n \"MaxSessionTime\": \"3600\",\n \"MaxSessions\": \"1\",\n \"Max_Incoming_Sessions\": \"1\",\n \"Max_Outgoing_Sessions\": \"1\",\n \"OriginHost\": \"10.156.0.13\",\n \"OriginID\": \"Customer_3135363430353432393438313132-2imxdoamy79xcgrates.org210096\",\n \"Region\": \"Europe\",\n \"RequestType\": \"*prepaid\",\n \"ResourceAllocation\": \"ResGroup1\",\n \"SetupTime\": \"1564054295\",\n \"SipPassword\": \"Xu4fUxO