Revise integration tests after StorDB addition

data/conf/samples/acc_generaltest_internal/cgrates.json

@@ -20,7 +20,9 @@
 	"db_type": "*internal"
 },
 
-
+"stor_db": {
+	"db_type": "*internal"
+},
 
 "loaders": [
 	{

data/conf/samples/acc_generaltest_mongo/cgrates.json

@@ -18,7 +18,13 @@
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
-	"db_port": 27017,
+	"db_port": 27017
+},
+
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
 },
 
 "loaders": [

data/conf/samples/acc_generaltest_mysql/cgrates.json

@@ -21,6 +21,10 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "loaders": [
 	{
 		"id": "*default",

data/conf/samples/actions_internal/cgradmin.json

@@ -20,6 +20,10 @@
 	"db_type": "*internal",	
 },
 
+"stor_db": {
+	"db_type": "*internal"
+},
+
 "cdrs": {
 	"enabled": true,						// start the CDR Server service:  <true|false>
 	"chargers_conns":["*localhost"],

data/conf/samples/actions_mongo/cgradmin.json

@@ -23,6 +23,12 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "cdrs": {
 	"enabled": true,						// start the CDR Server service:  <true|false>
 	"chargers_conns":["*localhost"],

data/conf/samples/actions_mysql/cgradmin.json

@@ -23,6 +23,10 @@
 	"db_name": "10", 						
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "cdrs": {
 	"enabled": true,						// start the CDR Server service:  <true|false>
 	"chargers_conns":["*localhost"],

data/conf/samples/actions_mysql_gob/cgradmin.json

@@ -30,6 +30,10 @@
 	"db_name": "10", 						
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "cdrs": {
 	"enabled": true,						// start the CDR Server service:  <true|false>
 	"chargers_conns":["conn1"],

data/conf/samples/analyzers/cgrates.json

@@ -18,7 +18,13 @@
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
-	"db_port": 27017,
+	"db_port": 27017
+},
+
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
 },
 
 "cdrs": {

data/conf/samples/analyzers_doc/cgrates.json

@@ -1,43 +1,47 @@
 {
     
-    "general": {
-        "log_level": 7,
-        "reply_timeout": "30s"
-    },
-    
-    "listen": {
-        "rpc_json": ":2012",
-        "rpc_gob": ":2013",
-        "http": ":2080"
-    },
-    
-    "data_db": {
-        "db_type": "redis",
-        "db_name": "10"
-    },
-    
-    "admins": {
-        "enabled": true
-    },
-    
-    "attributes": {
-        "enabled": true,
-        "prefix_indexed_fields":["*req.Destination", "*req.Account"],
-        "opts":{								
-		    "*processRuns": [				
-			    {
-				    "Tenant": "cgrates.org",
-				    "FilterIDs": [],
-				    "Value": 2
-			    }
-		    ]
-	    }
-    },
-    
-    "analyzers":{									
-        "enabled": true,							
-        "db_path": "/tmp/analyzers"			
+"general": {
+    "log_level": 7,
+    "reply_timeout": "30s"
+},
+
+"listen": {
+    "rpc_json": ":2012",
+    "rpc_gob": ":2013",
+    "http": ":2080"
+},
+
+"data_db": {
+    "db_type": "redis",
+    "db_name": "10"
+},
+
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
+"admins": {
+    "enabled": true
+},
+
+"attributes": {
+    "enabled": true,
+    "prefix_indexed_fields":["*req.Destination", "*req.Account"],
+    "opts":{								
+        "*processRuns": [				
+            {
+                "Tenant": "cgrates.org",
+                "FilterIDs": [],
+                "Value": 2
+            }
+        ]
     }
+},
+
+"analyzers":{									
+    "enabled": true,							
+    "db_path": "/tmp/analyzers"			
+}
     
 }
     

data/conf/samples/apis_actions_internal/cgrates.json

@@ -10,6 +10,9 @@
       "db_type": "*internal",
     },
 
+    "stor_db": {
+      "db_type": "*internal"
+    },
   
     "actions": {
         "enabled": true,

data/conf/samples/apis_actions_mongo/cgrates.json

@@ -12,7 +12,11 @@
       "db_port": 27017,
     },
   
-  
+    "stor_db": {
+        "db_type": "mongo",
+        "db_name": "cgrates",
+        "db_port": 27017
+    },
   
     "actions": {
         "enabled": true,

data/conf/samples/apis_actions_mysql/cgrates.json

@@ -1,39 +1,44 @@
 {
-    "general": {
-        "log_level": 7
-    },
 
-    "data_db": {								
-      "db_type": "redis",						
-      "db_port": 6379, 						
-      "db_name": "10"					
-    },
-  
+"general": {
+    "log_level": 7
+},
 
-    "actions": {
-        "enabled": true,
-        "thresholds_conns": ["*internal"],
-        "stats_conns": ["*internal"],
-        "accounts_conns": ["*internal"]
-    },
+"data_db": {								
+    "db_type": "redis",						
+    "db_port": 6379, 						
+    "db_name": "10"					
+},
 
-    "accounts": {
-        "enabled": true
-    },
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
 
-    "stats": {
-        "enabled": true,
-        "store_interval": "-1",
-        "thresholds_conns": ["*internal"]
-    },
+"actions": {
+    "enabled": true,
+    "thresholds_conns": ["*internal"],
+    "stats_conns": ["*internal"],
+    "accounts_conns": ["*internal"]
+},
+
+"accounts": {
+    "enabled": true
+},
+
+"stats": {
+    "enabled": true,
+    "store_interval": "-1",
+    "thresholds_conns": ["*internal"]
+},
+
+"thresholds": {	
+    "enabled": true,
+    "store_interval": "-1",
+    "actions_conns": ["*internal"]
+},
+
+"admins": {
+    "enabled": true
+}
 
-    "thresholds": {	
-        "enabled": true,
-        "store_interval": "-1",
-        "actions_conns": ["*internal"]
-    },
-  
-    "admins": {
-      "enabled": true
-    }
 }

data/conf/samples/apis_chargers_internal/cgrates.json

@@ -14,6 +14,10 @@
 		"db_type": "*internal"
 	},
 
+	"stor_db": {
+		"db_type": "*internal"
+	},
+
 	"attributes": {
 		"enabled": true
 	},

data/conf/samples/apis_chargers_mongo/cgrates.json

@@ -1,32 +1,38 @@
 {
-	"general": {
-		"log_level": 7,
-		"reply_timeout": "30s"
-	},
+"general": {
+	"log_level": 7,
+	"reply_timeout": "30s"
+},
 
-	"listen": {
-		"rpc_json": ":2012",
-		"rpc_gob": ":2013",
-		"http": ":2080"
-	},
+"listen": {
+	"rpc_json": ":2012",
+	"rpc_gob": ":2013",
+	"http": ":2080"
+},
 
-	"data_db": {
-		"db_type": "mongo",
-		"db_name": "10",
-		"db_port": 27017
-	},
+"data_db": {
+	"db_type": "mongo",
+	"db_name": "10",
+	"db_port": 27017
+},
 
-	"attributes": {
-		"enabled": true
-	},
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
+"attributes": {
+	"enabled": true
+},
 
-	"admins": {
-		"enabled": true
-	}
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true
+}
 
 }

data/conf/samples/apis_chargers_mysql/cgrates.json

@@ -1,33 +1,37 @@
 {
 
-	"general": {
-		"log_level": 7,
-		"reply_timeout": "50s"
-	},
+"general": {
+	"log_level": 7,
+	"reply_timeout": "50s"
+},
 
-	"listen": {
-		"rpc_json": ":2012",
-		"rpc_gob": ":2013",
-		"http": ":2080"
-	},
+"listen": {
+	"rpc_json": ":2012",
+	"rpc_gob": ":2013",
+	"http": ":2080"
+},
 
-	"data_db": {
-		"db_type": "redis",
-		"db_port": 6379,
-		"db_name": "10"
-	},
+"data_db": {
+	"db_type": "redis",
+	"db_port": 6379,
+	"db_name": "10"
+},
 
-	"attributes": {
-		"enabled": true
-	},
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
 
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
+"attributes": {
+	"enabled": true
+},
 
-	"admins": {
-		"enabled": true
-	}
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true
+}
 
 }

data/conf/samples/apis_config_mongo/cgrates.json

@@ -21,6 +21,12 @@
     "db_port": 27017,
   },
 
+  "stor_db": {
+    "db_type": "mongo",
+    "db_name": "cgrates",
+    "db_port": 27017
+  },
+
   "cdrs": {
     "enabled": true,
     "chargers_conns":["*internal"],

data/conf/samples/apis_config_mysql/cgrates.json

@@ -1,122 +1,127 @@
 {
-  // CGRateS Configuration file
-  //
+// CGRateS Configuration file
+//
 
 
-  "general": {
-    "log_level": 7,
-    "reply_timeout": "50s",
-  },
+"general": {
+  "log_level": 7,
+  "reply_timeout": "50s",
+},
 
 
-  "listen": {
-    "rpc_json": ":2012",
-    "rpc_gob": ":2013",
-    "http": ":2080",
-  },
+"listen": {
+  "rpc_json": ":2012",
+  "rpc_gob": ":2013",
+  "http": ":2080",
+},
 
-  "data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-    "db_type": "redis",						// data_db type: <redis|mongo>
-    "db_port": 6379, 						// data_db port to reach the database
-    "db_name": "10", 						// data_db database name to connect to
-  },
+"data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
+  "db_type": "redis",						// data_db type: <redis|mongo>
+  "db_port": 6379, 						// data_db port to reach the database
+  "db_name": "10", 						// data_db database name to connect to
+},
 
-  "cdrs": {
-    "enabled": true,
-    "chargers_conns":["*internal"],
-  },
+"stor_db": {
+  "db_password": "CGRateS.org"
+},
+
+"cdrs": {
+  "enabled": true,
+  "chargers_conns":["*internal"],
+},
 
 
-  "attributes": {
-    "enabled": true,
-    "stats_conns": ["*localhost"],
-    "resources_conns": ["*localhost"],
-    "accounts_conns": ["*localhost"]
-  },
+"attributes": {
+  "enabled": true,
+  "stats_conns": ["*localhost"],
+  "resources_conns": ["*localhost"],
+  "accounts_conns": ["*localhost"]
+},
 
 
-  "chargers": {
-    "enabled": true,
-    "attributes_conns": ["*internal"],
-  },
+"chargers": {
+  "enabled": true,
+  "attributes_conns": ["*internal"],
+},
 
 
-  "resources": {
-    "enabled": true,
-    "store_interval": "1s",
-    "thresholds_conns": ["*internal"]
-  },
+"resources": {
+  "enabled": true,
+  "store_interval": "1s",
+  "thresholds_conns": ["*internal"]
+},
 
 
-  "stats": {
-    "enabled": true,
-    "store_interval": "1s",
-    "thresholds_conns": ["*internal"],
-  },
+"stats": {
+  "enabled": true,
+  "store_interval": "1s",
+  "thresholds_conns": ["*internal"],
+},
 
 
-  "thresholds": {
-    "enabled": true,
-    "store_interval": "1s",
-  },
+"thresholds": {
+  "enabled": true,
+  "store_interval": "1s",
+},
 
 
-  "routes": {
-    "enabled": true,
-    "prefix_indexed_fields":["*req.Destination"],
-    "stats_conns": ["*internal"],
-    "resources_conns": ["*internal"],
-    "rates_conns": ["*internal"],
-  },
+"routes": {
+  "enabled": true,
+  "prefix_indexed_fields":["*req.Destination"],
+  "stats_conns": ["*internal"],
+  "resources_conns": ["*internal"],
+  "rates_conns": ["*internal"],
+},
 
 
-  "sessions": {
-    "enabled": true,
-    "routes_conns": ["*internal"],
-    "resources_conns": ["*internal"],
-    "attributes_conns": ["*internal"],
-    "rates_conns": ["*internal"],
-    "cdrs_conns": ["*internal"],
-    "chargers_conns": ["*internal"],
-  },
+"sessions": {
+  "enabled": true,
+  "routes_conns": ["*internal"],
+  "resources_conns": ["*internal"],
+  "attributes_conns": ["*internal"],
+  "rates_conns": ["*internal"],
+  "cdrs_conns": ["*internal"],
+  "chargers_conns": ["*internal"],
+},
 
 
-  "migrator":{
+"migrator":{
 
-    "users_filters":["Account"],
-  },
+  "users_filters":["Account"],
+},
 
 
-  "admins": {
-    "enabled": true,
-  },
+"admins": {
+  "enabled": true,
+},
 
 
-  "rates": {
-    "enabled": false
-  },
+"rates": {
+  "enabled": false
+},
 
 
-  "actions": {
-    "enabled": true,
-    "accounts_conns": ["*localhost"]
-  },
+"actions": {
+  "enabled": true,
+  "accounts_conns": ["*localhost"]
+},
 
 
-  "accounts": {
-    "enabled": true
-  },
+"accounts": {
+  "enabled": true
+},
 
 
-  "filters": {
-    "stats_conns": ["*internal"],
-    "resources_conns": ["*internal"],
-    "accounts_conns": ["*internal"],
-  },
+"filters": {
+  "stats_conns": ["*internal"],
+  "resources_conns": ["*internal"],
+  "accounts_conns": ["*internal"],
+},
+
+"config_db": {
+  "db_type": "redis",
+  "db_port": 6379,
+  "db_name": "12"
+}
 
-  "config_db": {
-    "db_type": "redis",
-    "db_port": 6379,
-    "db_name": "12"
-  }
 }

data/conf/samples/apis_loaders_internal/cgrates.json

@@ -10,6 +10,9 @@
     "db_type": "*internal",
 },
 
+"stor_db": {
+    "db_type": "*internal"
+},
 
 "loaders": [
   {

data/conf/samples/apis_loaders_mongo/cgrates.json

@@ -12,7 +12,11 @@
     "db_port": 27017,
 },
 
-
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "loaders": [
     {

data/conf/samples/apis_loaders_mysql/cgrates.json

@@ -11,6 +11,10 @@
     "db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 
 "loaders": [
     {

data/conf/samples/apis_srvmng_internal/cgrates.json

@@ -13,6 +13,10 @@
 
 "data_db": {
     "db_type": "*internal"
+},
+
+"stor_db": {
+    "db_type": "*internal"
 }
 
 }

data/conf/samples/apis_srvmng_mongo/cgrates.json

@@ -15,6 +15,12 @@
     "db_type": "mongo",
     "db_name": "10",
     "db_port": 27017
+},
+
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
 }
 
 }

data/conf/samples/apis_srvmng_mysql/cgrates.json

@@ -15,6 +15,10 @@
     "db_type": "redis",
     "db_port": 6379,
     "db_name": "10"
+},
+
+"stor_db": {
+    "db_password": "CGRateS.org"
 }
 
 }

data/conf/samples/attr_test_internal/cgrates.json

@@ -20,6 +20,9 @@
 	"db_type": "*internal"
 },
 
+"stor_db": {
+	"db_type": "*internal"
+},
 
 "loaders": [
 	{

data/conf/samples/attr_test_mongo/cgrates.json

@@ -21,6 +21,12 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "loaders": [
 	{
 		"id": "*default",

data/conf/samples/attr_test_mysql/cgrates.json

@@ -21,7 +21,9 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
-
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
 
 "loaders": [
 	{

data/conf/samples/attributes_internal/cgrates.json

@@ -1,25 +1,26 @@
 {
-  // CGRateS Configuration file
-  // will be used in apis/attributes_it_test.go
 
+"data_db": {
+  "db_type": "*internal"
+},
 
-  "data_db": {
-    "db_type": "*internal",
-  },
+"stor_db": {
+  "db_type": "*internal"
+},
 
+"attributes": {
+  "enabled": true,
+  "prefix_indexed_fields": ["*req.Destination"],
+  "exists_indexed_fields": ["*opts.*usage"], 
+  "notexists_indexed_fields": ["*req.ToR"]
+},
 
-  "attributes": {
-    "enabled": true,
-    "prefix_indexed_fields": ["*req.Destination"],
-    "exists_indexed_fields": ["*opts.*usage"], 
-    "notexists_indexed_fields": ["*req.ToR"], 
-  },
+"admins": {
+  "enabled": true
+},
 
-  "admins": {
-    "enabled": true,
-  },
+"tpes": {
+  "enabled": true
+}
 
-  "tpes": {
-    "enabled": true,
-  }
 }

data/conf/samples/attributes_mongo/cgrates.json

@@ -1,23 +1,27 @@
 {
-  // CGRateS Configuration file
-  // will be used in apis/attributes_it_test.go
+ 
+"data_db": {
+  "db_type": "mongo",
+  "db_name": "10",
+  "db_port": 27017
+},
 
 
-  "data_db": {
-    "db_type": "mongo",
-    "db_name": "10",
-    "db_port": 27017,
-  },
+"attributes": {
+  "enabled": true,
+  "prefix_indexed_fields": ["*req.Destination"],
+  "exists_indexed_fields": ["*opts.*usage"], 
+  "notexists_indexed_fields": ["*req.ToR"] 
+},
 
+"admins": {
+  "enabled": true
+},
 
-  "attributes": {
-    "enabled": true,
-    "prefix_indexed_fields": ["*req.Destination"],
-    "exists_indexed_fields": ["*opts.*usage"], 
-    "notexists_indexed_fields": ["*req.ToR"], 
-  },
+"stor_db": {
+  "db_type": "mongo",
+  "db_name": "cgrates",
+  "db_port": 27017
+}
 
-  "admins": {
-    "enabled": true,
-  }
 }

data/conf/samples/attributes_mysql/cgrates.json

@@ -12,6 +12,9 @@
     "db_name": "10", 						// data_db database name to connect to
   },
 
+  "stor_db": {
+    "db_password": "CGRateS.org"
+  },
 
   "attributes": {
     "enabled": true,

data/conf/samples/attributesindexes_mongo/cgrates.json

@@ -1,24 +1,29 @@
 {
-    // CGRateS Configuration file
-    // used in general_tests/attributes_filters_index_it_test.go
-    "general": {
-      "log_level": 7,
-    },
+    
+"general": {
+  "log_level": 7
+},
+
+"data_db": {
+  "db_type": "mongo",
+  "db_name": "10",
+  "db_port": 27017
+},
+
+"stor_db": {
+  "db_type": "mongo",
+  "db_name": "cgrates",
+  "db_port": 27017
+},
+
+"admins": {
+  "enabled": true
+},
+
+"attributes": {
+  "enabled": true,
+  "string_indexed_fields": [],
+  "prefix_indexed_fields": ["*req.Subject"],
+}
   
-    "data_db": {
-      "db_type": "mongo",
-      "db_name": "10",
-      "db_port": 27017,
-    },
- 
-    "admins": {
-      "enabled": true,
-    },
-  
-    "attributes": {
-      "enabled": true,
-      "string_indexed_fields": [],
-      "prefix_indexed_fields": ["*req.Subject"],
-    },
-  
-  }
+}

data/conf/samples/attributesindexes_mysql/cgrates.json

@@ -1,18 +1,23 @@
 {
-    // CGRateS Configuration file
-    // used in general_tests/attributes_filters_index_it_test.go
-    "general": {
-      "log_level": 7,
-    }, 
+
+// CGRateS Configuration file
+// used in general_tests/attributes_filters_index_it_test.go
+"general": {
+  "log_level": 7,
+}, 
+
+"stor_db": {
+  "db_password": "CGRateS.org"
+},
+
+"admins": {
+  "enabled": true,
+},
+
+"attributes": {
+  "enabled": true,
+  "string_indexed_fields": [],
+  "prefix_indexed_fields": ["*req.Subject"],
+},
   
-    "admins": {
-      "enabled": true,
-    },
-  
-    "attributes": {
-      "enabled": true,
-      "string_indexed_fields": [],
-      "prefix_indexed_fields": ["*req.Subject"],
-    },
-  
-  }
+}

data/conf/samples/cache_replicate/dispatcher_engine/cgrates.json

@@ -6,6 +6,9 @@
 	"reconnects": 1,
 },
 
+"stor_db": {
+	"db_type": "*internal"
+},
 
 "listen": {
 	"rpc_json": ":2012",

data/conf/samples/cache_replicate/dispatcher_engine2/cgrates.json

@@ -19,6 +19,10 @@
 	"db_port": 6379,
 	"db_name": "11",
 },
+
+"stor_db": {
+	"db_type": "*internal",
+},
 	
 "caches":{
 	"partitions": {

data/conf/samples/cache_replicate/engine1/cgrates.json

@@ -19,6 +19,10 @@
 	"db_type": "*internal",
 },
 
+"stor_db": {
+	"db_type": "*internal"
+},
+
 "caches":{
 	"remote_conns": ["gob_cache"],						// the conns that are queried when the items are not found in cache
 },   

data/conf/samples/cache_replicate/fltr_update_e1_mongo/cgrates.json

@@ -21,7 +21,11 @@
         "db_port": 27017,
     },
     
-    
+    "stor_db": {
+        "db_type": "mongo",
+        "db_name": "cgrates",
+        "db_port": 27017
+    },
 
     
     "rpc_conns": {

data/conf/samples/cache_replicate/fltr_update_e1_mysql/cgrates.json

@@ -21,7 +21,9 @@
         "db_name": "10", 						// data_db database name to connect to
     },
     
- 
+    "stor_db": {
+        "db_password": "CGRateS.org"
+    },
     
     "rpc_conns": {
         "cache_conn": {

data/conf/samples/cache_rpl_active_active/dispatcher_engine/cgrates.json

@@ -13,7 +13,9 @@
 	"http": ":2080",
 },
 
-
+"stor_db": {
+	"db_type": "*internal"
+},
 
 "caches":{
 	"partitions": {

data/conf/samples/cache_rpl_active_active/dispatcher_engine2/cgrates.json

@@ -20,6 +20,10 @@
 	"db_name": "11",
 },
 
+"stor_db": {
+	"db_type": "*internal"
+},
+
 "caches":{
 	"partitions": {
 		"*dispatcher_routes": {"limit": -1, "ttl": "1h", "replicate": true},

data/conf/samples/cache_rpl_active_active/engine1/cgrates.json

@@ -19,7 +19,9 @@
 	"db_type": "*internal",
 },
 
-
+"stor_db": {
+	"db_type": "*internal"
+},
 
 "rpc_conns": {
 	"conn1": {

data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json

@@ -13,7 +13,13 @@
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
-	"db_port": 27017,
+	"db_port": 27017
+},
+
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
 },
 
 "cdrs": {

data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json

@@ -16,6 +16,10 @@
 	"db_name": "10", 						
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "cdrs": {
 	"enabled": true,			// start the CDR Server service:  <true|false>
 	"chargers_conns":["*internal"],

data/conf/samples/cdrsonexpslave_mongo/cdrsreplicationslave.json

@@ -16,6 +16,12 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "cdrs": {
 	"enabled": true,						// start the CDR Server service:  <true|false>
 	"chargers_conns":["*internal"],

data/conf/samples/cdrsonexpslave_mysql/cdrsreplicationslave.json

@@ -16,6 +16,10 @@
 	"db_name": "10", 						
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/cdrsv1processeventmongo/cgrates.json

@@ -15,8 +15,11 @@
 	"db_port": 27017,
 },
 
-
-
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "attributes": {								
 	"enabled": true,

data/conf/samples/cdrsv1processeventmysql/cgrates.json

@@ -15,6 +15,10 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "attributes": {								
 	"enabled": true,
 },

data/conf/samples/cdrsv2internal/cgrates.json

@@ -1,58 +1,69 @@
 {
-	"general": {
-		"log_level": 7
-	},
 
-	"rates": {
-		"enabled": true
-	},
+"general": {
+	"log_level": 7
+},
 
-	"cdrs": {
+"data_db": {
+	"db_type": "*internal",
+},
+
+"stor_db": {
+	"db_type": "*internal",
+	"string_indexed_fields": ["RunID"]
+},
+
+"rates": {
+	"enabled": true
+},
+
+"cdrs": {
+	"enabled": true,
+	"attributes_conns":["*internal"],
+	"chargers_conns":["*localhost"],
+	"rates_conns": ["*localhost"],
+	"stats_conns": ["*localhost"],
+	"thresholds_conns": ["*localhost"],
+},
+
+"attributes": {
+	"enabled": true
+},
+
+"stats": {
+	"enabled": true,
+	"store_interval": "-1",
+	"thresholds_conns": ["*internal"]
+},
+
+"thresholds": {
+	"enabled": true,
+	"actions_conns": ["*localhost"],
+	"store_interval": "-1"
+},
+
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true,
+},
+
+"actions": {
+	"enabled": true
+},
+
+"loaders": [
+	{
+		"id": "*default",
 		"enabled": true,
-		"attributes_conns":["*internal"],
-		"chargers_conns":["*localhost"],
-		"rates_conns": ["*localhost"],
-		"stats_conns": ["*localhost"],
-		"thresholds_conns": ["*localhost"],
-	},
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
+		"tp_out_dir": ""
+	}
+]
 
-	"attributes": {
-		"enabled": true
-	},
-
-	"stats": {
-		"enabled": true,
-		"store_interval": "-1",
-		"thresholds_conns": ["*internal"]
-	},
-
-	"thresholds": {
-		"enabled": true,
-		"actions_conns": ["*localhost"],
-		"store_interval": "-1"
-	},
-
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
-
-	"admins": {
-		"enabled": true,
-	},
-
-	"actions": {
-		"enabled": true
-	},
-
-	"loaders": [
-		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
-			"tp_out_dir": ""
-		}
-	]
 }

data/conf/samples/cdrsv2mongo/cgrates.json

@@ -1,58 +1,65 @@
 {
-	"general": {
-		"log_level": 7
-	},
 
-	"rates": {
-		"enabled": true
-	},
+"general": {
+	"log_level": 7
+},
 
-	"cdrs": {
+"stor_db": {
+	"db_type": "mongo",
+	"db_port": 27017
+},
+
+"rates": {
+	"enabled": true
+},
+
+"cdrs": {
+	"enabled": true,
+	"attributes_conns":["*internal"],
+	"chargers_conns":["*localhost"],
+	"rates_conns": ["*localhost"],
+	"stats_conns": ["*localhost"],
+	"thresholds_conns": ["*localhost"]
+},
+
+"attributes": {
+	"enabled": true
+},
+
+"stats": {
+	"enabled": true,
+	"store_interval": "1s",
+	"thresholds_conns": ["*internal"]
+},
+
+"thresholds": {
+	"enabled": true,
+	"actions_conns": ["*localhost"],
+	"store_interval": "1s"
+},
+
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true
+},
+
+"actions": {
+	"enabled": true
+},
+
+"loaders": [
+	{
+		"id": "*default",
 		"enabled": true,
-		"attributes_conns":["*internal"],
-		"chargers_conns":["*localhost"],
-		"rates_conns": ["*localhost"],
-		"stats_conns": ["*localhost"],
-		"thresholds_conns": ["*localhost"],
-	},
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
+		"tp_out_dir": ""
+	}
+]
 
-	"attributes": {
-		"enabled": true
-	},
-
-	"stats": {
-		"enabled": true,
-		"store_interval": "1s",
-		"thresholds_conns": ["*internal"]
-	},
-
-	"thresholds": {
-		"enabled": true,
-		"actions_conns": ["*localhost"],
-		"store_interval": "1s"
-	},
-
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
-
-	"admins": {
-		"enabled": true,
-	},
-
-	"actions": {
-		"enabled": true
-	},
-
-	"loaders": [
-		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
-			"tp_out_dir": ""
-		}
-	]
 }

data/conf/samples/cdrsv2mysql/cdrsv2mysql.json

@@ -1,58 +1,64 @@
 {
-	"general": {
-		"log_level": 7
-	},
 
-	"rates": {
-		"enabled": true
-	},
+"general": {
+	"log_level": 7
+},
 
-	"cdrs": {
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
+
+"rates": {
+	"enabled": true
+},
+
+"cdrs": {
+	"enabled": true,
+	"attributes_conns":["*internal"],
+	"chargers_conns":["*localhost"],
+	"rates_conns": ["*localhost"],
+	"stats_conns": ["*localhost"],
+	"thresholds_conns": ["*localhost"],
+},
+
+"attributes": {
+	"enabled": true
+},
+
+"stats": {
+	"enabled": true,
+	"store_interval": "1s",
+	"thresholds_conns": ["*internal"]
+},
+
+"thresholds": {
+	"enabled": true,
+	"actions_conns": ["*localhost"],
+	"store_interval": "1s"
+},
+
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true,
+},
+
+"actions": {
+	"enabled": true
+},
+
+"loaders": [
+	{
+		"id": "*default",
 		"enabled": true,
-		"attributes_conns":["*internal"],
-		"chargers_conns":["*localhost"],
-		"rates_conns": ["*localhost"],
-		"stats_conns": ["*localhost"],
-		"thresholds_conns": ["*localhost"],
-	},
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
+		"tp_out_dir": ""
+	}
+]
 
-	"attributes": {
-		"enabled": true
-	},
-
-	"stats": {
-		"enabled": true,
-		"store_interval": "1s",
-		"thresholds_conns": ["*internal"]
-	},
-
-	"thresholds": {
-		"enabled": true,
-		"actions_conns": ["*localhost"],
-		"store_interval": "1s"
-	},
-
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
-
-	"admins": {
-		"enabled": true,
-	},
-
-	"actions": {
-		"enabled": true
-	},
-
-	"loaders": [
-		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
-			"tp_out_dir": ""
-		}
-	]
 }

data/conf/samples/cdrsv_failover_internal/cgrates.json

@@ -1,87 +1,95 @@
 {
 
-	"general": {
-		"log_level": 7,
-		"node_id": "TestFailCDRS",
-	},
+"general": {
+	"log_level": 7,
+	"node_id": "TestFailCDRS"
+},
 
-	"rates": {
-		"enabled": true,
-	},
+"data_db": {
+	"db_type": "*internal"
+},
 
-	"efs": {                                                    // ExportFailover service
-        "enabled": true,						                // starts the EventReader service: <true|false>
-	    "poster_attempts": 1,									// number of attempts before considering post request failed (eg: *httpPost, CDR exports)
-	    "failed_posts_dir": "/tmp/failed_posts",	// directory path where we store failed requests
-	    "failed_posts_ttl": "1s",								// time to wait before writing the failed posts in a single file
-    },
+"stor_db": {
+	"db_type": "*internal"			
+},
 
-	"cdrs": {
-		"enabled": true,
-		"attributes_conns":["*internal"],
-		"chargers_conns":["*localhost"],
-		"rates_conns": ["*localhost"],
-		"stats_conns": ["*localhost"],
-		"thresholds_conns": ["*localhost"],
-		"online_cdr_exports": ["s3_test_file"],
-		"ees_conns": ["*localhost"]
-	},
+"rates": {
+	"enabled": true
+},
 
-	"attributes": {
-		"enabled": true
-	},
+"efs": {                                                    
+	"enabled": true,						                
+	"poster_attempts": 1,									
+	"failed_posts_dir": "/tmp/failed_posts",	
+	"failed_posts_ttl": "1s"							
+},
 
-	"stats": {
-		"enabled": true,
-		"store_interval": "1s",
-		"thresholds_conns": ["*internal"]
-	},
+"cdrs": {
+	"enabled": true,
+	"attributes_conns":["*internal"],
+	"chargers_conns":["*localhost"],
+	"rates_conns": ["*localhost"],
+	"stats_conns": ["*localhost"],
+	"thresholds_conns": ["*localhost"],
+	"online_cdr_exports": ["s3_test_file"],
+	"ees_conns": ["*localhost"]
+},
 
-	"thresholds": {
-		"enabled": true,
-		"store_interval": "1s"
-	},
+"attributes": {
+	"enabled": true
+},
 
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
+"stats": {
+	"enabled": true,
+	"store_interval": "1s",
+	"thresholds_conns": ["*internal"]
+},
 
-	"admins": {
-		"enabled": true,
-	},
+"thresholds": {
+	"enabled": true,
+	"store_interval": "1s"
+},
 
-	"ees": {
-		"enabled": true,
-		"attributes_conns": ["*internal"],
-		"exporters": [
-			{
-				"id": "s3_test_file",
-				"type": "*s3JSONMap",
-				"export_path": "http://s3.us-east-2.amazonaws.com/",
-				"opts": {
-					"awsRegion": "eu-west-2",
-					"awsKey": "testkey",
-					"awsSecret": "testsecret",
-					"s3BucketID": "cgrates-cdrs"
-				},
-				"attempts": 1,
-				"failed_posts_dir": "/tmp/failed_posts",
-				"fields":[
-					{"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}
-				]
-			}
-		]
-	},
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
 
-	"loaders": [
+"admins": {
+	"enabled": true
+},
+
+"ees": {
+	"enabled": true,
+	"attributes_conns": ["*internal"],
+	"exporters": [
 		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
-			"tp_out_dir": ""
+			"id": "s3_test_file",
+			"type": "*s3JSONMap",
+			"export_path": "http://s3.us-east-2.amazonaws.com/",
+			"opts": {
+				"awsRegion": "eu-west-2",
+				"awsKey": "testkey",
+				"awsSecret": "testsecret",
+				"s3BucketID": "cgrates-cdrs"
+			},
+			"attempts": 1,
+			"failed_posts_dir": "/tmp/failed_posts",
+			"fields":[
+				{"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}
+			]
 		}
 	]
+},
+
+"loaders": [
+	{
+		"id": "*default",
+		"enabled": true,
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
+		"tp_out_dir": ""
+	}
+]
 }

data/conf/samples/cdrsv_failover_mongo/cgrates.json

@@ -1,99 +1,102 @@
 {
 
-	"general": {
-		"log_level": 7,
-		"node_id": "TestFailCDRS",
-	},
+"general": {
+	"log_level": 7,
+	"node_id": "TestFailCDRS"
+},
 
-	"efs": {                                                    // ExportFailover service
-	    "enabled": true,						                // starts the EventReader service: <true|false>
-	    "poster_attempts": 1,									// number of attempts before considering post request failed (eg: *httpPost, CDR exports)
-	    "failed_posts_dir": "/tmp/failed_posts",	// directory path where we store failed requests
-	    "failed_posts_ttl": "1s",								// time to wait before writing the failed posts in a single file
-    },
+"efs": {                                                    
+	"enabled": true,						                
+	"poster_attempts": 1,									
+	"failed_posts_dir": "/tmp/failed_posts",	
+	"failed_posts_ttl": "1s"								
+},
 
 
-	"data_db": {
-		"db_type": "mongo",
-		"db_name": "10",
-		"db_port": 27017
-	},
+"data_db": {
+	"db_type": "mongo",
+	"db_name": "10",
+	"db_port": 27017
+},
 
-	"cdrs": {
-		"enabled": true,
-		"attributes_conns":["*internal"],
-		"chargers_conns":["*localhost"],
-		"rates_conns": ["*localhost"],
-		"stats_conns": ["*localhost"],
-		"thresholds_conns": ["*localhost"],
-		"online_cdr_exports": ["s3_test_file"],
-		"ees_conns": ["*localhost"]
-	},
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
-	"attributes": {
-		"enabled": true
-	},
+"cdrs": {
+	"enabled": true,
+	"attributes_conns":["*internal"],
+	"chargers_conns":["*localhost"],
+	"rates_conns": ["*localhost"],
+	"stats_conns": ["*localhost"],
+	"thresholds_conns": ["*localhost"],
+	"online_cdr_exports": ["s3_test_file"],
+	"ees_conns": ["*localhost"]
+},
 
-	"stats": {
-		"enabled": true,
-		"store_interval": "1s",
-		"thresholds_conns": ["*internal"]
-	},
+"attributes": {
+	"enabled": true
+},
 
-	"thresholds": {
-		"enabled": true,
-		"store_interval": "1s"
-	},
+"stats": {
+	"enabled": true,
+	"store_interval": "1s",
+	"thresholds_conns": ["*internal"]
+},
 
-	"chargers": {
-		"enabled": true,
-		"attributes_conns": ["*internal"]
-	},
+"thresholds": {
+	"enabled": true,
+	"store_interval": "1s"
+},
 
-	"admins": {
-		"enabled": true,
-	},
+"chargers": {
+	"enabled": true,
+	"attributes_conns": ["*internal"]
+},
+
+"admins": {
+	"enabled": true
+},
 
 
-	"ees": {
-		"enabled": true,
-		"attributes_conns": ["*internal"],
-		"exporters": [
-			{
-				"id": "s3_test_file",
-				"type": "*s3JSONMap",
-				"export_path": "http://s3.us-east-2.amazonaws.com/",
-				"opts": {
-					"awsRegion": "eu-west-2",
-					"awsKey": "testkey",
-					"awsSecret": "testsecret",
-					"s3BucketID": "cgrates-cdrs"
-				},
-				"attempts": 1,
-				"failed_posts_dir": "/tmp/failed_posts",
-				"fields":[
-					{"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}
-				]
-			}
-		]
-	},
-
-	"rates": {
-		"enabled": true,
-	},
-
-	"loaders": [
+"ees": {
+	"enabled": true,
+	"attributes_conns": ["*internal"],
+	"exporters": [
 		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
-			"tp_out_dir": ""
+			"id": "s3_test_file",
+			"type": "*s3JSONMap",
+			"export_path": "http://s3.us-east-2.amazonaws.com/",
+			"opts": {
+				"awsRegion": "eu-west-2",
+				"awsKey": "testkey",
+				"awsSecret": "testsecret",
+				"s3BucketID": "cgrates-cdrs"
+			},
+			"attempts": 1,
+			"failed_posts_dir": "/tmp/failed_posts",
+			"fields":[
+				{"tag": "*originID", "path": "*exp.*originID", "type": "*variable", "value": "~*opts.*originID"}
+			]
 		}
 	]
+},
 
+"rates": {
+	"enabled": true
+},
 
-
+"loaders": [
+	{
+		"id": "*default",
+		"enabled": true,
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/testit",
+		"tp_out_dir": ""
+	}
+]
 
 }

data/conf/samples/cdrsv_failover_mysql/cgrates.json

@@ -9,6 +9,10 @@
 	"node_id": "TestFailCDRS",
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "efs": {                                                    // ExportFailover service
     "enabled": true,						                // starts the EventReader service: <true|false>
     "poster_attempts": 1,									// number of attempts before considering post request failed (eg: *httpPost, CDR exports)

data/conf/samples/cfg_rld_rates_internal/cgrates.json

@@ -1,26 +1,22 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"log_level": 7,
 	"reply_timeout": "50s"
 },
 
-
 "listen": {
 	"rpc_json": ":2012",
 	"rpc_gob": ":2013",
 	"http": ":2080"
 },
 
-
 "data_db": {
 	"db_type": "*internal"
 },
 
-
-
+"stor_db": {
+    "db_type": "*internal"
+}
 
 }

data/conf/samples/cfg_rld_rates_mongo/cgrates.json

@@ -1,28 +1,28 @@
 {
-// CGRateS Configuration file
-
 
 "general": {
 	"log_level": 7,
-	"reply_timeout": "30s",
+	"reply_timeout": "30s"
 },
 
 
 "listen": {
 	"rpc_json": ":2012",
 	"rpc_gob": ":2013",
-	"http": ":2080",
+	"http": ":2080"
 },
 
 
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
-	"db_port": 27017,
+	"db_port": 27017
 },
 
-
-
-
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+}
 
 }

data/conf/samples/cfg_rld_rates_mysql/cgrates.json

@@ -21,6 +21,8 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
-
+"stor_db": {
+    "db_password": "CGRateS.org"
+}
 
 }

data/conf/samples/core_config/cgrates.json

@@ -1,17 +1,20 @@
 {
-  // CGRateS Configuration file
-  // will be used in apis/cores_it_test.go
-  "general": {
-    "node_id": "Cores_apis_test",
-    "log_level": 7,
-  },
 
-  "data_db": {
-    "db_type": "*internal",
-  },
+"general": {
+  "node_id": "Cores_apis_test",
+  "log_level": 7
+},
 
+"data_db": {
+  "db_type": "*internal"
+},
+
+"stor_db": {
+  "db_type": "*internal"
+},
+
+"admins": {
+  "enabled": true
+}
 
-  "admins": {
-    "enabled": true,
-  }
 }

data/conf/samples/dataconverter_internal/cgrates.json

@@ -8,6 +8,10 @@
     "db_type": "*internal"
 },
 
+"stor_db": {
+    "db_type": "*internal"
+},
+
 "attributes": {
     "enabled": true
 },

data/conf/samples/dataconverter_mongo/cgrates.json

@@ -10,6 +10,12 @@
     "db_port": 27017						
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "attributes": {
     "enabled": true
 },

data/conf/samples/dataconverter_mysql/cgrates.json

@@ -10,6 +10,10 @@
     "db_name": "10" 						
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "attributes": {
     "enabled": true
 },

data/conf/samples/diamagent_internal/cgrates.json

@@ -16,7 +16,11 @@
 },
 
 "data_db": {
-	"db_type": "*internal",	
+	"db_type": "*internal"
+},
+
+"stor_db": {
+	"db_type": "*internal"			
 },
 
 "cdrs": {

data/conf/samples/diamagent_mongo/cgrates.json

@@ -22,6 +22,12 @@
 	"db_password": "",
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "cdrs": {
 	"enabled": true,
 },

data/conf/samples/diamagent_mysql/cgrates.json

@@ -9,6 +9,10 @@
 	"default_tenant": "cgrates.com",
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "listen": {
 	"rpc_json": ":2012",				// RPC JSON listening address
 	"rpc_gob": ":2013",					// RPC GOB listening address

data/conf/samples/diamagentmaxconn_internal/cgrates.json

@@ -18,6 +18,10 @@
 	"db_type": "*internal",	
 },
 
+"stor_db": {
+	"db_type": "*internal"			
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/diamagentmaxconn_mongo/cgrates.json

@@ -21,6 +21,13 @@
 	"db_password": "",
 },
 
+"stor_db": {
+	"db_type": "mongo",					// stor database type to use: <mysql|postgres>
+	"db_port": 27017, 						// the port to reach the stordb
+	"db_name": "stordb",
+	"db_password": ""
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/diamagentmaxconn_mysql/cgrates.json

@@ -20,6 +20,10 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/diamsctpagent_internal/cgrates.json

@@ -19,6 +19,10 @@
 	"db_type": "*internal",	
 },
 
+"stor_db": {
+	"db_type": "*internal"			
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/diamsctpagent_mongo/cgrates.json

@@ -22,6 +22,13 @@
 	"db_password": "",
 },
 
+"stor_db": {
+	"db_type": "mongo",					// stor database type to use: <mysql|postgres>
+	"db_port": 27017, 						// the port to reach the stordb
+	"db_name": "stordb",
+	"db_password": ""
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/diamsctpagent_mysql/cgrates.json

@@ -21,6 +21,10 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/dispatcher_opts/cgrates.json

@@ -1,59 +1,63 @@
 {
 
-    "general": {
-        "node_id": "HOST1",
-        "log_level": 7,
-    },
-        
-    "listen": {
-        "rpc_json": ":2012",			// RPC JSON listening address
-        "rpc_gob": ":2013",			// RPC GOB listening address
-        "http": ":2080",				// HTTP listening address
-    },    
+"general": {
+    "node_id": "HOST1",
+    "log_level": 7
+},
+    
+"listen": {
+    "rpc_json": ":2012",			
+    "rpc_gob": ":2013",			
+    "http": ":2080"				
+},    
 
-    "data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	    "db_type": "redis",						// data_db type: <redis|mongo>
-	    "db_port": 6379, 						// data_db port to reach the database
-	    "db_name": "10", 						// data_db database name to connect to
-    },
-    
-    "attributes": {								
-	    "enabled": true,						
-    },        
-    
-    "dispatchers":{
-        "enabled": true,
-        "opts": {								
-		 "*dispatchers": [						
-		 	{
-		 		"Tenant": "cgrates.org",
-		 		"FilterIDs": ["*string:~*opts.*subsys:*dispatchers"],
-		 		"Value": false,
-		 	},
-		 ],
-	   },
-    }, 
-        
-    "caches":{
-        "partitions": {
-            "*dispatcher_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false},
-            "*dispatcher_routes": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 						// control dispatcher routes caching
-            "*dispatchers": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 								// control dispatcher interface
-        },
-        "remote_conns": ["gob_cache"],						// the conns that are queried when the items are not found in cache
-    },    
+"data_db": {								
+    "db_type": "redis",						
+    "db_port": 6379, 						
+    "db_name": "10"						
+},
 
-    "admins": {
-        "enabled": true,
-    }, 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
+"attributes": {								
+    "enabled": true						
+},        
+
+"dispatchers":{
+    "enabled": true,
+    "opts": {								
+        "*dispatchers": [						
+            {
+                "Tenant": "cgrates.org",
+                "FilterIDs": ["*string:~*opts.*subsys:*dispatchers"],
+                "Value": false
+            }
+        ]
+    }
+}, 
     
-    "rpc_conns": {
-        "gob_cache": {
-            "strategy": "*first",
-            "conns": [
-                {"address": "127.0.0.1:2013", "transport":"*gob"},
-            ],
-        },
-    }, 
+"caches":{
+    "partitions": {
+        "*dispatcher_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false},
+        "*dispatcher_routes": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 						
+        "*dispatchers": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}							
+    },
+    "remote_conns": ["gob_cache"]						
+},    
+
+"admins": {
+    "enabled": true
+}, 
+
+"rpc_conns": {
+    "gob_cache": {
+        "strategy": "*first",
+        "conns": [
+            {"address": "127.0.0.1:2013", "transport":"*gob"}
+        ]
+    }
+}
     
-    }
+}

data/conf/samples/dispatcher_opts_admin/cgrates.json

@@ -1,66 +1,67 @@
 {
 
-    "general": {
-        "node_id": "HOST2",
-        "log_level": 7,
-    },
-        
+"general": {
+    "node_id": "HOST2",
+    "log_level": 7
+},
     
-    "listen": {
-        "rpc_json": ":4012",			// RPC JSON listening address
-        "rpc_gob": ":4013",			// RPC GOB listening address
-        "http": ":4080",				// HTTP listening address
-    },
+"listen": {
+    "rpc_json": ":4012",			
+    "rpc_gob": ":4013",			
+    "http": ":4080"				
+},
 
-    "data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	    "db_type": "redis",						// data_db type: <redis|mongo>
-	    "db_port": 6379, 						// data_db port to reach the database
-	    "db_name": "10", 						// data_db database name to connect to
-    },
-      
- 
-    "dispatchers":{
-        "enabled": true,
-        "opts": {								
-		 "*dispatchers": [						
-		 	{
-		 		"Tenant": "cgrates.org",
-		 		"FilterIDs": ["*string:~*opts.*subsys:*dispatchers"],
-		 		"Value": false,
-		 	},
-		 ],
-	   }, 
-    },
+"data_db": {								
+    "db_type": "redis",						
+    "db_port": 6379, 						
+    "db_name": "10" 						
+},
     
-    "caches":{
-        "partitions": {
-            "*dispatcher_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false},
-            "*dispatcher_routes": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 						// control dispatcher routes caching
-            "*dispatchers": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 								// control dispatcher interface
-        },
-        "remote_conns": ["gob_cache"],						// the conns that are queried when the items are not found in cache
-    },    
-       
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
 
-    "admins": {
-        "enabled": true,
-        "caches_conns":["broadcast_cache"],
+"dispatchers":{
+    "enabled": true,
+    "opts": {								
+        "*dispatchers": [						
+        {
+            "Tenant": "cgrates.org",
+            "FilterIDs": ["*string:~*opts.*subsys:*dispatchers"],
+            "Value": false
+        }
+        ]
+    }
+},
+
+"caches":{
+    "partitions": {
+        "*dispatcher_profiles": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false},
+        "*dispatcher_routes": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}, 						
+        "*dispatchers": {"limit": -1, "ttl": "", "static_ttl": false, "remote":true, "replicate": false}							
     },
+    "remote_conns": ["gob_cache"]				
+},    
     
-    "rpc_conns": {
-        "broadcast_cache": {
-            "strategy": "*broadcast",
-            "conns": [
-                {"address": "127.0.0.1:2012", "transport":"*json"},
-                {"address": "127.0.0.1:4012", "transport":"*json"},
-            ],
-        },
-        "gob_cache": {
-            "strategy": "*first",
-            "conns": [
-                {"address": "127.0.0.1:4013", "transport":"*gob"},
-            ],
-        },
-    }, 
-    
-    }
+"admins": {
+    "enabled": true,
+    "caches_conns":["broadcast_cache"]
+},
+
+"rpc_conns": {
+    "broadcast_cache": {
+        "strategy": "*broadcast",
+        "conns": [
+            {"address": "127.0.0.1:2012", "transport":"*json"},
+            {"address": "127.0.0.1:4012", "transport":"*json"}
+        ]
+    },
+    "gob_cache": {
+        "strategy": "*first",
+        "conns": [
+            {"address": "127.0.0.1:4013", "transport":"*gob"}
+        ]
+    }
+}
+
+}

data/conf/samples/dispatchers/all/cgrates.json

@@ -1,36 +1,34 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL",
 	"log_level": 7
 },
 
-
 "listen": {
  	"rpc_json": ":6012",
 	"rpc_gob": ":6013",
-	"http": ":6080",
+	"http": ":6080"
 },
 
-"data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	"db_type": "redis",						// data_db type: <redis|mongo>
-	"db_port": 6379, 						// data_db port to reach the database
-	"db_name": "11", 						// data_db database name to connect to
+"data_db": {								
+	"db_type": "redis",						
+	"db_port": 6379, 						
+	"db_name": "11"						
 },
 
-
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}]
 	},
 	"rplConn": {
 		"strategy": "*broadcast_sync",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
 	}
 },
 
@@ -38,50 +36,45 @@
 	"enabled": true
 },
 
-
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,	
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -92,12 +85,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"chargers_conns": ["*internal"],
-	"cdrs_conns": ["*internal"],
+	"cdrs_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/all2/cgrates.json

@@ -1,33 +1,31 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL2",
 	"log_level": 7
 },
 
-
 "listen": {
  	"rpc_json": ":7012",
 	"rpc_gob": ":7013",
-	"http": ":7080",
+	"http": ":7080"
 },
 
-"data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	"db_type": "redis",						// data_db type: <redis|mongo>
-	"db_port": 6379, 						// data_db port to reach the database
-	"db_name": "12", 						// data_db database name to connect to
+"data_db": {							
+	"db_type": "redis",					
+	"db_port": 6379, 					
+	"db_name": "12"					
 },
 
-
+"stor_db": {
+	"db_type":"*internal"
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
-	},
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
+	}
 },
 
 "attributes": {
@@ -36,47 +34,43 @@
 
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -87,13 +81,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"cdrs_conns": ["*internal"],
-	"chargers_conns": ["*internal"],
+	"chargers_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
-
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/all2_mongo/cgrates.json

@@ -1,7 +1,4 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL2",
@@ -12,22 +9,26 @@
 "listen": {
  	"rpc_json": ":7012",
 	"rpc_gob": ":7013",
-	"http": ":7080",
+	"http": ":7080"
 },
 
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "12",
-	"db_port": 27017,
+	"db_port": 27017
 },
 
-
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
-	},
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
+	}
 },
 
 "attributes": {
@@ -36,47 +37,43 @@
 
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -87,13 +84,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"cdrs_conns": ["*internal"],
-	"chargers_conns": ["*internal"],
+	"chargers_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
-
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/all2_mysql/cgrates.json

@@ -1,33 +1,31 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL2",
 	"log_level": 7
 },
 
-
 "listen": {
 	"rpc_json": ":7012",
 	"rpc_gob": ":7013",
-	"http": ":7080",
+	"http": ":7080"
 },
 
-"data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	"db_type": "redis",						// data_db type: <redis|mongo>
-	"db_port": 6379, 						// data_db port to reach the database
-	"db_name": "12", 						// data_db database name to connect to
+"data_db": {								
+	"db_type": "redis",						
+	"db_port": 6379, 						
+	"db_name": "12"						
 },
 
-
+"stor_db": {
+	"db_type":"*internal"
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
-	},
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
+	}
 },
 
 "attributes": {
@@ -36,47 +34,43 @@
 
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -87,13 +81,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"cdrs_conns": ["*internal"],
-	"chargers_conns": ["*internal"],
+	"chargers_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
-
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/all_mongo/cgrates.json

@@ -1,35 +1,36 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL",
 	"log_level": 7
 },
 
-
 "listen": {
  	"rpc_json": ":6012",
 	"rpc_gob": ":6013",
-	"http": ":6080",
+	"http": ":6080"
 },
 
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "11",
-	"db_port": 27017,
+	"db_port": 27017
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}]
 	},
 	"rplConn": {
 		"strategy": "*broadcast_sync",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
 	}
 },
 
@@ -39,47 +40,43 @@
 
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,	
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -90,12 +87,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"chargers_conns": ["*internal"],
-	"cdrs_conns": ["*internal"],
+	"cdrs_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/all_mysql/cgrates.json

@@ -1,86 +1,81 @@
 {
-// CGRateS Configuration file
-//
-
 
 "general": {
 	"node_id": "ALL",
 	"log_level": 7
 },
 
-
 "listen": {
 	"rpc_json": ":6012",
 	"rpc_gob": ":6013",
-	"http": ":6080",
+	"http": ":6080"
 },
 
-"data_db": {								// database used to store runtime data (eg: accounts, cdr stats)
-	"db_type": "redis",						// data_db type: <redis|mongo>
-	"db_port": 6379, 						// data_db port to reach the database
-	"db_name": "11", 						// data_db database name to connect to
+"data_db": {								
+	"db_type": "redis",						
+	"db_port": 6379, 						
+	"db_name": "11"						
 },
 
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
 
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:6012", "transport":"*json"}]
 	},
 	"rplConn": {
 		"strategy": "*broadcast_sync",
-		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}],
+		"conns": [{"address": "127.0.0.1:7012", "transport":"*json"}]
 	}
 },
 
-
 "attributes": {
 	"enabled": true
 },
 
 "chargers": {
 	"enabled": true,
-	"attributes_conns": ["*internal"],
+	"attributes_conns": ["*internal"]
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "routes": {
 	"enabled": true,
 	"rates_conns": ["*internal"],	
-	"accounts_conns": ["*internal"],
+	"accounts_conns": ["*internal"]
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "rates": {
-	"enabled": true,
+	"enabled": true
 },
 
 
 "actions": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "accounts": {
-	"enabled": true,
+	"enabled": true
 },
 
-
 "cdrs": {
 	"enabled": true,	
 	"chargers_conns":["*internal"],
-	"rates_conns": ["*internal"],
+	"rates_conns": ["*internal"]
 },
 
 "sessions": {
@@ -91,12 +86,12 @@
 	"attributes_conns": ["*internal"],
 	"rates_conns": ["*internal"],
 	"chargers_conns": ["*internal"],
-	"cdrs_conns": ["*internal"],
+	"cdrs_conns": ["*internal"]
 },
 
 "admins": {
 	"enabled": true,
-	"caches_conns":["conn1"],
-},
+	"caches_conns":["conn1"]
+}
 
 }

data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json

@@ -1,29 +1,25 @@
 {
 
-// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-// Copyright (C) ITsysCOM GmbH
-//
-// This file contains the default configuration hardcoded into CGRateS.
-// This is what you get when you load CGRateS with an empty configuration file.
-
 "general": {
  	"node_id": "DispatcherS1",
 	"log_level": 7,
- 	"reconnects": 1,	
+ 	"reconnects": 1	
 },
 
-
 "listen": {
  	"rpc_json": ":2012",
  	"rpc_gob": ":2013",
-	"http": ":2080",
+	"http": ":2080"
 },
 
+"stor_db": {
+	"db_type":"*internal"
+},
 
 "caches":{
 	"partitions": {
 		"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
-	},
+	}
 },
 
 "attributes": {
@@ -31,7 +27,7 @@
 },
 
 "chargers": {
-	"enabled": true,
+	"enabled": true
 },
 
 "sessions": {
@@ -40,15 +36,15 @@
 	"rates_conns": ["*localhost"],
 	"resources_conns": ["*localhost"],
 	"chargers_conns": ["*localhost"],
-	"listen_bijson": ":3014",
+	"listen_bijson": ":3014"
 },
 
 "dispatchers":{
  	"enabled": true,
- 	"attributes_conns": ["*internal"],
+ 	"attributes_conns": ["*internal"]
 },
 
 "admins": {
-	"enabled": true,
-},
+	"enabled": true
+}
 }

data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json

@@ -1,42 +1,38 @@
 {
 
-// Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-// Copyright (C) ITsysCOM GmbH
-//
-// This file contains the default configuration hardcoded into CGRateS.
-// This is what you get when you load CGRateS with an empty configuration file.
-
 "general": {
  	"node_id": "DispatcherS1",
 	"log_level": 7,
- 	"reconnects": 1,	
+ 	"reconnects": 1
 },
 
-
 "listen": {
  	"rpc_json": ":2012",
  	"rpc_gob": ":2013",
-	"http": ":2080",
+	"http": ":2080"
 },
 
+"stor_db": {
+	"db_type":"*internal"
+},
 
 "caches":{
 	"partitions": {
 		"*dispatcher_routes": {"limit": -1, "ttl": "2s"}
-	},
+	}
 },
 
-
 "sessions": {
 	"enabled": true,
-	"listen_bijson": ":3014",
+	"listen_bijson": ":3014"
 },
 
 "dispatchers":{
- 	"enabled": true,
+ 	"enabled": true
 },
 
 "admins": {
-	"enabled": true,
-},
+	"enabled": true
+}
+
 }

data/conf/samples/dnsagent_internal/cgrates.json

@@ -1,67 +1,73 @@
 {
-	"general": {
-		"log_level": 7									
-	},
 
-	"data_db": {
-		"db_type": "*internal"
-	},
+"general": {
+	"log_level": 7									
+},
 
-	"schedulers": {
+"data_db": {
+	"db_type": "*internal"
+},
+
+"stor_db": {
+	"db_type": "*internal"			
+},
+
+"schedulers": {
+	"enabled": true,
+	"cdrs_conns": ["*internal"]
+},
+
+"sessions": {
+	"enabled": true,
+	"attributes_conns": ["*localhost"],
+	"rals_conns": ["*internal"],
+	"cdrs_conns": ["*internal"],
+	"chargers_conns": ["*internal"],
+	"routes_conns": ["*localhost"]
+},
+
+"rates": {
+	"enabled": true
+},
+
+"cdrs": {
+	"enabled": true,
+	"rates_conns": ["*internal"]
+},
+
+"chargers": {
+	"enabled": true
+},
+
+
+"attributes": {
+	"enabled": true
+},
+
+"routes": {
+	"enabled": true
+},
+
+"dns_agent": {
+	"enabled": true,
+	"listen": ":2053",
+	"sessions_conns": ["*localhost"]
+},
+
+"admins": {
+	"enabled": true,
+	"scheduler_conns": ["*internal"]
+},
+
+"loaders": [
+	{
+		"id": "*default",
 		"enabled": true,
-		"cdrs_conns": ["*internal"]
-	},
+		"tenant": "cgrates.org",
+		"lockfile_path": ".cgr.lck",
+		"tp_in_dir": "/usr/share/cgrates/tariffplans/dnsagent",
+		"tp_out_dir": ""
+	}
+]
 
-	"sessions": {
-		"enabled": true,
-		"attributes_conns": ["*localhost"],
-		"rals_conns": ["*internal"],
-		"cdrs_conns": ["*internal"],
-		"chargers_conns": ["*internal"],
-		"routes_conns": ["*localhost"]
-	},
-
-	"rates": {
-		"enabled": true
-	},
-
-	"cdrs": {
-		"enabled": true,
-		"rates_conns": ["*internal"]
-	},
-
-	"chargers": {
-		"enabled": true
-	},
-
-
-	"attributes": {
-		"enabled": true
-	},
-
-	"routes": {
-		"enabled": true
-	},
-
-	"dns_agent": {
-		"enabled": true,
-		"listen": ":2053",
-		"sessions_conns": ["*localhost"]
-	},
-
-	"admins": {
-		"enabled": true,
-		"scheduler_conns": ["*internal"]
-	},
-
-	"loaders": [
-		{
-			"id": "*default",
-			"enabled": true,
-			"tenant": "cgrates.org",
-			"lockfile_path": ".cgr.lck",
-			"tp_in_dir": "/usr/share/cgrates/tariffplans/dnsagent",
-			"tp_out_dir": ""
-		}
-	]
 }

data/conf/samples/dnsagent_mongo/cgrates.json

@@ -17,6 +17,11 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "sessions": {
 	"enabled": true,

data/conf/samples/dnsagent_mysql/cgrates.json

@@ -11,6 +11,9 @@
 	"log_level": 7,											// control the level of messages logged (0-emerg to 7-debug)
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
 
 "sessions": {
 	"enabled": true,

data/conf/samples/ees/cgrates.json

@@ -1,34 +1,33 @@
 {
-// Sample CGRateS Configuration file for EEs
-//
-// Copyright (C) ITsysCOM GmbH
-
 
 "logger": {
-	"type": "*syslog",        // controls the destination of logs <*syslog|*stdout|*kafka>
-	"level": 7,               // system level precision for floats 
+	"type": "*syslog",       
+	"level": 7              
 },
 
 "listen": {
 	"rpc_json": ":2012",
 	"rpc_gob": ":2013",
-	"http": ":2080",
+	"http": ":2080"
 },
 
 "data_db": {
 	"db_type": "redis",
 	"db_port": 6379,
-	"db_name": "10",
+	"db_name": "10"
+},
+
+"stor_db": {
+	"db_password": "CGRateS.org"
 },
 
 "cdrs": {
 	"enabled": true,
 	"chargers_conns": ["*localhost"],
 	"rates_conns": ["*internal"],
-	"session_cost_retries": 0,
+	"session_cost_retries": 0
 },
 
-
 "chargers": {
 	"enabled": true,
 	"attributes_conns": ["*internal"],

data/conf/samples/ees_blocker_internal/cgrates.json

@@ -1,46 +1,50 @@
 {
 
-    "general": {
-        "log_level": 7
+"general": {
+    "log_level": 7
+},
+
+"listen": {
+    "rpc_json": ":2012",
+    "rpc_gob": ":2013",
+    "http": ":2080"
+},
+
+"data_db": {
+    "db_type": "*internal"
+},
+
+"stor_db": {
+    "db_type": "*internal"
+},
+
+"ees": {
+    "enabled": true,
+    "cache": {
+        "*fileCSV": {"limit": -1, "ttl": "500ms", "static_ttl": false}
     },
-    
-    "listen": {
-        "rpc_json": ":2012",
-        "rpc_gob": ":2013",
-        "http": ":2080"
-    },
-    
-    "data_db": {
-		"db_type": "*internal"
-	},
-    
-    "ees": {
-        "enabled": true,
-        "cache": {
-            "*fileCSV": {"limit": -1, "ttl": "500ms", "static_ttl": false}
+    "exporters": [
+        {
+            "id": "CSVExporter1",
+            "type": "*fileCSV",
+            "export_path": "/tmp/CSVFile1",
+            "attempts": 1,
+            "blocker": true,
+            "field_separator": ","
         },
-        "exporters": [
-            {
-                "id": "CSVExporter1",
-                "type": "*fileCSV",
-                "export_path": "/tmp/CSVFile1",
-                "attempts": 1,
-                "blocker": true,
-                "field_separator": ","
-            },
-            {
-                "id": "CSVExporter2",
-                "type": "*fileCSV",
-                "export_path": "/tmp/CSVFile2",
-                "attempts": 1,
-                "field_separator": ","
-            }
-        ]
-    },
-    
-    
-    "admins": {
-        "enabled": true
-    }
+        {
+            "id": "CSVExporter2",
+            "type": "*fileCSV",
+            "export_path": "/tmp/CSVFile2",
+            "attempts": 1,
+            "field_separator": ","
+        }
+    ]
+},
+
+
+"admins": {
+    "enabled": true
+}
     
 }

data/conf/samples/ees_blocker_mongo/cgrates.json

@@ -15,6 +15,12 @@
 		"db_name": "10",
 		"db_port": 27017
 	},
+
+    "stor_db": {
+        "db_type": "mongo",
+        "db_name": "cgrates",
+        "db_port": 27017
+    },
     
     "ees": {
         "enabled": true,

data/conf/samples/ees_blocker_mysql/cgrates.json

@@ -16,6 +16,10 @@
         "db_name": "10"
     },
     
+    "stor_db": {
+        "db_password": "CGRateS.org"
+    },
+
     "ees": {
         "enabled": true,
         "cache": {

data/conf/samples/ees_internal/cgrates.json

@@ -18,6 +18,10 @@
 	"db_type": "*internal",
 },
 
+"stor_db": {
+	"db_type": "*internal"			
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/ees_mongo/cgrates.json

@@ -13,13 +13,18 @@
 	"http": ":2080",
 },
 
-
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
 	"db_port": 27017
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/ees_mysql/cgrates.json

@@ -20,6 +20,10 @@
 	"db_name": "10"
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/ers_internal/cgrates.json

@@ -19,7 +19,11 @@
 
 
 "data_db": {
-	"db_type": "*internal",	
+	"db_type": "*internal"
+},
+
+"stor_db": {
+	"db_type": "*internal"			
 },
 
 "rates": {

data/conf/samples/ers_mongo/cgrates.json

@@ -24,6 +24,12 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/ers_mysql/cgrates.json

@@ -23,6 +23,10 @@
 	"db_name": "10",
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 "rates": {
 	"enabled": true,
 },

data/conf/samples/export_it_test_internal/cgrates.json

@@ -20,6 +20,9 @@
         "db_type": "*internal"
     },
     
+    "stor_db": {
+        "db_type": "*internal"			
+    },
     
     "cdrs": {
         "enabled": true,

data/conf/samples/export_it_test_mongo/cgrates.json

@@ -21,6 +21,12 @@
 	"db_port": 27017,
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
+
 "tpes": {
 	"enabled": true,
 },

data/conf/samples/export_it_test_mysql/cgrates.json

@@ -21,6 +21,10 @@
 	"db_name": "10", 						// data_db database name to connect to
 },
 
+"stor_db": {
+    "db_password": "CGRateS.org"
+},
+
 
 "cdrs": {
 	"enabled": true,

data/conf/samples/filter_indexes_internal/cgrates.json

@@ -10,7 +10,9 @@
     "db_type": "*internal",
   },
 
-
+  "stor_db": {
+    "db_type": "*internal"
+  },
 
   "attributes": {
     "enabled": true,

data/conf/samples/filter_indexes_mongo/cgrates.json

@@ -12,7 +12,11 @@
     "db_port": 27017,
   },
 
- 
+  "stor_db": {
+    "db_type": "mongo",
+    "db_name": "cgrates",
+    "db_port": 27017
+  },
 
   "attributes": {
     "enabled": true,

data/conf/samples/filter_indexes_mysql/cgrates.json

@@ -12,7 +12,9 @@
     "db_name": "10", 						// data_db database name to connect to
   },
 
-
+  "stor_db": {
+    "db_password": "CGRateS.org"
+  },
 
   "attributes": {
     "enabled": true,

data/conf/samples/filtered_replication/engine1_mongo/cgrates.json

@@ -1,25 +1,22 @@
 {
 "general": {
 	"log_level": 7,
-	"node_id" : "EngineMongo1",
+	"node_id" : "EngineMongo1"
 },
 
-
 "listen": {
 	"rpc_json": ":2022",
 	"rpc_gob": ":2023",
-	"http": ":2280",
+	"http": ":2280"
 },
 
-
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}],
-	},
+		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}]
+	}
 },
 
-
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "10",
@@ -44,25 +41,30 @@
 		"*load_ids":{"remote":true,"replicate":false},
 		"*indexes":{"remote":true, "replicate":false}, 
 		"*action_profiles":{"remote":true,"replicate":false},
-		"*account_profiles":{"remote":true,"replicate":false},
-	},
+		"*account_profiles":{"remote":true,"replicate":false}
+	}
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "admins": {
-	"enabled": true,
+	"enabled": true
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
-},
+	"enabled": true
+}
 
 }

data/conf/samples/filtered_replication/engine1_redis/cgrates.json

@@ -1,22 +1,21 @@
 {
+
 "general": {
 	"log_level": 7,
-	"node_id" : "EngineMongo1",
+	"node_id" : "EngineMongo1"
 },
 
-
 "listen": {
 	"rpc_json": ":2022",
 	"rpc_gob": ":2023",
-	"http": ":2280",
+	"http": ":2280"
 },
 
-
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}],
-	},
+		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}]
+	}
 },
 
 "data_db": {
@@ -43,25 +42,28 @@
 		"*load_ids":{"remote":true,"replicate":false},
 		"*indexes":{"remote":true, "replicate":false}, 
 		"*action_profiles":{"remote":true,"replicate":false},
-		"*account_profiles":{"remote":true,"replicate":false},
-	},
+		"*account_profiles":{"remote":true,"replicate":false}
+	}
 },
 
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
 
 "admins": {
-	"enabled": true,
+	"enabled": true
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
-},
+	"enabled": true
+}
 
 }

data/conf/samples/filtered_replication/engine2_mongo/cgrates.json

@@ -1,25 +1,23 @@
 {
+
 "general": {
 	"log_level": 7,
-	"node_id" : "EngineMongo2",
+	"node_id" : "EngineMongo2"
 },
 
-
 "listen": {
 	"rpc_json": ":2032",
 	"rpc_gob": ":2033",
-	"http": ":2380",
+	"http": ":2380"
 },
 
-
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}],
-	},
+		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}]
+	}
 },
 
-
 "data_db": {
 	"db_type": "mongo",
 	"db_name": "11",
@@ -44,25 +42,30 @@
 		"*load_ids":{"remote":true,"replicate":false},
 		"*indexes":{"remote":true, "replicate":false}, 
 		"*action_profiles":{"remote":true,"replicate":false},
-		"*account_profiles":{"remote":true,"replicate":false},
-	},
+		"*account_profiles":{"remote":true,"replicate":false}
+	}
 },
 
+"stor_db": {
+	"db_type": "mongo",
+	"db_name": "cgrates",
+	"db_port": 27017
+},
 
 "admins": {
-	"enabled": true,
+	"enabled": true
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
-},
+	"enabled": true
+}
 
 }

data/conf/samples/filtered_replication/engine2_redis/cgrates.json

@@ -1,25 +1,23 @@
 {
+
 "general": {
 	"log_level": 7,
-	"node_id" : "EngineMongo2",
+	"node_id" : "EngineMongo2"
 },
 
-
 "listen": {
 	"rpc_json": ":2032",
 	"rpc_gob": ":2033",
-	"http": ":2380",
+	"http": ":2380"
 },
 
-
 "rpc_conns": {
 	"conn1": {
 		"strategy": "*first",
-		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}],
-	},
+		"conns": [{"address": "127.0.0.1:2013", "transport":"*gob"}]
+	}
 },
 
-
 "data_db": {
 	"db_type": "redis",
 	"db_port": 6379,
@@ -44,25 +42,28 @@
 		"*load_ids":{"remote":true,"replicate":false},
 		"*indexes":{"remote":true, "replicate":false}, 
 		"*action_profiles":{"remote":true,"replicate":false},
-		"*account_profiles":{"remote":true,"replicate":false},
-	},
+		"*account_profiles":{"remote":true,"replicate":false}
+	}
 },
 
+"stor_db": {
+	"db_password": "CGRateS.org"
+},
 
 "admins": {
-	"enabled": true,
+	"enabled": true
 },
 
 "thresholds": {
-	"enabled": true,
+	"enabled": true
 },
 
 "stats": {
-	"enabled": true,
+	"enabled": true
 },
 
 "resources": {
-	"enabled": true,
-},
+	"enabled": true
+}
 
 }