diff options
Diffstat (limited to 'templates')
17 files changed, 309 insertions, 192 deletions
diff --git a/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json b/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json index 2faa9c8..d6068c3 100644 --- a/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json +++ b/templates/admin_api_server/etc/openbook/admin-api-server/admin-api-server.json @@ -16,6 +16,11 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_admin_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} } diff --git a/templates/admin_api_server/run.sh b/templates/admin_api_server/run.sh index 2e014b0..a01845a 100755 --- a/templates/admin_api_server/run.sh +++ b/templates/admin_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server --name admin_api_server_unstable docker-registry.pippiandcarlos.com/openbook_admin_api_server_unstable +docker run -d --rm --net=host -p 5002:5002 -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_api_server_unstable docker-registry.pippiandcarlos.com/openbook_admin_api_server_unstable ${@} exit 0 diff --git a/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json b/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json index c05e4f8..93cc5a4 100644 --- a/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json +++ b/templates/admin_web_ui/etc/openbook/admin-web-ui/admin-web-ui.json @@ -4,6 +4,11 @@ {% if "True" == openbook_install_admin_web_ui|string() %} ,"application.port": {{ openbook_admin_web_ui_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} } diff --git a/templates/admin_web_ui/run.sh b/templates/admin_web_ui/run.sh index c7de25b..2baf2d2 100755 --- a/templates/admin_web_ui/run.sh +++ b/templates/admin_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui --name admin_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_admin_web_ui_unstable +docker run -d --rm --net=host -p 5004:5004 -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_admin_web_ui_unstable ${@} exit 0 diff --git a/templates/ci/openbook.gentoo b/templates/ci/openbook.gentoo index 430d70d..30f65f8 100755 --- a/templates/ci/openbook.gentoo +++ b/templates/ci/openbook.gentoo @@ -1,6 +1,6 @@ #!/sbin/openrc-run -extra_commands=test_database +extra_commands="debug test_database" depend() { need docker @@ -12,6 +12,12 @@ start() { eend $? } +debug() { + ebegin "Starting Openbook in debug mode" + /opt/openbook/openbookctl debug + eend $? +} + stop() { ebegin "Stopping Openbook" /opt/openbook/openbookctl stop diff --git a/templates/ci/openbook.redhat b/templates/ci/openbook.redhat index c4d3040..a240b79 100755 --- a/templates/ci/openbook.redhat +++ b/templates/ci/openbook.redhat @@ -17,6 +17,9 @@ case $1 in start*) /opt/openbook/openbookctl start ;; + debug*) + /opt/openbook/openbookctl debug + ;; stop*) /opt/openbook/openbookctl stop ;; diff --git a/templates/ci/openbook.ubuntu b/templates/ci/openbook.ubuntu index 02900fa..0689872 100755 --- a/templates/ci/openbook.ubuntu +++ b/templates/ci/openbook.ubuntu @@ -13,6 +13,9 @@ case $1 in start*) /opt/openbook/openbookctl start ;; + debug*) + /opt/openbook/openbookctl debug + ;; stop*) /opt/openbook/openbookctl stop ;; diff --git a/templates/ci/openbookctl b/templates/ci/openbookctl index 0563a16..b59d413 100755 --- a/templates/ci/openbookctl +++ b/templates/ci/openbookctl @@ -38,25 +38,25 @@ do_start() { ensure_openbook_databases_created {% endif %} {% if "True" == openbook_install_job_scheduler_server|string() %} - /opt/openbook/job_scheduler_server/run.sh + /opt/openbook/job_scheduler_server/run.sh ${@} {% endif %} {% if "True" == openbook_install_workflow_server|string() %} - /opt/openbook/workflow_server/run.sh + /opt/openbook/workflow_server/run.sh ${@} {% endif %} {% if "True" == openbook_install_admin_api_server|string() %} - /opt/openbook/admin_api_server/run.sh + /opt/openbook/admin_api_server/run.sh ${@} {% endif %} {% if "True" == openbook_install_customer_api_server|string() %} - /opt/openbook/customer_api_server/run.sh + /opt/openbook/customer_api_server/run.sh ${@} {% endif %} {% if "True" == openbook_install_admin_web_ui|string() %} - /opt/openbook/admin_web_ui/run.sh + /opt/openbook/admin_web_ui/run.sh ${@} {% endif %} {% if "True" == openbook_install_customer_web_ui|string() %} - /opt/openbook/customer_web_ui/run.sh + /opt/openbook/customer_web_ui/run.sh ${@} {% endif %} echo - echo "Openbook started. All components may not be fully initialized and available." + echo "Openbook started." } do_stop() { @@ -82,11 +82,14 @@ do_stop() { docker stop database {% endif %} docker container prune -f + echo + echo "Openbook stopped." } do_help() { echo "Usage:" echo " $0 start" + echo " $0 debug" echo " $0 stop" {% if "True" == openbook_install_database|string() %} echo " $0 test_database" @@ -97,6 +100,9 @@ case $1 in start*) do_start ;; + debug*) + do_start debug + ;; stop*) do_stop ;; diff --git a/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json b/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json index caa52eb..4d2b7a4 100644 --- a/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json +++ b/templates/customer_api_server/etc/openbook/customer-api-server/customer-api-server.json @@ -16,6 +16,11 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_customer_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] - {% endif %} + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} } diff --git a/templates/customer_api_server/run.sh b/templates/customer_api_server/run.sh index 2884e62..e859d85 100755 --- a/templates/customer_api_server/run.sh +++ b/templates/customer_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server --name customer_api_server_unstable docker-registry.pippiandcarlos.com/openbook_customer_api_server_unstable +docker run -d --rm --net=host -p 5003:5003 -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_api_server_unstable docker-registry.pippiandcarlos.com/openbook_customer_api_server_unstable ${@} exit 0 diff --git a/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json b/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json index e743a7d..2958320 100644 --- a/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json +++ b/templates/customer_web_ui/etc/openbook/customer-web-ui/customer-web-ui.json @@ -4,6 +4,11 @@ {% if "True" == openbook_install_customer_web_ui|string() %} ,"application.port": {{ openbook_customer_web_ui_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} } diff --git a/templates/customer_web_ui/run.sh b/templates/customer_web_ui/run.sh index 3016f56..9f16d08 100755 --- a/templates/customer_web_ui/run.sh +++ b/templates/customer_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui --name customer_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_customer_web_ui_unstable +docker run -d --rm --net=host -p 5005:5005 -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_customer_web_ui_unstable ${@} exit 0 diff --git a/templates/database/etc/openbook/database/create_openbook_schemas.sql b/templates/database/etc/openbook/database/create_openbook_schemas.sql index f2f6d1b..a5420cd 100644 --- a/templates/database/etc/openbook/database/create_openbook_schemas.sql +++ b/templates/database/etc/openbook/database/create_openbook_schemas.sql @@ -10,7 +10,7 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook` /*!40100 DEFAULT CHARACTER SET latin1 */; +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook` /*!40100 DEFAULT CHARACTER SET utf8 */; GRANT ALL PRIVILEGES ON openbook.* TO openbook@'%' IDENTIFIED BY '{{ openbook_database_password }}'; GRANT ALL PRIVILEGES ON openbook.* TO openbook@localhost IDENTIFIED BY '{{ openbook_database_password }}'; @@ -87,7 +87,7 @@ CREATE TABLE `t_audit_event` ( PRIMARY KEY (`event_id`), KEY `ix_audit_event_1` (`event_time`,`event_type`,`entity_id`), KEY `ix_audit_event_2` (`user_id`,`event_time`) -) ENGINE=InnoDB AUTO_INCREMENT=1801 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1853 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -290,7 +290,7 @@ CREATE TABLE `t_customer` ( `registration_number` varchar(128) DEFAULT NULL, PRIMARY KEY (`customer_id`), UNIQUE KEY `ix_customer_3` (`management_region_id`,`customer_name`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=315465 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=315519 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -420,7 +420,7 @@ CREATE TABLE `t_host` ( `disk_allocation_ratio` decimal(6,2) DEFAULT NULL, PRIMARY KEY (`host_id`), KEY `ix_host_1` (`service_manager_id`,`service_region_id`,`host_foreign_id`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=1861 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1980 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -436,7 +436,7 @@ CREATE TABLE `t_host_attributes` ( `vm_count` int(11) NOT NULL, `socket_count` int(11) NOT NULL, PRIMARY KEY (`host_id`,`update_date`) -) ENGINE=InnoDB AUTO_INCREMENT=1861 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1980 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -459,7 +459,7 @@ CREATE TABLE `t_invoice` ( `payer_metadata` text DEFAULT NULL, PRIMARY KEY (`invoice_id`), KEY `ix_invoice_1` (`management_region_id`,`payer_type`,`payer_id`) -) ENGINE=InnoDB AUTO_INCREMENT=12484695 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=12485633 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -559,26 +559,7 @@ CREATE TABLE `t_metric_aggregate_customer_daily` ( PRIMARY KEY (`metric_id`,`customer_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736651` VALUES LESS THAN (736651) ENGINE = InnoDB, - PARTITION `p736652` VALUES LESS THAN (736652) ENGINE = InnoDB, - PARTITION `p736653` VALUES LESS THAN (736653) ENGINE = InnoDB, - PARTITION `p736654` VALUES LESS THAN (736654) ENGINE = InnoDB, - PARTITION `p736655` VALUES LESS THAN (736655) ENGINE = InnoDB, - PARTITION `p736656` VALUES LESS THAN (736656) ENGINE = InnoDB, - PARTITION `p736657` VALUES LESS THAN (736657) ENGINE = InnoDB, - PARTITION `p736658` VALUES LESS THAN (736658) ENGINE = InnoDB, - PARTITION `p736659` VALUES LESS THAN (736659) ENGINE = InnoDB, - PARTITION `p736660` VALUES LESS THAN (736660) ENGINE = InnoDB, - PARTITION `p736661` VALUES LESS THAN (736661) ENGINE = InnoDB, - PARTITION `p736662` VALUES LESS THAN (736662) ENGINE = InnoDB, - PARTITION `p736663` VALUES LESS THAN (736663) ENGINE = InnoDB, - PARTITION `p736664` VALUES LESS THAN (736664) ENGINE = InnoDB, - PARTITION `p736665` VALUES LESS THAN (736665) ENGINE = InnoDB, - PARTITION `p736666` VALUES LESS THAN (736666) ENGINE = InnoDB, - PARTITION `p736667` VALUES LESS THAN (736667) ENGINE = InnoDB, - PARTITION `p736668` VALUES LESS THAN (736668) ENGINE = InnoDB, - PARTITION `p736669` VALUES LESS THAN (736669) ENGINE = InnoDB, - PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, +(PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, PARTITION `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, @@ -952,7 +933,30 @@ CREATE TABLE `t_metric_aggregate_customer_daily` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -969,30 +973,7 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` ( PRIMARY KEY (`metric_id`,`customer_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736952` VALUES LESS THAN (736952) ENGINE = InnoDB, - PARTITION `p736953` VALUES LESS THAN (736953) ENGINE = InnoDB, - PARTITION `p736954` VALUES LESS THAN (736954) ENGINE = InnoDB, - PARTITION `p736955` VALUES LESS THAN (736955) ENGINE = InnoDB, - PARTITION `p736956` VALUES LESS THAN (736956) ENGINE = InnoDB, - PARTITION `p736957` VALUES LESS THAN (736957) ENGINE = InnoDB, - PARTITION `p736958` VALUES LESS THAN (736958) ENGINE = InnoDB, - PARTITION `p736959` VALUES LESS THAN (736959) ENGINE = InnoDB, - PARTITION `p736960` VALUES LESS THAN (736960) ENGINE = InnoDB, - PARTITION `p736961` VALUES LESS THAN (736961) ENGINE = InnoDB, - PARTITION `p736962` VALUES LESS THAN (736962) ENGINE = InnoDB, - PARTITION `p736963` VALUES LESS THAN (736963) ENGINE = InnoDB, - PARTITION `p736964` VALUES LESS THAN (736964) ENGINE = InnoDB, - PARTITION `p736965` VALUES LESS THAN (736965) ENGINE = InnoDB, - PARTITION `p736966` VALUES LESS THAN (736966) ENGINE = InnoDB, - PARTITION `p736967` VALUES LESS THAN (736967) ENGINE = InnoDB, - PARTITION `p736968` VALUES LESS THAN (736968) ENGINE = InnoDB, - PARTITION `p736969` VALUES LESS THAN (736969) ENGINE = InnoDB, - PARTITION `p736970` VALUES LESS THAN (736970) ENGINE = InnoDB, - PARTITION `p736971` VALUES LESS THAN (736971) ENGINE = InnoDB, - PARTITION `p736972` VALUES LESS THAN (736972) ENGINE = InnoDB, - PARTITION `p736973` VALUES LESS THAN (736973) ENGINE = InnoDB, - PARTITION `p736974` VALUES LESS THAN (736974) ENGINE = InnoDB, - PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, +(PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, PARTITION `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, @@ -1061,7 +1042,30 @@ CREATE TABLE `t_metric_aggregate_customer_hourly` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1100,26 +1104,7 @@ CREATE TABLE `t_metric_aggregate_resource_daily` ( PRIMARY KEY (`metric_id`,`resource_id`,`resource_foreign_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736651` VALUES LESS THAN (736651) ENGINE = InnoDB, - PARTITION `p736652` VALUES LESS THAN (736652) ENGINE = InnoDB, - PARTITION `p736653` VALUES LESS THAN (736653) ENGINE = InnoDB, - PARTITION `p736654` VALUES LESS THAN (736654) ENGINE = InnoDB, - PARTITION `p736655` VALUES LESS THAN (736655) ENGINE = InnoDB, - PARTITION `p736656` VALUES LESS THAN (736656) ENGINE = InnoDB, - PARTITION `p736657` VALUES LESS THAN (736657) ENGINE = InnoDB, - PARTITION `p736658` VALUES LESS THAN (736658) ENGINE = InnoDB, - PARTITION `p736659` VALUES LESS THAN (736659) ENGINE = InnoDB, - PARTITION `p736660` VALUES LESS THAN (736660) ENGINE = InnoDB, - PARTITION `p736661` VALUES LESS THAN (736661) ENGINE = InnoDB, - PARTITION `p736662` VALUES LESS THAN (736662) ENGINE = InnoDB, - PARTITION `p736663` VALUES LESS THAN (736663) ENGINE = InnoDB, - PARTITION `p736664` VALUES LESS THAN (736664) ENGINE = InnoDB, - PARTITION `p736665` VALUES LESS THAN (736665) ENGINE = InnoDB, - PARTITION `p736666` VALUES LESS THAN (736666) ENGINE = InnoDB, - PARTITION `p736667` VALUES LESS THAN (736667) ENGINE = InnoDB, - PARTITION `p736668` VALUES LESS THAN (736668) ENGINE = InnoDB, - PARTITION `p736669` VALUES LESS THAN (736669) ENGINE = InnoDB, - PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, +(PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, PARTITION `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, @@ -1493,7 +1478,30 @@ CREATE TABLE `t_metric_aggregate_resource_daily` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1513,30 +1521,7 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` ( PRIMARY KEY (`metric_id`,`resource_id`,`resource_foreign_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736952` VALUES LESS THAN (736952) ENGINE = InnoDB, - PARTITION `p736953` VALUES LESS THAN (736953) ENGINE = InnoDB, - PARTITION `p736954` VALUES LESS THAN (736954) ENGINE = InnoDB, - PARTITION `p736955` VALUES LESS THAN (736955) ENGINE = InnoDB, - PARTITION `p736956` VALUES LESS THAN (736956) ENGINE = InnoDB, - PARTITION `p736957` VALUES LESS THAN (736957) ENGINE = InnoDB, - PARTITION `p736958` VALUES LESS THAN (736958) ENGINE = InnoDB, - PARTITION `p736959` VALUES LESS THAN (736959) ENGINE = InnoDB, - PARTITION `p736960` VALUES LESS THAN (736960) ENGINE = InnoDB, - PARTITION `p736961` VALUES LESS THAN (736961) ENGINE = InnoDB, - PARTITION `p736962` VALUES LESS THAN (736962) ENGINE = InnoDB, - PARTITION `p736963` VALUES LESS THAN (736963) ENGINE = InnoDB, - PARTITION `p736964` VALUES LESS THAN (736964) ENGINE = InnoDB, - PARTITION `p736965` VALUES LESS THAN (736965) ENGINE = InnoDB, - PARTITION `p736966` VALUES LESS THAN (736966) ENGINE = InnoDB, - PARTITION `p736967` VALUES LESS THAN (736967) ENGINE = InnoDB, - PARTITION `p736968` VALUES LESS THAN (736968) ENGINE = InnoDB, - PARTITION `p736969` VALUES LESS THAN (736969) ENGINE = InnoDB, - PARTITION `p736970` VALUES LESS THAN (736970) ENGINE = InnoDB, - PARTITION `p736971` VALUES LESS THAN (736971) ENGINE = InnoDB, - PARTITION `p736972` VALUES LESS THAN (736972) ENGINE = InnoDB, - PARTITION `p736973` VALUES LESS THAN (736973) ENGINE = InnoDB, - PARTITION `p736974` VALUES LESS THAN (736974) ENGINE = InnoDB, - PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, +(PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, PARTITION `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, @@ -1605,7 +1590,30 @@ CREATE TABLE `t_metric_aggregate_resource_hourly` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1645,26 +1653,7 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` ( PRIMARY KEY (`metric_id`,`tenant_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736651` VALUES LESS THAN (736651) ENGINE = InnoDB, - PARTITION `p736652` VALUES LESS THAN (736652) ENGINE = InnoDB, - PARTITION `p736653` VALUES LESS THAN (736653) ENGINE = InnoDB, - PARTITION `p736654` VALUES LESS THAN (736654) ENGINE = InnoDB, - PARTITION `p736655` VALUES LESS THAN (736655) ENGINE = InnoDB, - PARTITION `p736656` VALUES LESS THAN (736656) ENGINE = InnoDB, - PARTITION `p736657` VALUES LESS THAN (736657) ENGINE = InnoDB, - PARTITION `p736658` VALUES LESS THAN (736658) ENGINE = InnoDB, - PARTITION `p736659` VALUES LESS THAN (736659) ENGINE = InnoDB, - PARTITION `p736660` VALUES LESS THAN (736660) ENGINE = InnoDB, - PARTITION `p736661` VALUES LESS THAN (736661) ENGINE = InnoDB, - PARTITION `p736662` VALUES LESS THAN (736662) ENGINE = InnoDB, - PARTITION `p736663` VALUES LESS THAN (736663) ENGINE = InnoDB, - PARTITION `p736664` VALUES LESS THAN (736664) ENGINE = InnoDB, - PARTITION `p736665` VALUES LESS THAN (736665) ENGINE = InnoDB, - PARTITION `p736666` VALUES LESS THAN (736666) ENGINE = InnoDB, - PARTITION `p736667` VALUES LESS THAN (736667) ENGINE = InnoDB, - PARTITION `p736668` VALUES LESS THAN (736668) ENGINE = InnoDB, - PARTITION `p736669` VALUES LESS THAN (736669) ENGINE = InnoDB, - PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, +(PARTITION `p736670` VALUES LESS THAN (736670) ENGINE = InnoDB, PARTITION `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, @@ -2038,7 +2027,30 @@ CREATE TABLE `t_metric_aggregate_tenant_daily` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2056,30 +2068,7 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` ( PRIMARY KEY (`metric_id`,`tenant_id`,`service_region_id`,`aggregate_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`aggregate_datetime`)) -(PARTITION `p736952` VALUES LESS THAN (736952) ENGINE = InnoDB, - PARTITION `p736953` VALUES LESS THAN (736953) ENGINE = InnoDB, - PARTITION `p736954` VALUES LESS THAN (736954) ENGINE = InnoDB, - PARTITION `p736955` VALUES LESS THAN (736955) ENGINE = InnoDB, - PARTITION `p736956` VALUES LESS THAN (736956) ENGINE = InnoDB, - PARTITION `p736957` VALUES LESS THAN (736957) ENGINE = InnoDB, - PARTITION `p736958` VALUES LESS THAN (736958) ENGINE = InnoDB, - PARTITION `p736959` VALUES LESS THAN (736959) ENGINE = InnoDB, - PARTITION `p736960` VALUES LESS THAN (736960) ENGINE = InnoDB, - PARTITION `p736961` VALUES LESS THAN (736961) ENGINE = InnoDB, - PARTITION `p736962` VALUES LESS THAN (736962) ENGINE = InnoDB, - PARTITION `p736963` VALUES LESS THAN (736963) ENGINE = InnoDB, - PARTITION `p736964` VALUES LESS THAN (736964) ENGINE = InnoDB, - PARTITION `p736965` VALUES LESS THAN (736965) ENGINE = InnoDB, - PARTITION `p736966` VALUES LESS THAN (736966) ENGINE = InnoDB, - PARTITION `p736967` VALUES LESS THAN (736967) ENGINE = InnoDB, - PARTITION `p736968` VALUES LESS THAN (736968) ENGINE = InnoDB, - PARTITION `p736969` VALUES LESS THAN (736969) ENGINE = InnoDB, - PARTITION `p736970` VALUES LESS THAN (736970) ENGINE = InnoDB, - PARTITION `p736971` VALUES LESS THAN (736971) ENGINE = InnoDB, - PARTITION `p736972` VALUES LESS THAN (736972) ENGINE = InnoDB, - PARTITION `p736973` VALUES LESS THAN (736973) ENGINE = InnoDB, - PARTITION `p736974` VALUES LESS THAN (736974) ENGINE = InnoDB, - PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, +(PARTITION `p736975` VALUES LESS THAN (736975) ENGINE = InnoDB, PARTITION `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, @@ -2148,7 +2137,30 @@ CREATE TABLE `t_metric_aggregate_tenant_hourly` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2186,30 +2198,7 @@ CREATE TABLE `t_metric_values` ( KEY `ix_metric_values_3` (`metric_id`,`customer_id`,`service_region_id`,`metric_datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PARTITION BY RANGE (to_days(`metric_datetime`)) -(PARTITION `p737005` VALUES LESS THAN (737005) ENGINE = InnoDB, - PARTITION `p737006` VALUES LESS THAN (737006) ENGINE = InnoDB, - PARTITION `p737007` VALUES LESS THAN (737007) ENGINE = InnoDB, - PARTITION `p737008` VALUES LESS THAN (737008) ENGINE = InnoDB, - PARTITION `p737009` VALUES LESS THAN (737009) ENGINE = InnoDB, - PARTITION `p737010` VALUES LESS THAN (737010) ENGINE = InnoDB, - PARTITION `p737011` VALUES LESS THAN (737011) ENGINE = InnoDB, - PARTITION `p737012` VALUES LESS THAN (737012) ENGINE = InnoDB, - PARTITION `p737013` VALUES LESS THAN (737013) ENGINE = InnoDB, - PARTITION `p737014` VALUES LESS THAN (737014) ENGINE = InnoDB, - PARTITION `p737015` VALUES LESS THAN (737015) ENGINE = InnoDB, - PARTITION `p737016` VALUES LESS THAN (737016) ENGINE = InnoDB, - PARTITION `p737017` VALUES LESS THAN (737017) ENGINE = InnoDB, - PARTITION `p737018` VALUES LESS THAN (737018) ENGINE = InnoDB, - PARTITION `p737019` VALUES LESS THAN (737019) ENGINE = InnoDB, - PARTITION `p737020` VALUES LESS THAN (737020) ENGINE = InnoDB, - PARTITION `p737021` VALUES LESS THAN (737021) ENGINE = InnoDB, - PARTITION `p737022` VALUES LESS THAN (737022) ENGINE = InnoDB, - PARTITION `p737023` VALUES LESS THAN (737023) ENGINE = InnoDB, - PARTITION `p737024` VALUES LESS THAN (737024) ENGINE = InnoDB, - PARTITION `p737025` VALUES LESS THAN (737025) ENGINE = InnoDB, - PARTITION `p737026` VALUES LESS THAN (737026) ENGINE = InnoDB, - PARTITION `p737027` VALUES LESS THAN (737027) ENGINE = InnoDB, - PARTITION `p737028` VALUES LESS THAN (737028) ENGINE = InnoDB, +(PARTITION `p737028` VALUES LESS THAN (737028) ENGINE = InnoDB, PARTITION `p737029` VALUES LESS THAN (737029) ENGINE = InnoDB, PARTITION `p737030` VALUES LESS THAN (737030) ENGINE = InnoDB, PARTITION `p737031` VALUES LESS THAN (737031) ENGINE = InnoDB, @@ -2225,7 +2214,30 @@ CREATE TABLE `t_metric_values` ( PARTITION `p737041` VALUES LESS THAN (737041) ENGINE = InnoDB, PARTITION `p737042` VALUES LESS THAN (737042) ENGINE = InnoDB, PARTITION `p737043` VALUES LESS THAN (737043) ENGINE = InnoDB, - PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB); + PARTITION `p737044` VALUES LESS THAN (737044) ENGINE = InnoDB, + PARTITION `p737045` VALUES LESS THAN (737045) ENGINE = InnoDB, + PARTITION `p737046` VALUES LESS THAN (737046) ENGINE = InnoDB, + PARTITION `p737047` VALUES LESS THAN (737047) ENGINE = InnoDB, + PARTITION `p737048` VALUES LESS THAN (737048) ENGINE = InnoDB, + PARTITION `p737049` VALUES LESS THAN (737049) ENGINE = InnoDB, + PARTITION `p737050` VALUES LESS THAN (737050) ENGINE = InnoDB, + PARTITION `p737051` VALUES LESS THAN (737051) ENGINE = InnoDB, + PARTITION `p737052` VALUES LESS THAN (737052) ENGINE = InnoDB, + PARTITION `p737053` VALUES LESS THAN (737053) ENGINE = InnoDB, + PARTITION `p737054` VALUES LESS THAN (737054) ENGINE = InnoDB, + PARTITION `p737055` VALUES LESS THAN (737055) ENGINE = InnoDB, + PARTITION `p737056` VALUES LESS THAN (737056) ENGINE = InnoDB, + PARTITION `p737057` VALUES LESS THAN (737057) ENGINE = InnoDB, + PARTITION `p737058` VALUES LESS THAN (737058) ENGINE = InnoDB, + PARTITION `p737059` VALUES LESS THAN (737059) ENGINE = InnoDB, + PARTITION `p737060` VALUES LESS THAN (737060) ENGINE = InnoDB, + PARTITION `p737061` VALUES LESS THAN (737061) ENGINE = InnoDB, + PARTITION `p737062` VALUES LESS THAN (737062) ENGINE = InnoDB, + PARTITION `p737063` VALUES LESS THAN (737063) ENGINE = InnoDB, + PARTITION `p737064` VALUES LESS THAN (737064) ENGINE = InnoDB, + PARTITION `p737065` VALUES LESS THAN (737065) ENGINE = InnoDB, + PARTITION `p737066` VALUES LESS THAN (737066) ENGINE = InnoDB, + PARTITION `p737067` VALUES LESS THAN (737067) ENGINE = InnoDB); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2464,7 +2476,7 @@ CREATE TABLE `t_region` ( PRIMARY KEY (`region_id`), UNIQUE KEY `ix_region_1` (`parent_region_id`,`region_type`,`region_name`), KEY `ix_region_2` (`parent_region_id`) -) ENGINE=InnoDB AUTO_INCREMENT=140 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=145 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2531,7 +2543,7 @@ CREATE TABLE `t_service_instance` ( PRIMARY KEY (`service_instance_id`), UNIQUE KEY `ix_provisioned_entity_1` (`service_manager_id`,`service_region_id`,`service_instance_foreign_id`(255)), KEY `ix_provisioned_entity_3` (`service_manager_id`) -) ENGINE=InnoDB AUTO_INCREMENT=83401 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=85826 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2589,7 +2601,7 @@ CREATE TABLE `t_service_manager` ( `service_manager_type_id` int(10) unsigned NOT NULL, PRIMARY KEY (`service_manager_id`), UNIQUE KEY `ix_service_manager_1` (`service_manager_name`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=71 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2631,10 +2643,30 @@ CREATE TABLE `t_tenant` ( `customer_id` int(10) unsigned DEFAULT NULL, `service_manager_id` int(10) unsigned NOT NULL, `is_active` tinyint(4) NOT NULL DEFAULT 0, + `tenant_type_id` int(10) unsigned DEFAULT 1, KEY `ix_tenant_1` (`tenant_id`), KEY `ix_tenant_2` (`customer_id`), KEY `ix_tenant_3` (`service_manager_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1967 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2053 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_tenant_type` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(32) NOT NULL DEFAULT '', + `description` varchar(256) DEFAULT NULL, + KEY `ix_tenant_1` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `t_tenant_type_properties` ( + `tenant_type_id` int(10) unsigned NOT NULL, + `property_group` varchar(128) NOT NULL, + `property_name` varchar(128) NOT NULL, + `property_value` text DEFAULT NULL, + PRIMARY KEY (`tenant_type_id`,`property_group`,`property_name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2654,7 +2686,7 @@ CREATE TABLE `t_unbilled_charges` ( `payer_metadata` text DEFAULT NULL, PRIMARY KEY (`invoice_id`), KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`) -) ENGINE=InnoDB AUTO_INCREMENT=898 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=797 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2736,7 +2768,7 @@ CREATE TABLE `t_unbilled_charges_temp` ( `payer_metadata` text DEFAULT NULL, PRIMARY KEY (`invoice_id`), KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`) -) ENGINE=InnoDB AUTO_INCREMENT=898 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=797 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -3121,7 +3153,8 @@ SET character_set_client = utf8; `is_active` tinyint NOT NULL, `customer_name` tinyint NOT NULL, `management_region_id` tinyint NOT NULL, - `service_manager_type` tinyint NOT NULL + `service_manager_type` tinyint NOT NULL, + `tenant_type` tinyint NOT NULL ) ENGINE=MyISAM */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; @@ -3142,6 +3175,42 @@ SET character_set_client = utf8; `role_context` tinyint NOT NULL ) ENGINE=MyISAM */; SET character_set_client = @saved_cs_client; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`openbook`@`%` PROCEDURE `p_preallocate_partitions`(IN tableName VARCHAR(255), IN columnName VARCHAR(255), IN beginDate DATETIME, IN numDays INT) +BEGIN + DECLARE partitionDay, endDay INT; + DECLARE partitionName VARCHAR(255); + DECLARE partitionList VARCHAR(5000); + + SET partitionDay = (SELECT (TO_DAYS(beginDate + INTERVAL 1 DAY))); + SET endDay = partitionDay + numDays; + SET partitionList = ""; + WHILE partitionDay <= endDay DO + SET partitionName = CONCAT("p", partitionDay); + SET partitionList = CONCAT(partitionList, 'PARTITION ', partitionName, ' VALUES LESS THAN(', partitionDay, ')'); + IF partitionDay < endDay THEN + SET partitionList = CONCAT(partitionList, ','); + END IF; + SET partitionDay = partitionDay + 1; + END WHILE; + SET @stmt = CONCAT('ALTER TABLE ', tableName, ' PARTITION BY RANGE (TO_DAYS(', columnName, ')) (', partitionList, ')'); + PREPARE pStmt FROM @stmt; + EXECUTE pStmt; + DEALLOCATE PREPARE pStmt; + END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; CREATE DATABASE /*!32312 IF NOT EXISTS*/ `openbook_jobs` /*!40100 DEFAULT CHARACTER SET utf8 */; @@ -4010,7 +4079,7 @@ USE `openbook`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `v_tenant` AS select `t`.`tenant_id` AS `tenant_id`,`t`.`tenant_name` AS `tenant_name`,`t`.`tenant_foreign_id` AS `tenant_foreign_id`,`t`.`create_date` AS `create_date`,`t`.`deactivate_date` AS `deactivate_date`,`t`.`customer_id` AS `customer_id`,`t`.`service_manager_id` AS `service_manager_id`,`t`.`is_active` AS `is_active`,`c`.`customer_name` AS `customer_name`,`c`.`management_region_id` AS `management_region_id`,`tsmt`.`service_manager_type` AS `service_manager_type` from (((`t_tenant` `t` left join `t_customer` `c` on(`t`.`customer_id` = `c`.`customer_id`)) left join `t_service_manager` `tsm` on(`t`.`service_manager_id` = `tsm`.`service_manager_id`)) left join `t_service_manager_type` `tsmt` on(`tsm`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) */; +/*!50001 VIEW `v_tenant` AS select `t`.`tenant_id` AS `tenant_id`,`t`.`tenant_name` AS `tenant_name`,`t`.`tenant_foreign_id` AS `tenant_foreign_id`,`t`.`create_date` AS `create_date`,`t`.`deactivate_date` AS `deactivate_date`,`t`.`customer_id` AS `customer_id`,`t`.`service_manager_id` AS `service_manager_id`,`t`.`is_active` AS `is_active`,`c`.`customer_name` AS `customer_name`,`c`.`management_region_id` AS `management_region_id`,`tsmt`.`service_manager_type` AS `service_manager_type`,`tt`.`name` AS `tenant_type` from ((((`t_tenant` `t` left join `t_customer` `c` on(`t`.`customer_id` = `c`.`customer_id`)) left join `t_service_manager` `tsm` on(`t`.`service_manager_id` = `tsm`.`service_manager_id`)) left join `t_service_manager_type` `tsmt` on(`tsm`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) left join `t_tenant_type` `tt` on(`t`.`tenant_type_id` = `tt`.`id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; diff --git a/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json b/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json index 59c1694..1950709 100644 --- a/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json +++ b/templates/job_scheduler_server/etc/openbook/job-scheduler-server/job-scheduler-server.json @@ -14,6 +14,11 @@ ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} } diff --git a/templates/job_scheduler_server/run.sh b/templates/job_scheduler_server/run.sh index e8276e1..ece8753 100755 --- a/templates/job_scheduler_server/run.sh +++ b/templates/job_scheduler_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_unstable docker-registry.pippiandcarlos.com/openbook_job_scheduler_server_unstable +docker run -d --rm --net=host -p 5000:5000 -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_unstable docker-registry.pippiandcarlos.com/openbook_job_scheduler_server_unstable ${@} exit 0 diff --git a/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json b/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json index 8ddd571..4c6b56d 100644 --- a/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json +++ b/templates/workflow_server/etc/openbook/workflow-server/workflow-server.json @@ -14,6 +14,11 @@ ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook" ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] + ,"jwt.signature.key": "{{ openbook_jwt_signature_key }}" +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" {% endif %} } diff --git a/templates/workflow_server/run.sh b/templates/workflow_server/run.sh index c471480..ed89b05 100755 --- a/templates/workflow_server/run.sh +++ b/templates/workflow_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_unstable docker-registry.pippiandcarlos.com/openbook_workflow_server_unstable +docker run -d --rm --net=host -p 5001:5001 -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_unstable docker-registry.pippiandcarlos.com/openbook_workflow_server_unstable ${@} exit 0 |