Commit Graph

2417 Commits

Author SHA1 Message Date
TeoV
33bc2e8b39 Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/loader_csv_test.go
2017-09-15 16:27:23 +03:00
TeoV
0f288af170 Add a new fild in models TPResource ID and replace primary key with PK and set tenant after ID 2017-09-15 16:21:32 +03:00
DanB
bdafd99137 Storage mongo returning TenantID from getKeysForPrefix for resource and resource profiles 2017-09-15 14:54:10 +02:00
DanB
9fbe0eefa4 Tenant in Resource 2017-09-15 14:18:56 +02:00
DanB
95565e8ff0 Loader to consider tenant when building up resource indexes 2017-09-15 11:55:50 +02:00
DanB
956e6d47bb Merge branch 'master' of github.com:cgrates/cgrates 2017-09-13 18:54:15 +02:00
DanB
959ffdcc75 TPReader creating StatQueue based on StatQueueProfile, adding necessary methods in dataDB, tests 2017-09-13 18:54:05 +02:00
edwardro22
54133db99b Formated code 2017-09-13 15:08:24 +00:00
edwardro22
d71040dcf9 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-13 14:28:23 +00:00
DanB
3495a5d706 TPReader init resources if missing from dataDB 2017-09-13 16:10:12 +02:00
edwardro22
3fd52d6022 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-13 09:16:11 +00:00
edwardro22
fd01dd409d small fix 2017-09-13 09:16:01 +00:00
edwardro22
d01f8b58dc Added Tenant to resources 2017-09-13 09:08:09 +00:00
DanB
e4f035ee6c DataManager test fix 2017-09-12 18:42:22 +02:00
DanB
5c02dfa205 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-12 18:35:07 +02:00
DanB
5afdc9a983 StatS - runBackup routine 2017-09-12 18:34:57 +02:00
TeoV
7abc1d8c9d Add test for TPRate and TPRatingProfiles and set tags offline_tp for TP tests 2017-09-12 16:25:26 +03:00
edwardro22
8f4523fdd7 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-12 12:32:58 +00:00
edwardro22
40cd82dc26 Added Tenant field to TPstats 2017-09-12 08:45:53 +00:00
DanB
525538813c Merge branch 'master' of github.com:cgrates/cgrates 2017-09-11 17:54:41 +02:00
DanB
0c3ad179b2 StatQueue methods for processing events 2017-09-11 17:54:33 +02:00
TeoV
be42436f10 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-10 23:26:04 +03:00
DanB
883818316f Fix merge conflict 2017-09-10 19:56:20 +02:00
DanB
f2e5ab7704 DataManager tests for StatQueue CRUD operations 2017-09-10 19:51:33 +02:00
DanB
68809c63d1 StatASR LoadMarshaled 2017-09-10 19:25:26 +02:00
DanB
05ecfbdf0d StoredStatQueue, DataManager as data storage manager 2017-09-10 19:22:18 +02:00
edwardro22
b651b06826 Removed copyright from go doc 2017-09-10 15:02:46 +00:00
TeoV
e2d9f3a73e Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-10 16:55:33 +03:00
TeoV
965e476c7c Add test for TPUser and disable stats from tutmysql tutmongo and tutpostgres 2017-09-10 16:54:38 +03:00
DanB
6391938eb6 Adding Tenant to Stats, storage optimized metrics 2017-09-10 14:41:39 +02:00
DanB
239306aa1b Moved stats files in engine 2017-09-08 20:44:02 +02:00
DanB
c4a76eec94 Merge fixes 2017-09-08 20:43:13 +02:00
DanB
9ea9ec65d9 Refactoring stats, disabled for now in sources 2017-09-08 19:40:09 +02:00
edwardro22
41bc52ca97 Removed logs 2017-09-07 15:35:52 +00:00
edwardro22
cf61dbd5dc Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 15:24:52 +00:00
edwardro22
b76cede416 Small fix 2017-09-07 15:23:48 +00:00
edwardro22
6ff6515510 Small fix 2017-09-07 15:11:44 +00:00
edwardro22
4b7165405d Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/libtest.go
2017-09-07 15:06:16 +00:00
edwardro22
2c7d27745c Versioning fix 2017-09-07 15:00:18 +00:00
TeoV
aeb96949aa Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 10:05:43 -04:00
TeoV
76427bbb51 Rename StatsConfig -> StatQueueProfile 2017-09-07 10:02:49 -04:00
Dan Christian Bogos
8e0945cff4 Merge pull request #722 from TeoV/master
Merge LoadRatingCache and LoadAccountingCache into LoadDataDBCache
2017-09-07 12:34:06 +02:00
DanB
5108e88e42 ResourceS - moving short cache to general cache 2017-09-07 11:53:31 +02:00
TeoV
0c33a4480c Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 05:45:30 -04:00
TeoV
02d9b539bd Merge LoadRatingCache and LoadAccountingCache into LoadDataDBCache 2017-09-07 05:43:33 -04:00
edwardro22
411b049591 Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/onstor_it_test.go
	engine/storage_map.go
	engine/storage_mongo_datadb.go
	engine/storage_redis.go
	engine/version.go
2017-09-06 23:02:08 +00:00
edwardro22
4cd54e9ab7 Refactored versions and added tests 2017-09-06 18:48:02 +00:00
DanB
25babe9746 ResourceS cache for private vars test 2017-09-06 20:02:00 +02:00
TeoV
fb81b72570 fix Rename ResourceConfig -> Resource Profile after merge 2017-09-06 11:30:13 -04:00
TeoV
6325e26c4b Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/loader_csv_test.go
	engine/loader_it_test.go
	engine/tp_reader.go
2017-09-06 10:56:40 -04:00