From ee05c6885f8688c101a186690f716250d7aca657 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Tue, 28 Nov 2017 14:17:35 -0700 Subject: syncing up with vzw --- build-docker-containers.sh | 2 +- jjb/run.sh | 4 +- jjb/yaml/glance-gateway-if-pipeline.yaml | 37 - jjb/yaml/glance-gateway.yaml | 27 - jjb/yaml/image-foundry-if-pipeline.yaml | 37 - jjb/yaml/image-foundry.yaml | 42 - jjb/yaml/ob-deploy-branch.yaml | 43 - jjb/yaml/openbook-all-ob-pipeline.yaml | 75 - jjb/yaml/openbook-baseimage.yaml | 21 - jjb/yaml/openbook-core-ob-pipeline.yaml | 55 - jjb/yaml/openbook-database.yaml | 21 - jjb/yaml/openbook-ob-pipeline.yaml | 136 -- jjb/yaml/openbook.yaml | 67 - .../glance-gateway-if-pipeline.yaml | 37 + jjb/yaml/pippiandcarlos.com/glance-gateway.yaml | 27 + .../image-foundry-if-pipeline.yaml | 37 + jjb/yaml/pippiandcarlos.com/image-foundry.yaml | 42 + jjb/yaml/pippiandcarlos.com/ob-ctl.yaml | 65 + jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml | 43 + .../openbook-all-ob-pipeline.yaml | 75 + .../pippiandcarlos.com/openbook-baseimage.yaml | 21 + .../openbook-core-ob-pipeline.yaml | 55 + jjb/yaml/pippiandcarlos.com/openbook-database.yaml | 21 + .../pippiandcarlos.com/openbook-ob-pipeline.yaml | 136 ++ jjb/yaml/pippiandcarlos.com/openbook.yaml | 67 + .../glance-gateway-if-pipeline.yaml | 37 + .../verizoncloudplatform.com/glance-gateway.yaml | 26 + .../image-foundry-if-pipeline.yaml | 37 + .../verizoncloudplatform.com/image-foundry.yaml | 40 + jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml | 65 + .../verizoncloudplatform.com/ob-deploy-branch.yaml | 43 + .../openbook-all-ob-pipeline.yaml | 75 + .../openbook-baseimage.yaml | 20 + .../openbook-core-ob-pipeline.yaml | 55 + .../openbook-database.yaml | 20 + .../openbook-ob-pipeline.yaml | 136 ++ jjb/yaml/verizoncloudplatform.com/openbook.yaml | 67 + pillar/openbook/ansible.sls | 6 +- salt/openbook/admin_api_server/files/Dockerfile | 2 + .../admin_api_server/files/admin_api_server.json | 4 + salt/openbook/admin_api_server/files/run.sh | 2 +- salt/openbook/admin_web_ui/files/Dockerfile | 2 + salt/openbook/admin_web_ui/files/admin_web_ui.json | 4 + salt/openbook/admin_web_ui/files/run.sh | 2 +- salt/openbook/ansible/files/ob-ctl.sh | 14 + salt/openbook/ansible/files/openbook.yaml | 10 + .../ansible/files/stop_start_openbook.yaml | 10 +- salt/openbook/customer_api_server/files/Dockerfile | 2 + .../files/customer_api_server.json | 6 +- salt/openbook/customer_api_server/files/run.sh | 2 +- salt/openbook/customer_web_ui/files/Dockerfile | 2 + .../customer_web_ui/files/customer_web_ui.json | 4 + salt/openbook/customer_web_ui/files/run.sh | 2 +- .../database/files/create_openbook_schemas.sql | 1573 +++----------------- .../files/job_scheduler_server.json | 4 + .../workflow_server/files/workflow_server.json | 4 + 56 files changed, 1535 insertions(+), 1934 deletions(-) delete mode 100644 jjb/yaml/glance-gateway-if-pipeline.yaml delete mode 100644 jjb/yaml/glance-gateway.yaml delete mode 100644 jjb/yaml/image-foundry-if-pipeline.yaml delete mode 100644 jjb/yaml/image-foundry.yaml delete mode 100644 jjb/yaml/ob-deploy-branch.yaml delete mode 100644 jjb/yaml/openbook-all-ob-pipeline.yaml delete mode 100644 jjb/yaml/openbook-baseimage.yaml delete mode 100644 jjb/yaml/openbook-core-ob-pipeline.yaml delete mode 100644 jjb/yaml/openbook-database.yaml delete mode 100644 jjb/yaml/openbook-ob-pipeline.yaml delete mode 100644 jjb/yaml/openbook.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/glance-gateway-if-pipeline.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/glance-gateway.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/image-foundry-if-pipeline.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/image-foundry.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/ob-ctl.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook-all-ob-pipeline.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook-core-ob-pipeline.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook-database.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml create mode 100644 jjb/yaml/pippiandcarlos.com/openbook.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/glance-gateway-if-pipeline.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/glance-gateway.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/image-foundry-if-pipeline.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/image-foundry.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook-all-ob-pipeline.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook-core-ob-pipeline.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook-database.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml create mode 100644 jjb/yaml/verizoncloudplatform.com/openbook.yaml create mode 100644 salt/openbook/ansible/files/ob-ctl.sh diff --git a/build-docker-containers.sh b/build-docker-containers.sh index 93281e1..7a7f971 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -35,7 +35,7 @@ sudo /root/openbook_build/ci/build.sh ${artifact} # refresh openbook-v4-installer repo (ansible playbook) pushd ${HOME} -git clone git@pippiandcarlos.com:repos/openbook-v4-installer.git +git clone git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git sudo rsync -aq --delete --exclude=.git /root/openbook_build/ansible/ openbook-v4-installer/ sudo chown -R jenkins: openbook-v4-installer pushd openbook-v4-installer/ diff --git a/jjb/run.sh b/jjb/run.sh index 34962f5..7cb9d70 100755 --- a/jjb/run.sh +++ b/jjb/run.sh @@ -1,9 +1,9 @@ #!/bin/bash -ini="${1}" +site="${1}" virtualenv venv . venv/bin/activate venv/bin/pip install --upgrade -r requirements.txt -jenkins-jobs --conf "${ini}" update --delete-old yaml/ +jenkins-jobs --conf "${site}.ini" update --delete-old "yaml/${site}" diff --git a/jjb/yaml/glance-gateway-if-pipeline.yaml b/jjb/yaml/glance-gateway-if-pipeline.yaml deleted file mode 100644 index 2353d68..0000000 --- a/jjb/yaml/glance-gateway-if-pipeline.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- job: - name: glance-gateway-gg-pipeline - project-type: pipeline - dsl: | - pipeline { - agent { - node { - label "master" - } - } - stages { - stage("checkout-manifests") { - agent { - node { - label "glance_gateway" - customWorkspace "workspace/glance-gateway" - } - } - steps { - git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/glance-gateway.git") - } - } - stage("update-images") { - agent { - node { - label "glance_gateway" - customWorkspace "workspace/image-foundry" - } - } - steps { - git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry.git") - sh(script: "./glance-gateway.sh") - } - } - } - } diff --git a/jjb/yaml/glance-gateway.yaml b/jjb/yaml/glance-gateway.yaml deleted file mode 100644 index 47e7231..0000000 --- a/jjb/yaml/glance-gateway.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- job: - name: "glance-gateway" - project-type: freestyle - node: image_foundry - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - - build-blocker: - use-build-blocker: true - blocking-jobs: - - ".*if-pipeline" - block_level: 'GLOBAL' - queue-scanning: 'BUILDABLE' - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: "git@pippiandcarlos.com:repos/glance-gateway.git" - branches: - - "master" - builders: - - trigger-builds: - - project: "glance-gateway-gg-pipeline" diff --git a/jjb/yaml/image-foundry-if-pipeline.yaml b/jjb/yaml/image-foundry-if-pipeline.yaml deleted file mode 100644 index 1d5f023..0000000 --- a/jjb/yaml/image-foundry-if-pipeline.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- job: - name: image-foundry-if-pipeline - project-type: pipeline - dsl: | - pipeline { - agent { - node { - label "master" - } - } - stages { - stage("checkout-elements") { - agent { - node { - label "glance_gateway" - customWorkspace "workspace/image-foundry-pippiandcarlos" - } - } - steps { - git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry-pippiandcarlos.git") - } - } - stage("diskimage-builder") { - agent { - node { - label "glance_gateway" - customWorkspace "workspace/image-foundry" - } - } - steps { - git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry.git") - sh(script: "./image-foundry.sh") - } - } - } - } diff --git a/jjb/yaml/image-foundry.yaml b/jjb/yaml/image-foundry.yaml deleted file mode 100644 index 9fbaff2..0000000 --- a/jjb/yaml/image-foundry.yaml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- job: - name: "image-foundry" - project-type: freestyle - node: image_foundry - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: "git@pippiandcarlos.com:repos/image-foundry.git" - branches: - - "master" - builders: - - trigger-builds: - - project: "image-foundry-if-pipeline" - -- job: - name: "image-foundry-pippiandarlos" - project-type: freestyle - node: image_foundry - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: "git@pippiandcarlos.com:repos/image-foundry-pippiandcarlos.git" - branches: - - "master" - builders: - - trigger-builds: - - project: "image-foundry-if-pipeline" diff --git a/jjb/yaml/ob-deploy-branch.yaml b/jjb/yaml/ob-deploy-branch.yaml deleted file mode 100644 index 044d871..0000000 --- a/jjb/yaml/ob-deploy-branch.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- project: - name: "ob-deploy-branch" - branch: - - "unstable" - - "develop" - - "stage" - - "master" - jobs: - - "ob-deploy-branch-{branch}" - -- job-template: - name: "ob-deploy-branch-{branch}" - project-type: freestyle - node: openbook_v4 - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - - build-blocker: - use-build-blocker: true - blocking-jobs: - - ".*ob-pipeline" - block_level: 'GLOBAL' - queue-scanning: 'BUILDABLE' - triggers: - - reverse: - jobs: - - "admin-api-server-{branch}-ob-pipeline" - - "admin-web-ui-{branch}-ob-pipeline" - - "customer-api-server-{branch}-ob-pipeline" - - "customer-web-ui-{branch}-ob-pipeline" - - "job-scheduler-server-{branch}-ob-pipeline" - - "workflow-server-{branch}-ob-pipeline" - scm: - - git: - url: git@pippiandcarlos.com:repos/openbook-v4-installer.git - branches: - - master - builders: - - shell: | - ./ob-deploy-branch.sh {branch} diff --git a/jjb/yaml/openbook-all-ob-pipeline.yaml b/jjb/yaml/openbook-all-ob-pipeline.yaml deleted file mode 100644 index f81f8ab..0000000 --- a/jjb/yaml/openbook-all-ob-pipeline.yaml +++ /dev/null @@ -1,75 +0,0 @@ ---- -- project: - name: "openbook-all-ob-pipeline" - branch: - - "unstable" - - "develop" - - "stage" - - "master" - jobs: - - "openbook-all-{branch}-ob-pipeline" - -- job-template: - name: "openbook-all-{branch}-ob-pipeline" - project-type: pipeline - dsl: | - pipeline {{ - agent {{ - node {{ - label "master" - }} - }} - stages {{ - stage("checkout") {{ - agent {{ - node {{ - label "openbook_v4" - customWorkspace "workspace/openbook-core" - }} - }} - steps {{ - git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") - }} - }} - stage("baseimage") {{ - steps {{ - build(job: "openbook-baseimage") - }} - }} - stage("database") {{ - steps {{ - build(job: "openbook-database") - }} - }} - stage("admin-api-server") {{ - steps {{ - build(job: "admin-api-server-{branch}-ob-pipeline") - }} - }} - stage("customer-api-server") {{ - steps {{ - build(job: "customer-api-server-{branch}-ob-pipeline") - }} - }} - stage("admin-web-ui") {{ - steps {{ - build(job: "admin-web-ui-{branch}-ob-pipeline") - }} - }} - stage("customer-web-ui") {{ - steps {{ - build(job: "customer-web-ui-{branch}-ob-pipeline") - }} - }} - stage("job-scheduler-server") {{ - steps {{ - build(job: "job-scheduler-server-{branch}-ob-pipeline") - }} - }} - stage("workflow-server") {{ - steps {{ - build(job: "workflow-server-{branch}-ob-pipeline") - }} - }} - }} - }} diff --git a/jjb/yaml/openbook-baseimage.yaml b/jjb/yaml/openbook-baseimage.yaml deleted file mode 100644 index 2ab74bb..0000000 --- a/jjb/yaml/openbook-baseimage.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- job: - name: openbook-baseimage - project-type: freestyle - node: openbook_v4 - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: git@pippiandcarlos.com:repos/openbook-v4-ci.git - branches: - - master - builders: - - shell: | - ./build-docker-containers.sh baseimage unstable diff --git a/jjb/yaml/openbook-core-ob-pipeline.yaml b/jjb/yaml/openbook-core-ob-pipeline.yaml deleted file mode 100644 index 32669ab..0000000 --- a/jjb/yaml/openbook-core-ob-pipeline.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project: - name: "openbook-core-ob-pipeline" - branch: - - "unstable" - - "develop" - - "stage" - - "master" - jobs: - - "openbook-core-{branch}-ob-pipeline" - -- job-template: - name: "openbook-core-{branch}-ob-pipeline" - project-type: pipeline - dsl: | - pipeline {{ - agent {{ - node {{ - label "master" - }} - }} - stages {{ - stage("checkout") {{ - agent {{ - node {{ - label "openbook_v4" - customWorkspace "workspace/openbook-core" - }} - }} - steps {{ - git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") - }} - }} - stage("admin-api-server") {{ - steps {{ - build(job: "admin-api-server-{branch}-ob-pipeline") - }} - }} - stage("customer-api-server") {{ - steps {{ - build(job: "customer-api-server-{branch}-ob-pipeline") - }} - }} - stage("job-scheduler-server") {{ - steps {{ - build(job: "job-scheduler-server-{branch}-ob-pipeline") - }} - }} - stage("workflow-server") {{ - steps {{ - build(job: "workflow-server-{branch}-ob-pipeline") - }} - }} - }} - }} diff --git a/jjb/yaml/openbook-database.yaml b/jjb/yaml/openbook-database.yaml deleted file mode 100644 index 70594de..0000000 --- a/jjb/yaml/openbook-database.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- job: - name: openbook-database - project-type: freestyle - node: openbook_v4 - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: git@pippiandcarlos.com:repos/openbook-v4-ci.git - branches: - - master - builders: - - shell: | - ./build-docker-containers.sh database unstable diff --git a/jjb/yaml/openbook-ob-pipeline.yaml b/jjb/yaml/openbook-ob-pipeline.yaml deleted file mode 100644 index cd09544..0000000 --- a/jjb/yaml/openbook-ob-pipeline.yaml +++ /dev/null @@ -1,136 +0,0 @@ ---- -- project: - name: "openbook-ob-pipeline" - jobs: - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-api-server" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-api-server" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-api-server" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-api-server" - branch: "master" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-web-ui" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-web-ui" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-web-ui" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "admin-web-ui" - branch: "master" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-api-server" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-api-server" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-api-server" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-api-server" - branch: "master" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-web-ui" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-web-ui" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-web-ui" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "customer-web-ui" - branch: "master" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "job-scheduler-server" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "job-scheduler-server" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "job-scheduler-server" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "job-scheduler-server" - branch: "master" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "workflow-server" - branch: "unstable" - tag: "4.1" - - "{artifact}-{branch}-ob-pipeline": - artifact: "workflow-server" - branch: "develop" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "workflow-server" - branch: "stage" - tag: "4.0" - - "{artifact}-{branch}-ob-pipeline": - artifact: "workflow-server" - branch: "master" - tag: "4.0" - -- job-template: - name: "{artifact}-{branch}-ob-pipeline" - project-type: pipeline - dsl: | - pipeline {{ - agent {{ - node {{ - label "openbook_v4" - customWorkspace "workspace/{artifact}" - }} - }} - stages {{ - stage("gradle") {{ - steps {{ - git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/{artifact}.git") - sh(script: "/var/lib/jenkins/find_next_tag.sh \$(pwd) {artifact} {tag}") - sh(script: "./gradlew -PbuildNumber=\$(cat /tmp/newtag_{artifact}) -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar") - stash(includes: "build/libs/*.jar", name: "jar") - }} - }} - stage("upload-jar") {{ - steps {{ - git(poll: false, branch: "master", url: "git@github.com:Talligent/deployment-scripts.git") - unstash(name: "jar") - sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --branch={branch} --version=\$(cat /tmp/newtag_{artifact}) --filepath=build/libs/{artifact}.\$(cat /tmp/newtag_{artifact}).jar") - }} - }} - stage("docker-container") {{ - steps {{ - git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/openbook-v4-ci.git") - sh(script: "./build-docker-containers.sh {artifact} {branch}") - }} - }} - }} - }} diff --git a/jjb/yaml/openbook.yaml b/jjb/yaml/openbook.yaml deleted file mode 100644 index 0eb9c3a..0000000 --- a/jjb/yaml/openbook.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- project: - name: "openobok" - jobs: - - "openbook-{artifact}-{branch}": - artifact: "admin-api-server" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "admin-api-server" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "customer-api-server" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "customer-api-server" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "admin-web-ui" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "admin-web-ui" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "customer-web-ui" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "customer-web-ui" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "job-scheduler-server" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "job-scheduler-server" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "workflow-server" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "workflow-server" - branch: "develop" - - "openbook-{artifact}-{branch}": - artifact: "openbook-core" - branch: "unstable" - - "openbook-{artifact}-{branch}": - artifact: "openbook-core" - branch: "develop" - -- job-template: - name: "openbook-{artifact}-{branch}" - project-type: freestyle - node: openbook_v4 - properties: - - build-discarder: - days-to-keep: 0 - num-to-keep: 1 - artifact-days-to-keep: 0 - triggers: - - pollscm: - cron: "H/5 * * * *" - scm: - - git: - url: "git@github.com:Talligent/{artifact}.git" - branches: - - "{branch}" - builders: - - trigger-builds: - - project: "{artifact}-{branch}-ob-pipeline" diff --git a/jjb/yaml/pippiandcarlos.com/glance-gateway-if-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/glance-gateway-if-pipeline.yaml new file mode 100644 index 0000000..2353d68 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/glance-gateway-if-pipeline.yaml @@ -0,0 +1,37 @@ +--- +- job: + name: glance-gateway-gg-pipeline + project-type: pipeline + dsl: | + pipeline { + agent { + node { + label "master" + } + } + stages { + stage("checkout-manifests") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/glance-gateway" + } + } + steps { + git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/glance-gateway.git") + } + } + stage("update-images") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry" + } + } + steps { + git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry.git") + sh(script: "./glance-gateway.sh") + } + } + } + } diff --git a/jjb/yaml/pippiandcarlos.com/glance-gateway.yaml b/jjb/yaml/pippiandcarlos.com/glance-gateway.yaml new file mode 100644 index 0000000..47e7231 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/glance-gateway.yaml @@ -0,0 +1,27 @@ +--- +- job: + name: "glance-gateway" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*if-pipeline" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: "git@pippiandcarlos.com:repos/glance-gateway.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "glance-gateway-gg-pipeline" diff --git a/jjb/yaml/pippiandcarlos.com/image-foundry-if-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/image-foundry-if-pipeline.yaml new file mode 100644 index 0000000..1d5f023 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/image-foundry-if-pipeline.yaml @@ -0,0 +1,37 @@ +--- +- job: + name: image-foundry-if-pipeline + project-type: pipeline + dsl: | + pipeline { + agent { + node { + label "master" + } + } + stages { + stage("checkout-elements") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry-pippiandcarlos" + } + } + steps { + git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry-pippiandcarlos.git") + } + } + stage("diskimage-builder") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry" + } + } + steps { + git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/image-foundry.git") + sh(script: "./image-foundry.sh") + } + } + } + } diff --git a/jjb/yaml/pippiandcarlos.com/image-foundry.yaml b/jjb/yaml/pippiandcarlos.com/image-foundry.yaml new file mode 100644 index 0000000..9fbaff2 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/image-foundry.yaml @@ -0,0 +1,42 @@ +--- +- job: + name: "image-foundry" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: "git@pippiandcarlos.com:repos/image-foundry.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "image-foundry-if-pipeline" + +- job: + name: "image-foundry-pippiandarlos" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: "git@pippiandcarlos.com:repos/image-foundry-pippiandcarlos.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "image-foundry-if-pipeline" diff --git a/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml b/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml new file mode 100644 index 0000000..37ac158 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/ob-ctl.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: "ob-ctl" + jobs: + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "restart" + +- job-template: + name: "ob-ctl-{action}-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*ob-pipeline" + - "ob-deploy-branch.*" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + scm: + - git: + url: git@pippiandcarlos.com:repos/openbook-v4-installer.git + branches: + - master + builders: + - shell: | + ./ob-ctl.sh {branch} {action} diff --git a/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml b/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml new file mode 100644 index 0000000..044d871 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/ob-deploy-branch.yaml @@ -0,0 +1,43 @@ +--- +- project: + name: "ob-deploy-branch" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "ob-deploy-branch-{branch}" + +- job-template: + name: "ob-deploy-branch-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*ob-pipeline" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + triggers: + - reverse: + jobs: + - "admin-api-server-{branch}-ob-pipeline" + - "admin-web-ui-{branch}-ob-pipeline" + - "customer-api-server-{branch}-ob-pipeline" + - "customer-web-ui-{branch}-ob-pipeline" + - "job-scheduler-server-{branch}-ob-pipeline" + - "workflow-server-{branch}-ob-pipeline" + scm: + - git: + url: git@pippiandcarlos.com:repos/openbook-v4-installer.git + branches: + - master + builders: + - shell: | + ./ob-deploy-branch.sh {branch} diff --git a/jjb/yaml/pippiandcarlos.com/openbook-all-ob-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/openbook-all-ob-pipeline.yaml new file mode 100644 index 0000000..f81f8ab --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook-all-ob-pipeline.yaml @@ -0,0 +1,75 @@ +--- +- project: + name: "openbook-all-ob-pipeline" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "openbook-all-{branch}-ob-pipeline" + +- job-template: + name: "openbook-all-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "master" + }} + }} + stages {{ + stage("checkout") {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/openbook-core" + }} + }} + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") + }} + }} + stage("baseimage") {{ + steps {{ + build(job: "openbook-baseimage") + }} + }} + stage("database") {{ + steps {{ + build(job: "openbook-database") + }} + }} + stage("admin-api-server") {{ + steps {{ + build(job: "admin-api-server-{branch}-ob-pipeline") + }} + }} + stage("customer-api-server") {{ + steps {{ + build(job: "customer-api-server-{branch}-ob-pipeline") + }} + }} + stage("admin-web-ui") {{ + steps {{ + build(job: "admin-web-ui-{branch}-ob-pipeline") + }} + }} + stage("customer-web-ui") {{ + steps {{ + build(job: "customer-web-ui-{branch}-ob-pipeline") + }} + }} + stage("job-scheduler-server") {{ + steps {{ + build(job: "job-scheduler-server-{branch}-ob-pipeline") + }} + }} + stage("workflow-server") {{ + steps {{ + build(job: "workflow-server-{branch}-ob-pipeline") + }} + }} + }} + }} diff --git a/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml b/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml new file mode 100644 index 0000000..2ab74bb --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook-baseimage.yaml @@ -0,0 +1,21 @@ +--- +- job: + name: openbook-baseimage + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: git@pippiandcarlos.com:repos/openbook-v4-ci.git + branches: + - master + builders: + - shell: | + ./build-docker-containers.sh baseimage unstable diff --git a/jjb/yaml/pippiandcarlos.com/openbook-core-ob-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/openbook-core-ob-pipeline.yaml new file mode 100644 index 0000000..32669ab --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook-core-ob-pipeline.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: "openbook-core-ob-pipeline" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "openbook-core-{branch}-ob-pipeline" + +- job-template: + name: "openbook-core-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "master" + }} + }} + stages {{ + stage("checkout") {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/openbook-core" + }} + }} + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") + }} + }} + stage("admin-api-server") {{ + steps {{ + build(job: "admin-api-server-{branch}-ob-pipeline") + }} + }} + stage("customer-api-server") {{ + steps {{ + build(job: "customer-api-server-{branch}-ob-pipeline") + }} + }} + stage("job-scheduler-server") {{ + steps {{ + build(job: "job-scheduler-server-{branch}-ob-pipeline") + }} + }} + stage("workflow-server") {{ + steps {{ + build(job: "workflow-server-{branch}-ob-pipeline") + }} + }} + }} + }} diff --git a/jjb/yaml/pippiandcarlos.com/openbook-database.yaml b/jjb/yaml/pippiandcarlos.com/openbook-database.yaml new file mode 100644 index 0000000..70594de --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook-database.yaml @@ -0,0 +1,21 @@ +--- +- job: + name: openbook-database + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: git@pippiandcarlos.com:repos/openbook-v4-ci.git + branches: + - master + builders: + - shell: | + ./build-docker-containers.sh database unstable diff --git a/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml b/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml new file mode 100644 index 0000000..cd09544 --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook-ob-pipeline.yaml @@ -0,0 +1,136 @@ +--- +- project: + name: "openbook-ob-pipeline" + jobs: + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "master" + tag: "4.0" + +- job-template: + name: "{artifact}-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/{artifact}" + }} + }} + stages {{ + stage("gradle") {{ + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/{artifact}.git") + sh(script: "/var/lib/jenkins/find_next_tag.sh \$(pwd) {artifact} {tag}") + sh(script: "./gradlew -PbuildNumber=\$(cat /tmp/newtag_{artifact}) -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar") + stash(includes: "build/libs/*.jar", name: "jar") + }} + }} + stage("upload-jar") {{ + steps {{ + git(poll: false, branch: "master", url: "git@github.com:Talligent/deployment-scripts.git") + unstash(name: "jar") + sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --branch={branch} --version=\$(cat /tmp/newtag_{artifact}) --filepath=build/libs/{artifact}.\$(cat /tmp/newtag_{artifact}).jar") + }} + }} + stage("docker-container") {{ + steps {{ + git(poll: false, branch: "master", url: "git@pippiandcarlos.com:repos/openbook-v4-ci.git") + sh(script: "./build-docker-containers.sh {artifact} {branch}") + }} + }} + }} + }} diff --git a/jjb/yaml/pippiandcarlos.com/openbook.yaml b/jjb/yaml/pippiandcarlos.com/openbook.yaml new file mode 100644 index 0000000..0eb9c3a --- /dev/null +++ b/jjb/yaml/pippiandcarlos.com/openbook.yaml @@ -0,0 +1,67 @@ +--- +- project: + name: "openobok" + jobs: + - "openbook-{artifact}-{branch}": + artifact: "admin-api-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "admin-api-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "customer-api-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "customer-api-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "admin-web-ui" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "admin-web-ui" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "customer-web-ui" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "customer-web-ui" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "job-scheduler-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "job-scheduler-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "workflow-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "workflow-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "openbook-core" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "openbook-core" + branch: "develop" + +- job-template: + name: "openbook-{artifact}-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: "git@github.com:Talligent/{artifact}.git" + branches: + - "{branch}" + builders: + - trigger-builds: + - project: "{artifact}-{branch}-ob-pipeline" diff --git a/jjb/yaml/verizoncloudplatform.com/glance-gateway-if-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/glance-gateway-if-pipeline.yaml new file mode 100644 index 0000000..98ca417 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/glance-gateway-if-pipeline.yaml @@ -0,0 +1,37 @@ +--- +- job: + name: glance-gateway-gg-pipeline + project-type: pipeline + dsl: | + pipeline { + agent { + node { + label "master" + } + } + stages { + stage("checkout-manifests") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/glance-gateway" + } + } + steps { + git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/glance-gateway.git") + } + } + stage("update-images") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry" + } + } + steps { + git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry.git") + sh(script: "./glance-gateway.sh") + } + } + } + } diff --git a/jjb/yaml/verizoncloudplatform.com/glance-gateway.yaml b/jjb/yaml/verizoncloudplatform.com/glance-gateway.yaml new file mode 100644 index 0000000..f56ad24 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/glance-gateway.yaml @@ -0,0 +1,26 @@ +--- +- job: + name: "glance-gateway" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*if-pipeline" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + artifact-days-to-keep: 0 + triggers: + - github + scm: + - git: + url: "git@github.vcp.vzwnet.com:konstca/glance-gateway.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "glance-gateway-gg-pipeline" diff --git a/jjb/yaml/verizoncloudplatform.com/image-foundry-if-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/image-foundry-if-pipeline.yaml new file mode 100644 index 0000000..119fca4 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/image-foundry-if-pipeline.yaml @@ -0,0 +1,37 @@ +--- +- job: + name: image-foundry-if-pipeline + project-type: pipeline + dsl: | + pipeline { + agent { + node { + label "master" + } + } + stages { + stage("checkout-elements") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry-vzw" + } + } + steps { + git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry-vzw.git") + } + } + stage("diskimage-builder") { + agent { + node { + label "glance_gateway" + customWorkspace "workspace/image-foundry" + } + } + steps { + git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/image-foundry.git") + sh(script: "./image-foundry.sh") + } + } + } + } diff --git a/jjb/yaml/verizoncloudplatform.com/image-foundry.yaml b/jjb/yaml/verizoncloudplatform.com/image-foundry.yaml new file mode 100644 index 0000000..db35f51 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/image-foundry.yaml @@ -0,0 +1,40 @@ +--- +- job: + name: "image-foundry" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - github + scm: + - git: + url: "git@github.vcp.vzwnet.com:konstca/image-foundry.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "image-foundry-if-pipeline" + +- job: + name: "image-foundry-vzw" + project-type: freestyle + node: image_foundry + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - github + scm: + - git: + url: "git@github.vcp.vzwnet.com:konstca/image-foundry-vzw.git" + branches: + - "master" + builders: + - trigger-builds: + - project: "image-foundry-if-pipeline" diff --git a/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml new file mode 100644 index 0000000..b12ec55 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/ob-ctl.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: "ob-ctl" + jobs: + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "unstable" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "develop" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "stage" + action: "restart" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "stop" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "start" + - "ob-ctl-{action}-{branch}": + branch: "master" + action: "restart" + +- job-template: + name: "ob-ctl-{action}-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*ob-pipeline" + - "ob-deploy-branch.*" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + scm: + - git: + url: git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git + branches: + - master + builders: + - shell: | + ./ob-ctl.sh {branch} {action} diff --git a/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml new file mode 100644 index 0000000..ef7c736 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/ob-deploy-branch.yaml @@ -0,0 +1,43 @@ +--- +- project: + name: "ob-deploy-branch" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "ob-deploy-branch-{branch}" + +- job-template: + name: "ob-deploy-branch-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - ".*ob-pipeline" + block_level: 'GLOBAL' + queue-scanning: 'BUILDABLE' + triggers: + - reverse: + jobs: + - "admin-api-server-{branch}-ob-pipeline" + - "admin-web-ui-{branch}-ob-pipeline" + - "customer-api-server-{branch}-ob-pipeline" + - "customer-web-ui-{branch}-ob-pipeline" + - "job-scheduler-server-{branch}-ob-pipeline" + - "workflow-server-{branch}-ob-pipeline" + scm: + - git: + url: git@github.vcp.vzwnet.com:konstca/openbook-v4-installer.git + branches: + - master + builders: + - shell: | + ./ob-deploy-branch.sh {branch} diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-all-ob-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-all-ob-pipeline.yaml new file mode 100644 index 0000000..f81f8ab --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook-all-ob-pipeline.yaml @@ -0,0 +1,75 @@ +--- +- project: + name: "openbook-all-ob-pipeline" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "openbook-all-{branch}-ob-pipeline" + +- job-template: + name: "openbook-all-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "master" + }} + }} + stages {{ + stage("checkout") {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/openbook-core" + }} + }} + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") + }} + }} + stage("baseimage") {{ + steps {{ + build(job: "openbook-baseimage") + }} + }} + stage("database") {{ + steps {{ + build(job: "openbook-database") + }} + }} + stage("admin-api-server") {{ + steps {{ + build(job: "admin-api-server-{branch}-ob-pipeline") + }} + }} + stage("customer-api-server") {{ + steps {{ + build(job: "customer-api-server-{branch}-ob-pipeline") + }} + }} + stage("admin-web-ui") {{ + steps {{ + build(job: "admin-web-ui-{branch}-ob-pipeline") + }} + }} + stage("customer-web-ui") {{ + steps {{ + build(job: "customer-web-ui-{branch}-ob-pipeline") + }} + }} + stage("job-scheduler-server") {{ + steps {{ + build(job: "job-scheduler-server-{branch}-ob-pipeline") + }} + }} + stage("workflow-server") {{ + steps {{ + build(job: "workflow-server-{branch}-ob-pipeline") + }} + }} + }} + }} diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml new file mode 100644 index 0000000..d42cd60 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook-baseimage.yaml @@ -0,0 +1,20 @@ +--- +- job: + name: openbook-baseimage + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - github + scm: + - git: + url: git@github.vcp.vzwnet.com:konstca/openbook-v4-ci.git + branches: + - master + builders: + - shell: | + ./build-docker-containers.sh baseimage unstable diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-core-ob-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-core-ob-pipeline.yaml new file mode 100644 index 0000000..32669ab --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook-core-ob-pipeline.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: "openbook-core-ob-pipeline" + branch: + - "unstable" + - "develop" + - "stage" + - "master" + jobs: + - "openbook-core-{branch}-ob-pipeline" + +- job-template: + name: "openbook-core-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "master" + }} + }} + stages {{ + stage("checkout") {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/openbook-core" + }} + }} + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/openbook-core.git") + }} + }} + stage("admin-api-server") {{ + steps {{ + build(job: "admin-api-server-{branch}-ob-pipeline") + }} + }} + stage("customer-api-server") {{ + steps {{ + build(job: "customer-api-server-{branch}-ob-pipeline") + }} + }} + stage("job-scheduler-server") {{ + steps {{ + build(job: "job-scheduler-server-{branch}-ob-pipeline") + }} + }} + stage("workflow-server") {{ + steps {{ + build(job: "workflow-server-{branch}-ob-pipeline") + }} + }} + }} + }} diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml new file mode 100644 index 0000000..dd5bcda --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook-database.yaml @@ -0,0 +1,20 @@ +--- +- job: + name: openbook-database + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - github + scm: + - git: + url: git@github.vcp.vzwnet.com:konstca/openbook-v4-ci.git + branches: + - master + builders: + - shell: | + ./build-docker-containers.sh database unstable diff --git a/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml b/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml new file mode 100644 index 0000000..a8ab511 --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook-ob-pipeline.yaml @@ -0,0 +1,136 @@ +--- +- project: + name: "openbook-ob-pipeline" + jobs: + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-api-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "admin-web-ui" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-api-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "customer-web-ui" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "job-scheduler-server" + branch: "master" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "unstable" + tag: "4.1" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "develop" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "stage" + tag: "4.0" + - "{artifact}-{branch}-ob-pipeline": + artifact: "workflow-server" + branch: "master" + tag: "4.0" + +- job-template: + name: "{artifact}-{branch}-ob-pipeline" + project-type: pipeline + dsl: | + pipeline {{ + agent {{ + node {{ + label "openbook_v4" + customWorkspace "workspace/{artifact}" + }} + }} + stages {{ + stage("gradle") {{ + steps {{ + git(poll: false, branch: "{branch}", url: "git@github.com:Talligent/{artifact}.git") + sh(script: "/var/lib/jenkins/find_next_tag.sh \$(pwd) {artifact} {tag}") + sh(script: "./gradlew -PbuildNumber=\$(cat /tmp/newtag_{artifact}) -PbuildMode=buildProd -Dorg.gradle.daemon=false clean shadowJar") + stash(includes: "build/libs/*.jar", name: "jar") + }} + }} + stage("upload-jar") {{ + steps {{ + git(poll: false, branch: "master", url: "git@github.com:Talligent/deployment-scripts.git") + unstash(name: "jar") + sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --branch={branch} --version=\$(cat /tmp/newtag_{artifact}) --filepath=build/libs/{artifact}.\$(cat /tmp/newtag_{artifact}).jar") + }} + }} + stage("docker-container") {{ + steps {{ + git(poll: false, branch: "master", url: "git@github.vcp.vzwnet.com:konstca/openbook-v4-ci.git") + sh(script: "./build-docker-containers.sh {artifact} {branch}") + }} + }} + }} + }} diff --git a/jjb/yaml/verizoncloudplatform.com/openbook.yaml b/jjb/yaml/verizoncloudplatform.com/openbook.yaml new file mode 100644 index 0000000..0eb9c3a --- /dev/null +++ b/jjb/yaml/verizoncloudplatform.com/openbook.yaml @@ -0,0 +1,67 @@ +--- +- project: + name: "openobok" + jobs: + - "openbook-{artifact}-{branch}": + artifact: "admin-api-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "admin-api-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "customer-api-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "customer-api-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "admin-web-ui" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "admin-web-ui" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "customer-web-ui" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "customer-web-ui" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "job-scheduler-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "job-scheduler-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "workflow-server" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "workflow-server" + branch: "develop" + - "openbook-{artifact}-{branch}": + artifact: "openbook-core" + branch: "unstable" + - "openbook-{artifact}-{branch}": + artifact: "openbook-core" + branch: "develop" + +- job-template: + name: "openbook-{artifact}-{branch}" + project-type: freestyle + node: openbook_v4 + properties: + - build-discarder: + days-to-keep: 0 + num-to-keep: 1 + artifact-days-to-keep: 0 + triggers: + - pollscm: + cron: "H/5 * * * *" + scm: + - git: + url: "git@github.com:Talligent/{artifact}.git" + branches: + - "{branch}" + builders: + - trigger-builds: + - project: "{artifact}-{branch}-ob-pipeline" diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls index 2b6fb11..1c8b52c 100644 --- a/pillar/openbook/ansible.sls +++ b/pillar/openbook/ansible.sls @@ -219,9 +219,9 @@ ansible: mode: "0755" relative_to_buildroot: True is_template: False - ob_deploy_branch_sh: - name: ob-deploy-branch.sh - source: ob-deploy-branch.sh + ob_ctl_sh: + name: ob-ctl.sh + source: ob-ctl.sh mode: "0755" relative_to_buildroot: True is_template: False diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile index f6d22ba..7f4125a 100644 --- a/salt/openbook/admin_api_server/files/Dockerfile +++ b/salt/openbook/admin_api_server/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8083 5701 5702 VOLUME {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} VOLUME {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json index 5b457a2..c110a67 100644 --- a/salt/openbook/admin_api_server/files/admin_api_server.json +++ b/salt/openbook/admin_api_server/files/admin_api_server.json @@ -17,5 +17,9 @@ ,"application.port": {{ openbook_admin_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] {% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh index a09c30d..b98d6cc 100644 --- a/salt/openbook/admin_api_server/files/run.sh +++ b/salt/openbook/admin_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} exit 0 diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile index 5bd87ad..d302881 100644 --- a/salt/openbook/admin_web_ui/files/Dockerfile +++ b/salt/openbook/admin_web_ui/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8082 5701 5702 VOLUME {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} VOLUME {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/admin_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json index c41570a..c35a25c 100644 --- a/salt/openbook/admin_web_ui/files/admin_web_ui.json +++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json @@ -5,5 +5,9 @@ ,"application.port": {{ openbook_admin_web_ui_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] {% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh index a563ada..90c4256 100644 --- a/salt/openbook/admin_web_ui/files/run.sh +++ b/salt/openbook/admin_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} exit 0 diff --git a/salt/openbook/ansible/files/ob-ctl.sh b/salt/openbook/ansible/files/ob-ctl.sh new file mode 100644 index 0000000..6a2a108 --- /dev/null +++ b/salt/openbook/ansible/files/ob-ctl.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +branch="${1}" +action="${2}" +buildroot="$(pwd)" + +pushd ${buildroot}/conf +cp ${HOME}/env.yaml.openbook . +rm -f env.yaml +ln -s env.yaml.openbook env.yaml +popd +pushd ${buildroot} +ansible-playbook -i inventory_json_${branch}.rb -e "action=${action}" openbook_stop_start.yaml +popd diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml index 15908c6..44a0081 100644 --- a/salt/openbook/ansible/files/openbook.yaml +++ b/salt/openbook/ansible/files/openbook.yaml @@ -153,6 +153,16 @@ runlevel: "{% raw %}{{ item.runlevel }}{% endraw %}" with_items: - { name: openbook, runlevel: default } + when: openbook_install_database|string() == "False" + + - name: "Disable openbook service" + service: + name: "{% raw %}{{ item.name }}{% endraw %}" + enabled: no + runlevel: "{% raw %}{{ item.runlevel }}{% endraw %}" + with_items: + - { name: openbook, runlevel: default } + when: openbook_install_database|string() == "True" - name: "Stop Openbook" hosts: "{% raw %}{{ groups['target']|sort(reverse=True) }}{% endraw %}" diff --git a/salt/openbook/ansible/files/stop_start_openbook.yaml b/salt/openbook/ansible/files/stop_start_openbook.yaml index 83c1d57..376d1f5 100644 --- a/salt/openbook/ansible/files/stop_start_openbook.yaml +++ b/salt/openbook/ansible/files/stop_start_openbook.yaml @@ -2,9 +2,9 @@ - name: "Verify action to take" hosts: localhost tasks: - - name: "Check that -e 'action=[stop|start]' was passed in" - fail: msg="The variable 'action' was not passed in with a value of 'stop' or 'start' on the command line." - when: action not in ["stop", "start"] + - name: "Check that -e 'action=[stop|start|restart]' was passed in" + fail: msg="The variable 'action' was not passed in with a value of 'stop', 'start' or 'restart' on the command line." + when: action not in ["stop", "start", "restart"] - name: "Stop Openbook" hosts: "{{ groups['target']|sort(reverse=True) }}" @@ -17,7 +17,7 @@ docker stop ${cont} done docker container prune -f - when: action == "stop" + when: action in ["stop", "restart"] - name: "Start Openbook" hosts: "{{ groups['target']|sort }}" @@ -25,4 +25,4 @@ tasks: - name: "Start Openbook" shell: /etc/init.d/openbook start - when: action == "start" + when: action in ["start", "restart"] diff --git a/salt/openbook/customer_api_server/files/Dockerfile b/salt/openbook/customer_api_server/files/Dockerfile index d80916f..9b58100 100644 --- a/salt/openbook/customer_api_server/files/Dockerfile +++ b/salt/openbook/customer_api_server/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8081 5701 5702 VOLUME {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} VOLUME {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index 7704b40..767fa97 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -16,6 +16,10 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_customer_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] - {% endif %} +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh index 7a5cbc4..7199918 100644 --- a/salt/openbook/customer_api_server/files/run.sh +++ b/salt/openbook/customer_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} exit 0 diff --git a/salt/openbook/customer_web_ui/files/Dockerfile b/salt/openbook/customer_web_ui/files/Dockerfile index 9a44a6c..47c4435 100644 --- a/salt/openbook/customer_web_ui/files/Dockerfile +++ b/salt/openbook/customer_web_ui/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8080 5701 5702 VOLUME {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} VOLUME {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json index e6a78be..5979275 100644 --- a/salt/openbook/customer_web_ui/files/customer_web_ui.json +++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json @@ -5,5 +5,9 @@ ,"application.port": {{ openbook_customer_web_ui_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] {% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh index abb01bd..988a95a 100644 --- a/salt/openbook/customer_web_ui/files/run.sh +++ b/salt/openbook/customer_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} exit 0 diff --git a/salt/openbook/database/files/create_openbook_schemas.sql b/salt/openbook/database/files/create_openbook_schemas.sql index 6437dd1..94dd671 100644 --- a/salt/openbook/database/files/create_openbook_schemas.sql +++ b/salt/openbook/database/files/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 '{% raw %}{{ openbook_database_password }}{% endraw %}'; GRANT ALL PRIVILEGES ON openbook.* TO openbook@localhost IDENTIFIED BY '{% raw %}{{ openbook_database_password }}{% endraw %}'; @@ -19,9 +19,9 @@ USE `openbook`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `DATABASECHANGELOG` ( - `ID` varchar(63) NOT NULL, - `AUTHOR` varchar(63) NOT NULL, - `FILENAME` varchar(200) NOT NULL, + `ID` varchar(255) NOT NULL, + `AUTHOR` varchar(255) NOT NULL, + `FILENAME` varchar(255) NOT NULL, `DATEEXECUTED` datetime NOT NULL, `ORDEREXECUTED` int(11) NOT NULL, `EXECTYPE` varchar(10) NOT NULL, @@ -32,15 +32,14 @@ CREATE TABLE `DATABASECHANGELOG` ( `LIQUIBASE` varchar(20) DEFAULT NULL, `CONTEXTS` varchar(255) DEFAULT NULL, `LABELS` varchar(255) DEFAULT NULL, - `DEPLOYMENT_ID` varchar(10) DEFAULT NULL, - PRIMARY KEY (`ID`,`AUTHOR`,`FILENAME`) + `DEPLOYMENT_ID` varchar(10) DEFAULT NULL ) 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 */; CREATE TABLE `DATABASECHANGELOGLOCK` ( `ID` int(11) NOT NULL, - `LOCKED` tinyint(1) NOT NULL, + `LOCKED` bit(1) NOT NULL, `LOCKGRANTED` datetime DEFAULT NULL, `LOCKEDBY` varchar(255) DEFAULT NULL, PRIMARY KEY (`ID`) @@ -87,7 +86,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 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 +289,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=314159 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 */; @@ -375,7 +374,7 @@ CREATE TABLE `t_exception_event` ( PRIMARY KEY (`event_id`), KEY `ix_exception_event_1` (`event_time`,`event_type`,`entity_id`), KEY `ix_exception_event_2` (`user_id`,`event_time`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) 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 */; @@ -419,8 +418,8 @@ CREATE TABLE `t_host` ( `host_aggregate` varchar(255) DEFAULT NULL, `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; + KEY `ix_host_1` (`service_manager_id`,`service_region_id`,`host_foreign_id`) +) 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 */; @@ -436,7 +435,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 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 +458,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=12480500 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 */; @@ -539,7 +538,7 @@ CREATE TABLE `t_metric` ( `time_resolution` varchar(16) NOT NULL, PRIMARY KEY (`metric_id`), UNIQUE KEY `ix_metric_1` (`service_manager_type_id`,`metric_name`) -) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=50 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,370 +558,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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, - PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, - PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, - PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB, - PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB, - PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB, - PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB, - PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB, - PARTITION `p736679` VALUES LESS THAN (736679) ENGINE = InnoDB, - PARTITION `p736680` VALUES LESS THAN (736680) ENGINE = InnoDB, - PARTITION `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, - PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, - PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, - PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, - PARTITION `p736687` VALUES LESS THAN (736687) ENGINE = InnoDB, - PARTITION `p736688` VALUES LESS THAN (736688) ENGINE = InnoDB, - PARTITION `p736689` VALUES LESS THAN (736689) ENGINE = InnoDB, - PARTITION `p736690` VALUES LESS THAN (736690) ENGINE = InnoDB, - PARTITION `p736691` VALUES LESS THAN (736691) ENGINE = InnoDB, - PARTITION `p736692` VALUES LESS THAN (736692) ENGINE = InnoDB, - PARTITION `p736693` VALUES LESS THAN (736693) ENGINE = InnoDB, - PARTITION `p736694` VALUES LESS THAN (736694) ENGINE = InnoDB, - PARTITION `p736695` VALUES LESS THAN (736695) ENGINE = InnoDB, - PARTITION `p736696` VALUES LESS THAN (736696) ENGINE = InnoDB, - PARTITION `p736697` VALUES LESS THAN (736697) ENGINE = InnoDB, - PARTITION `p736698` VALUES LESS THAN (736698) ENGINE = InnoDB, - PARTITION `p736699` VALUES LESS THAN (736699) ENGINE = InnoDB, - PARTITION `p736700` VALUES LESS THAN (736700) ENGINE = InnoDB, - PARTITION `p736701` VALUES LESS THAN (736701) ENGINE = InnoDB, - PARTITION `p736702` VALUES LESS THAN (736702) ENGINE = InnoDB, - PARTITION `p736703` VALUES LESS THAN (736703) ENGINE = InnoDB, - PARTITION `p736704` VALUES LESS THAN (736704) ENGINE = InnoDB, - PARTITION `p736705` VALUES LESS THAN (736705) ENGINE = InnoDB, - PARTITION `p736706` VALUES LESS THAN (736706) ENGINE = InnoDB, - PARTITION `p736707` VALUES LESS THAN (736707) ENGINE = InnoDB, - PARTITION `p736708` VALUES LESS THAN (736708) ENGINE = InnoDB, - PARTITION `p736709` VALUES LESS THAN (736709) ENGINE = InnoDB, - PARTITION `p736710` VALUES LESS THAN (736710) ENGINE = InnoDB, - PARTITION `p736711` VALUES LESS THAN (736711) ENGINE = InnoDB, - PARTITION `p736712` VALUES LESS THAN (736712) ENGINE = InnoDB, - PARTITION `p736713` VALUES LESS THAN (736713) ENGINE = InnoDB, - PARTITION `p736714` VALUES LESS THAN (736714) ENGINE = InnoDB, - PARTITION `p736715` VALUES LESS THAN (736715) ENGINE = InnoDB, - PARTITION `p736716` VALUES LESS THAN (736716) ENGINE = InnoDB, - PARTITION `p736717` VALUES LESS THAN (736717) ENGINE = InnoDB, - PARTITION `p736718` VALUES LESS THAN (736718) ENGINE = InnoDB, - PARTITION `p736719` VALUES LESS THAN (736719) ENGINE = InnoDB, - PARTITION `p736720` VALUES LESS THAN (736720) ENGINE = InnoDB, - PARTITION `p736721` VALUES LESS THAN (736721) ENGINE = InnoDB, - PARTITION `p736722` VALUES LESS THAN (736722) ENGINE = InnoDB, - PARTITION `p736723` VALUES LESS THAN (736723) ENGINE = InnoDB, - PARTITION `p736724` VALUES LESS THAN (736724) ENGINE = InnoDB, - PARTITION `p736725` VALUES LESS THAN (736725) ENGINE = InnoDB, - PARTITION `p736726` VALUES LESS THAN (736726) ENGINE = InnoDB, - PARTITION `p736727` VALUES LESS THAN (736727) ENGINE = InnoDB, - PARTITION `p736728` VALUES LESS THAN (736728) ENGINE = InnoDB, - PARTITION `p736729` VALUES LESS THAN (736729) ENGINE = InnoDB, - PARTITION `p736730` VALUES LESS THAN (736730) ENGINE = InnoDB, - PARTITION `p736731` VALUES LESS THAN (736731) ENGINE = InnoDB, - PARTITION `p736732` VALUES LESS THAN (736732) ENGINE = InnoDB, - PARTITION `p736733` VALUES LESS THAN (736733) ENGINE = InnoDB, - PARTITION `p736734` VALUES LESS THAN (736734) ENGINE = InnoDB, - PARTITION `p736735` VALUES LESS THAN (736735) ENGINE = InnoDB, - PARTITION `p736736` VALUES LESS THAN (736736) ENGINE = InnoDB, - PARTITION `p736737` VALUES LESS THAN (736737) ENGINE = InnoDB, - PARTITION `p736738` VALUES LESS THAN (736738) ENGINE = InnoDB, - PARTITION `p736739` VALUES LESS THAN (736739) ENGINE = InnoDB, - PARTITION `p736740` VALUES LESS THAN (736740) ENGINE = InnoDB, - PARTITION `p736741` VALUES LESS THAN (736741) ENGINE = InnoDB, - PARTITION `p736742` VALUES LESS THAN (736742) ENGINE = InnoDB, - PARTITION `p736743` VALUES LESS THAN (736743) ENGINE = InnoDB, - PARTITION `p736744` VALUES LESS THAN (736744) ENGINE = InnoDB, - PARTITION `p736745` VALUES LESS THAN (736745) ENGINE = InnoDB, - PARTITION `p736746` VALUES LESS THAN (736746) ENGINE = InnoDB, - PARTITION `p736747` VALUES LESS THAN (736747) ENGINE = InnoDB, - PARTITION `p736748` VALUES LESS THAN (736748) ENGINE = InnoDB, - PARTITION `p736749` VALUES LESS THAN (736749) ENGINE = InnoDB, - PARTITION `p736750` VALUES LESS THAN (736750) ENGINE = InnoDB, - PARTITION `p736751` VALUES LESS THAN (736751) ENGINE = InnoDB, - PARTITION `p736752` VALUES LESS THAN (736752) ENGINE = InnoDB, - PARTITION `p736753` VALUES LESS THAN (736753) ENGINE = InnoDB, - PARTITION `p736754` VALUES LESS THAN (736754) ENGINE = InnoDB, - PARTITION `p736755` VALUES LESS THAN (736755) ENGINE = InnoDB, - PARTITION `p736756` VALUES LESS THAN (736756) ENGINE = InnoDB, - PARTITION `p736757` VALUES LESS THAN (736757) ENGINE = InnoDB, - PARTITION `p736758` VALUES LESS THAN (736758) ENGINE = InnoDB, - PARTITION `p736759` VALUES LESS THAN (736759) ENGINE = InnoDB, - PARTITION `p736760` VALUES LESS THAN (736760) ENGINE = InnoDB, - PARTITION `p736761` VALUES LESS THAN (736761) ENGINE = InnoDB, - PARTITION `p736762` VALUES LESS THAN (736762) ENGINE = InnoDB, - PARTITION `p736763` VALUES LESS THAN (736763) ENGINE = InnoDB, - PARTITION `p736764` VALUES LESS THAN (736764) ENGINE = InnoDB, - PARTITION `p736765` VALUES LESS THAN (736765) ENGINE = InnoDB, - PARTITION `p736766` VALUES LESS THAN (736766) ENGINE = InnoDB, - PARTITION `p736767` VALUES LESS THAN (736767) ENGINE = InnoDB, - PARTITION `p736768` VALUES LESS THAN (736768) ENGINE = InnoDB, - PARTITION `p736769` VALUES LESS THAN (736769) ENGINE = InnoDB, - PARTITION `p736770` VALUES LESS THAN (736770) ENGINE = InnoDB, - PARTITION `p736771` VALUES LESS THAN (736771) ENGINE = InnoDB, - PARTITION `p736772` VALUES LESS THAN (736772) ENGINE = InnoDB, - PARTITION `p736773` VALUES LESS THAN (736773) ENGINE = InnoDB, - PARTITION `p736774` VALUES LESS THAN (736774) ENGINE = InnoDB, - PARTITION `p736775` VALUES LESS THAN (736775) ENGINE = InnoDB, - PARTITION `p736776` VALUES LESS THAN (736776) ENGINE = InnoDB, - PARTITION `p736777` VALUES LESS THAN (736777) ENGINE = InnoDB, - PARTITION `p736778` VALUES LESS THAN (736778) ENGINE = InnoDB, - PARTITION `p736779` VALUES LESS THAN (736779) ENGINE = InnoDB, - PARTITION `p736780` VALUES LESS THAN (736780) ENGINE = InnoDB, - PARTITION `p736781` VALUES LESS THAN (736781) ENGINE = InnoDB, - PARTITION `p736782` VALUES LESS THAN (736782) ENGINE = InnoDB, - PARTITION `p736783` VALUES LESS THAN (736783) ENGINE = InnoDB, - PARTITION `p736784` VALUES LESS THAN (736784) ENGINE = InnoDB, - PARTITION `p736785` VALUES LESS THAN (736785) ENGINE = InnoDB, - PARTITION `p736786` VALUES LESS THAN (736786) ENGINE = InnoDB, - PARTITION `p736787` VALUES LESS THAN (736787) ENGINE = InnoDB, - PARTITION `p736788` VALUES LESS THAN (736788) ENGINE = InnoDB, - PARTITION `p736789` VALUES LESS THAN (736789) ENGINE = InnoDB, - PARTITION `p736790` VALUES LESS THAN (736790) ENGINE = InnoDB, - PARTITION `p736791` VALUES LESS THAN (736791) ENGINE = InnoDB, - PARTITION `p736792` VALUES LESS THAN (736792) ENGINE = InnoDB, - PARTITION `p736793` VALUES LESS THAN (736793) ENGINE = InnoDB, - PARTITION `p736794` VALUES LESS THAN (736794) ENGINE = InnoDB, - PARTITION `p736795` VALUES LESS THAN (736795) ENGINE = InnoDB, - PARTITION `p736796` VALUES LESS THAN (736796) ENGINE = InnoDB, - PARTITION `p736797` VALUES LESS THAN (736797) ENGINE = InnoDB, - PARTITION `p736798` VALUES LESS THAN (736798) ENGINE = InnoDB, - PARTITION `p736799` VALUES LESS THAN (736799) ENGINE = InnoDB, - PARTITION `p736800` VALUES LESS THAN (736800) ENGINE = InnoDB, - PARTITION `p736801` VALUES LESS THAN (736801) ENGINE = InnoDB, - PARTITION `p736802` VALUES LESS THAN (736802) ENGINE = InnoDB, - PARTITION `p736803` VALUES LESS THAN (736803) ENGINE = InnoDB, - PARTITION `p736804` VALUES LESS THAN (736804) ENGINE = InnoDB, - PARTITION `p736805` VALUES LESS THAN (736805) ENGINE = InnoDB, - PARTITION `p736806` VALUES LESS THAN (736806) ENGINE = InnoDB, - PARTITION `p736807` VALUES LESS THAN (736807) ENGINE = InnoDB, - PARTITION `p736808` VALUES LESS THAN (736808) ENGINE = InnoDB, - PARTITION `p736809` VALUES LESS THAN (736809) ENGINE = InnoDB, - PARTITION `p736810` VALUES LESS THAN (736810) ENGINE = InnoDB, - PARTITION `p736811` VALUES LESS THAN (736811) ENGINE = InnoDB, - PARTITION `p736812` VALUES LESS THAN (736812) ENGINE = InnoDB, - PARTITION `p736813` VALUES LESS THAN (736813) ENGINE = InnoDB, - PARTITION `p736814` VALUES LESS THAN (736814) ENGINE = InnoDB, - PARTITION `p736815` VALUES LESS THAN (736815) ENGINE = InnoDB, - PARTITION `p736816` VALUES LESS THAN (736816) ENGINE = InnoDB, - PARTITION `p736817` VALUES LESS THAN (736817) ENGINE = InnoDB, - PARTITION `p736818` VALUES LESS THAN (736818) ENGINE = InnoDB, - PARTITION `p736819` VALUES LESS THAN (736819) ENGINE = InnoDB, - PARTITION `p736820` VALUES LESS THAN (736820) ENGINE = InnoDB, - PARTITION `p736821` VALUES LESS THAN (736821) ENGINE = InnoDB, - PARTITION `p736822` VALUES LESS THAN (736822) ENGINE = InnoDB, - PARTITION `p736823` VALUES LESS THAN (736823) ENGINE = InnoDB, - PARTITION `p736824` VALUES LESS THAN (736824) ENGINE = InnoDB, - PARTITION `p736825` VALUES LESS THAN (736825) ENGINE = InnoDB, - PARTITION `p736826` VALUES LESS THAN (736826) ENGINE = InnoDB, - PARTITION `p736827` VALUES LESS THAN (736827) ENGINE = InnoDB, - PARTITION `p736828` VALUES LESS THAN (736828) ENGINE = InnoDB, - PARTITION `p736829` VALUES LESS THAN (736829) ENGINE = InnoDB, - PARTITION `p736830` VALUES LESS THAN (736830) ENGINE = InnoDB, - PARTITION `p736831` VALUES LESS THAN (736831) ENGINE = InnoDB, - PARTITION `p736832` VALUES LESS THAN (736832) ENGINE = InnoDB, - PARTITION `p736833` VALUES LESS THAN (736833) ENGINE = InnoDB, - PARTITION `p736834` VALUES LESS THAN (736834) ENGINE = InnoDB, - PARTITION `p736835` VALUES LESS THAN (736835) ENGINE = InnoDB, - PARTITION `p736836` VALUES LESS THAN (736836) ENGINE = InnoDB, - PARTITION `p736837` VALUES LESS THAN (736837) ENGINE = InnoDB, - PARTITION `p736838` VALUES LESS THAN (736838) ENGINE = InnoDB, - PARTITION `p736839` VALUES LESS THAN (736839) ENGINE = InnoDB, - PARTITION `p736840` VALUES LESS THAN (736840) ENGINE = InnoDB, - PARTITION `p736841` VALUES LESS THAN (736841) ENGINE = InnoDB, - PARTITION `p736842` VALUES LESS THAN (736842) ENGINE = InnoDB, - PARTITION `p736843` VALUES LESS THAN (736843) ENGINE = InnoDB, - PARTITION `p736844` VALUES LESS THAN (736844) ENGINE = InnoDB, - PARTITION `p736845` VALUES LESS THAN (736845) ENGINE = InnoDB, - PARTITION `p736846` VALUES LESS THAN (736846) ENGINE = InnoDB, - PARTITION `p736847` VALUES LESS THAN (736847) ENGINE = InnoDB, - PARTITION `p736848` VALUES LESS THAN (736848) ENGINE = InnoDB, - PARTITION `p736849` VALUES LESS THAN (736849) ENGINE = InnoDB, - PARTITION `p736850` VALUES LESS THAN (736850) ENGINE = InnoDB, - PARTITION `p736851` VALUES LESS THAN (736851) ENGINE = InnoDB, - PARTITION `p736852` VALUES LESS THAN (736852) ENGINE = InnoDB, - PARTITION `p736853` VALUES LESS THAN (736853) ENGINE = InnoDB, - PARTITION `p736854` VALUES LESS THAN (736854) ENGINE = InnoDB, - PARTITION `p736855` VALUES LESS THAN (736855) ENGINE = InnoDB, - PARTITION `p736856` VALUES LESS THAN (736856) ENGINE = InnoDB, - PARTITION `p736857` VALUES LESS THAN (736857) ENGINE = InnoDB, - PARTITION `p736858` VALUES LESS THAN (736858) ENGINE = InnoDB, - PARTITION `p736859` VALUES LESS THAN (736859) ENGINE = InnoDB, - PARTITION `p736860` VALUES LESS THAN (736860) ENGINE = InnoDB, - PARTITION `p736861` VALUES LESS THAN (736861) ENGINE = InnoDB, - PARTITION `p736862` VALUES LESS THAN (736862) ENGINE = InnoDB, - PARTITION `p736863` VALUES LESS THAN (736863) ENGINE = InnoDB, - PARTITION `p736864` VALUES LESS THAN (736864) ENGINE = InnoDB, - PARTITION `p736865` VALUES LESS THAN (736865) ENGINE = InnoDB, - PARTITION `p736866` VALUES LESS THAN (736866) ENGINE = InnoDB, - PARTITION `p736867` VALUES LESS THAN (736867) ENGINE = InnoDB, - PARTITION `p736868` VALUES LESS THAN (736868) ENGINE = InnoDB, - PARTITION `p736869` VALUES LESS THAN (736869) ENGINE = InnoDB, - PARTITION `p736870` VALUES LESS THAN (736870) ENGINE = InnoDB, - PARTITION `p736871` VALUES LESS THAN (736871) ENGINE = InnoDB, - PARTITION `p736872` VALUES LESS THAN (736872) ENGINE = InnoDB, - PARTITION `p736873` VALUES LESS THAN (736873) ENGINE = InnoDB, - PARTITION `p736874` VALUES LESS THAN (736874) ENGINE = InnoDB, - PARTITION `p736875` VALUES LESS THAN (736875) ENGINE = InnoDB, - PARTITION `p736876` VALUES LESS THAN (736876) ENGINE = InnoDB, - PARTITION `p736877` VALUES LESS THAN (736877) ENGINE = InnoDB, - PARTITION `p736878` VALUES LESS THAN (736878) ENGINE = InnoDB, - PARTITION `p736879` VALUES LESS THAN (736879) ENGINE = InnoDB, - PARTITION `p736880` VALUES LESS THAN (736880) ENGINE = InnoDB, - PARTITION `p736881` VALUES LESS THAN (736881) ENGINE = InnoDB, - PARTITION `p736882` VALUES LESS THAN (736882) ENGINE = InnoDB, - PARTITION `p736883` VALUES LESS THAN (736883) ENGINE = InnoDB, - PARTITION `p736884` VALUES LESS THAN (736884) ENGINE = InnoDB, - PARTITION `p736885` VALUES LESS THAN (736885) ENGINE = InnoDB, - PARTITION `p736886` VALUES LESS THAN (736886) ENGINE = InnoDB, - PARTITION `p736887` VALUES LESS THAN (736887) ENGINE = InnoDB, - PARTITION `p736888` VALUES LESS THAN (736888) ENGINE = InnoDB, - PARTITION `p736889` VALUES LESS THAN (736889) ENGINE = InnoDB, - PARTITION `p736890` VALUES LESS THAN (736890) ENGINE = InnoDB, - PARTITION `p736891` VALUES LESS THAN (736891) ENGINE = InnoDB, - PARTITION `p736892` VALUES LESS THAN (736892) ENGINE = InnoDB, - PARTITION `p736893` VALUES LESS THAN (736893) ENGINE = InnoDB, - PARTITION `p736894` VALUES LESS THAN (736894) ENGINE = InnoDB, - PARTITION `p736895` VALUES LESS THAN (736895) ENGINE = InnoDB, - PARTITION `p736896` VALUES LESS THAN (736896) ENGINE = InnoDB, - PARTITION `p736897` VALUES LESS THAN (736897) ENGINE = InnoDB, - PARTITION `p736898` VALUES LESS THAN (736898) ENGINE = InnoDB, - PARTITION `p736899` VALUES LESS THAN (736899) ENGINE = InnoDB, - PARTITION `p736900` VALUES LESS THAN (736900) ENGINE = InnoDB, - PARTITION `p736901` VALUES LESS THAN (736901) ENGINE = InnoDB, - PARTITION `p736902` VALUES LESS THAN (736902) ENGINE = InnoDB, - PARTITION `p736903` VALUES LESS THAN (736903) ENGINE = InnoDB, - PARTITION `p736904` VALUES LESS THAN (736904) ENGINE = InnoDB, - PARTITION `p736905` VALUES LESS THAN (736905) ENGINE = InnoDB, - PARTITION `p736906` VALUES LESS THAN (736906) ENGINE = InnoDB, - PARTITION `p736907` VALUES LESS THAN (736907) ENGINE = InnoDB, - PARTITION `p736908` VALUES LESS THAN (736908) ENGINE = InnoDB, - PARTITION `p736909` VALUES LESS THAN (736909) ENGINE = InnoDB, - PARTITION `p736910` VALUES LESS THAN (736910) ENGINE = InnoDB, - PARTITION `p736911` VALUES LESS THAN (736911) ENGINE = InnoDB, - PARTITION `p736912` VALUES LESS THAN (736912) ENGINE = InnoDB, - PARTITION `p736913` VALUES LESS THAN (736913) ENGINE = InnoDB, - PARTITION `p736914` VALUES LESS THAN (736914) ENGINE = InnoDB, - PARTITION `p736915` VALUES LESS THAN (736915) ENGINE = InnoDB, - PARTITION `p736916` VALUES LESS THAN (736916) ENGINE = InnoDB, - PARTITION `p736917` VALUES LESS THAN (736917) ENGINE = InnoDB, - PARTITION `p736918` VALUES LESS THAN (736918) ENGINE = InnoDB, - PARTITION `p736919` VALUES LESS THAN (736919) ENGINE = InnoDB, - PARTITION `p736920` VALUES LESS THAN (736920) ENGINE = InnoDB, - PARTITION `p736921` VALUES LESS THAN (736921) ENGINE = InnoDB, - PARTITION `p736922` VALUES LESS THAN (736922) ENGINE = InnoDB, - PARTITION `p736923` VALUES LESS THAN (736923) ENGINE = InnoDB, - PARTITION `p736924` VALUES LESS THAN (736924) ENGINE = InnoDB, - PARTITION `p736925` VALUES LESS THAN (736925) ENGINE = InnoDB, - PARTITION `p736926` VALUES LESS THAN (736926) ENGINE = InnoDB, - PARTITION `p736927` VALUES LESS THAN (736927) ENGINE = InnoDB, - PARTITION `p736928` VALUES LESS THAN (736928) ENGINE = InnoDB, - PARTITION `p736929` VALUES LESS THAN (736929) ENGINE = InnoDB, - PARTITION `p736930` VALUES LESS THAN (736930) ENGINE = InnoDB, - PARTITION `p736931` VALUES LESS THAN (736931) ENGINE = InnoDB, - PARTITION `p736932` VALUES LESS THAN (736932) ENGINE = InnoDB, - PARTITION `p736933` VALUES LESS THAN (736933) ENGINE = InnoDB, - PARTITION `p736934` VALUES LESS THAN (736934) ENGINE = InnoDB, - PARTITION `p736935` VALUES LESS THAN (736935) ENGINE = InnoDB, - PARTITION `p736936` VALUES LESS THAN (736936) ENGINE = InnoDB, - PARTITION `p736937` VALUES LESS THAN (736937) ENGINE = InnoDB, - PARTITION `p736938` VALUES LESS THAN (736938) ENGINE = InnoDB, - PARTITION `p736939` VALUES LESS THAN (736939) ENGINE = InnoDB, - PARTITION `p736940` VALUES LESS THAN (736940) ENGINE = InnoDB, - PARTITION `p736941` VALUES LESS THAN (736941) ENGINE = InnoDB, - PARTITION `p736942` VALUES LESS THAN (736942) ENGINE = InnoDB, - PARTITION `p736943` VALUES LESS THAN (736943) ENGINE = InnoDB, - PARTITION `p736944` VALUES LESS THAN (736944) ENGINE = InnoDB, - PARTITION `p736945` VALUES LESS THAN (736945) ENGINE = InnoDB, - PARTITION `p736946` VALUES LESS THAN (736946) ENGINE = InnoDB, - PARTITION `p736947` VALUES LESS THAN (736947) ENGINE = InnoDB, - PARTITION `p736948` VALUES LESS THAN (736948) ENGINE = InnoDB, - PARTITION `p736949` VALUES LESS THAN (736949) ENGINE = InnoDB, - PARTITION `p736950` VALUES LESS THAN (736950) ENGINE = InnoDB, - PARTITION `p736951` VALUES LESS THAN (736951) ENGINE = InnoDB, - 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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -952,7 +588,20 @@ 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); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -969,69 +618,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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -1061,7 +648,20 @@ 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); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -1085,7 +685,7 @@ CREATE TABLE `t_metric_aggregate_customer_monthly` ( /*!40101 SET character_set_client = utf8 */; CREATE TABLE `t_metric_aggregate_resource_daily` ( `metric_id` int(11) NOT NULL DEFAULT 0, - `resource_id` int(11) NOT NULL DEFAULT 0, + `resource_id` int(11) NOT NULL, `resource_foreign_id` varchar(255) NOT NULL DEFAULT '', `aggregate_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `min` double DEFAULT NULL, @@ -1100,370 +700,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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, - PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, - PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, - PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB, - PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB, - PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB, - PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB, - PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB, - PARTITION `p736679` VALUES LESS THAN (736679) ENGINE = InnoDB, - PARTITION `p736680` VALUES LESS THAN (736680) ENGINE = InnoDB, - PARTITION `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, - PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, - PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, - PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, - PARTITION `p736687` VALUES LESS THAN (736687) ENGINE = InnoDB, - PARTITION `p736688` VALUES LESS THAN (736688) ENGINE = InnoDB, - PARTITION `p736689` VALUES LESS THAN (736689) ENGINE = InnoDB, - PARTITION `p736690` VALUES LESS THAN (736690) ENGINE = InnoDB, - PARTITION `p736691` VALUES LESS THAN (736691) ENGINE = InnoDB, - PARTITION `p736692` VALUES LESS THAN (736692) ENGINE = InnoDB, - PARTITION `p736693` VALUES LESS THAN (736693) ENGINE = InnoDB, - PARTITION `p736694` VALUES LESS THAN (736694) ENGINE = InnoDB, - PARTITION `p736695` VALUES LESS THAN (736695) ENGINE = InnoDB, - PARTITION `p736696` VALUES LESS THAN (736696) ENGINE = InnoDB, - PARTITION `p736697` VALUES LESS THAN (736697) ENGINE = InnoDB, - PARTITION `p736698` VALUES LESS THAN (736698) ENGINE = InnoDB, - PARTITION `p736699` VALUES LESS THAN (736699) ENGINE = InnoDB, - PARTITION `p736700` VALUES LESS THAN (736700) ENGINE = InnoDB, - PARTITION `p736701` VALUES LESS THAN (736701) ENGINE = InnoDB, - PARTITION `p736702` VALUES LESS THAN (736702) ENGINE = InnoDB, - PARTITION `p736703` VALUES LESS THAN (736703) ENGINE = InnoDB, - PARTITION `p736704` VALUES LESS THAN (736704) ENGINE = InnoDB, - PARTITION `p736705` VALUES LESS THAN (736705) ENGINE = InnoDB, - PARTITION `p736706` VALUES LESS THAN (736706) ENGINE = InnoDB, - PARTITION `p736707` VALUES LESS THAN (736707) ENGINE = InnoDB, - PARTITION `p736708` VALUES LESS THAN (736708) ENGINE = InnoDB, - PARTITION `p736709` VALUES LESS THAN (736709) ENGINE = InnoDB, - PARTITION `p736710` VALUES LESS THAN (736710) ENGINE = InnoDB, - PARTITION `p736711` VALUES LESS THAN (736711) ENGINE = InnoDB, - PARTITION `p736712` VALUES LESS THAN (736712) ENGINE = InnoDB, - PARTITION `p736713` VALUES LESS THAN (736713) ENGINE = InnoDB, - PARTITION `p736714` VALUES LESS THAN (736714) ENGINE = InnoDB, - PARTITION `p736715` VALUES LESS THAN (736715) ENGINE = InnoDB, - PARTITION `p736716` VALUES LESS THAN (736716) ENGINE = InnoDB, - PARTITION `p736717` VALUES LESS THAN (736717) ENGINE = InnoDB, - PARTITION `p736718` VALUES LESS THAN (736718) ENGINE = InnoDB, - PARTITION `p736719` VALUES LESS THAN (736719) ENGINE = InnoDB, - PARTITION `p736720` VALUES LESS THAN (736720) ENGINE = InnoDB, - PARTITION `p736721` VALUES LESS THAN (736721) ENGINE = InnoDB, - PARTITION `p736722` VALUES LESS THAN (736722) ENGINE = InnoDB, - PARTITION `p736723` VALUES LESS THAN (736723) ENGINE = InnoDB, - PARTITION `p736724` VALUES LESS THAN (736724) ENGINE = InnoDB, - PARTITION `p736725` VALUES LESS THAN (736725) ENGINE = InnoDB, - PARTITION `p736726` VALUES LESS THAN (736726) ENGINE = InnoDB, - PARTITION `p736727` VALUES LESS THAN (736727) ENGINE = InnoDB, - PARTITION `p736728` VALUES LESS THAN (736728) ENGINE = InnoDB, - PARTITION `p736729` VALUES LESS THAN (736729) ENGINE = InnoDB, - PARTITION `p736730` VALUES LESS THAN (736730) ENGINE = InnoDB, - PARTITION `p736731` VALUES LESS THAN (736731) ENGINE = InnoDB, - PARTITION `p736732` VALUES LESS THAN (736732) ENGINE = InnoDB, - PARTITION `p736733` VALUES LESS THAN (736733) ENGINE = InnoDB, - PARTITION `p736734` VALUES LESS THAN (736734) ENGINE = InnoDB, - PARTITION `p736735` VALUES LESS THAN (736735) ENGINE = InnoDB, - PARTITION `p736736` VALUES LESS THAN (736736) ENGINE = InnoDB, - PARTITION `p736737` VALUES LESS THAN (736737) ENGINE = InnoDB, - PARTITION `p736738` VALUES LESS THAN (736738) ENGINE = InnoDB, - PARTITION `p736739` VALUES LESS THAN (736739) ENGINE = InnoDB, - PARTITION `p736740` VALUES LESS THAN (736740) ENGINE = InnoDB, - PARTITION `p736741` VALUES LESS THAN (736741) ENGINE = InnoDB, - PARTITION `p736742` VALUES LESS THAN (736742) ENGINE = InnoDB, - PARTITION `p736743` VALUES LESS THAN (736743) ENGINE = InnoDB, - PARTITION `p736744` VALUES LESS THAN (736744) ENGINE = InnoDB, - PARTITION `p736745` VALUES LESS THAN (736745) ENGINE = InnoDB, - PARTITION `p736746` VALUES LESS THAN (736746) ENGINE = InnoDB, - PARTITION `p736747` VALUES LESS THAN (736747) ENGINE = InnoDB, - PARTITION `p736748` VALUES LESS THAN (736748) ENGINE = InnoDB, - PARTITION `p736749` VALUES LESS THAN (736749) ENGINE = InnoDB, - PARTITION `p736750` VALUES LESS THAN (736750) ENGINE = InnoDB, - PARTITION `p736751` VALUES LESS THAN (736751) ENGINE = InnoDB, - PARTITION `p736752` VALUES LESS THAN (736752) ENGINE = InnoDB, - PARTITION `p736753` VALUES LESS THAN (736753) ENGINE = InnoDB, - PARTITION `p736754` VALUES LESS THAN (736754) ENGINE = InnoDB, - PARTITION `p736755` VALUES LESS THAN (736755) ENGINE = InnoDB, - PARTITION `p736756` VALUES LESS THAN (736756) ENGINE = InnoDB, - PARTITION `p736757` VALUES LESS THAN (736757) ENGINE = InnoDB, - PARTITION `p736758` VALUES LESS THAN (736758) ENGINE = InnoDB, - PARTITION `p736759` VALUES LESS THAN (736759) ENGINE = InnoDB, - PARTITION `p736760` VALUES LESS THAN (736760) ENGINE = InnoDB, - PARTITION `p736761` VALUES LESS THAN (736761) ENGINE = InnoDB, - PARTITION `p736762` VALUES LESS THAN (736762) ENGINE = InnoDB, - PARTITION `p736763` VALUES LESS THAN (736763) ENGINE = InnoDB, - PARTITION `p736764` VALUES LESS THAN (736764) ENGINE = InnoDB, - PARTITION `p736765` VALUES LESS THAN (736765) ENGINE = InnoDB, - PARTITION `p736766` VALUES LESS THAN (736766) ENGINE = InnoDB, - PARTITION `p736767` VALUES LESS THAN (736767) ENGINE = InnoDB, - PARTITION `p736768` VALUES LESS THAN (736768) ENGINE = InnoDB, - PARTITION `p736769` VALUES LESS THAN (736769) ENGINE = InnoDB, - PARTITION `p736770` VALUES LESS THAN (736770) ENGINE = InnoDB, - PARTITION `p736771` VALUES LESS THAN (736771) ENGINE = InnoDB, - PARTITION `p736772` VALUES LESS THAN (736772) ENGINE = InnoDB, - PARTITION `p736773` VALUES LESS THAN (736773) ENGINE = InnoDB, - PARTITION `p736774` VALUES LESS THAN (736774) ENGINE = InnoDB, - PARTITION `p736775` VALUES LESS THAN (736775) ENGINE = InnoDB, - PARTITION `p736776` VALUES LESS THAN (736776) ENGINE = InnoDB, - PARTITION `p736777` VALUES LESS THAN (736777) ENGINE = InnoDB, - PARTITION `p736778` VALUES LESS THAN (736778) ENGINE = InnoDB, - PARTITION `p736779` VALUES LESS THAN (736779) ENGINE = InnoDB, - PARTITION `p736780` VALUES LESS THAN (736780) ENGINE = InnoDB, - PARTITION `p736781` VALUES LESS THAN (736781) ENGINE = InnoDB, - PARTITION `p736782` VALUES LESS THAN (736782) ENGINE = InnoDB, - PARTITION `p736783` VALUES LESS THAN (736783) ENGINE = InnoDB, - PARTITION `p736784` VALUES LESS THAN (736784) ENGINE = InnoDB, - PARTITION `p736785` VALUES LESS THAN (736785) ENGINE = InnoDB, - PARTITION `p736786` VALUES LESS THAN (736786) ENGINE = InnoDB, - PARTITION `p736787` VALUES LESS THAN (736787) ENGINE = InnoDB, - PARTITION `p736788` VALUES LESS THAN (736788) ENGINE = InnoDB, - PARTITION `p736789` VALUES LESS THAN (736789) ENGINE = InnoDB, - PARTITION `p736790` VALUES LESS THAN (736790) ENGINE = InnoDB, - PARTITION `p736791` VALUES LESS THAN (736791) ENGINE = InnoDB, - PARTITION `p736792` VALUES LESS THAN (736792) ENGINE = InnoDB, - PARTITION `p736793` VALUES LESS THAN (736793) ENGINE = InnoDB, - PARTITION `p736794` VALUES LESS THAN (736794) ENGINE = InnoDB, - PARTITION `p736795` VALUES LESS THAN (736795) ENGINE = InnoDB, - PARTITION `p736796` VALUES LESS THAN (736796) ENGINE = InnoDB, - PARTITION `p736797` VALUES LESS THAN (736797) ENGINE = InnoDB, - PARTITION `p736798` VALUES LESS THAN (736798) ENGINE = InnoDB, - PARTITION `p736799` VALUES LESS THAN (736799) ENGINE = InnoDB, - PARTITION `p736800` VALUES LESS THAN (736800) ENGINE = InnoDB, - PARTITION `p736801` VALUES LESS THAN (736801) ENGINE = InnoDB, - PARTITION `p736802` VALUES LESS THAN (736802) ENGINE = InnoDB, - PARTITION `p736803` VALUES LESS THAN (736803) ENGINE = InnoDB, - PARTITION `p736804` VALUES LESS THAN (736804) ENGINE = InnoDB, - PARTITION `p736805` VALUES LESS THAN (736805) ENGINE = InnoDB, - PARTITION `p736806` VALUES LESS THAN (736806) ENGINE = InnoDB, - PARTITION `p736807` VALUES LESS THAN (736807) ENGINE = InnoDB, - PARTITION `p736808` VALUES LESS THAN (736808) ENGINE = InnoDB, - PARTITION `p736809` VALUES LESS THAN (736809) ENGINE = InnoDB, - PARTITION `p736810` VALUES LESS THAN (736810) ENGINE = InnoDB, - PARTITION `p736811` VALUES LESS THAN (736811) ENGINE = InnoDB, - PARTITION `p736812` VALUES LESS THAN (736812) ENGINE = InnoDB, - PARTITION `p736813` VALUES LESS THAN (736813) ENGINE = InnoDB, - PARTITION `p736814` VALUES LESS THAN (736814) ENGINE = InnoDB, - PARTITION `p736815` VALUES LESS THAN (736815) ENGINE = InnoDB, - PARTITION `p736816` VALUES LESS THAN (736816) ENGINE = InnoDB, - PARTITION `p736817` VALUES LESS THAN (736817) ENGINE = InnoDB, - PARTITION `p736818` VALUES LESS THAN (736818) ENGINE = InnoDB, - PARTITION `p736819` VALUES LESS THAN (736819) ENGINE = InnoDB, - PARTITION `p736820` VALUES LESS THAN (736820) ENGINE = InnoDB, - PARTITION `p736821` VALUES LESS THAN (736821) ENGINE = InnoDB, - PARTITION `p736822` VALUES LESS THAN (736822) ENGINE = InnoDB, - PARTITION `p736823` VALUES LESS THAN (736823) ENGINE = InnoDB, - PARTITION `p736824` VALUES LESS THAN (736824) ENGINE = InnoDB, - PARTITION `p736825` VALUES LESS THAN (736825) ENGINE = InnoDB, - PARTITION `p736826` VALUES LESS THAN (736826) ENGINE = InnoDB, - PARTITION `p736827` VALUES LESS THAN (736827) ENGINE = InnoDB, - PARTITION `p736828` VALUES LESS THAN (736828) ENGINE = InnoDB, - PARTITION `p736829` VALUES LESS THAN (736829) ENGINE = InnoDB, - PARTITION `p736830` VALUES LESS THAN (736830) ENGINE = InnoDB, - PARTITION `p736831` VALUES LESS THAN (736831) ENGINE = InnoDB, - PARTITION `p736832` VALUES LESS THAN (736832) ENGINE = InnoDB, - PARTITION `p736833` VALUES LESS THAN (736833) ENGINE = InnoDB, - PARTITION `p736834` VALUES LESS THAN (736834) ENGINE = InnoDB, - PARTITION `p736835` VALUES LESS THAN (736835) ENGINE = InnoDB, - PARTITION `p736836` VALUES LESS THAN (736836) ENGINE = InnoDB, - PARTITION `p736837` VALUES LESS THAN (736837) ENGINE = InnoDB, - PARTITION `p736838` VALUES LESS THAN (736838) ENGINE = InnoDB, - PARTITION `p736839` VALUES LESS THAN (736839) ENGINE = InnoDB, - PARTITION `p736840` VALUES LESS THAN (736840) ENGINE = InnoDB, - PARTITION `p736841` VALUES LESS THAN (736841) ENGINE = InnoDB, - PARTITION `p736842` VALUES LESS THAN (736842) ENGINE = InnoDB, - PARTITION `p736843` VALUES LESS THAN (736843) ENGINE = InnoDB, - PARTITION `p736844` VALUES LESS THAN (736844) ENGINE = InnoDB, - PARTITION `p736845` VALUES LESS THAN (736845) ENGINE = InnoDB, - PARTITION `p736846` VALUES LESS THAN (736846) ENGINE = InnoDB, - PARTITION `p736847` VALUES LESS THAN (736847) ENGINE = InnoDB, - PARTITION `p736848` VALUES LESS THAN (736848) ENGINE = InnoDB, - PARTITION `p736849` VALUES LESS THAN (736849) ENGINE = InnoDB, - PARTITION `p736850` VALUES LESS THAN (736850) ENGINE = InnoDB, - PARTITION `p736851` VALUES LESS THAN (736851) ENGINE = InnoDB, - PARTITION `p736852` VALUES LESS THAN (736852) ENGINE = InnoDB, - PARTITION `p736853` VALUES LESS THAN (736853) ENGINE = InnoDB, - PARTITION `p736854` VALUES LESS THAN (736854) ENGINE = InnoDB, - PARTITION `p736855` VALUES LESS THAN (736855) ENGINE = InnoDB, - PARTITION `p736856` VALUES LESS THAN (736856) ENGINE = InnoDB, - PARTITION `p736857` VALUES LESS THAN (736857) ENGINE = InnoDB, - PARTITION `p736858` VALUES LESS THAN (736858) ENGINE = InnoDB, - PARTITION `p736859` VALUES LESS THAN (736859) ENGINE = InnoDB, - PARTITION `p736860` VALUES LESS THAN (736860) ENGINE = InnoDB, - PARTITION `p736861` VALUES LESS THAN (736861) ENGINE = InnoDB, - PARTITION `p736862` VALUES LESS THAN (736862) ENGINE = InnoDB, - PARTITION `p736863` VALUES LESS THAN (736863) ENGINE = InnoDB, - PARTITION `p736864` VALUES LESS THAN (736864) ENGINE = InnoDB, - PARTITION `p736865` VALUES LESS THAN (736865) ENGINE = InnoDB, - PARTITION `p736866` VALUES LESS THAN (736866) ENGINE = InnoDB, - PARTITION `p736867` VALUES LESS THAN (736867) ENGINE = InnoDB, - PARTITION `p736868` VALUES LESS THAN (736868) ENGINE = InnoDB, - PARTITION `p736869` VALUES LESS THAN (736869) ENGINE = InnoDB, - PARTITION `p736870` VALUES LESS THAN (736870) ENGINE = InnoDB, - PARTITION `p736871` VALUES LESS THAN (736871) ENGINE = InnoDB, - PARTITION `p736872` VALUES LESS THAN (736872) ENGINE = InnoDB, - PARTITION `p736873` VALUES LESS THAN (736873) ENGINE = InnoDB, - PARTITION `p736874` VALUES LESS THAN (736874) ENGINE = InnoDB, - PARTITION `p736875` VALUES LESS THAN (736875) ENGINE = InnoDB, - PARTITION `p736876` VALUES LESS THAN (736876) ENGINE = InnoDB, - PARTITION `p736877` VALUES LESS THAN (736877) ENGINE = InnoDB, - PARTITION `p736878` VALUES LESS THAN (736878) ENGINE = InnoDB, - PARTITION `p736879` VALUES LESS THAN (736879) ENGINE = InnoDB, - PARTITION `p736880` VALUES LESS THAN (736880) ENGINE = InnoDB, - PARTITION `p736881` VALUES LESS THAN (736881) ENGINE = InnoDB, - PARTITION `p736882` VALUES LESS THAN (736882) ENGINE = InnoDB, - PARTITION `p736883` VALUES LESS THAN (736883) ENGINE = InnoDB, - PARTITION `p736884` VALUES LESS THAN (736884) ENGINE = InnoDB, - PARTITION `p736885` VALUES LESS THAN (736885) ENGINE = InnoDB, - PARTITION `p736886` VALUES LESS THAN (736886) ENGINE = InnoDB, - PARTITION `p736887` VALUES LESS THAN (736887) ENGINE = InnoDB, - PARTITION `p736888` VALUES LESS THAN (736888) ENGINE = InnoDB, - PARTITION `p736889` VALUES LESS THAN (736889) ENGINE = InnoDB, - PARTITION `p736890` VALUES LESS THAN (736890) ENGINE = InnoDB, - PARTITION `p736891` VALUES LESS THAN (736891) ENGINE = InnoDB, - PARTITION `p736892` VALUES LESS THAN (736892) ENGINE = InnoDB, - PARTITION `p736893` VALUES LESS THAN (736893) ENGINE = InnoDB, - PARTITION `p736894` VALUES LESS THAN (736894) ENGINE = InnoDB, - PARTITION `p736895` VALUES LESS THAN (736895) ENGINE = InnoDB, - PARTITION `p736896` VALUES LESS THAN (736896) ENGINE = InnoDB, - PARTITION `p736897` VALUES LESS THAN (736897) ENGINE = InnoDB, - PARTITION `p736898` VALUES LESS THAN (736898) ENGINE = InnoDB, - PARTITION `p736899` VALUES LESS THAN (736899) ENGINE = InnoDB, - PARTITION `p736900` VALUES LESS THAN (736900) ENGINE = InnoDB, - PARTITION `p736901` VALUES LESS THAN (736901) ENGINE = InnoDB, - PARTITION `p736902` VALUES LESS THAN (736902) ENGINE = InnoDB, - PARTITION `p736903` VALUES LESS THAN (736903) ENGINE = InnoDB, - PARTITION `p736904` VALUES LESS THAN (736904) ENGINE = InnoDB, - PARTITION `p736905` VALUES LESS THAN (736905) ENGINE = InnoDB, - PARTITION `p736906` VALUES LESS THAN (736906) ENGINE = InnoDB, - PARTITION `p736907` VALUES LESS THAN (736907) ENGINE = InnoDB, - PARTITION `p736908` VALUES LESS THAN (736908) ENGINE = InnoDB, - PARTITION `p736909` VALUES LESS THAN (736909) ENGINE = InnoDB, - PARTITION `p736910` VALUES LESS THAN (736910) ENGINE = InnoDB, - PARTITION `p736911` VALUES LESS THAN (736911) ENGINE = InnoDB, - PARTITION `p736912` VALUES LESS THAN (736912) ENGINE = InnoDB, - PARTITION `p736913` VALUES LESS THAN (736913) ENGINE = InnoDB, - PARTITION `p736914` VALUES LESS THAN (736914) ENGINE = InnoDB, - PARTITION `p736915` VALUES LESS THAN (736915) ENGINE = InnoDB, - PARTITION `p736916` VALUES LESS THAN (736916) ENGINE = InnoDB, - PARTITION `p736917` VALUES LESS THAN (736917) ENGINE = InnoDB, - PARTITION `p736918` VALUES LESS THAN (736918) ENGINE = InnoDB, - PARTITION `p736919` VALUES LESS THAN (736919) ENGINE = InnoDB, - PARTITION `p736920` VALUES LESS THAN (736920) ENGINE = InnoDB, - PARTITION `p736921` VALUES LESS THAN (736921) ENGINE = InnoDB, - PARTITION `p736922` VALUES LESS THAN (736922) ENGINE = InnoDB, - PARTITION `p736923` VALUES LESS THAN (736923) ENGINE = InnoDB, - PARTITION `p736924` VALUES LESS THAN (736924) ENGINE = InnoDB, - PARTITION `p736925` VALUES LESS THAN (736925) ENGINE = InnoDB, - PARTITION `p736926` VALUES LESS THAN (736926) ENGINE = InnoDB, - PARTITION `p736927` VALUES LESS THAN (736927) ENGINE = InnoDB, - PARTITION `p736928` VALUES LESS THAN (736928) ENGINE = InnoDB, - PARTITION `p736929` VALUES LESS THAN (736929) ENGINE = InnoDB, - PARTITION `p736930` VALUES LESS THAN (736930) ENGINE = InnoDB, - PARTITION `p736931` VALUES LESS THAN (736931) ENGINE = InnoDB, - PARTITION `p736932` VALUES LESS THAN (736932) ENGINE = InnoDB, - PARTITION `p736933` VALUES LESS THAN (736933) ENGINE = InnoDB, - PARTITION `p736934` VALUES LESS THAN (736934) ENGINE = InnoDB, - PARTITION `p736935` VALUES LESS THAN (736935) ENGINE = InnoDB, - PARTITION `p736936` VALUES LESS THAN (736936) ENGINE = InnoDB, - PARTITION `p736937` VALUES LESS THAN (736937) ENGINE = InnoDB, - PARTITION `p736938` VALUES LESS THAN (736938) ENGINE = InnoDB, - PARTITION `p736939` VALUES LESS THAN (736939) ENGINE = InnoDB, - PARTITION `p736940` VALUES LESS THAN (736940) ENGINE = InnoDB, - PARTITION `p736941` VALUES LESS THAN (736941) ENGINE = InnoDB, - PARTITION `p736942` VALUES LESS THAN (736942) ENGINE = InnoDB, - PARTITION `p736943` VALUES LESS THAN (736943) ENGINE = InnoDB, - PARTITION `p736944` VALUES LESS THAN (736944) ENGINE = InnoDB, - PARTITION `p736945` VALUES LESS THAN (736945) ENGINE = InnoDB, - PARTITION `p736946` VALUES LESS THAN (736946) ENGINE = InnoDB, - PARTITION `p736947` VALUES LESS THAN (736947) ENGINE = InnoDB, - PARTITION `p736948` VALUES LESS THAN (736948) ENGINE = InnoDB, - PARTITION `p736949` VALUES LESS THAN (736949) ENGINE = InnoDB, - PARTITION `p736950` VALUES LESS THAN (736950) ENGINE = InnoDB, - PARTITION `p736951` VALUES LESS THAN (736951) ENGINE = InnoDB, - 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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -1493,13 +730,26 @@ 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); /*!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_metric_aggregate_resource_hourly` ( `metric_id` int(11) NOT NULL DEFAULT 0, - `resource_id` int(11) NOT NULL DEFAULT 0, + `resource_id` int(11) NOT NULL, `resource_foreign_id` varchar(255) NOT NULL DEFAULT '', `tenant_id` int(11) NOT NULL DEFAULT 0, `customer_id` int(11) NOT NULL DEFAULT 0, @@ -1513,69 +763,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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -1605,13 +793,26 @@ 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); /*!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_metric_aggregate_resource_monthly` ( `metric_id` int(11) NOT NULL DEFAULT 0, - `resource_id` int(11) NOT NULL DEFAULT 0, + `resource_id` int(11) NOT NULL, `resource_foreign_id` varchar(255) NOT NULL DEFAULT '', `aggregate_datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `min` double DEFAULT NULL, @@ -1645,370 +846,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 `p736671` VALUES LESS THAN (736671) ENGINE = InnoDB, - PARTITION `p736672` VALUES LESS THAN (736672) ENGINE = InnoDB, - PARTITION `p736673` VALUES LESS THAN (736673) ENGINE = InnoDB, - PARTITION `p736674` VALUES LESS THAN (736674) ENGINE = InnoDB, - PARTITION `p736675` VALUES LESS THAN (736675) ENGINE = InnoDB, - PARTITION `p736676` VALUES LESS THAN (736676) ENGINE = InnoDB, - PARTITION `p736677` VALUES LESS THAN (736677) ENGINE = InnoDB, - PARTITION `p736678` VALUES LESS THAN (736678) ENGINE = InnoDB, - PARTITION `p736679` VALUES LESS THAN (736679) ENGINE = InnoDB, - PARTITION `p736680` VALUES LESS THAN (736680) ENGINE = InnoDB, - PARTITION `p736681` VALUES LESS THAN (736681) ENGINE = InnoDB, - PARTITION `p736682` VALUES LESS THAN (736682) ENGINE = InnoDB, - PARTITION `p736683` VALUES LESS THAN (736683) ENGINE = InnoDB, - PARTITION `p736684` VALUES LESS THAN (736684) ENGINE = InnoDB, - PARTITION `p736685` VALUES LESS THAN (736685) ENGINE = InnoDB, - PARTITION `p736686` VALUES LESS THAN (736686) ENGINE = InnoDB, - PARTITION `p736687` VALUES LESS THAN (736687) ENGINE = InnoDB, - PARTITION `p736688` VALUES LESS THAN (736688) ENGINE = InnoDB, - PARTITION `p736689` VALUES LESS THAN (736689) ENGINE = InnoDB, - PARTITION `p736690` VALUES LESS THAN (736690) ENGINE = InnoDB, - PARTITION `p736691` VALUES LESS THAN (736691) ENGINE = InnoDB, - PARTITION `p736692` VALUES LESS THAN (736692) ENGINE = InnoDB, - PARTITION `p736693` VALUES LESS THAN (736693) ENGINE = InnoDB, - PARTITION `p736694` VALUES LESS THAN (736694) ENGINE = InnoDB, - PARTITION `p736695` VALUES LESS THAN (736695) ENGINE = InnoDB, - PARTITION `p736696` VALUES LESS THAN (736696) ENGINE = InnoDB, - PARTITION `p736697` VALUES LESS THAN (736697) ENGINE = InnoDB, - PARTITION `p736698` VALUES LESS THAN (736698) ENGINE = InnoDB, - PARTITION `p736699` VALUES LESS THAN (736699) ENGINE = InnoDB, - PARTITION `p736700` VALUES LESS THAN (736700) ENGINE = InnoDB, - PARTITION `p736701` VALUES LESS THAN (736701) ENGINE = InnoDB, - PARTITION `p736702` VALUES LESS THAN (736702) ENGINE = InnoDB, - PARTITION `p736703` VALUES LESS THAN (736703) ENGINE = InnoDB, - PARTITION `p736704` VALUES LESS THAN (736704) ENGINE = InnoDB, - PARTITION `p736705` VALUES LESS THAN (736705) ENGINE = InnoDB, - PARTITION `p736706` VALUES LESS THAN (736706) ENGINE = InnoDB, - PARTITION `p736707` VALUES LESS THAN (736707) ENGINE = InnoDB, - PARTITION `p736708` VALUES LESS THAN (736708) ENGINE = InnoDB, - PARTITION `p736709` VALUES LESS THAN (736709) ENGINE = InnoDB, - PARTITION `p736710` VALUES LESS THAN (736710) ENGINE = InnoDB, - PARTITION `p736711` VALUES LESS THAN (736711) ENGINE = InnoDB, - PARTITION `p736712` VALUES LESS THAN (736712) ENGINE = InnoDB, - PARTITION `p736713` VALUES LESS THAN (736713) ENGINE = InnoDB, - PARTITION `p736714` VALUES LESS THAN (736714) ENGINE = InnoDB, - PARTITION `p736715` VALUES LESS THAN (736715) ENGINE = InnoDB, - PARTITION `p736716` VALUES LESS THAN (736716) ENGINE = InnoDB, - PARTITION `p736717` VALUES LESS THAN (736717) ENGINE = InnoDB, - PARTITION `p736718` VALUES LESS THAN (736718) ENGINE = InnoDB, - PARTITION `p736719` VALUES LESS THAN (736719) ENGINE = InnoDB, - PARTITION `p736720` VALUES LESS THAN (736720) ENGINE = InnoDB, - PARTITION `p736721` VALUES LESS THAN (736721) ENGINE = InnoDB, - PARTITION `p736722` VALUES LESS THAN (736722) ENGINE = InnoDB, - PARTITION `p736723` VALUES LESS THAN (736723) ENGINE = InnoDB, - PARTITION `p736724` VALUES LESS THAN (736724) ENGINE = InnoDB, - PARTITION `p736725` VALUES LESS THAN (736725) ENGINE = InnoDB, - PARTITION `p736726` VALUES LESS THAN (736726) ENGINE = InnoDB, - PARTITION `p736727` VALUES LESS THAN (736727) ENGINE = InnoDB, - PARTITION `p736728` VALUES LESS THAN (736728) ENGINE = InnoDB, - PARTITION `p736729` VALUES LESS THAN (736729) ENGINE = InnoDB, - PARTITION `p736730` VALUES LESS THAN (736730) ENGINE = InnoDB, - PARTITION `p736731` VALUES LESS THAN (736731) ENGINE = InnoDB, - PARTITION `p736732` VALUES LESS THAN (736732) ENGINE = InnoDB, - PARTITION `p736733` VALUES LESS THAN (736733) ENGINE = InnoDB, - PARTITION `p736734` VALUES LESS THAN (736734) ENGINE = InnoDB, - PARTITION `p736735` VALUES LESS THAN (736735) ENGINE = InnoDB, - PARTITION `p736736` VALUES LESS THAN (736736) ENGINE = InnoDB, - PARTITION `p736737` VALUES LESS THAN (736737) ENGINE = InnoDB, - PARTITION `p736738` VALUES LESS THAN (736738) ENGINE = InnoDB, - PARTITION `p736739` VALUES LESS THAN (736739) ENGINE = InnoDB, - PARTITION `p736740` VALUES LESS THAN (736740) ENGINE = InnoDB, - PARTITION `p736741` VALUES LESS THAN (736741) ENGINE = InnoDB, - PARTITION `p736742` VALUES LESS THAN (736742) ENGINE = InnoDB, - PARTITION `p736743` VALUES LESS THAN (736743) ENGINE = InnoDB, - PARTITION `p736744` VALUES LESS THAN (736744) ENGINE = InnoDB, - PARTITION `p736745` VALUES LESS THAN (736745) ENGINE = InnoDB, - PARTITION `p736746` VALUES LESS THAN (736746) ENGINE = InnoDB, - PARTITION `p736747` VALUES LESS THAN (736747) ENGINE = InnoDB, - PARTITION `p736748` VALUES LESS THAN (736748) ENGINE = InnoDB, - PARTITION `p736749` VALUES LESS THAN (736749) ENGINE = InnoDB, - PARTITION `p736750` VALUES LESS THAN (736750) ENGINE = InnoDB, - PARTITION `p736751` VALUES LESS THAN (736751) ENGINE = InnoDB, - PARTITION `p736752` VALUES LESS THAN (736752) ENGINE = InnoDB, - PARTITION `p736753` VALUES LESS THAN (736753) ENGINE = InnoDB, - PARTITION `p736754` VALUES LESS THAN (736754) ENGINE = InnoDB, - PARTITION `p736755` VALUES LESS THAN (736755) ENGINE = InnoDB, - PARTITION `p736756` VALUES LESS THAN (736756) ENGINE = InnoDB, - PARTITION `p736757` VALUES LESS THAN (736757) ENGINE = InnoDB, - PARTITION `p736758` VALUES LESS THAN (736758) ENGINE = InnoDB, - PARTITION `p736759` VALUES LESS THAN (736759) ENGINE = InnoDB, - PARTITION `p736760` VALUES LESS THAN (736760) ENGINE = InnoDB, - PARTITION `p736761` VALUES LESS THAN (736761) ENGINE = InnoDB, - PARTITION `p736762` VALUES LESS THAN (736762) ENGINE = InnoDB, - PARTITION `p736763` VALUES LESS THAN (736763) ENGINE = InnoDB, - PARTITION `p736764` VALUES LESS THAN (736764) ENGINE = InnoDB, - PARTITION `p736765` VALUES LESS THAN (736765) ENGINE = InnoDB, - PARTITION `p736766` VALUES LESS THAN (736766) ENGINE = InnoDB, - PARTITION `p736767` VALUES LESS THAN (736767) ENGINE = InnoDB, - PARTITION `p736768` VALUES LESS THAN (736768) ENGINE = InnoDB, - PARTITION `p736769` VALUES LESS THAN (736769) ENGINE = InnoDB, - PARTITION `p736770` VALUES LESS THAN (736770) ENGINE = InnoDB, - PARTITION `p736771` VALUES LESS THAN (736771) ENGINE = InnoDB, - PARTITION `p736772` VALUES LESS THAN (736772) ENGINE = InnoDB, - PARTITION `p736773` VALUES LESS THAN (736773) ENGINE = InnoDB, - PARTITION `p736774` VALUES LESS THAN (736774) ENGINE = InnoDB, - PARTITION `p736775` VALUES LESS THAN (736775) ENGINE = InnoDB, - PARTITION `p736776` VALUES LESS THAN (736776) ENGINE = InnoDB, - PARTITION `p736777` VALUES LESS THAN (736777) ENGINE = InnoDB, - PARTITION `p736778` VALUES LESS THAN (736778) ENGINE = InnoDB, - PARTITION `p736779` VALUES LESS THAN (736779) ENGINE = InnoDB, - PARTITION `p736780` VALUES LESS THAN (736780) ENGINE = InnoDB, - PARTITION `p736781` VALUES LESS THAN (736781) ENGINE = InnoDB, - PARTITION `p736782` VALUES LESS THAN (736782) ENGINE = InnoDB, - PARTITION `p736783` VALUES LESS THAN (736783) ENGINE = InnoDB, - PARTITION `p736784` VALUES LESS THAN (736784) ENGINE = InnoDB, - PARTITION `p736785` VALUES LESS THAN (736785) ENGINE = InnoDB, - PARTITION `p736786` VALUES LESS THAN (736786) ENGINE = InnoDB, - PARTITION `p736787` VALUES LESS THAN (736787) ENGINE = InnoDB, - PARTITION `p736788` VALUES LESS THAN (736788) ENGINE = InnoDB, - PARTITION `p736789` VALUES LESS THAN (736789) ENGINE = InnoDB, - PARTITION `p736790` VALUES LESS THAN (736790) ENGINE = InnoDB, - PARTITION `p736791` VALUES LESS THAN (736791) ENGINE = InnoDB, - PARTITION `p736792` VALUES LESS THAN (736792) ENGINE = InnoDB, - PARTITION `p736793` VALUES LESS THAN (736793) ENGINE = InnoDB, - PARTITION `p736794` VALUES LESS THAN (736794) ENGINE = InnoDB, - PARTITION `p736795` VALUES LESS THAN (736795) ENGINE = InnoDB, - PARTITION `p736796` VALUES LESS THAN (736796) ENGINE = InnoDB, - PARTITION `p736797` VALUES LESS THAN (736797) ENGINE = InnoDB, - PARTITION `p736798` VALUES LESS THAN (736798) ENGINE = InnoDB, - PARTITION `p736799` VALUES LESS THAN (736799) ENGINE = InnoDB, - PARTITION `p736800` VALUES LESS THAN (736800) ENGINE = InnoDB, - PARTITION `p736801` VALUES LESS THAN (736801) ENGINE = InnoDB, - PARTITION `p736802` VALUES LESS THAN (736802) ENGINE = InnoDB, - PARTITION `p736803` VALUES LESS THAN (736803) ENGINE = InnoDB, - PARTITION `p736804` VALUES LESS THAN (736804) ENGINE = InnoDB, - PARTITION `p736805` VALUES LESS THAN (736805) ENGINE = InnoDB, - PARTITION `p736806` VALUES LESS THAN (736806) ENGINE = InnoDB, - PARTITION `p736807` VALUES LESS THAN (736807) ENGINE = InnoDB, - PARTITION `p736808` VALUES LESS THAN (736808) ENGINE = InnoDB, - PARTITION `p736809` VALUES LESS THAN (736809) ENGINE = InnoDB, - PARTITION `p736810` VALUES LESS THAN (736810) ENGINE = InnoDB, - PARTITION `p736811` VALUES LESS THAN (736811) ENGINE = InnoDB, - PARTITION `p736812` VALUES LESS THAN (736812) ENGINE = InnoDB, - PARTITION `p736813` VALUES LESS THAN (736813) ENGINE = InnoDB, - PARTITION `p736814` VALUES LESS THAN (736814) ENGINE = InnoDB, - PARTITION `p736815` VALUES LESS THAN (736815) ENGINE = InnoDB, - PARTITION `p736816` VALUES LESS THAN (736816) ENGINE = InnoDB, - PARTITION `p736817` VALUES LESS THAN (736817) ENGINE = InnoDB, - PARTITION `p736818` VALUES LESS THAN (736818) ENGINE = InnoDB, - PARTITION `p736819` VALUES LESS THAN (736819) ENGINE = InnoDB, - PARTITION `p736820` VALUES LESS THAN (736820) ENGINE = InnoDB, - PARTITION `p736821` VALUES LESS THAN (736821) ENGINE = InnoDB, - PARTITION `p736822` VALUES LESS THAN (736822) ENGINE = InnoDB, - PARTITION `p736823` VALUES LESS THAN (736823) ENGINE = InnoDB, - PARTITION `p736824` VALUES LESS THAN (736824) ENGINE = InnoDB, - PARTITION `p736825` VALUES LESS THAN (736825) ENGINE = InnoDB, - PARTITION `p736826` VALUES LESS THAN (736826) ENGINE = InnoDB, - PARTITION `p736827` VALUES LESS THAN (736827) ENGINE = InnoDB, - PARTITION `p736828` VALUES LESS THAN (736828) ENGINE = InnoDB, - PARTITION `p736829` VALUES LESS THAN (736829) ENGINE = InnoDB, - PARTITION `p736830` VALUES LESS THAN (736830) ENGINE = InnoDB, - PARTITION `p736831` VALUES LESS THAN (736831) ENGINE = InnoDB, - PARTITION `p736832` VALUES LESS THAN (736832) ENGINE = InnoDB, - PARTITION `p736833` VALUES LESS THAN (736833) ENGINE = InnoDB, - PARTITION `p736834` VALUES LESS THAN (736834) ENGINE = InnoDB, - PARTITION `p736835` VALUES LESS THAN (736835) ENGINE = InnoDB, - PARTITION `p736836` VALUES LESS THAN (736836) ENGINE = InnoDB, - PARTITION `p736837` VALUES LESS THAN (736837) ENGINE = InnoDB, - PARTITION `p736838` VALUES LESS THAN (736838) ENGINE = InnoDB, - PARTITION `p736839` VALUES LESS THAN (736839) ENGINE = InnoDB, - PARTITION `p736840` VALUES LESS THAN (736840) ENGINE = InnoDB, - PARTITION `p736841` VALUES LESS THAN (736841) ENGINE = InnoDB, - PARTITION `p736842` VALUES LESS THAN (736842) ENGINE = InnoDB, - PARTITION `p736843` VALUES LESS THAN (736843) ENGINE = InnoDB, - PARTITION `p736844` VALUES LESS THAN (736844) ENGINE = InnoDB, - PARTITION `p736845` VALUES LESS THAN (736845) ENGINE = InnoDB, - PARTITION `p736846` VALUES LESS THAN (736846) ENGINE = InnoDB, - PARTITION `p736847` VALUES LESS THAN (736847) ENGINE = InnoDB, - PARTITION `p736848` VALUES LESS THAN (736848) ENGINE = InnoDB, - PARTITION `p736849` VALUES LESS THAN (736849) ENGINE = InnoDB, - PARTITION `p736850` VALUES LESS THAN (736850) ENGINE = InnoDB, - PARTITION `p736851` VALUES LESS THAN (736851) ENGINE = InnoDB, - PARTITION `p736852` VALUES LESS THAN (736852) ENGINE = InnoDB, - PARTITION `p736853` VALUES LESS THAN (736853) ENGINE = InnoDB, - PARTITION `p736854` VALUES LESS THAN (736854) ENGINE = InnoDB, - PARTITION `p736855` VALUES LESS THAN (736855) ENGINE = InnoDB, - PARTITION `p736856` VALUES LESS THAN (736856) ENGINE = InnoDB, - PARTITION `p736857` VALUES LESS THAN (736857) ENGINE = InnoDB, - PARTITION `p736858` VALUES LESS THAN (736858) ENGINE = InnoDB, - PARTITION `p736859` VALUES LESS THAN (736859) ENGINE = InnoDB, - PARTITION `p736860` VALUES LESS THAN (736860) ENGINE = InnoDB, - PARTITION `p736861` VALUES LESS THAN (736861) ENGINE = InnoDB, - PARTITION `p736862` VALUES LESS THAN (736862) ENGINE = InnoDB, - PARTITION `p736863` VALUES LESS THAN (736863) ENGINE = InnoDB, - PARTITION `p736864` VALUES LESS THAN (736864) ENGINE = InnoDB, - PARTITION `p736865` VALUES LESS THAN (736865) ENGINE = InnoDB, - PARTITION `p736866` VALUES LESS THAN (736866) ENGINE = InnoDB, - PARTITION `p736867` VALUES LESS THAN (736867) ENGINE = InnoDB, - PARTITION `p736868` VALUES LESS THAN (736868) ENGINE = InnoDB, - PARTITION `p736869` VALUES LESS THAN (736869) ENGINE = InnoDB, - PARTITION `p736870` VALUES LESS THAN (736870) ENGINE = InnoDB, - PARTITION `p736871` VALUES LESS THAN (736871) ENGINE = InnoDB, - PARTITION `p736872` VALUES LESS THAN (736872) ENGINE = InnoDB, - PARTITION `p736873` VALUES LESS THAN (736873) ENGINE = InnoDB, - PARTITION `p736874` VALUES LESS THAN (736874) ENGINE = InnoDB, - PARTITION `p736875` VALUES LESS THAN (736875) ENGINE = InnoDB, - PARTITION `p736876` VALUES LESS THAN (736876) ENGINE = InnoDB, - PARTITION `p736877` VALUES LESS THAN (736877) ENGINE = InnoDB, - PARTITION `p736878` VALUES LESS THAN (736878) ENGINE = InnoDB, - PARTITION `p736879` VALUES LESS THAN (736879) ENGINE = InnoDB, - PARTITION `p736880` VALUES LESS THAN (736880) ENGINE = InnoDB, - PARTITION `p736881` VALUES LESS THAN (736881) ENGINE = InnoDB, - PARTITION `p736882` VALUES LESS THAN (736882) ENGINE = InnoDB, - PARTITION `p736883` VALUES LESS THAN (736883) ENGINE = InnoDB, - PARTITION `p736884` VALUES LESS THAN (736884) ENGINE = InnoDB, - PARTITION `p736885` VALUES LESS THAN (736885) ENGINE = InnoDB, - PARTITION `p736886` VALUES LESS THAN (736886) ENGINE = InnoDB, - PARTITION `p736887` VALUES LESS THAN (736887) ENGINE = InnoDB, - PARTITION `p736888` VALUES LESS THAN (736888) ENGINE = InnoDB, - PARTITION `p736889` VALUES LESS THAN (736889) ENGINE = InnoDB, - PARTITION `p736890` VALUES LESS THAN (736890) ENGINE = InnoDB, - PARTITION `p736891` VALUES LESS THAN (736891) ENGINE = InnoDB, - PARTITION `p736892` VALUES LESS THAN (736892) ENGINE = InnoDB, - PARTITION `p736893` VALUES LESS THAN (736893) ENGINE = InnoDB, - PARTITION `p736894` VALUES LESS THAN (736894) ENGINE = InnoDB, - PARTITION `p736895` VALUES LESS THAN (736895) ENGINE = InnoDB, - PARTITION `p736896` VALUES LESS THAN (736896) ENGINE = InnoDB, - PARTITION `p736897` VALUES LESS THAN (736897) ENGINE = InnoDB, - PARTITION `p736898` VALUES LESS THAN (736898) ENGINE = InnoDB, - PARTITION `p736899` VALUES LESS THAN (736899) ENGINE = InnoDB, - PARTITION `p736900` VALUES LESS THAN (736900) ENGINE = InnoDB, - PARTITION `p736901` VALUES LESS THAN (736901) ENGINE = InnoDB, - PARTITION `p736902` VALUES LESS THAN (736902) ENGINE = InnoDB, - PARTITION `p736903` VALUES LESS THAN (736903) ENGINE = InnoDB, - PARTITION `p736904` VALUES LESS THAN (736904) ENGINE = InnoDB, - PARTITION `p736905` VALUES LESS THAN (736905) ENGINE = InnoDB, - PARTITION `p736906` VALUES LESS THAN (736906) ENGINE = InnoDB, - PARTITION `p736907` VALUES LESS THAN (736907) ENGINE = InnoDB, - PARTITION `p736908` VALUES LESS THAN (736908) ENGINE = InnoDB, - PARTITION `p736909` VALUES LESS THAN (736909) ENGINE = InnoDB, - PARTITION `p736910` VALUES LESS THAN (736910) ENGINE = InnoDB, - PARTITION `p736911` VALUES LESS THAN (736911) ENGINE = InnoDB, - PARTITION `p736912` VALUES LESS THAN (736912) ENGINE = InnoDB, - PARTITION `p736913` VALUES LESS THAN (736913) ENGINE = InnoDB, - PARTITION `p736914` VALUES LESS THAN (736914) ENGINE = InnoDB, - PARTITION `p736915` VALUES LESS THAN (736915) ENGINE = InnoDB, - PARTITION `p736916` VALUES LESS THAN (736916) ENGINE = InnoDB, - PARTITION `p736917` VALUES LESS THAN (736917) ENGINE = InnoDB, - PARTITION `p736918` VALUES LESS THAN (736918) ENGINE = InnoDB, - PARTITION `p736919` VALUES LESS THAN (736919) ENGINE = InnoDB, - PARTITION `p736920` VALUES LESS THAN (736920) ENGINE = InnoDB, - PARTITION `p736921` VALUES LESS THAN (736921) ENGINE = InnoDB, - PARTITION `p736922` VALUES LESS THAN (736922) ENGINE = InnoDB, - PARTITION `p736923` VALUES LESS THAN (736923) ENGINE = InnoDB, - PARTITION `p736924` VALUES LESS THAN (736924) ENGINE = InnoDB, - PARTITION `p736925` VALUES LESS THAN (736925) ENGINE = InnoDB, - PARTITION `p736926` VALUES LESS THAN (736926) ENGINE = InnoDB, - PARTITION `p736927` VALUES LESS THAN (736927) ENGINE = InnoDB, - PARTITION `p736928` VALUES LESS THAN (736928) ENGINE = InnoDB, - PARTITION `p736929` VALUES LESS THAN (736929) ENGINE = InnoDB, - PARTITION `p736930` VALUES LESS THAN (736930) ENGINE = InnoDB, - PARTITION `p736931` VALUES LESS THAN (736931) ENGINE = InnoDB, - PARTITION `p736932` VALUES LESS THAN (736932) ENGINE = InnoDB, - PARTITION `p736933` VALUES LESS THAN (736933) ENGINE = InnoDB, - PARTITION `p736934` VALUES LESS THAN (736934) ENGINE = InnoDB, - PARTITION `p736935` VALUES LESS THAN (736935) ENGINE = InnoDB, - PARTITION `p736936` VALUES LESS THAN (736936) ENGINE = InnoDB, - PARTITION `p736937` VALUES LESS THAN (736937) ENGINE = InnoDB, - PARTITION `p736938` VALUES LESS THAN (736938) ENGINE = InnoDB, - PARTITION `p736939` VALUES LESS THAN (736939) ENGINE = InnoDB, - PARTITION `p736940` VALUES LESS THAN (736940) ENGINE = InnoDB, - PARTITION `p736941` VALUES LESS THAN (736941) ENGINE = InnoDB, - PARTITION `p736942` VALUES LESS THAN (736942) ENGINE = InnoDB, - PARTITION `p736943` VALUES LESS THAN (736943) ENGINE = InnoDB, - PARTITION `p736944` VALUES LESS THAN (736944) ENGINE = InnoDB, - PARTITION `p736945` VALUES LESS THAN (736945) ENGINE = InnoDB, - PARTITION `p736946` VALUES LESS THAN (736946) ENGINE = InnoDB, - PARTITION `p736947` VALUES LESS THAN (736947) ENGINE = InnoDB, - PARTITION `p736948` VALUES LESS THAN (736948) ENGINE = InnoDB, - PARTITION `p736949` VALUES LESS THAN (736949) ENGINE = InnoDB, - PARTITION `p736950` VALUES LESS THAN (736950) ENGINE = InnoDB, - PARTITION `p736951` VALUES LESS THAN (736951) ENGINE = InnoDB, - 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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -2038,7 +876,20 @@ 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); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2056,69 +907,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 `p736976` VALUES LESS THAN (736976) ENGINE = InnoDB, - PARTITION `p736977` VALUES LESS THAN (736977) ENGINE = InnoDB, - PARTITION `p736978` VALUES LESS THAN (736978) ENGINE = InnoDB, - PARTITION `p736979` VALUES LESS THAN (736979) ENGINE = InnoDB, - PARTITION `p736980` VALUES LESS THAN (736980) ENGINE = InnoDB, - PARTITION `p736981` VALUES LESS THAN (736981) ENGINE = InnoDB, - PARTITION `p736982` VALUES LESS THAN (736982) ENGINE = InnoDB, - PARTITION `p736983` VALUES LESS THAN (736983) ENGINE = InnoDB, - PARTITION `p736984` VALUES LESS THAN (736984) ENGINE = InnoDB, - PARTITION `p736985` VALUES LESS THAN (736985) ENGINE = InnoDB, - PARTITION `p736986` VALUES LESS THAN (736986) ENGINE = InnoDB, - PARTITION `p736987` VALUES LESS THAN (736987) ENGINE = InnoDB, - PARTITION `p736988` VALUES LESS THAN (736988) ENGINE = InnoDB, - PARTITION `p736989` VALUES LESS THAN (736989) ENGINE = InnoDB, - PARTITION `p736990` VALUES LESS THAN (736990) ENGINE = InnoDB, - PARTITION `p736991` VALUES LESS THAN (736991) ENGINE = InnoDB, - PARTITION `p736992` VALUES LESS THAN (736992) ENGINE = InnoDB, - PARTITION `p736993` VALUES LESS THAN (736993) ENGINE = InnoDB, - PARTITION `p736994` VALUES LESS THAN (736994) ENGINE = InnoDB, - PARTITION `p736995` VALUES LESS THAN (736995) ENGINE = InnoDB, - PARTITION `p736996` VALUES LESS THAN (736996) ENGINE = InnoDB, - PARTITION `p736997` VALUES LESS THAN (736997) ENGINE = InnoDB, - PARTITION `p736998` VALUES LESS THAN (736998) ENGINE = InnoDB, - PARTITION `p736999` VALUES LESS THAN (736999) ENGINE = InnoDB, - PARTITION `p737000` VALUES LESS THAN (737000) ENGINE = InnoDB, - PARTITION `p737001` VALUES LESS THAN (737001) ENGINE = InnoDB, - PARTITION `p737002` VALUES LESS THAN (737002) ENGINE = InnoDB, - PARTITION `p737003` VALUES LESS THAN (737003) ENGINE = InnoDB, - PARTITION `p737004` VALUES LESS THAN (737004) ENGINE = InnoDB, - 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 `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, @@ -2148,7 +937,20 @@ 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); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2186,20 +988,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 `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, @@ -2225,7 +1014,20 @@ 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); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; @@ -2272,7 +1074,7 @@ CREATE TABLE `t_product` ( `public_product` tinyint(4) NOT NULL, `management_region_id` int(10) unsigned NOT NULL, PRIMARY KEY (`product_id`) -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=13 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 */; @@ -2373,7 +1175,7 @@ CREATE TABLE `t_provider` ( PRIMARY KEY (`provider_id`), UNIQUE KEY `ix_provider_2` (`management_region_id`), UNIQUE KEY `ix_provider_1` (`public_url`(255)) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=3245 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 */; @@ -2410,7 +1212,7 @@ CREATE TABLE `t_provider_service_manager` ( `provider_id` int(11) NOT NULL, `service_manager_id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=117 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=7 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 */; @@ -2423,7 +1225,7 @@ CREATE TABLE `t_rate` ( `rate_structure` text NOT NULL, PRIMARY KEY (`rate_id`), KEY `ix_rate_1` (`rate_plan_id`) -) ENGINE=InnoDB AUTO_INCREMENT=681 DEFAULT CHARSET=utf8; +) 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 */; @@ -2438,7 +1240,7 @@ CREATE TABLE `t_rate_plan` ( PRIMARY KEY (`rate_plan_id`), UNIQUE KEY `ix_rate_plan_2` (`management_region_id`,`rate_plan_name`), KEY `ix_rate_plan_1` (`management_region_id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; +) 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 */; @@ -2464,7 +1266,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=2 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 */; @@ -2515,7 +1317,7 @@ CREATE TABLE `t_service` ( `externally_managed` tinyint(4) NOT NULL DEFAULT 1, PRIMARY KEY (`service_id`), UNIQUE KEY `ix_service_1` (`service_manager_type_id`,`service_type`) -) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=15 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,16 +1333,16 @@ 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 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_service_instance_aggregates` ( - `customer_id` int(10) unsigned NOT NULL DEFAULT 0, + `customer_id` int(10) unsigned NOT NULL, `customer_name` varchar(255) DEFAULT NULL, - `tenant_id` int(10) unsigned NOT NULL DEFAULT 0, + `tenant_id` int(10) unsigned NOT NULL, `tenant_name` varchar(255) DEFAULT NULL, - `management_region_id` varchar(128) NOT NULL DEFAULT '', + `management_region_id` varchar(128) NOT NULL, `service_manager_id` int(10) unsigned NOT NULL, `service_manager_name` varchar(256) NOT NULL, `service_region_id` int(10) unsigned NOT NULL, @@ -2589,7 +1391,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 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 +1433,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 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=5 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 +1476,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 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 +1558,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 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 */; @@ -2789,7 +1611,7 @@ CREATE TABLE `t_users` ( `external` tinyint(1) DEFAULT 0, PRIMARY KEY (`user_id`), UNIQUE KEY `username` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; SET @saved_cs_client = @@character_set_client; SET character_set_client = utf8; @@ -3121,7 +1943,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 +1965,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 */; @@ -3827,7 +2686,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_all_charges` AS select `t_invoice`.`invoice_id` AS `invoice_id`,`t_invoice`.`payer_id` AS `payer_id`,`t_invoice`.`payer_type` AS `payer_type`,`t_invoice`.`payer_name` AS `payer_name`,`t_invoice`.`invoice_number` AS `invoice_number`,`t_invoice`.`invoice_date` AS `invoice_date`,`t_invoice`.`period_begin` AS `period_begin`,`t_invoice`.`period_end` AS `period_end`,`t_invoice`.`invoice_amount` AS `invoice_amount`,`t_invoice`.`actual_charges` AS `actual_charges`,`t_invoice`.`invoice_currency` AS `invoice_currency`,`t_invoice`.`management_region_id` AS `management_region_id` from `t_invoice` union select `t_unbilled_charges`.`invoice_id` AS `invoice_id`,`t_unbilled_charges`.`payer_id` AS `payer_id`,`t_unbilled_charges`.`payer_type` AS `payer_type`,`t_unbilled_charges`.`payer_name` AS `payer_name`,`t_unbilled_charges`.`invoice_number` AS `invoice_number`,`t_unbilled_charges`.`invoice_date` AS `invoice_date`,`t_unbilled_charges`.`period_begin` AS `period_begin`,`t_unbilled_charges`.`period_end` AS `period_end`,`t_unbilled_charges`.`invoice_amount` AS `invoice_amount`,`t_unbilled_charges`.`actual_charges` AS `actual_charges`,`t_unbilled_charges`.`invoice_currency` AS `invoice_currency`,`t_unbilled_charges`.`management_region_id` AS `management_region_id` from `t_unbilled_charges` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3840,7 +2699,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_all_charges_detail` AS select `t_invoice_detail`.`invoice_id` AS `invoice_id`,`t_invoice_detail`.`customer_id` AS `customer_id`,`t_invoice_detail`.`customer_name` AS `customer_name`,`t_invoice_detail`.`service_region_id` AS `service_region_id`,`t_invoice_detail`.`rate` AS `rate`,`t_invoice_detail`.`rate_display` AS `rate_display`,`t_invoice_detail`.`rate_unit` AS `rate_unit`,`t_invoice_detail`.`rate_interval` AS `rate_interval`,`t_invoice_detail`.`rate_multiplier_percent` AS `rate_multiplier_percent`,`t_invoice_detail`.`units_billed` AS `units_billed`,`t_invoice_detail`.`units_billed_display` AS `units_billed_display`,`t_invoice_detail`.`item_invoice_amount` AS `item_invoice_amount`,`t_invoice_detail`.`item_category` AS `item_category`,`t_invoice_detail`.`item_group` AS `item_group`,`t_invoice_detail`.`item_type` AS `item_type`,`t_invoice_detail`.`item_detail` AS `item_detail`,`t_invoice_detail`.`tenant_id` AS `tenant_id`,`t_invoice_detail`.`tenant_name` AS `tenant_name` from `t_invoice_detail` union select `t_unbilled_charges_detail`.`invoice_id` AS `invoice_id`,`t_unbilled_charges_detail`.`customer_id` AS `customer_id`,`t_unbilled_charges_detail`.`customer_name` AS `customer_name`,`t_unbilled_charges_detail`.`service_region_id` AS `service_region_id`,`t_unbilled_charges_detail`.`rate` AS `rate`,`t_unbilled_charges_detail`.`rate_display` AS `rate_display`,`t_unbilled_charges_detail`.`rate_unit` AS `rate_unit`,`t_unbilled_charges_detail`.`rate_interval` AS `rate_interval`,`t_unbilled_charges_detail`.`rate_multiplier_percent` AS `rate_multiplier_percent`,`t_unbilled_charges_detail`.`units_billed` AS `units_billed`,`t_unbilled_charges_detail`.`units_billed_display` AS `units_billed_display`,`t_unbilled_charges_detail`.`item_invoice_amount` AS `item_invoice_amount`,`t_unbilled_charges_detail`.`item_category` AS `item_category`,`t_unbilled_charges_detail`.`item_group` AS `item_group`,`t_unbilled_charges_detail`.`item_type` AS `item_type`,`t_unbilled_charges_detail`.`item_detail` AS `item_detail`,`t_unbilled_charges_detail`.`tenant_id` AS `tenant_id`,`t_unbilled_charges_detail`.`tenant_name` AS `tenant_name` from `t_unbilled_charges_detail` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3853,7 +2712,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_current_host` AS select `h`.`host_id` AS `host_id`,`h`.`service_manager_id` AS `service_manager_id`,`sm`.`service_manager_name` AS `service_manager_name`,`h`.`service_region_id` AS `service_region_id`,`r`.`region_name` AS `region_name`,`h`.`host_foreign_id` AS `host_foreign_id`,`h`.`host_name` AS `host_name`,`h`.`hypervisor_type` AS `hypervisor_type`,`h`.`host_aggregate` AS `host_aggregate`,`h`.`add_date` AS `add_date`,`h`.`remove_date` AS `remove_date`,`h`.`cpu_allocation_ratio` AS `cpu_allocation_ratio`,`h`.`ram_allocation_ratio` AS `ram_allocation_ratio`,`h`.`disk_allocation_ratio` AS `disk_allocation_ratio`,`ha`.`update_date` AS `update_date`,`ha`.`ram_mb` AS `ram_mb`,`ha`.`ram_mb_used` AS `ram_mb_used`,`ha`.`disk_gb` AS `disk_gb`,`ha`.`disk_gb_used` AS `disk_gb_used`,`ha`.`vcpus` AS `vcpus`,`ha`.`vcpus_used` AS `vcpus_used`,`ha`.`vm_count` AS `vm_count`,`ha`.`socket_count` AS `socket_count` from (((`t_host` `h` join `v_current_host_attributes` `ha` on(`h`.`host_id` = `ha`.`host_id`)) join `t_service_manager` `sm` on(`h`.`service_manager_id` = `sm`.`service_manager_id`)) join `t_region` `r` on(`h`.`service_region_id` = `r`.`region_id`)) where `h`.`remove_date` > curdate() */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3866,7 +2725,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_current_host_attributes` AS select `tha1`.`host_id` AS `host_id`,`tha1`.`update_date` AS `update_date`,`tha1`.`ram_mb` AS `ram_mb`,`tha1`.`ram_mb_used` AS `ram_mb_used`,`tha1`.`disk_gb` AS `disk_gb`,`tha1`.`disk_gb_used` AS `disk_gb_used`,`tha1`.`vcpus` AS `vcpus`,`tha1`.`vcpus_used` AS `vcpus_used`,`tha1`.`vm_count` AS `vm_count`,`tha1`.`socket_count` AS `socket_count` from `t_host_attributes` `tha1` where `tha1`.`update_date` = (select max(`t_host_attributes`.`update_date`) from `t_host_attributes` where `t_host_attributes`.`host_id` = `tha1`.`host_id`) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3879,7 +2738,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_customer` AS select `c`.`customer_id` AS `customer_id`,`c`.`customer_name` AS `customer_name`,`c`.`metadata` AS `metadata`,`c`.`tax_rate` AS `tax_rate`,`c`.`currency` AS `currency`,`c`.`discount_percent` AS `discount_percent`,`c`.`billing_frequency` AS `billing_frequency`,`c`.`last_bill_date` AS `last_bill_date`,`c`.`next_bill_date` AS `next_bill_date`,`c`.`is_active` AS `is_active`,`c`.`create_date` AS `create_date`,`c`.`activate_date` AS `activate_date`,`c`.`billing_start_date` AS `billing_start_date`,`c`.`last_payment_date` AS `last_payment_date`,`c`.`deactivate_date` AS `deactivate_date`,`c`.`description` AS `description`,`c`.`minimum_invoice_commitment` AS `minimum_invoice_commitment`,`c`.`invoicing_method` AS `invoicing_method`,`c`.`management_region_id` AS `management_region_id`,`c`.`billing_address_line_1` AS `billing_address_line_1`,`c`.`billing_address_line_2` AS `billing_address_line_2`,`c`.`billing_address_city` AS `billing_address_city`,`c`.`billing_address_region` AS `billing_address_region`,`c`.`billing_address_country` AS `billing_address_country`,`c`.`billing_address_postal_code` AS `billing_address_postal_code`,`c`.`payer_payment_details` AS `payer_payment_details`,`c`.`payment_method_confirmed` AS `payment_method_confirmed`,`c`.`balance_due` AS `balance_due`,`c`.`spend_soft_limit` AS `spend_soft_limit`,`c`.`spend_hard_limit` AS `spend_hard_limit`,`c`.`terms_and_conditions_2_accept_date` AS `terms_and_conditions_2_accept_date`,`c`.`tax_id` AS `tax_id`,`c`.`registration_number` AS `registration_number`,`r1`.`region_name` AS `management_region_name` from (`t_customer` `c` left join `t_region` `r1` on(`c`.`management_region_id` = `r1`.`region_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3892,7 +2751,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_metric` AS select `m`.`metric_id` AS `metric_id`,`m`.`service_manager_type_id` AS `service_manager_type_id`,`m`.`metric_name` AS `metric_name`,`m`.`metric_label` AS `metric_label`,`m`.`metric_source` AS `metric_source`,`m`.`metric_type` AS `metric_type`,`m`.`metric_unit` AS `metric_unit`,`m`.`entity_resolution` AS `entity_resolution`,`m`.`time_resolution` AS `time_resolution`,`sm`.`service_manager_type` AS `service_manager_type` from (`t_metric` `m` left join `t_service_manager_type` `sm` on(`m`.`service_manager_type_id` = `sm`.`service_manager_type_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3905,7 +2764,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_promo_code_redemption` AS select `p`.`management_region_id` AS `management_region_id`,`p`.`promo_code_id` AS `promo_code_id`,`p`.`promo_code` AS `promo_code`,`p`.`salesperson` AS `salesperson`,`p`.`discount_or_credit` AS `discount_or_credit`,`p`.`credit_amount` AS `credit_amount`,`p`.`credit_type` AS `credit_type`,`p`.`apply_to_charge_category` AS `apply_to_charge_category`,`p`.`trigger_charge_category` AS `trigger_charge_category`,`p`.`trigger_amount` AS `trigger_amount`,`p`.`discount_percent` AS `discount_percent`,`p`.`available_invoice_periods` AS `available_invoice_periods`,`p`.`expire_date` AS `expire_date`,`p`.`currency` AS `currency`,`r`.`redemption_date` AS `redemption_date`,`c`.`customer_id` AS `customer_id`,`c`.`customer_name` AS `customer_name` from ((`t_promo_code_redemption` `r` join `t_customer` `c`) join `t_promo_code` `p`) where `r`.`payer_type` = 'Customer' and `r`.`payer_id` = `c`.`customer_id` and `p`.`promo_code_id` = `r`.`promo_code_id` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3918,7 +2777,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_provider` AS select `t_provider`.`provider_id` AS `provider_id`,`t_provider`.`provider_name` AS `provider_name`,`t_provider`.`provider_type` AS `provider_type`,`t_provider`.`metadata` AS `metadata`,`t_provider`.`tax_rate` AS `tax_rate`,`t_provider`.`currency` AS `currency`,`t_provider`.`discount_percent` AS `discount_percent`,`t_provider`.`billing_frequency` AS `billing_frequency`,`t_provider`.`last_bill_date` AS `last_bill_date`,`t_provider`.`next_bill_date` AS `next_bill_date`,`t_provider`.`last_payment_date` AS `last_payment_date`,`t_provider`.`is_active` AS `is_active`,`t_provider`.`create_date` AS `create_date`,`t_provider`.`activate_date` AS `activate_date`,`t_provider`.`billing_start_date` AS `billing_start_date`,`t_provider`.`deactivate_date` AS `deactivate_date`,`t_provider`.`description` AS `description`,`t_provider`.`minimum_invoice_commitment` AS `minimum_invoice_commitment`,`t_provider`.`invoicing_method` AS `invoicing_method`,`t_provider`.`invoice_processing_method` AS `invoice_processing_method`,`t_provider`.`billing_address_line_1` AS `billing_address_line_1`,`t_provider`.`billing_address_line_2` AS `billing_address_line_2`,`t_provider`.`billing_address_city` AS `billing_address_city`,`t_provider`.`billing_address_region` AS `billing_address_region`,`t_provider`.`billing_address_country` AS `billing_address_country`,`t_provider`.`billing_address_postal_code` AS `billing_address_postal_code`,`t_provider`.`legal_address_line_1` AS `legal_address_line_1`,`t_provider`.`legal_address_line_2` AS `legal_address_line_2`,`t_provider`.`legal_address_city` AS `legal_address_city`,`t_provider`.`legal_address_region` AS `legal_address_region`,`t_provider`.`legal_address_country` AS `legal_address_country`,`t_provider`.`legal_address_postal_code` AS `legal_address_postal_code`,`t_provider`.`payer_payment_details` AS `payer_payment_details`,`t_provider`.`payee_payment_details` AS `payee_payment_details`,`t_provider`.`public_url` AS `public_url`,`t_provider`.`management_region_id` AS `management_region_id`,`t_provider`.`balance_due` AS `balance_due`,`t_provider`.`openbook_processes_payments` AS `openbook_processes_payments`,`t_provider`.`openbook_processes_past_due_invoices` AS `openbook_processes_past_due_invoices`,`t_provider`.`openstack_tenant_id` AS `openstack_tenant_id`,`t_provider`.`tax_id` AS `tax_id`,`t_provider`.`registration_number` AS `registration_number`,`t_provider`.`os_service_manager_id` AS `os_service_manager_id`,`t_region`.`parent_region_id` AS `parent_management_region_id` from (`t_provider` left join `t_region` on(`t_region`.`region_id` = `t_provider`.`management_region_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3927,9 +2786,9 @@ USE `openbook`; /*!50001 SET @saved_cs_client = @@character_set_client */; /*!50001 SET @saved_cs_results = @@character_set_results */; /*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 SET character_set_client = latin1 */; +/*!50001 SET character_set_results = latin1 */; +/*!50001 SET collation_connection = latin1_swedish_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ /*!50001 VIEW `v_rate_plan_assignment` AS select `a`.`rate_plan_id` AS `rate_plan_id`,`a`.`assignee_id` AS `assignee_id`,`a`.`assignee_type` AS `assignee_type`,`a`.`assignment_start_date` AS `assignment_start_date`,`a`.`assignment_end_date` AS `assignment_end_date`,`a`.`assignment_type` AS `assignment_type`,`r`.`management_region_id` AS `management_region_id` from (`t_rate_plan_assignment` `a` left join `t_rate_plan` `r` on(`a`.`rate_plan_id` = `r`.`rate_plan_id`)) */; @@ -3944,7 +2803,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_service` AS select `s`.`service_id` AS `service_id`,`s`.`service_type` AS `service_type`,`s`.`service_description` AS `service_description`,`s`.`service_manager_type_id` AS `service_manager_type_id`,`s`.`states` AS `states`,`s`.`externally_managed` AS `externally_managed`,`sm`.`service_manager_type` AS `service_manager_type` from (`t_service` `s` left join `t_service_manager_type` `sm` on(`s`.`service_manager_type_id` = `sm`.`service_manager_type_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3957,7 +2816,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_service_instance` AS select `tsi`.`service_instance_id` AS `service_instance_id`,`tsi`.`service_id` AS `service_id`,`tsi`.`service_instance_name` AS `service_instance_name`,`tsi`.`service_manager_id` AS `service_manager_id`,`tsi`.`service_region_id` AS `service_region_id`,`tsi`.`service_instance_foreign_id` AS `service_instance_foreign_id`,`tsi`.`tenant_id` AS `tenant_id`,`tsi`.`current_attributes` AS `current_attributes`,`tt`.`tenant_name` AS `tenant_name`,`tt`.`tenant_foreign_id` AS `tenant_foreign_id`,`tt`.`customer_id` AS `customer_id`,`tc`.`customer_name` AS `customer_name`,`tc`.`management_region_id` AS `management_region_id`,`tsm`.`service_manager_name` AS `service_manager_name`,`tr`.`region_name` AS `service_region_name`,`tsmt`.`service_manager_type` AS `service_manager_type`,`ts`.`service_type` AS `service_type`,`tsis`.`start_date` AS `provisioned_date`,`tsis`.`end_date` AS `deprovisioned_date` from (((((((`t_service_instance` `tsi` left join `t_tenant` `tt` on(`tsi`.`tenant_id` = `tt`.`tenant_id`)) left join `t_customer` `tc` on(`tc`.`customer_id` = `tt`.`customer_id`)) left join `t_service` `ts` on(`tsi`.`service_id` = `ts`.`service_id`)) left join `t_service_manager_type` `tsmt` on(`ts`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) left join `t_region` `tr` on(`tsi`.`service_region_id` = `tr`.`region_id`)) left join `t_service_manager` `tsm` on(`tsi`.`service_manager_id` = `tsm`.`service_manager_id`)) left join `t_service_instance_state` `tsis` on(`tsi`.`service_instance_id` = `tsis`.`service_instance_id` and `tsis`.`state` = 'In Existence')) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3970,7 +2829,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_service_instance_attributes` AS select `tpsa`.`service_instance_id` AS `service_instance_id`,`tpsa`.`start_date` AS `start_date`,`tpsa`.`end_date` AS `end_date`,`tpsa`.`attributes` AS `attributes`,`tt`.`tenant_id` AS `tenant_id`,`tt`.`tenant_foreign_id` AS `tenant_foreign_id`,`tt`.`tenant_name` AS `tenant_name`,`tc`.`customer_id` AS `customer_id`,`tc`.`customer_name` AS `customer_name`,`tc`.`management_region_id` AS `management_region_id`,`tps`.`service_instance_name` AS `service_instance_name`,`tps`.`service_instance_foreign_id` AS `service_instance_foreign_id`,`tps`.`service_manager_id` AS `service_manager_id`,`tsm`.`service_manager_name` AS `service_manager_name`,`ts`.`service_id` AS `service_id`,`ts`.`service_type` AS `service_type`,`tsmt`.`service_manager_type` AS `service_manager_type`,`tr`.`region_id` AS `service_region_id`,`tr`.`region_name` AS `service_region_name` from (((((((`t_service_instance_attributes` `tpsa` left join `t_service_instance` `tps` on(`tps`.`service_instance_id` = `tpsa`.`service_instance_id`)) left join `t_service` `ts` on(`ts`.`service_id` = `tps`.`service_id`)) left join `t_service_manager` `tsm` on(`tsm`.`service_manager_id` = `tps`.`service_manager_id`)) left join `t_region` `tr` on(`tps`.`service_region_id` = `tr`.`region_id`)) left join `t_service_manager_type` `tsmt` on(`ts`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) left join `t_tenant` `tt` on(`tps`.`tenant_id` = `tt`.`tenant_id`)) left join `t_customer` `tc` on(`tt`.`customer_id` = `tc`.`customer_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3983,7 +2842,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_service_instance_state` AS select `tpss`.`service_instance_id` AS `service_instance_id`,`tpss`.`state` AS `state`,`tpss`.`start_date` AS `start_date`,`tpss`.`end_date` AS `end_date`,`tpss`.`interval_length_milliseconds` AS `interval_length_milliseconds`,`tt`.`tenant_id` AS `tenant_id`,`tt`.`tenant_foreign_id` AS `tenant_foreign_id`,`tt`.`tenant_name` AS `tenant_name`,`tc`.`customer_id` AS `customer_id`,`tc`.`customer_name` AS `customer_name`,`tc`.`management_region_id` AS `management_region_id`,`tps`.`service_instance_name` AS `service_instance_name`,`tps`.`service_instance_foreign_id` AS `service_instance_foreign_id`,`tps`.`service_manager_id` AS `service_manager_id`,`tsm`.`service_manager_name` AS `service_manager_name`,`ts`.`service_id` AS `service_id`,`ts`.`service_type` AS `service_type`,`tsmt`.`service_manager_type` AS `service_manager_type`,`tr`.`region_id` AS `service_region_id`,`tr`.`region_name` AS `service_region_name` from (((((((`t_service_instance_state` `tpss` left join `t_service_instance` `tps` on(`tps`.`service_instance_id` = `tpss`.`service_instance_id`)) left join `t_service` `ts` on(`ts`.`service_id` = `tps`.`service_id`)) left join `t_service_manager` `tsm` on(`tsm`.`service_manager_id` = `tps`.`service_manager_id`)) left join `t_region` `tr` on(`tps`.`service_region_id` = `tr`.`region_id`)) left join `t_service_manager_type` `tsmt` on(`ts`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) left join `t_tenant` `tt` on(`tps`.`tenant_id` = `tt`.`tenant_id`)) left join `t_customer` `tc` on(`tt`.`customer_id` = `tc`.`customer_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -3996,7 +2855,7 @@ USE `openbook`; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`openbook`@`localhost` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`openbook`@`%` SQL SECURITY DEFINER */ /*!50001 VIEW `v_service_manager` AS select `tsm`.`service_manager_id` AS `service_manager_id`,`tsm`.`service_manager_name` AS `service_manager_name`,`tsm`.`service_manager_description` AS `service_manager_description`,`tsm`.`metadata` AS `metadata`,`tsm`.`service_region_id` AS `service_region_id`,`tsm`.`service_manager_type_id` AS `service_manager_type_id`,`tsmt`.`service_manager_type` AS `service_manager_type` from (`t_service_manager` `tsm` left join `t_service_manager_type` `tsmt` on(`tsm`.`service_manager_type_id` = `tsmt`.`service_manager_type_id`)) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -4010,7 +2869,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 */; @@ -4018,9 +2877,9 @@ USE `openbook`; /*!50001 SET @saved_cs_client = @@character_set_client */; /*!50001 SET @saved_cs_results = @@character_set_results */; /*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 SET character_set_client = latin1 */; +/*!50001 SET character_set_results = latin1 */; +/*!50001 SET collation_connection = latin1_swedish_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ /*!50001 VIEW `v_users` AS select `u`.`user_id` AS `user_id`,`u`.`username` AS `username`,`u`.`first_name` AS `first_name`,`u`.`last_name` AS `last_name`,`u`.`email_address` AS `email_address`,`u`.`phone_number` AS `phone_number`,`u`.`password` AS `password`,`u`.`is_active` AS `is_active`,`u`.`password_change_token` AS `password_change_token`,`u`.`last_password_change_date` AS `last_password_change_date`,`u`.`password_change_token_expire_date` AS `password_change_token_expire_date`,`r`.`role_name` AS `role_name`,`r`.`role_context` AS `role_context` from (`t_users` `u` left join `t_user_roles` `r` on(`u`.`user_id` = `r`.`user_id`)) */; diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json index 1decfa2..456e850 100644 --- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json +++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json @@ -15,5 +15,9 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] {% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json index f1187e5..541cbf3 100644 --- a/salt/openbook/workflow_server/files/workflow_server.json +++ b/salt/openbook/workflow_server/files/workflow_server.json @@ -15,5 +15,9 @@ ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow" ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] {% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } -- cgit v1.3