Cvo analytics small improvements

src/main/resources/reports/accounts_summary/report.json

@@ -0,0 +1,8 @@
+{
+    "refreshFrequency": "HOURLY",
+    "refreshProcedureName": "refresh_report_accounts_summary",
+    "reportName": "report_accounts_summary",
+    "reportPrettyName": "Accounts summary",
+    "reportType": "COUNTERS",
+    "sourceTableName": "report_accounts_summary"
+}

src/main/resources/reports/active_by_product_term_monthly/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_active_by_product_term_monthly",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Monthly active subscriptions",
+	"sourceTableName": "report_active_by_product_term_monthly",
+	"refreshProcedureName": "refresh_report_active_by_product_term_monthly",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/cancellations_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_cancellations_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily cancellations",
+	"sourceTableName": "report_cancellations_daily",
+	"refreshProcedureName": "refresh_report_cancellations_daily",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/chargebacks_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_chargebacks_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily chargebacks value",
+	"sourceTableName": "report_chargebacks_daily",
+	"refreshProcedureName": "refresh_report_chargebacks_daily",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/invoices_balance_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_invoices_balance_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily invoices balance",
+	"sourceTableName": "report_invoices_balance_daily",
+	"refreshProcedureName": "refresh_report_invoices_balance_daily",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/invoices_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_invoices_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily invoices value",
+	"sourceTableName": "report_invoices_daily",
+	"refreshProcedureName": "refresh_report_invoices_daily",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/mrr/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_mrr_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily MRR",
+	"sourceTableName": "report_mrr_daily",
+	"refreshProcedureName": "refresh_report_mrr_daily",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/new_accounts_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_new_accounts_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily new accounts",
+	"sourceTableName": "report_new_accounts_daily",
+	"refreshProcedureName": "refresh_report_new_accounts_daily",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/reports/payment_provider_conversion/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payment_provider_conversion",
+	"reportType": "TABLE",
+	"reportPrettyName": "Payment Provider Conversion",
+	"sourceTableName": "report_payment_provider_conversion_history",
+	"refreshProcedureName": "refresh_report_payment_provider_conversion_history",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/reports/payment_provider_errors/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payment_provider_errors",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Payment Provider Errors",
+	"sourceTableName": "report_payment_provider_errors",
+	"refreshProcedureName": "refresh_report_payment_provider_errors",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/reports/payment_provider_monitor/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payment_provider_monitor",
+	"reportType": "TABLE",
+	"reportPrettyName": "Payment Provider Monitor",
+	"sourceTableName": "report_payment_provider_monitor_history",
+	"refreshProcedureName": "refresh_report_payment_provider_monitor_history",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/payments_by_provider/report_1.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payments_by_provider",
+	"reportType": "TABLE",
+	"reportPrettyName": "Payments By Provider",
+	"sourceTableName": "report_payments_by_provider_history",
+	"refreshProcedureName": "refresh_report_payments_by_provider_history",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/reports/payments_by_provider/report_2.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payments_by_provider_last_24h_summary",
+	"reportType": "COUNTERS",
+	"reportPrettyName": "Payments By Provider Summary (last 24hrs)",
+	"sourceTableName": "report_payments_by_provider_last_24h_summary",
+	"refreshProcedureName": "refresh_report_payments_by_provider_last_24h_summary",
+	"refreshFrequency": "DAILY"
+}

src/main/resources/reports/payments_total_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_payments_total_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily payments value",
+	"sourceTableName": "report_payments_total_daily",
+	"refreshProcedureName": "refresh_report_payments_total_daily",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/reports/refunds_total_daily/report.json

@@ -0,0 +1,8 @@
+{
+	"reportName": "report_refunds_total_daily",
+	"reportType": "TIMELINE",
+	"reportPrettyName": "Daily refunds value",
+	"sourceTableName": "report_refunds_total_daily",
+	"refreshProcedureName": "refresh_report_refunds_total_daily",
+	"refreshFrequency": "HOURLY"
+}

src/main/resources/seed_reports.sh

@@ -41,6 +41,7 @@ SYSTEM=$HERE/system
 
 function install_ddl() {
     local ddl=$1
+    echo "Executing $ddl..."
     mysql -h$MYSQL_HOST -u$MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "source $ddl"
 }
 
@@ -50,8 +51,8 @@ function create_report() {
     local report_type=$3
     local source_table_name=$4
 
-    curl -v \
-         -X POST \
+    echo "Creating report $report_name (\"$report_pretty_name\")..."
+    curl \
          -u $KILLBILL_USER:$KILLBILL_PASSWORD \
          -H "X-Killbill-ApiKey:$KILLBILL_API_KEY" \
          -H "X-Killbill-ApiSecret:$KILLBILL_API_SECRET" \
@@ -65,30 +66,20 @@ function create_report() {
 
 # Install the DDL - the calendar table needs to be first
 install_ddl $REPORTS/calendar.sql
-for r in `find $REPORTS -type f -name '*.sql' -o -name '*.ddl' -maxdepth 1`; do install_ddl $r; done
-for r in `find $SYSTEM -type f -name '*.sql' -o -name '*.ddl' -maxdepth 1`; do install_ddl $r; done
+for r in `find $REPORTS -maxdepth 1 -type f -name '*.sql' -o -name '*.ddl' | sed /calendar\.sql/d`; do install_ddl $r; done
+for r in `find $SYSTEM -maxdepth 1 -type f -name '*.sql' -o -name '*.ddl'`; do install_ddl $r; done
 
 # Dashboard views
-create_report 'accounts_summary' 'Account summary' 'COUNTERS' 'v_report_accounts_summary'
-create_report 'active_by_product_term_monthly' 'Active subscriptions' 'TIMELINE' 'v_report_active_by_product_term_monthly'
-create_report 'cancellations_count_daily' 'Cancellations' 'TIMELINE' 'v_report_cancellations_daily'
-create_report 'chargebacks_daily' 'Chargebacks' 'TIMELINE' 'v_report_chargebacks_daily'
 create_report 'conversions_daily' 'Conversions' 'TIMELINE' 'v_report_conversions_daily'
 create_report 'invoice_adjustments_daily' 'Invoice adjustments' 'TIMELINE' 'v_report_invoice_adjustments_daily'
 create_report 'invoice_item_adjustments_daily' 'Invoice item adjustments' 'TIMELINE' 'v_report_invoice_item_adjustments_daily'
 create_report 'invoice_item_credits_daily' 'Invoice credits' 'TIMELINE' 'v_report_invoice_item_credits_daily'
-create_report 'invoices_balance_daily' 'Invoice balance' 'TIMELINE' 'v_report_invoices_balance_daily'
-create_report 'invoices_daily' 'Invoices' 'TIMELINE' 'v_report_invoices_daily'
-create_report 'mrr_daily' 'MRR' 'TIMELINE' 'v_report_mrr_daily'
-create_report 'new_accounts_daily' 'New accounts' 'TIMELINE' 'v_report_new_accounts_daily'
 create_report 'overdue_states_count_daily' 'Overdue states' 'TIMELINE' 'v_report_overdue_states_count_daily'
-create_report 'payments_total_daily' 'Payment ($ amount)' 'TIMELINE' 'v_report_payments_total_daily'
-create_report 'refunds_total_daily' 'Refunds' 'TIMELINE' 'v_report_refunds_total_daily'
 create_report 'trial_starts_count_daily' 'Trials' 'TIMELINE' 'v_report_trial_starts_count_daily'
 
 # System views
-create_report 'system_report_control_tag_no_test' 'Control tags' 'COUNTERS' 'v_system_report_control_tag_no_test'
-create_report 'system_report_notifications_per_queue_name' 'Notification queues' 'TIMELINE' 'v_system_report_notifications_per_queue_name'
-create_report 'system_report_notifications_per_queue_name_late' 'Late notifications' 'COUNTERS' 'v_system_report_notifications_per_queue_name_late'
-create_report 'system_report_payments' 'Payments status' 'COUNTERS' 'v_system_report_payments'
-create_report 'system_report_payments_per_day' 'Payments' 'TIMELINE' 'v_system_report_payments_per_day'
+create_report 'system_report_control_tag_no_test' 'System - Control tags' 'COUNTERS' 'v_system_report_control_tag_no_test'
+create_report 'system_report_notifications_per_queue_name' 'System - Notification queues' 'TIMELINE' 'v_system_report_notifications_per_queue_name'
+create_report 'system_report_notifications_per_queue_name_late' 'System - Late notifications' 'COUNTERS' 'v_system_report_notifications_per_queue_name_late'
+create_report 'system_report_payments' 'System - Payments status' 'COUNTERS' 'v_system_report_payments'
+create_report 'system_report_payments_per_day' 'System - Payments' 'TIMELINE' 'v_system_report_payments_per_day'

src/main/resources/seed_scheduled_reports.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+KILLBILL_HTTP_PROTOCOL=${KILLBILL_HTTP_PROTOCOL-"http"}
+KILLBILL_HOST=${KILLBILL_HOST-"127.0.0.1"}
+KILLBILL_PORT=${KILLBILL_PORT-"8080"}
+
+KILLBILL_USER=${KILLBILL_USER-"admin"}
+KILLBILL_PASSWORD=${KILLBILL_PASSWORD-"password"}
+KILLBILL_API_KEY=${KILLBILL_API_KEY-"bob"}
+KILLBILL_API_SECRET=${KILLBILL_API_SECRET-"lazar"}
+
+MYSQL_HOST=${MYSQL_HOST-"127.0.0.1"}
+MYSQL_USER=${MYSQL_USER-"root"}
+MYSQL_PASSWORD=${MYSQL_PASSWORD-"root"}
+MYSQL_DATABASE=${MYSQL_DATABASE-"killbill"}
+
+function install_ddl() {
+    local ddl=$1
+    echo "Executing $ddl..."
+    mysql -h$MYSQL_HOST -u$MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "source $ddl"
+}
+
+function create_report() {
+    local report=$1
+    for r in `find $report -maxdepth 1 -type f -name '*.json' | sort`; do
+        echo "Creating report $r..."
+        curl \
+            -u $KILLBILL_USER:$KILLBILL_PASSWORD \
+            -H "X-Killbill-ApiKey:$KILLBILL_API_KEY" \
+            -H "X-Killbill-ApiSecret:$KILLBILL_API_SECRET" \
+            -H 'Content-Type: application/json' \
+            -d @${r} \
+            $KILLBILL_HTTP_PROTOCOL://$KILLBILL_HOST:$KILLBILL_PORT/plugins/killbill-analytics/reports
+    done
+}
+
+# Install the DDL and creates the reports contained in folders passed as script parameters
+for p in ${@}; do
+    echo -e "\n***** Processing folder ${p}"
+	for r in `find $p -maxdepth 1 -type f -name '*.sql' -o -name '*.ddl' -o -name '*.prc' | sort`; do install_ddl $r; done
+	create_report $p
+done