From 4065bcb58f1ae8e6461b3a8c6e47600a3b58dafd Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 15 Jan 2014 18:57:17 +0100 Subject: [PATCH] Fixup rates tutorial json --- data/Monit/cgrates.monit | 10 ---------- data/monit/cgrates.monit | 9 +++++++++ data/tutorials/fs_csv/README.md | 4 ++-- data/tutorials/fs_csv/cgrates/tariffplans/README.md | 4 ++-- data/tutorials/fs_json/README.md | 4 ++-- .../fs_json/cgrates/tariffplans/DestinationRates.csv | 2 ++ data/tutorials/fs_json/cgrates/tariffplans/README.md | 4 ++-- .../fs_json/cgrates/tariffplans/RatingPlans.csv | 7 +++++++ 8 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 data/Monit/cgrates.monit create mode 100644 data/monit/cgrates.monit diff --git a/data/Monit/cgrates.monit b/data/Monit/cgrates.monit deleted file mode 100644 index fe6c56b45..000000000 --- a/data/Monit/cgrates.monit +++ /dev/null @@ -1,10 +0,0 @@ -# CGRateS Monit check script - -check process CGRateS with pidfile /var/run/cgrates/cgr-engine.pid - start program = "/etc/init.d/cgrates start" - stop program = "/etc/init.d/cgrates stop" - #if failed host 127.0.0.1 port 2012 type TCP then restart # Rater - #if failed host 127.0.0.1 port 2013 type TCP then restart # History - #if failed host 127.0.0.1 port 2022 type TCP then restart # CDRS - if 5 restarts within 5 cycles then timeout - diff --git a/data/monit/cgrates.monit b/data/monit/cgrates.monit new file mode 100644 index 000000000..8e85e3fca --- /dev/null +++ b/data/monit/cgrates.monit @@ -0,0 +1,9 @@ +# CGRateS Monit check script + +check process CGRateS with pidfile /var/run/cgrates/cgr-engine.pid + start program = "/etc/init.d/cgrates start" + stop program = "/etc/init.d/cgrates stop" + if failed host 127.0.0.1 port 2012 type TCP 4 times within 4 cycles then restart # Rater + if failed host 127.0.0.1 port 2013 type TCP 4 times within 4 cycles then restart # History + if failed host 127.0.0.1 port 2022 type TCP 4 times within 4 cycles then restart # CDRS + if 5 restarts within 20 cycles then timeout diff --git a/data/tutorials/fs_csv/README.md b/data/tutorials/fs_csv/README.md index 4eaad5ccf..1a39ef3ad 100644 --- a/data/tutorials/fs_csv/README.md +++ b/data/tutorials/fs_csv/README.md @@ -1,5 +1,5 @@ -Tutorial fs_prepaid_csv -======================= +Tutorial FS_CSV +=============== Scenario: --------- diff --git a/data/tutorials/fs_csv/cgrates/tariffplans/README.md b/data/tutorials/fs_csv/cgrates/tariffplans/README.md index f84eb28f6..124fa3141 100644 --- a/data/tutorials/fs_csv/cgrates/tariffplans/README.md +++ b/data/tutorials/fs_csv/cgrates/tariffplans/README.md @@ -1,5 +1,5 @@ -CGRateS - FSGermanyPrep1 -========================== +Tutorial - FS_CSV +================= Scenario: --------- diff --git a/data/tutorials/fs_json/README.md b/data/tutorials/fs_json/README.md index e4528d9c5..b3355dd50 100644 --- a/data/tutorials/fs_json/README.md +++ b/data/tutorials/fs_json/README.md @@ -1,5 +1,5 @@ -Tutorial fs_prepaid_csv -======================= +Tutorial FS_JSON +================ Scenario: --------- diff --git a/data/tutorials/fs_json/cgrates/tariffplans/DestinationRates.csv b/data/tutorials/fs_json/cgrates/tariffplans/DestinationRates.csv index b617f1d4e..7c94d0974 100644 --- a/data/tutorials/fs_json/cgrates/tariffplans/DestinationRates.csv +++ b/data/tutorials/fs_json/cgrates/tariffplans/DestinationRates.csv @@ -1,5 +1,7 @@ #Tag,DestinationsTag,RatesTag DR_1002_20CNT,DST_1002,RT_20CNT +DR_1002_10CNT,DST_1002,RT_10CNT DR_1003_20CNT,DST_1003,RT_40CNT +DR_1003_10CNT,DST_1003,RT_10CNT DR_FS_40CNT,DST_FS,RT_40CNT DR_FS_10CNT,DST_FS,RT_10CNT diff --git a/data/tutorials/fs_json/cgrates/tariffplans/README.md b/data/tutorials/fs_json/cgrates/tariffplans/README.md index 67087eab5..3b4102574 100644 --- a/data/tutorials/fs_json/cgrates/tariffplans/README.md +++ b/data/tutorials/fs_json/cgrates/tariffplans/README.md @@ -1,5 +1,5 @@ -CGRateS - FSGermanyPrep1 -========================== +Tutorial FS_JSON +================ Scenario: --------- diff --git a/data/tutorials/fs_json/cgrates/tariffplans/RatingPlans.csv b/data/tutorials/fs_json/cgrates/tariffplans/RatingPlans.csv index 61af34466..dde7f25bb 100644 --- a/data/tutorials/fs_json/cgrates/tariffplans/RatingPlans.csv +++ b/data/tutorials/fs_json/cgrates/tariffplans/RatingPlans.csv @@ -5,6 +5,13 @@ RP_RETAIL1,DR_FS_10CNT,OFFPEAK_EVENING,10 RP_RETAIL1,DR_FS_10CNT,OFFPEAK_WEEKEND,10 RP_RETAIL2,DR_1002_20CNT,PEAK,10 RP_RETAIL2,DR_1003_20CNT,PEAK,10 +RP_RETAIL2,DR_FS_40CNT,PEAK,10 +RP_RETAIL2,DR_1002_10CNT,OFFPEAK_MORNING,10 +RP_RETAIL2,DR_1002_10CNT,OFFPEAK_EVENING,10 +RP_RETAIL2,DR_1002_10CNT,OFFPEAK_WEEKEND,10 +RP_RETAIL2,DR_1003_10CNT,OFFPEAK_MORNING,10 +RP_RETAIL2,DR_1003_10CNT,OFFPEAK_EVENING,10 +RP_RETAIL2,DR_1003_10CNT,OFFPEAK_WEEKEND,10 RP_RETAIL2,DR_FS_10CNT,OFFPEAK_MORNING,10 RP_RETAIL2,DR_FS_10CNT,OFFPEAK_EVENING,10 RP_RETAIL2,DR_FS_10CNT,OFFPEAK_WEEKEND,10