From 6a31c38025148975dfb453ceb1cf376de280196e Mon Sep 17 00:00:00 2001 From: TeoV Date: Tue, 14 Apr 2020 10:55:34 +0300 Subject: [PATCH] Update config with correct cache config --- .../samples/cdrsv1processevent/cgrates.json | 4 +- .../cdrsv1processeventmongo/cgrates.json | 4 +- .../cdrsv1processeventmysql/cgrates.json | 4 +- .../dispatchers_internal/cgrates.json | 4 +- .../dispatchers_internal_gob/cgrates.json | 4 +- .../dispatchers_mongo/cgrates.json | 4 +- .../dispatchers_mongo_gob/cgrates.json | 4 +- .../dispatchers_mysql/cgrates.json | 4 +- .../dispatchers_mysql_gob/cgrates.json | 4 +- .../dispatchers_no_attributes/cgrates.json | 4 +- data/conf/samples/gocs/dsp_site/cgrates.json | 4 +- data/conf/samples/mongoatlas/cgrates.json | 50 +++++++++-------- .../samples/precache/tutmongo/cgrates.json | 56 ++++++++++--------- .../samples/precache/tutmysql/cgrates.json | 56 ++++++++++--------- .../samples/rpccaching_mongo/cgrates.json | 4 +- .../samples/rpccaching_mysql/cgrates.json | 4 +- 16 files changed, 123 insertions(+), 91 deletions(-) diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index 149d88e97..100984443 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -76,7 +76,9 @@ }, "caches":{ - "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false}, + "partitions": { + "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false} + }, }, } diff --git a/data/conf/samples/cdrsv1processeventmongo/cgrates.json b/data/conf/samples/cdrsv1processeventmongo/cgrates.json index 63f33d5d7..0c8556ebe 100644 --- a/data/conf/samples/cdrsv1processeventmongo/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmongo/cgrates.json @@ -80,7 +80,9 @@ }, "caches":{ - "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false}, + "partitions": { + "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false} + }, }, } diff --git a/data/conf/samples/cdrsv1processeventmysql/cgrates.json b/data/conf/samples/cdrsv1processeventmysql/cgrates.json index 4501189d2..1e3f66112 100644 --- a/data/conf/samples/cdrsv1processeventmysql/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmysql/cgrates.json @@ -77,7 +77,9 @@ }, "caches":{ - "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false}, + "partitions": { + "*rpc_responses": {"limit": -1, "ttl": "2s", "static_ttl": false} + }, }, } diff --git a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json index ed0603355..0df802204 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json @@ -30,7 +30,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json index dd1d060f1..ee4f7d1bf 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json @@ -30,7 +30,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json index 4620d8619..ef0f1dbc8 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json @@ -33,7 +33,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json index 2be4c5c98..3f3af9c76 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json @@ -33,7 +33,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json index 9357d728a..b012d723c 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json @@ -24,7 +24,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, diff --git a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json index cf42f8476..39d750bc0 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json @@ -32,7 +32,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json index ad98db4c6..77b625873 100755 --- a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json @@ -24,7 +24,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "schedulers": { diff --git a/data/conf/samples/gocs/dsp_site/cgrates.json b/data/conf/samples/gocs/dsp_site/cgrates.json index d710f587c..b37b3a837 100644 --- a/data/conf/samples/gocs/dsp_site/cgrates.json +++ b/data/conf/samples/gocs/dsp_site/cgrates.json @@ -21,7 +21,9 @@ }, "caches":{ - "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + "partitions": { + "*dispatcher_routes": {"limit": -1, "ttl": "2s"} + }, }, "stor_db": { diff --git a/data/conf/samples/mongoatlas/cgrates.json b/data/conf/samples/mongoatlas/cgrates.json index 27dcdabb4..bd5ddfd99 100755 --- a/data/conf/samples/mongoatlas/cgrates.json +++ b/data/conf/samples/mongoatlas/cgrates.json @@ -36,30 +36,32 @@ "caches":{ - "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, - "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, - "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s"}, + "partitions": { + "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, + "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, + "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, + "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, + "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s"}, + "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s"}, + "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s"}, + "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s"}, + "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s"}, + "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s"} + }, }, diff --git a/data/conf/samples/precache/tutmongo/cgrates.json b/data/conf/samples/precache/tutmongo/cgrates.json index 0c242bb27..9170676b1 100644 --- a/data/conf/samples/precache/tutmongo/cgrates.json +++ b/data/conf/samples/precache/tutmongo/cgrates.json @@ -30,33 +30,35 @@ "caches":{ - "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s", "precache": true}, - "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_profiles" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_hosts" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_routes" : {"limit": 10000, "ttl":"0s", "precache": false}, + "partitions": { + "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, + "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, + "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, + "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, + "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s", "precache": true}, + "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_profiles" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_hosts" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_routes" : {"limit": 10000, "ttl":"0s", "precache": false} + }, }, diff --git a/data/conf/samples/precache/tutmysql/cgrates.json b/data/conf/samples/precache/tutmysql/cgrates.json index dcb6c383e..fdb712f22 100644 --- a/data/conf/samples/precache/tutmysql/cgrates.json +++ b/data/conf/samples/precache/tutmysql/cgrates.json @@ -26,33 +26,35 @@ "caches":{ - "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, - "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, - "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, - "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, - "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, - "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, - "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, - "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, - "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s", "precache": true}, - "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_profiles" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_hosts" : {"limit": 10000, "ttl":"0s", "precache": true}, - "*dispatcher_routes" : {"limit": 10000, "ttl":"0s", "precache": false}, + "partitions": { + "*destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*reverse_destinations": {"limit": 10000, "ttl":"0s", "precache": true}, + "*rating_plans": {"limit": 10000, "ttl":"0s","precache": true}, + "*rating_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*actions": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*account_action_plans": {"limit": 10000, "ttl":"0s", "precache": true}, + "*action_triggers": {"limit": 10000, "ttl":"0s", "precache": true}, + "*shared_groups": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resources": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueues": {"limit": 10000, "ttl":"0s", "precache": true}, + "*statqueue_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*thresholds": {"limit": 10000, "ttl":"0s", "precache": true}, + "*threshold_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*filters": {"limit": 10000, "ttl":"0s", "precache": true}, + "*supplier_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*attribute_profiles": {"limit": 10000, "ttl":"0s", "precache": true}, + "*resource_filter_indexes" :{"limit": 10000, "ttl":"0s", "precache": true}, + "*stat_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*threshold_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*supplier_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*attribute_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*charger_filter_indexes" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_profiles" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_hosts" : {"limit": 10000, "ttl":"0s", "precache": true}, + "*dispatcher_routes" : {"limit": 10000, "ttl":"0s", "precache": false} + }, }, diff --git a/data/conf/samples/rpccaching_mongo/cgrates.json b/data/conf/samples/rpccaching_mongo/cgrates.json index 1d22f1ae7..00f0ffcad 100644 --- a/data/conf/samples/rpccaching_mongo/cgrates.json +++ b/data/conf/samples/rpccaching_mongo/cgrates.json @@ -28,7 +28,9 @@ "caches":{ - "*rpc_responses": {"limit": -1, "ttl": "1s"}, + "partitions": { + "*rpc_responses": {"limit": -1, "ttl": "1s"} + }, }, diff --git a/data/conf/samples/rpccaching_mysql/cgrates.json b/data/conf/samples/rpccaching_mysql/cgrates.json index 26ad28730..42d87ed8c 100644 --- a/data/conf/samples/rpccaching_mysql/cgrates.json +++ b/data/conf/samples/rpccaching_mysql/cgrates.json @@ -18,7 +18,9 @@ "caches":{ - "*rpc_responses": {"limit": -1, "ttl": "1s"}, + "partitions": { + "*rpc_responses": {"limit": -1, "ttl": "1s"} + }, },