diff --git a/Dockerfile b/Dockerfile index 6eb75064f..a260b9810 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,19 @@ FROM python:3.11-slim-bullseye ENV APT_INSTALL="apt-get -y install --no-install-recommends" +ARG CHROME_VERSION="latest" + +ENV CHROME_LATEST_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" +ENV CHROME_VERSION_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb" + RUN apt-get -y update \ && $APT_INSTALL vim git openssh-server wget openjdk-11-jdk \ && python -m pip install --upgrade pip \ && apt-get clean -RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ - && $APT_INSTALL ./google-chrome-stable_current_amd64.deb \ - && rm -rf ./google-chrome-stable_current_amd64.deb +RUN if [ "$CHROME_VERSION" = "latest" ]; then wget -O google-chrome.deb $CHROME_LATEST_URL; else wget -O google-chrome.deb $CHROME_VERSION_URL; fi \ + && $APT_INSTALL ./google-chrome.deb \ + && rm -rf ./google-chrome.deb COPY requirements.txt /tmp/requirements.txt RUN pip install --no-cache-dir -r /tmp/requirements.txt diff --git a/README.md b/README.md index 2286db13e..a3761d69f 100644 --- a/README.md +++ b/README.md @@ -5,22 +5,22 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat ## Supported versions * Supported Jira versions: - * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.4.8` and `8.20.24` + * Jira [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `9.4.10` and `8.20.26` * Supported Jira Service Management versions: - * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.8` and `4.20.24` + * Jira Service Management [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `5.4.10` and `4.20.26` * Supported Confluence versions: - * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.11`, `7.13.18` and `8.1.4` platform release + * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.19.14` and `8.5.1` * Supported Bitbucket Server versions: - * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.14` and `8.9.2` + * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.21.16` and `8.9.5` * Supported Crowd versions: * Crowd [release notes](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `5.1.4` * Supported Bamboo versions: - * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.3` + * Bamboo [Long Term Support release](https://confluence.atlassian.com/bamboo/bamboo-release-notes-671089224.html): `9.2.5` ## Support In case of technical questions, issues or problems with DC Apps Performance Toolkit, contact us for support in the [community Slack](http://bit.ly/dcapt_slack) **#data-center-app-performance-toolkit** channel. diff --git a/app/bamboo.yml b/app/bamboo.yml index 32f0ef018..332753761 100644 --- a/app/bamboo.yml +++ b/app/bamboo.yml @@ -49,7 +49,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.13.0 execution: - scenario: jmeter executor: jmeter @@ -123,7 +123,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/bitbucket.yml b/app/bitbucket.yml index a01519649..e30bef4c3 100644 --- a/app/bitbucket.yml +++ b/app/bitbucket.yml @@ -36,7 +36,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} concurrency: ${concurrency} @@ -90,7 +90,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/confluence.yml b/app/confluence.yml index 54403ab72..afbe3a62c 100644 --- a/app/confluence.yml +++ b/app/confluence.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} executor: ${load_executor} @@ -117,7 +117,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jira.yml b/app/jira.yml index 1dc2d0e9d..287614a96 100644 --- a/app/jira.yml +++ b/app/jira.yml @@ -51,7 +51,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.13.0 execution: - scenario: ${load_executor} executor: ${load_executor} @@ -118,7 +118,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/jsm.yml b/app/jsm.yml index db0c188dc..9a586636d 100644 --- a/app/jsm.yml +++ b/app/jsm.yml @@ -67,7 +67,7 @@ services: - python util/post_run/cleanup_results_dir.py - module: pip-install packages: - - selenium==4.10.0 + - selenium==4.13.0 execution: - scenario: ${load_executor}_agents executor: ${load_executor} @@ -170,7 +170,7 @@ modules: httpsampler.ignore_failed_embedded_resources: "true" selenium: chromedriver: - version: "114.0.5735.90" # Supports Chrome version 114. You can refer to http://chromedriver.chromium.org/downloads + version: "118.0.5993.70" # Supports Chrome version 118. You can refer to https://googlechromelabs.github.io/chrome-for-testing reporting: - data-source: sample-labels module: junit-xml diff --git a/app/selenium_ui/jsm/pages/agent_pages.py b/app/selenium_ui/jsm/pages/agent_pages.py index 0110d8b93..5e1c8b277 100644 --- a/app/selenium_ui/jsm/pages/agent_pages.py +++ b/app/selenium_ui/jsm/pages/agent_pages.py @@ -11,7 +11,7 @@ class PopupManager(BasePage): def dismiss_default_popup(self): return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2, PopupLocators.popup_3, PopupLocators.popup_4, - PopupLocators.popup_5, PopupLocators.popup_6) + PopupLocators.popup_5, PopupLocators.popup_6, PopupLocators.popup_7) class Login(BasePage): diff --git a/app/selenium_ui/jsm/pages/agent_selectors.py b/app/selenium_ui/jsm/pages/agent_selectors.py index 9cf05ed6a..b0729f6c2 100644 --- a/app/selenium_ui/jsm/pages/agent_selectors.py +++ b/app/selenium_ui/jsm/pages/agent_selectors.py @@ -10,6 +10,7 @@ class PopupLocators: popup_4 = '.aui-button aui-button-link' popup_5 = '.buttons-container > div > a' popup_6 = '.css-19r5em7' + popup_7 = '.css-178ag6o' class UrlManager: diff --git a/app/util/bamboo/bamboo_dataset_generator/pom.xml b/app/util/bamboo/bamboo_dataset_generator/pom.xml index 823c8fab9..766cd6679 100644 --- a/app/util/bamboo/bamboo_dataset_generator/pom.xml +++ b/app/util/bamboo/bamboo_dataset_generator/pom.xml @@ -5,7 +5,7 @@ com.atlassian.bamboo bamboo-specs-parent - 9.2.1 + 9.2.5 @@ -18,7 +18,7 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 + 3.1.0 @@ -49,13 +49,13 @@ com.atlassian.buildeng bamboo-plan-ownership-specs - 1.4.0 + 2.1.7 com.atlassian.buildeng bamboo-pbc-specs - 1.4.0 + 2.1.7 @@ -67,38 +67,38 @@ com.fasterxml.jackson.core jackson-core - 2.12.4 + 2.15.2 com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.15.2 com.jayway.jsonpath json-path - 2.4.0 + 2.7.0 commons-codec commons-codec - 1.10 + 1.16.0 org.apache.logging.log4j log4j-api - 2.17.1 + 2.20.0 org.apache.logging.log4j log4j-core - 2.17.1 + 2.20.0 org.apache.logging.log4j log4j-slf4j-impl - 2.17.1 + 2.20.0 @@ -115,4 +115,4 @@ https://packages.atlassian.com/mvn/maven-external/ - + \ No newline at end of file diff --git a/app/util/conf.py b/app/util/conf.py index db0c93623..446cd862b 100644 --- a/app/util/conf.py +++ b/app/util/conf.py @@ -2,7 +2,7 @@ from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML -TOOLKIT_VERSION = '7.5.0' +TOOLKIT_VERSION = '7.6.0' UNSUPPORTED_VERSION = '6.3.0' diff --git a/app/util/confluence/populate_db.sh b/app/util/confluence/populate_db.sh index 809a2555f..ebb678d77 100644 --- a/app/util/confluence/populate_db.sh +++ b/app/util/confluence/populate_db.sh @@ -20,7 +20,7 @@ CONFLUENCE_DB_PASS="Password1!" SELECT_CONFLUENCE_SETTING_SQL="select BANDANAVALUE from BANDANA where BANDANACONTEXT = '_GLOBAL' and BANDANAKEY = 'atlassian.confluence.settings';" # Confluence version variables -SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2) +SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2) if [[ ! $(systemctl status confluence) ]]; then echo "The Confluence service was not found on this host." \ diff --git a/app/util/confluence/upload_attachments.sh b/app/util/confluence/upload_attachments.sh index 3d45f0588..47fd0b199 100644 --- a/app/util/confluence/upload_attachments.sh +++ b/app/util/confluence/upload_attachments.sh @@ -4,7 +4,7 @@ ################### Variables section ################### # Confluence version variables CONFLUENCE_VERSION_FILE="/media/atl/confluence/shared-home/confluence.version" -SUPPORTED_CONFLUENCE_VERSIONS=(7.13.7 7.19.2) +SUPPORTED_CONFLUENCE_VERSIONS=(7.19.2) CONFLUENCE_VERSION=$(sudo su confluence -c "cat ${CONFLUENCE_VERSION_FILE}") if [[ -z "$CONFLUENCE_VERSION" ]]; then echo The $CONFLUENCE_VERSION_FILE file does not exists or emtpy. Please check if CONFLUENCE_VERSION_FILE variable \ diff --git a/app/util/jira/populate_db.sh b/app/util/jira/populate_db.sh index 1ee377dc5..e61ef3716 100644 --- a/app/util/jira/populate_db.sh +++ b/app/util/jira/populate_db.sh @@ -43,8 +43,8 @@ JIRA_DB_PASS="Password1!" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8) -SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8) +SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10) +SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") # JSM section diff --git a/app/util/jira/upload_attachments.sh b/app/util/jira/upload_attachments.sh index 695289770..6bf03ce87 100644 --- a/app/util/jira/upload_attachments.sh +++ b/app/util/jira/upload_attachments.sh @@ -29,8 +29,8 @@ JIRA_VERSION_FILE="/media/atl/jira/shared/jira-software.version" # Jira/JSM supported versions -SUPPORTED_JIRA_VERSIONS=(8.20.24 9.4.8) -SUPPORTED_JSM_VERSIONS=(4.20.24 5.4.8) +SUPPORTED_JIRA_VERSIONS=(8.20.26 9.4.10) +SUPPORTED_JSM_VERSIONS=(4.20.26 5.4.10) SUPPORTED_VERSIONS=("${SUPPORTED_JIRA_VERSIONS[@]}") if [[ ${jsm} == 1 ]]; then diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars index c50270074..aa4069387 100644 --- a/app/util/k8s/dcapt-small.tfvars +++ b/app/util/k8s/dcapt-small.tfvars @@ -85,34 +85,34 @@ jira_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # # Jira version -jira_version_tag = "9.4.8" +jira_version_tag = "9.4.10" # JSM version -# jira_version_tag = "5.4.8" +# jira_version_tag = "5.4.10" # Shared home restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # -# Jira 9.4.8 DCAPT small dataset EBS snapshot - jira_shared_home_snapshot_id = "snap-0005a8c3cc297b294" -# Jira 8.20.24 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0c3cb60ddc50c1136" -# JSM 5.4.8 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-02f299ef7f1f524b2" -# JSM 4.20.24 DCAPT small dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0971e128b8d1d2af9" +# Jira 9.4.10 DCAPT small dataset EBS snapshot + jira_shared_home_snapshot_id = "snap-019fd367ec397b1f3" +# Jira 8.20.26 DCAPT small dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0592bc60820536611" +# JSM 5.4.10 DCAPT small dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0e340e980918e45f6" +# JSM 4.20.26 DCAPT small dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-096d1185a5fee02ea" # Database restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # Build number stored within the snapshot and Jira license are also required, so that Jira can be fully setup prior to start. # -# Jira 9.4.8 DCAPT small dataset RDS snapshot - jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-8" -# Jira 8.20.24 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-24" -# JSM 5.4.8 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-8" -# JSM 4.20.24 DCAPT small dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-24" +# Jira 9.4.10 DCAPT small dataset RDS snapshot + jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-10" +# Jira 8.20.26 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-26" +# JSM 5.4.10 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-10" +# JSM 4.20.26 DCAPT small dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-26" # Helm chart version of Jira # jira_helm_chart_version = "" @@ -181,33 +181,27 @@ confluence_license = "confluence-license" confluence_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "7.19.11" +confluence_version_tag = "8.5.1" # Shared home restore configuration. -# 8.1.4 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-0815ada397b953b93" -# 7.19.11 DCAPT small dataset EBS snapshot -confluence_shared_home_snapshot_id = "snap-00ede7dca448a6243" -# 7.13.18 DCAPT small dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-055811dae848f13ae" +# 8.5.1 DCAPT small dataset EBS snapshot +confluence_shared_home_snapshot_id = "snap-008cc496f440198de" +# 7.19.14 DCAPT small dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-0a175c4fd76039985" # Database restore configuration. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. -# 8.1.4 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-1-4" -# 7.19.11 DCAPT small dataset RDS snapshot -confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" -# 7.13.18 DCAPT small dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-13-18" +# 8.5.1 DCAPT small dataset RDS snapshot +confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" +# 7.19.14 DCAPT small dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-14" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information -# 8.1.4 -# confluence_db_snapshot_build_number = "9003" -# 7.19.11 -confluence_db_snapshot_build_number = "8804" -# 7.13.18 -# confluence_db_snapshot_build_number = "8703" +# 8.5.1 +confluence_db_snapshot_build_number = "9012" +# 7.19.14 +# confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence #confluence_helm_chart_version = "" @@ -283,23 +277,23 @@ bitbucket_license = "bitbucket-license" bitbucket_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "7.21.14" +bitbucket_version_tag = "7.21.16" # Shared home restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT small dataset EBS snapshot -bitbucket_shared_home_snapshot_id = "snap-03893c494ba7edcf4" -# 8.9.2 DCAPT small dataset EBS snapshot -#bitbucket_shared_home_snapshot_id = "snap-0fb8cd6bf387057c0" +# 7.21.16 DCAPT small dataset EBS snapshot +bitbucket_shared_home_snapshot_id = "snap-04351bd6779e3ee76" +# 8.9.5 DCAPT small dataset EBS snapshot +#bitbucket_shared_home_snapshot_id = "snap-01806166c1afe8bd5" # Database restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT small dataset RDS snapshot -bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14" -# 8.9.2 DCAPT small dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2" +# 7.21.16 DCAPT small dataset RDS snapshot +bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16" +# 8.9.5 DCAPT small dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5" # Helm chart version of Bitbucket #bitbucket_helm_chart_version = "" diff --git a/app/util/k8s/dcapt-snapshots.json b/app/util/k8s/dcapt-snapshots.json index 51e46840f..3c3bec259 100644 --- a/app/util/k8s/dcapt-snapshots.json +++ b/app/util/k8s/dcapt-snapshots.json @@ -2,106 +2,106 @@ "jira": { "versions": [ { - "version": "9.4.8", + "version": "8.20.26", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-9-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-9-4-8" + "us-east-2": "snap-0c0c388d53cd4153b", + "us-west-2": "snap-04c97a366b279c0c8", + "us-west-1": "snap-0c4828c55fb868c85", + "us-east-1": "snap-0ed5739736a819039" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-9-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-9-4-8" + "us-east-2": "snap-0592bc60820536611", + "us-west-2": "snap-09c303e2256c39750", + "us-west-1": "snap-009f8618111b0df8a", + "us-east-1": "snap-0e54d81f7913b7519" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-0640210f62a262aaf", - "us-east-2": "snap-0d619095feaa2eca5", - "us-west-1": "snap-00f6a0fc8ba4c4cce", - "us-west-2": "snap-0d23a05be5f527030" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-8-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-8-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-8-20-26" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-05a61b57dbb4f9834", - "us-east-2": "snap-0005a8c3cc297b294", - "us-west-1": "snap-0dfb346bb01f4709a", - "us-west-2": "snap-0c17be9ae98bbd1ed" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-8-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-8-20-26" } ] } ] }, { - "version": "8.20.24", + "version": "9.4.10", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-8-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-8-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-8-20-24" + "us-east-2": "snap-084e99e384dcfbe31", + "us-west-2": "snap-08202454ed728b840", + "us-west-1": "snap-05ec9d6216ead357c", + "us-east-1": "snap-00b18b7028faaefb5" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-8-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-8-20-24" + "us-east-2": "snap-019fd367ec397b1f3", + "us-west-2": "snap-04b680cf28fd7a8c2", + "us-west-1": "snap-00d008f66bb5e7f35", + "us-east-1": "snap-0d9855f9597b68de9" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-029edbed07ab594e0", - "us-east-2": "snap-0b5f4473954e6d959", - "us-west-1": "snap-0ffaa992ba449a53d", - "us-west-2": "snap-01e69efc1d8943038" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-9-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-9-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-9-4-10" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-083d2d8f5797f907e", - "us-east-2": "snap-0c3cb60ddc50c1136", - "us-west-1": "snap-07de609e058d28a03", - "us-west-2": "snap-01fa045458071eda5" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jira-small-9-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jira-small-9-4-10" } ] } @@ -112,106 +112,106 @@ "jsm": { "versions": [ { - "version": "5.4.8", + "version": "4.20.26", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-5-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-5-4-8" + "us-east-2": "snap-0f7aa03eea37f3304", + "us-west-2": "snap-0db2080204c6af65b", + "us-west-1": "snap-0e59b22bdf8afc48a", + "us-east-1": "snap-0039e3761f9a41435" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-5-4-8", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-5-4-8" + "us-east-2": "snap-096d1185a5fee02ea", + "us-west-2": "snap-0e8f9a8451a8a5471", + "us-west-1": "snap-0ef9883afd1b1c4c8", + "us-east-1": "snap-0b53ebf533e7497fc" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-0a13271b63872a2a6", - "us-east-2": "snap-0fb58e8d005edeb32", - "us-west-1": "snap-05d6aa53717fb3c6c", - "us-west-2": "snap-043842d9319f25659" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-4-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-4-20-26" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-08bc969471d0ee11f", - "us-east-2": "snap-02f299ef7f1f524b2", - "us-west-1": "snap-0fa5b8bd27f66e6c3", - "us-west-2": "snap-063211f90e6d81bbd" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-4-20-26", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-4-20-26" } ] } ] }, { - "version": "4.20.24", + "version": "5.4.10", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-4-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-4-20-24" + "us-east-2": "snap-0381cc00e37231565", + "us-west-2": "snap-0b1fd6df7f4edf2cb", + "us-west-1": "snap-0d50a4c16236384a8", + "us-east-1": "snap-08622b061a708cca0" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-4-20-24", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-4-20-24" + "us-east-2": "snap-0e340e980918e45f6", + "us-west-2": "snap-0f717ad41f9234b17", + "us-west-1": "snap-0040e1af99841ae15", + "us-east-1": "snap-0052087e82b1cfe82" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-0c95405b316f28ec8", - "us-east-2": "snap-0cae5febc8127250b", - "us-west-1": "snap-081f548dda005c97e", - "us-west-2": "snap-08e23754ddc402ec4" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-5-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-5-4-10" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-0d933d20b989beb7b", - "us-east-2": "snap-0971e128b8d1d2af9", - "us-west-1": "snap-0c6d8b6aa53b93e78", - "us-west-2": "snap-0734518fb7d55f7ce" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-jsm-small-5-4-10", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-jsm-small-5-4-10" } ] } @@ -222,17 +222,18 @@ "confluence": { "versions": [ { - "version": "7.19.11", + "version": "8.5.1", + "build_number": "9012", "data": [ { "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-19-11", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-19-11" + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-8-5-1", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-8-5-1" } ] }, @@ -241,10 +242,10 @@ "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-19-11", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-19-11" + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-8-5-1", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-8-5-1" } ] }, @@ -253,10 +254,10 @@ "size": "large", "snapshots": [ { - "us-east-1": "snap-03b3a8541b7466ec3", - "us-east-2": "snap-09365c581a158a979", - "us-west-1": "snap-01bc9fdb49bc6641e", - "us-west-2": "snap-061919924738ea4c3" + "us-east-1": "snap-099a9ce9e9c902815", + "us-east-2": "snap-074a2fdca0497b6b6", + "us-west-1": "snap-01b07710d49b113b2", + "us-west-2": "snap-031dad82fa7367921" } ] }, @@ -265,51 +266,39 @@ "size": "small", "snapshots": [ { - "us-east-1": "snap-0dad75f94da7f317b", - "us-east-2": "snap-00ede7dca448a6243", - "us-west-1": "snap-0f72ad2146e3a19c3", - "us-west-2": "snap-09ff2c4be549518a0" + "us-east-1": "snap-09d97f19261bd463e", + "us-east-2": "snap-008cc496f440198de", + "us-west-1": "snap-02b3a229b530c8a87", + "us-west-2": "snap-01d8ebf9701613c4c" } ] } ] }, { - "version": "7.13.18", + "version": "7.19.14", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-13-18", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-13-18" + "us-east-2": "snap-00f5e8147604a017e", + "us-west-2": "snap-0e8cda8b822c13483", + "us-west-1": "snap-00ec3df2af108617f", + "us-east-1": "snap-02132c2d6b67b6a87" } ] }, { "type": "rds", - "size": "small", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-13-18", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-13-18" - } - ] - }, - { - "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "snap-08156f8bb0099942f", - "us-east-2": "snap-04cc3d8455b1ef6e9", - "us-west-1": "snap-039e3a985cf126fc0", - "us-west-2": "snap-0ce8a0947cd581752" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-7-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-7-19-14" } ] }, @@ -318,27 +307,10 @@ "size": "small", "snapshots": [ { - "us-east-1": "snap-01df9653b5c8f9f64", - "us-east-2": "snap-055811dae848f13ae", - "us-west-1": "snap-058e37561a1cce3e9", - "us-west-2": "snap-0bb261f0b3266d136" - } - ] - } - ] - }, - { - "version": "8.1.4", - "data": [ - { - "type": "rds", - "size": "large", - "snapshots": [ - { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-8-1-4", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-8-1-4" + "us-east-2": "snap-0a175c4fd76039985", + "us-west-2": "snap-09b197387bd1b013f", + "us-west-1": "snap-0f50de55b7ebc1a2f", + "us-east-1": "snap-002beb3b098f557f2" } ] }, @@ -347,144 +319,121 @@ "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-8-1-4", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-8-1-4" - } - ] - }, - { - "type": "ebs", - "size": "large", - "snapshots": [ - { - "us-east-1": "snap-05ef2adcab5114c74", - "us-east-2": "snap-0125fdfcf37dabef5", - "us-west-1": "snap-03bc324c9a6de2295", - "us-west-2": "snap-0ec08b4c302b42b95" - } - ] - }, - { - "type": "ebs", - "size": "small", - "snapshots": [ - { - "us-east-1": "snap-055cb419abdb154e3", - "us-east-2": "snap-0815ada397b953b93", - "us-west-1": "snap-08339c9a4eac5fbb1", - "us-west-2": "snap-07a38cca1ce0aa26b" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-confluence-small-7-19-14", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-confluence-small-7-19-14" } ] } - ] + ], + "build_number": "8804" } ] }, "bitbucket": { "versions": [ { - "version": "7.21.14", + "version": "7.21.16", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-7-21-14", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-7-21-14" + "us-east-2": "snap-0d4bbe0cf3056c0ee", + "us-west-2": "snap-011517fb12a96d7f6", + "us-west-1": "snap-0a7ef1f68ad32c5a0", + "us-east-1": "snap-0f86be2be1f2f4ddf" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-14", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-14" + "us-east-2": "snap-04351bd6779e3ee76", + "us-west-2": "snap-0bebe8f1c94590199", + "us-west-1": "snap-0ce49affbc7cc1b07", + "us-east-1": "snap-06eb9677c8467e578" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-01873c2840b4dd3c3", - "us-east-2": "snap-0ccb8c3d34ff171f1", - "us-west-1": "snap-0cde4bd0ed0358d0e", - "us-west-2": "snap-0f8b60b668f3bbb66" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-7-21-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-7-21-16" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-0a869d88cb2829bc4", - "us-east-2": "snap-03893c494ba7edcf4", - "us-west-1": "snap-020733b644be01f62", - "us-west-2": "snap-07e784e26a282e18c" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-16", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-7-21-16" } ] } ] }, { - "version": "8.9.2", + "version": "8.9.5", "data": [ { - "type": "rds", + "type": "ebs", "size": "large", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-8-9-2", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-8-9-2" + "us-east-2": "snap-0261a9130a9fd7618", + "us-west-2": "snap-0562a2bce19b8da31", + "us-west-1": "snap-0af7263fa69303a6c", + "us-east-1": "snap-0acd7f844242a09ee" } ] }, { - "type": "rds", + "type": "ebs", "size": "small", "snapshots": [ { - "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-2", - "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-2" + "us-east-2": "snap-01806166c1afe8bd5", + "us-west-2": "snap-0b274a971cccb6a27", + "us-west-1": "snap-07a647d51a0b5028f", + "us-east-1": "snap-035b01bc7520af6fb" } ] }, { - "type": "ebs", + "type": "rds", "size": "large", "snapshots": [ { - "us-east-1": "snap-0c5d82e754dd8f536", - "us-east-2": "snap-0d933f3d40000e877", - "us-west-1": "snap-039620171723e6e2c", - "us-west-2": "snap-01a121265b13ee758" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-8-9-5", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-8-9-5" } ] }, { - "type": "ebs", + "type": "rds", "size": "small", "snapshots": [ { - "us-east-1": "snap-039acd2608c3bce3f", - "us-east-2": "snap-0fb8cd6bf387057c0", - "us-west-1": "snap-012dc94feaaa30490", - "us-west-2": "snap-0a0f1b03ec0e8bf36" + "us-east-2": "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-west-2": "arn:aws:rds:us-west-2:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-west-1": "arn:aws:rds:us-west-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-5", + "us-east-1": "arn:aws:rds:us-east-1:585036043680:snapshot:dcapt-bitbucket-small-8-9-5" } ] } @@ -496,6 +445,7 @@ "versions": [ { "version": "5.1.4", + "build_number": "1893", "data": [ { "type": "rds", @@ -514,10 +464,10 @@ "size": "large", "snapshots": [ { - "us-east-1": "", + "us-east-1": "snap-08c6dc6abc75fe2b4", "us-east-2": "snap-0a8e229690be9ae30", - "us-west-1": "", - "us-west-2": "" + "us-west-1": "snap-0206b022c6880fe67", + "us-west-2": "snap-07a9b523b316aeb32" } ] } @@ -526,5 +476,3 @@ ] } } - - diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars index 4d59db180..6ffe95ad0 100644 --- a/app/util/k8s/dcapt.tfvars +++ b/app/util/k8s/dcapt.tfvars @@ -84,34 +84,34 @@ jira_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions # # Jira version -jira_version_tag = "9.4.8" +jira_version_tag = "9.4.10" # JSM version -# jira_version_tag = "5.4.8" +# jira_version_tag = "5.4.10" # Shared home restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # -# Jira 9.4.8 DCAPT large dataset EBS snapshot -jira_shared_home_snapshot_id = "snap-0d619095feaa2eca5" -# Jira 8.20.24 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0b5f4473954e6d959" -# JSM 5.4.8 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0fb58e8d005edeb32" -# JSM 4.20.24 DCAPT large dataset EBS snapshot -# jira_shared_home_snapshot_id = "snap-0cae5febc8127250b" +# Jira 9.4.10 DCAPT large dataset EBS snapshot +jira_shared_home_snapshot_id = "snap-084e99e384dcfbe31" +# Jira 8.20.26 DCAPT large dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0c0c388d53cd4153b" +# JSM 5.4.10 DCAPT large dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0381cc00e37231565" +# JSM 4.20.26 DCAPT large dataset EBS snapshot +# jira_shared_home_snapshot_id = "snap-0f7aa03eea37f3304" # Database restore configuration. # Make sure Jira/JSM version set in `jira_version_tag` match the snapshot version. # Build number stored within the snapshot and Jira license are also required, so that Jira can be fully setup prior to start. # -# Jira 9.4.8 DCAPT large dataset RDS snapshot -jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-8" -# Jira 8.20.24 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-24" -# JSM 5.4.8 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-8" -# JSM 4.20.24 DCAPT large dataset RDS snapshot -# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-24" +# Jira 9.4.10 DCAPT large dataset RDS snapshot +jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-9-4-10" +# Jira 8.20.26 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jira-8-20-26" +# JSM 5.4.10 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-5-4-10" +# JSM 4.20.26 DCAPT large dataset RDS snapshot +# jira_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-jsm-4-20-26" # Helm chart version of Jira # jira_helm_chart_version = "" @@ -174,37 +174,31 @@ confluence_license = "confluence-license" confluence_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -confluence_version_tag = "7.19.11" +confluence_version_tag = "8.5.1" # Shared home restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # -# 8.1.4 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-0125fdfcf37dabef5" -# 7.19.11 DCAPT large dataset EBS snapshot -confluence_shared_home_snapshot_id = "snap-09365c581a158a979" -# 7.13.18 DCAPT large dataset EBS snapshot -# confluence_shared_home_snapshot_id = "snap-04cc3d8455b1ef6e9" +# 8.5.1 DCAPT large dataset EBS snapshot +confluence_shared_home_snapshot_id = "snap-074a2fdca0497b6b6" +# 7.19.14 DCAPT large dataset EBS snapshot +# confluence_shared_home_snapshot_id = "snap-00f5e8147604a017e" # Database restore configuration. # Make sure confluence version set in `confluence_version_tag` match the snapshot version. # Build number stored within the snapshot and Confluence license are also required, so that Confluence can be fully setup prior to start. # -# 8.1.4 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-1-4" -# 7.19.11 DCAPT large dataset RDS snapshot -confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-11" -# 7.13.18 DCAPT large dataset RDS snapshot -# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-13-18" +# 8.5.1 DCAPT large dataset RDS snapshot +confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-8-5-1" +# 7.19.14 DCAPT large dataset RDS snapshot +# confluence_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-confluence-7-19-14" # Build number for a specific Confluence version can be found in the link below: # https://developer.atlassian.com/server/confluence/confluence-build-information -# 8.1.4 -# confluence_db_snapshot_build_number = "9003" -# 7.19.11 -confluence_db_snapshot_build_number = "8804" -# 7.13.18 -# confluence_db_snapshot_build_number = "8703" +# 8.5.1 +confluence_db_snapshot_build_number = "9012" +# 7.19.14 +# confluence_db_snapshot_build_number = "8804" # Helm chart version of Confluence # confluence_helm_chart_version = "" @@ -278,23 +272,23 @@ bitbucket_license = "bitbucket-license" bitbucket_replica_count = 1 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions -bitbucket_version_tag = "7.21.14" +bitbucket_version_tag = "7.21.16" # Shared home restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT large dataset EBS snapshot -bitbucket_shared_home_snapshot_id = "snap-0ccb8c3d34ff171f1" -# 8.9.2 DCAPT large dataset EBS snapshot -#bitbucket_shared_home_snapshot_id = "snap-0d933f3d40000e877" +# 7.21.16 DCAPT large dataset EBS snapshot +bitbucket_shared_home_snapshot_id = "snap-0d4bbe0cf3056c0ee" +# 8.9.5 DCAPT large dataset EBS snapshot +#bitbucket_shared_home_snapshot_id = "snap-0261a9130a9fd7618" # Database restore configuration. # Make sure Bitbucket version set in `bitbucket_version_tag` match the snapshot version. # -# 7.21.14 DCAPT large dataset RDS snapshot -bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-14" -# 8.9.2 DCAPT large dataset RDS snapshot -#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-2" +# 7.21.16 DCAPT large dataset RDS snapshot +bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-7-21-16" +# 8.9.5 DCAPT large dataset RDS snapshot +#bitbucket_db_snapshot_id = "arn:aws:rds:us-east-2:585036043680:snapshot:dcapt-bitbucket-8-9-5" # Helm chart version of Bitbucket #bitbucket_helm_chart_version = "" @@ -473,8 +467,8 @@ bamboo_license = "bamboo-license" # By default, latest supported by DCAPT version is set. # https://hub.docker.com/r/atlassian/bamboo/tags # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags -bamboo_version_tag = "9.2.3" -bamboo_agent_version_tag = "9.2.3" +bamboo_version_tag = "9.2.5" +bamboo_agent_version_tag = "9.2.5" # Helm chart version of Bamboo and Bamboo agent instances # bamboo_helm_chart_version = "" diff --git a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md index 0842c9316..3ef7f1a7c 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bamboo.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bamboo.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Bamboo @@ -51,11 +51,12 @@ specifically for performance testing during the DC app review process. {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bamboo` - `products` - `bamboo` - `bamboo_license` - one-liner of valid bamboo license without spaces and new line symbols @@ -66,16 +67,15 @@ specifically for performance testing during the DC app review process. Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. From local terminal (Git bash terminal for Windows) start the installation (~40min): +6. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -6. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. -7. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. +7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bamboo`. +8. Wait for all remote agents to be started and connected. It can take up to 10 minutes. Agents can be checked in `Settings` > `Agents`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. diff --git a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md index 91fc257ea..e68aeabd8 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md +++ b/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Bitbucket @@ -33,31 +33,6 @@ It'll also provide you with a lightweight and less expensive environment for dev Once you're ready to generate test results for the Marketplace Data Center Apps Approval process, run the toolkit in an **enterprise-scale environment**. ---- - -{{% note %}} -In case you are in the middle of Bitbucket DC app performance testing with the CloudFormation deployment option, -the process can be continued after switching to the `7.1.0` DCAPT version. -{{% /note %}} - -* Checkout release `7.1.0` of the `dc-app-performance-toolkit` repository: - - ``` - git checkout release-7.1.0 - ``` -* Use the docker container with the `7.1.0` release tag to run performance tests from docker: - - ``` - cd dc-app-performance-toolkit - docker pull atlassian/dcapt:7.1.0 - docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt:7.1.0 bitbucket.yml - ``` -* The corresponding version of the user guide could be found in the `dc-app-performance-toolkit/docs` folder or by this -[link](https://github.com/atlassian/dc-app-performance-toolkit/blob/release-7.1.0/docs/dc-apps-performance-toolkit-user-guide-bitbucket.md). -* If specific version of the Bitbucket DC is required, please contact support in the [community Slack](http://bit.ly/dcapt_slack). - ---- - ### 1. Setting up Bitbucket Data Center development environment #### AWS cost estimation for the development environment @@ -84,11 +59,12 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bitbucket-small` - `products` - `bitbucket` - `bitbucket_license` - one-liner of valid bitbucket license without spaces and new line symbols @@ -100,18 +76,17 @@ Below process describes how to install low-tier Bitbucket DC with "small" datase Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `bitbucket_version_tag` - Bitbucket version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Bitbucket version specified in **bitbucket_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -252,28 +227,28 @@ Below process describes how to install enterprise-scale Bitbucket DC with "large {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-bitbucket-large` - `products` - `bitbucket` - `bitbucket_license` - one-liner of valid bitbucket license without spaces and new line symbols - `region` - AWS region for deployment. **Do not change default region (`us-east-2`). If specific region is required, contact support.** - `instance_types` - `["m5.4xlarge"]` -5. Optional variables to override: +6. Optional variables to override: - `bitbucket_version_tag` - Bitbucket version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Bitbucket version specified in **bitbucket_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/bitbucket`. {{% note %}} New trial license could be generated on [my atlassian](https://my.atlassian.com/license/evaluation). @@ -466,7 +441,6 @@ To receive scalability benchmark results for two-node Bitbucket DC **with** app- ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-confluence.md b/docs/dc-apps-performance-toolkit-user-guide-confluence.md index d5b37bce9..52e86610e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-confluence.md +++ b/docs/dc-apps-performance-toolkit-user-guide-confluence.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Confluence @@ -33,31 +33,6 @@ It'll also provide you with a lightweight and less expensive environment for dev Once you're ready to generate test results for the Marketplace Data Center Apps Approval process, run the toolkit in an **enterprise-scale environment**. ---- - -{{% note %}} -In case you are in the middle of Confluence DC app performance testing with the CloudFormation deployment option, -the process can be continued after switching to the `6.3.0` DCAPT version. -{{% /note %}} - -* Checkout release `6.3.0` of the `dc-app-performance-toolkit` repository: - - ``` - git checkout release-6.3.0 - ``` -* Use the docker container with the `6.3.0` release tag to run performance tests from docker: - - ``` - cd dc-app-performance-toolkit - docker pull atlassian/dcapt:6.3.0 - docker run --shm-size=4g -v "$PWD:/dc-app-performance-toolkit" atlassian/dcapt:6.3.0 confluence.yml - ``` -* The corresponding version of the user guide could be found in the `dc-app-performance-toolkit/docs` folder or by this -[link](https://github.com/atlassian/dc-app-performance-toolkit/blob/release-6.3.0/docs/dc-apps-performance-toolkit-user-guide-confluence.md). -* If specific version of the Confluence DC is required, please contact support in the [community Slack](http://bit.ly/dcapt_slack). - ---- - ### 1. Setting up Confluence Data Center development environment #### AWS cost estimation for the development environment @@ -84,11 +59,12 @@ Below process describes how to install low-tier Confluence DC with "small" datas {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-confluence-small` - `products` - `confluence` - `confluence_license` - one-liner of valid confluence license without spaces and new line symbols @@ -99,18 +75,17 @@ Below process describes how to install low-tier Confluence DC with "small" datas Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `confluence_version_tag` - Confluence version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Confluence version specified in **confluence_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -331,11 +306,12 @@ Below process describes how to install enterprise-scale Confluence DC with "larg {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-confluence-large` - `products` - `confluence` - `confluence_license` - one-liner of valid confluence license without spaces and new line symbols @@ -346,18 +322,17 @@ Below process describes how to install enterprise-scale Confluence DC with "larg Use this server id for generation `BX02-9YO1-IN86-LO5G`. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `confluence_version_tag` - Confluence version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Confluence version specified in **confluence_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/confluence`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -541,7 +516,6 @@ To receive scalability benchmark results for two-node Confluence DC **with** app ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-crowd.md b/docs/dc-apps-performance-toolkit-user-guide-crowd.md index 98c63c59b..0f13b4f80 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-crowd.md +++ b/docs/dc-apps-performance-toolkit-user-guide-crowd.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Crowd @@ -48,11 +48,12 @@ specifically for performance testing during the DC app review process. {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-crowd` - `products` - `crowd` - `crowd_license` - one-liner of valid crowd license without spaces and new line symbols @@ -64,15 +65,14 @@ specifically for performance testing during the DC app review process. Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. From local terminal (Git bash terminal for Windows) start the installation (~40min): +6. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -6. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. +7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/crowd`. --- @@ -295,7 +295,6 @@ To receive scalability benchmark results for two-node Crowd DC **with** app-spec ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md index b1b5547c7..698c5750f 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira-cf.md @@ -4,10 +4,15 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira (CloudFormation deployment) +{{% warning %}} +CloudFormation deployment option will be no longer supported starting from January 2024. +It is recommended to use TerraForm deployment. More details could be found in [User Guide](https://developer.atlassian.com/platform/marketplace/dc-apps-performance-toolkit-user-guide-jira/). +{{% /warning %}} + This document walks you through the process of testing your app on Jira using the Data Center App Performance Toolkit. These instructions focus on producing the required [performance and scale benchmarks for your Data Center app](/platform/marketplace/dc-apps-performance-and-scale-testing/). {{% note %}} @@ -68,10 +73,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.24`, `9.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.26`, `9.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -389,10 +394,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | Software | -| Version | The Data Center App Performance Toolkit officially supports `8.20.24`, `9.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | Software | +| Version | The Data Center App Performance Toolkit officially supports `8.20.26`, `9.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** diff --git a/docs/dc-apps-performance-toolkit-user-guide-jira.md b/docs/dc-apps-performance-toolkit-user-guide-jira.md index c851159f7..446c05a71 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jira.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jira.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Jira @@ -41,7 +41,7 @@ run the toolkit in an **enterprise-scale environment**. --- {{% note %}} -DCAPT has fully transitioned to Terraform deployment. If you still wish to use CloudFormation deployment, refer to the [Jira Data Center app testing [CloudFormation]](/platform/marketplace/dc-apps-performance-toolkit-user-guide-jira-cf/) +DCAPT has fully transitioned to Terraform deployment. CloudFormation deployment option will be no longer supported starting from January 2024. {{% /note %}} ### 1. Setting up Jira Data Center development environment @@ -70,11 +70,12 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jira-small` - `products` - `jira` - `jira_license` - one-liner of valid jira license without spaces and new line symbols @@ -85,24 +86,23 @@ Below process describes how to install low-tier Jira DC with "small" dataset inc Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Re-index (only for Jira 8.x, for Jira 9.x skip this step): - - Go to **![cog icon](/platform/marketplace/images/cog.png) > System > Indexing**. - - Select the **Full re-index** option. - - Click **Re-Index** and wait until re-indexing is completed (~2s). 8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +9. Re-index (only for Jira 8.x, for Jira 9.x skip this step): + - Go to **![cog icon](/platform/marketplace/images/cog.png) > System > Indexing**. + - Select the **Full re-index** option. + - Click **Re-Index** and wait until re-indexing is completed (~2s). {{% note %}} All the datasets use the standard `admin`/`admin` credentials. {{% /note %}} @@ -337,11 +337,12 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-performance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jira` - `products` - `jira` - `jira_license` - one-liner of valid jira license without spaces and new line symbols @@ -352,18 +353,17 @@ Below process describes how to install enterprise-scale Jira DC with "large" dat Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -9. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -571,7 +571,6 @@ To receive scalability benchmark results for two-node Jira DC **with** app-speci ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md index 93310e73a..f04322a03 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm-cf.md @@ -4,10 +4,15 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-09-20" --- # Data Center App Performance Toolkit User Guide For Jira Service Management (CloudFormation deployment) +{{% warning %}} +CloudFormation deployment option will be no longer supported starting from January 2024. +It is recommended to use TerraForm deployment. More details could be found in [User Guide](https://developer.atlassian.com/platform/marketplace/dc-apps-performance-toolkit-user-guide-jsm/). +{{% /warning %}} + This document walks you through the process of testing your app on Jira Service Management using the Data Center App Performance Toolkit. These instructions focus on producing the required [performance and scale benchmarks for your Data Center app](/platform/marketplace/dc-apps-performance-and-scale-testing/): If your application relays or extends the functionality of **Insight** ([What is Insight?](https://confluence.atlassian.com/servicemanagementserver/what-is-insight-1044784313.html)): @@ -68,10 +73,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.24`, `5.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.26`, `5.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** @@ -550,10 +555,10 @@ All important parameters are listed and described in this section. For all other **Jira setup** -| Parameter | Recommended Value | -| --------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Jira Product | ServiceManagement | -| Version | The Data Center App Performance Toolkit officially supports `4.20.24`, `5.4.8` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | +| Parameter | Recommended Value | +| --------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Jira Product | ServiceManagement | +| Version | The Data Center App Performance Toolkit officially supports `4.20.26`, `5.4.10` ([Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)) | **Cluster nodes** diff --git a/docs/dc-apps-performance-toolkit-user-guide-jsm.md b/docs/dc-apps-performance-toolkit-user-guide-jsm.md index 5f6693251..c3561a77e 100644 --- a/docs/dc-apps-performance-toolkit-user-guide-jsm.md +++ b/docs/dc-apps-performance-toolkit-user-guide-jsm.md @@ -4,7 +4,7 @@ platform: platform product: marketplace category: devguide subcategory: build -date: "2023-08-15" +date: "2023-10-03" --- # Data Center App Performance Toolkit User Guide For Jira Service Management @@ -42,7 +42,7 @@ run the toolkit in an **enterprise-scale environment**. --- {{% note %}} -DCAPT has fully transitioned to Terraform deployment. If you still wish to use CloudFormation deployment, refer to the [Jira Service Management Data Center app testing [CloudFormation]](/platform/marketplace/dc-apps-performance-toolkit-user-guide-jsm-cf/) +DCAPT has fully transitioned to Terraform deployment. CloudFormation deployment option will be no longer supported starting from January 2024. {{% /note %}} ### 1. Setting up Jira Service Management Data Center development environment @@ -71,11 +71,12 @@ Below process describes how to install low-tier Jira Service Management DC with {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-apps-peformance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-apps-peformance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt-small.tfvars` file: +5. Set **required** variables in `dcapt-small.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jsm-small`. - `products` - `jira` - `jira_image_repository` - `atlassian/jira-servicemanagement` - make sure to select the **Jira Service Management** application. @@ -87,18 +88,17 @@ Below process describes how to install low-tier Jira Service Management DC with Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira Service Management version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira Service Management version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~20 min): +7. From local terminal (Git bash terminal for Windows) start the installation (~20 min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt-small.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -368,11 +368,12 @@ Below process describes how to install enterprise-scale Jira Service Management {{% warning %}} Do not use `root` user credentials for cluster creation. Instead, [create an admin user](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-set-up.html#create-an-admin). {{% /warning %}} -2. Navigate to `dc-app-perfrormance-toolkit/app/util/k8s` folder. -3. Set AWS access keys created in step1 in `aws_envs` file: +2. Clone [Data Center App Performance Toolkit](https://github.com/atlassian/dc-app-performance-toolkit) locally. +3. Navigate to `dc-app-perfrormance-toolkit/app/util/k8s` folder. +4. Set AWS access keys created in step1 in `aws_envs` file: - `AWS_ACCESS_KEY_ID` - `AWS_SECRET_ACCESS_KEY` -4. Set **required** variables in `dcapt.tfvars` file: +5. Set **required** variables in `dcapt.tfvars` file: - `environment_name` - any name for you environment, e.g. `dcapt-jsm-large`. - `products` - `jira` - `jira_image_repository` - `atlassian/jira-servicemanagement` - make sure to select the **Jira Service Management** application. @@ -384,18 +385,17 @@ Below process describes how to install enterprise-scale Jira Service Management Use `BX02-9YO1-IN86-LO5G` Server ID for generation. {{% /note %}} -5. Optional variables to override: +6. Optional variables to override: - `jira_version_tag` - Jira Service Management version to deploy. Supported versions see in [README.md](https://github.com/atlassian/dc-app-performance-toolkit/blob/master/README.md). - Make sure that the Jira Service Management version specified in **jira_version_tag** is consistent with the EBS and RDS snapshot versions. Additionally, ensure that corresponding version snapshot lines are uncommented. -6. From local terminal (Git bash terminal for Windows) start the installation (~40min): +7. From local terminal (Git bash terminal for Windows) start the installation (~40min): ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` -7. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. +8. Copy product URL from the console output. Product url should look like `http://a1234-54321.us-east-2.elb.amazonaws.com/jira`. {{% note %}} All the datasets use the standard `admin`/`admin` credentials. @@ -609,7 +609,6 @@ To receive scalability benchmark results for two-node Jira Service Management DC ``` bash docker run --pull=always --env-file aws_envs \ -v "$PWD/dcapt.tfvars:/data-center-terraform/config.tfvars" \ - -v "$PWD/.terraform:/data-center-terraform/.terraform" \ -v "$PWD/logs:/data-center-terraform/logs" \ -it atlassianlabs/terraform ./install.sh -c config.tfvars ``` diff --git a/requirements.txt b/requirements.txt index 798691b5d..137b2d299 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -matplotlib==3.7.2 -pandas==2.0.3 -numpy==1.25.1 -scipy==1.11.1 -pytest==7.4.0 -locust==2.15.1 -selenium==4.10.0 -filelock==3.12.2 +matplotlib==3.8.0 +pandas==2.1.1 +numpy==1.26.0 +scipy==1.11.3 +pytest==7.4.2 +locust==2.16.1 +selenium==4.13.0 +filelock==3.12.4 packaging==23.1 -prettytable==3.8.0 -bzt==1.16.23 -boto3==1.28.11 +prettytable==3.9.0 +bzt==1.16.26 +boto3==1.28.56