diff --git a/config/config.go b/config/config.go index 0e859428e..2bb9ee319 100755 --- a/config/config.go +++ b/config/config.go @@ -299,7 +299,7 @@ var posibleLoaderTypes = utils.NewStringSet([]string{utils.MetaAttributes, var possibleReaderTypes = utils.NewStringSet([]string{utils.MetaFileCSV, utils.MetaKafkajsonMap, utils.MetaFileXML, utils.MetaSQL, utils.MetaFileFWV, - utils.MetaPartialCSV, utils.MetaOsipsFlatstore, utils.MetaKamFlatstore}) + utils.MetaPartialCSV, utils.MetaFlatstore}) func (cfg *CGRConfig) LazySanityCheck() { for _, cdrePrfl := range cfg.cdrsCfg.OnlineCDRExports { diff --git a/config/configsanity.go b/config/configsanity.go index 3e36c5c74..63783d08c 100644 --- a/config/configsanity.go +++ b/config/configsanity.go @@ -399,7 +399,7 @@ func (cfg *CGRConfig) checkConfigSanity() error { } switch rdr.Type { - case utils.MetaFileCSV, utils.MetaPartialCSV, utils.MetaOsipsFlatstore, utils.MetaKamFlatstore: + case utils.MetaFileCSV, utils.MetaPartialCSV, utils.MetaFlatstore: for _, dir := range []string{rdr.ProcessedPath, rdr.SourcePath} { if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) { return fmt.Errorf("<%s> Nonexistent folder: %s for reader with ID: %s", utils.ERs, dir, rdr.ID) diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index 681262943..447fcc9ef 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -329,7 +329,7 @@ "id": "FlatstoreOsips", "enabled": true, "run_delay": -1, - "type": "*opensips_flatstore", + "type": "*flatstore", "field_separator": "|", "source_path": "/tmp/flatstoreErs/in", "processed_path": "/tmp/flatstoreErs/out", diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index 02bdda690..104c1d859 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -332,7 +332,7 @@ "id": "FlatstoreOsips", "enabled": true, "run_delay": -1, - "type": "*opensips_flatstore", + "type": "*flatstore", "field_separator": "|", "source_path": "/tmp/flatstoreErs/in", "processed_path": "/tmp/flatstoreErs/out", diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index 06c103360..af793f73e 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -329,7 +329,7 @@ "id": "FlatstoreOsips", "enabled": true, "run_delay": -1, - "type": "*opensips_flatstore", + "type": "*flatstore", "field_separator": "|", "source_path": "/tmp/flatstoreErs/in", "processed_path": "/tmp/flatstoreErs/out", diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index 54e85831e..4596c9d6e 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -326,7 +326,7 @@ "id": "FlatstoreOsips", "enabled": true, "run_delay": -1, - "type": "*opensips_flatstore", + "type": "*flatstore", "field_separator": "|", "source_path": "/tmp/flatstoreErs/in", "processed_path": "/tmp/flatstoreErs/out", diff --git a/ers/reader.go b/ers/reader.go index 19b096c72..586b53afd 100644 --- a/ers/reader.go +++ b/ers/reader.go @@ -50,7 +50,7 @@ func NewEventReader(cfg *config.CGRConfig, cfgIdx int, return NewKafkaER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) case utils.MetaSQL: return NewSQLEventReader(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) - case utils.MetaKamFlatstore, utils.MetaOsipsFlatstore: + case utils.MetaFlatstore: return NewFlatstoreER(cfg, cfgIdx, rdrEvents, rdrErr, fltrS, rdrExit) } return diff --git a/utils/consts.go b/utils/consts.go index c19ad2a27..48563ec23 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -25,8 +25,6 @@ var ( MainCDRFields = NewStringSet([]string{CGRID, Source, OriginHost, OriginID, ToR, RequestType, Tenant, Category, Account, Subject, Destination, SetupTime, AnswerTime, Usage, COST, RATED, Partial, RunID, PreRated, CostSource, CostDetails, ExtraInfo, OrderID}) - CDRCFileFormats = NewStringSet([]string{MetaFileCSV, MetaFScsv, - MetaKamFlatstore, MetaOsipsFlatstore, MetaPartialCSV, MetaFileFWV, MetaFileXML}) PostPaidRatedSlice = []string{META_POSTPAID, META_RATED} ItemList = NewStringSet([]string{MetaAccounts, MetaAttributes, MetaChargers, MetaDispatchers, MetaDispatcherHosts, MetaFilters, MetaResources, MetaStats, MetaThresholds, MetaSuppliers, @@ -258,9 +256,7 @@ const ( ThresholdPrefix = "thd_" TimingsPrefix = "tmg_" FilterPrefix = "ftr_" - FilterIndex = "fti_" CDR_STATS_PREFIX = "cst_" - LOG_CALL_COST_PREFIX = "cco_" VERSION_PREFIX = "ver_" StatQueueProfilePrefix = "sqp_" SupplierProfilePrefix = "spp_" @@ -281,7 +277,6 @@ const ( META_HTTP_POST = "*http_post" MetaHTTPjson = "*http_json" MetaHTTPjsonCDR = "*http_json_cdr" - META_HTTP_JSONRPC = "*http_jsonrpc" MetaHTTPjsonMap = "*http_json_map" MetaAMQPjsonCDR = "*amqp_json_cdr" MetaAMQPjsonMap = "*amqp_json_map" @@ -292,8 +287,7 @@ const ( MetaS3jsonMap = "*s3_json_map" CONFIG_PATH = "/etc/cgrates/" DISCONNECT_CAUSE = "DisconnectCause" - MetaKamFlatstore = "*kamailio_flatstore" - MetaOsipsFlatstore = "*opensips_flatstore" + MetaFlatstore = "*flatstore" MetaRating = "*rating" NOT_AVAILABLE = "N/A" CALL = "call"