merge

Author: martyh

app/jira.yml

@@ -4,6 +4,7 @@ settings:
  aggregator: consolidator
  verbose: false
  check-updates: false # disable bzt check for updates
+ check-updates: false # disable bzt check for updates
  env:
  application_hostname: a2421393e2a54406195c3db80732d226-987115805.us-east-2.elb.amazonaws.com # Jira DC hostname without protocol and port e.g. test-jira.atlassian.com or localhost
  application_protocol: http # http or https
@@ -14,14 +15,20 @@ settings:
  admin_password: admin
  load_executor: jmeter # jmeter and locust are supported. jmeter by default.
  concurrency: 200 # number of concurrent virtual users for jmeter or locust scenario
+ load_executor: jmeter # jmeter and locust are supported. jmeter by default.
+ concurrency: 200 # number of concurrent virtual users for jmeter or locust scenario
  test_duration: 45m
  ramp-up: 3m # time to spin all concurrent users
  total_actions_per_hour: 54500 # number of total JMeter/Locust actions per hour
+ ramp-up: 3m # time to spin all concurrent users
+ total_actions_per_hour: 54500 # number of total JMeter/Locust actions per hour
  WEBDRIVER_VISIBLE: False
  JMETER_VERSION: 5.5
  LANGUAGE: en_US.utf8
  allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
  environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
+ allow_analytics: Yes # Allow sending basic run analytics to Atlassian. These analytics help us to understand how the tool is being used and help us to continue to invest in this tooling. For more details please see our README.
+ environment_compliance_check: True # Pre-test environment compliance validation. Set to "False" to skip it.
  # Action percentage for Jmeter and Locust load executors
  create_issue: 4
  search_jql: 11
@@ -43,6 +50,7 @@ services:
  prepare:
  - python util/pre_run/environment_checker.py
  - python util/pre_run/environment_compliance_check.py jira
+ - python util/pre_run/environment_compliance_check.py jira
  - python util/data_preparation/jira_prepare_data.py
  shutdown:
  - python util/post_run/jmeter_post_check.py

app/reports_generation/performance_profile.yml

@@ -1,6 +1,8 @@
 # Defines which column from test runs is used for aggregated report. Default is "90% Line"
 column_name: "90% Line"
 runs:
+ # relativePath should contain a relative path to the directory with run results starting from dc-app-performance-toolkit folder.
+ # E.g. relativePath: "./app/results/jira/2024-01-01_10-10-10"
  # relativePath should contain a relative path to the directory with run results starting from dc-app-performance-toolkit folder.
  # E.g. relativePath: "./app/results/jira/2024-01-01_10-10-10"
  - runName: "without app"

app/util/k8s/dcapt-small.tfvars

@@ -7,6 +7,7 @@
 
 ################################################################################
 # Configuration settings to change
+# Configuration settings to change
 ################################################################################
 
 # Unique name of your small-scale test cluster.
@@ -44,6 +45,9 @@ whitelist_cidr = ["0.0.0.0/0"]
 # Path to a JSON file with EBS and RDS snapshot IDs
 snapshots_json_file_path = "dcapt-snapshots.json"
 
+# Path to a JSON file with EBS and RDS snapshot IDs
+snapshots_json_file_path = "dcapt-snapshots.json"
+
 # (optional) Custom tags for all resources to be created. Please add all tags you need to propagate among the resources.
 resource_tags = {Name: "dcapt-testing-small"}
 
@@ -57,6 +61,7 @@ instance_disk_size = 100
 # and removes the need to change this value.
 min_cluster_capacity = 1
 max_cluster_capacity = 2
+max_cluster_capacity = 2
 
 # By default, Ingress controller listens on 443 and 80. You can enable only http port 80 by
 # uncommenting the below line, which will disable port 443. This results in fewer inbound rules in Nginx controller security group.
@@ -83,6 +88,7 @@ max_cluster_capacity = 2
 jira_image_repository = "atlassian/jira-software"
 # JSM
 # ! REQUIRED for JSM !
+# ! REQUIRED for JSM !
 # jira_image_repository = "atlassian/jira-servicemanagement"
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
@@ -92,6 +98,15 @@ jira_version_tag = "9.12.1"
 # ! REQUIRED for JSM !
 # jira_version_tag = "5.12.1"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
+jira_dataset_size = "small"
+# Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
+# Jira version.
+jira_version_tag = "9.12.1"
+# JSM version
+# ! REQUIRED for JSM !
+# jira_version_tag = "5.12.1"
+
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 jira_dataset_size = "small"
 
@@ -125,6 +140,8 @@ jira_nfs_limits_memory = "1.5Gi"
 # initial volume size of local/shared home EBS.
 jira_local_home_size = "20Gi"
 jira_shared_home_size = "20Gi"
+jira_local_home_size = "20Gi"
+jira_shared_home_size = "20Gi"
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.
@@ -157,6 +174,11 @@ jira_db_master_password = "Password1!"
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 confluence_version_tag = "8.5.4"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
+confluence_dataset_size = "small"
+# Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
+confluence_version_tag = "8.5.4"
+
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 confluence_dataset_size = "small"
 
@@ -189,6 +211,7 @@ synchrony_stack_size = "2048k"
 # Storage
 confluence_local_home_size = "20Gi"
 confluence_shared_home_size = "20Gi"
+confluence_shared_home_size = "20Gi"
 
 # Confluence NFS instance resource configuration
 confluence_nfs_requests_cpu = "500m"
@@ -206,6 +229,7 @@ confluence_db_instance_class = "db.t3.medium"
 confluence_db_allocated_storage = 200
 confluence_db_iops = 1000
 
+
 # If you restore the database, make sure `confluence_db_name' is set to the db name from the snapshot.
 # Set `null` if the snapshot does not have a default db name.
 confluence_db_name = "confluence"
@@ -230,6 +254,11 @@ confluence_collaborative_editing_enabled = true
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 bitbucket_version_tag = "8.9.8"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
+bitbucket_dataset_size = "small"
+# Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
+bitbucket_version_tag = "8.9.8"
+
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 bitbucket_dataset_size = "small"
 
@@ -275,6 +304,7 @@ bitbucket_max_heap = "2048m"
 
 # Storage
 bitbucket_local_home_size = "20Gi"
+bitbucket_local_home_size = "20Gi"
 bitbucket_shared_home_size = "20Gi"
 
 # Bitbucket NFS instance resource configuration
@@ -301,6 +331,7 @@ bitbucket_db_instance_class = "db.t3.medium"
 bitbucket_db_allocated_storage = 100
 bitbucket_db_iops = 1000
 
+
 # If you restore the database, make sure `bitbucket_db_name' is set to the db name from the snapshot.
 # Set `null` if the snapshot does not have a default db name.
 bitbucket_db_name = "bitbucket"

app/util/k8s/dcapt.tfvars

@@ -5,6 +5,7 @@
 
 ################################################################################
 # Configuration settings to change
+# Configuration settings to change
 ################################################################################
 
 # Unique name of your enterprise-scale test cluster.
@@ -53,19 +54,24 @@ whitelist_cidr = ["0.0.0.0/0"]
 # Path to a JSON file with EBS and RDS snapshot IDs
 snapshots_json_file_path = "dcapt-snapshots.json"
 
+# Path to a JSON file with EBS and RDS snapshot IDs
+snapshots_json_file_path = "dcapt-snapshots.json"
+
 # (optional) Custom tags for all resources to be created. Please add all tags you need to propagate among the resources.
 resource_tags = {Name: "dcapt-testing"}
 
 # Instance types that is preferred for EKS node group.
 instance_types = ["m5.2xlarge"]
 instance_disk_size = 200
+instance_disk_size = 200
 
 # Minimum and maximum size of the EKS cluster.
 # Cluster-autoscaler is installed in the EKS cluster that will manage the requested capacity
 # and increase/decrease the number of nodes accordingly. This ensures there is always enough resources for the workloads
 # and removes the need to change this value.
 min_cluster_capacity = 1
 max_cluster_capacity = 6
+max_cluster_capacity = 6
 
 # By default, Ingress controller listens on 443 and 80. You can enable only http port 80 by
 # uncommenting the below line, which will disable port 443. This results in fewer inbound rules in Nginx controller security group.
@@ -90,6 +96,17 @@ test_deployment_cpu_limit = "4"
 test_deployment_mem_request = "8Gi"
 test_deployment_mem_limit = "8Gi"
 
+################################################################################
+# Execution Environment Settings
+################################################################################
+# Create a docker-in-docker privileged container as execution environment pod
+
+start_test_deployment = "true"
+test_deployment_cpu_request = "3"
+test_deployment_cpu_limit = "4"
+test_deployment_mem_request = "8Gi"
+test_deployment_mem_limit = "8Gi"
+
 ################################################################################
 # Jira/JSM Settings
 ################################################################################
@@ -102,18 +119,27 @@ test_deployment_mem_limit = "8Gi"
 # Jira
 jira_image_repository = "atlassian/jira-software"
 
+
 # JSM
 # ! REQUIRED for JSM !
+# ! REQUIRED for JSM !
 # jira_image_repository = "atlassian/jira-servicemanagement"
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 # Jira version
 jira_version_tag = "9.12.1"
 
+jira_version_tag = "9.12.1"
+
 # JSM version
 # ! REQUIRED for JSM !
 # jira_version_tag = "5.12.1"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large.
+jira_dataset_size = "large"
+# ! REQUIRED for JSM !
+# jira_version_tag = "5.12.1"
+
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large.
 jira_dataset_size = "large"
 
@@ -128,6 +154,7 @@ jira_installation_timeout = 25
 # Jira/JSM instance resource configuration
 jira_cpu = "6"
 jira_mem = "16Gi"
+jira_mem = "16Gi"
 jira_min_heap = "12288m"
 jira_max_heap = "12288m"
 jira_reserved_code_cache = "2048m"
@@ -136,6 +163,8 @@ jira_reserved_code_cache = "2048m"
 # initial volume size of local/shared home EBS.
 jira_local_home_size = "200Gi"
 jira_shared_home_size = "200Gi"
+jira_local_home_size = "200Gi"
+jira_shared_home_size = "200Gi"
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.
@@ -167,7 +196,10 @@ jira_db_master_password = "Password1!"
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 confluence_version_tag = "8.5.4"
+confluence_version_tag = "8.5.4"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
+confluence_dataset_size = "large"
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 confluence_dataset_size = "large"
 
@@ -182,19 +214,24 @@ confluence_installation_timeout = 30
 # Confluence instance resource configuration
 confluence_cpu = "6"
 confluence_mem = "16Gi"
+confluence_cpu = "6"
+confluence_mem = "16Gi"
 confluence_min_heap = "12288m"
 confluence_max_heap = "12288m"
 
 # Synchrony instance resource configuration
 synchrony_cpu = "1"
 synchrony_mem = "3Gi"
+synchrony_cpu = "1"
+synchrony_mem = "3Gi"
 synchrony_min_heap = "1024m"
 synchrony_max_heap = "2048m"
 synchrony_stack_size = "2048k"
 
 # Storage
 confluence_local_home_size = "200Gi"
 confluence_shared_home_size = "200Gi"
+confluence_shared_home_size = "200Gi"
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.
@@ -232,7 +269,10 @@ confluence_collaborative_editing_enabled = true
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 bitbucket_version_tag = "8.9.8"
+bitbucket_version_tag = "8.9.8"
 
+# Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
+bitbucket_dataset_size = "large"
 # Dataset size. Used only when snapshots_json_file_path is defined. Defaults to large
 bitbucket_dataset_size = "large"
 
@@ -315,6 +355,7 @@ bitbucket_db_master_password = "Password1!"
 
 # Supported versions by DCAPT: https://github.com/atlassian/dc-app-performance-toolkit#supported-versions
 crowd_version_tag = "5.2.2"
+crowd_version_tag = "5.2.2"
 
 # Helm chart version of Crowd and Crowd agent instances. By default the latest version is installed.
 # crowd_helm_chart_version = "<helm_chart_version>"
@@ -333,6 +374,8 @@ crowd_max_heap = "2048m"
 # Storage
 crowd_local_home_size = "20Gi"
 crowd_shared_home_size = "20Gi"
+crowd_local_home_size = "20Gi"
+crowd_shared_home_size = "20Gi"
 
 # Crowd NFS instance resource configuration
 crowd_nfs_requests_cpu = "1"
@@ -376,6 +419,8 @@ crowd_db_master_password = "Password1!"
 # https://hub.docker.com/r/atlassian/bamboo-agent-base/tags
 bamboo_version_tag = "9.2.9"
 bamboo_agent_version_tag = "9.2.9"
+bamboo_version_tag = "9.2.9"
+bamboo_agent_version_tag = "9.2.9"
 
 # Helm chart version of Bamboo and Bamboo agent instances
 # bamboo_helm_chart_version = "<helm_chart_version>"
@@ -419,6 +464,7 @@ bamboo_max_heap = "4096m"
 
 # Bamboo Agent instance resource configuration
 bamboo_agent_cpu = "250m"
+bamboo_agent_cpu = "250m"
 bamboo_agent_mem = "700m"
 
 # Storage
@@ -430,6 +476,10 @@ bamboo_nfs_requests_cpu = "1"
 bamboo_nfs_requests_memory = "1Gi"
 bamboo_nfs_limits_cpu = "2"
 bamboo_nfs_limits_memory = "2Gi"
+bamboo_nfs_requests_cpu = "1"
+bamboo_nfs_requests_memory = "1Gi"
+bamboo_nfs_limits_cpu = "2"
+bamboo_nfs_limits_memory = "2Gi"
 
 # RDS instance configurable attributes. Note that the allowed value of allocated storage and iops may vary based on instance type.
 # You may want to adjust these values according to your needs.
@@ -460,9 +510,11 @@ bamboo_dataset_url = "https://centaurus-datasets.s3.amazonaws.com/bamboo/dcapt-b
 # to kube-monitoring namespace. Defaults to false.
 # monitoring_enabled = true
 
+# Create Grafana service of LoadBalancer type. Defaults to false. To restrict access to LB URL
 # Create Grafana service of LoadBalancer type. Defaults to false. To restrict access to LB URL
 # the list of CIRDs from whitelist_cidr will be automatically applied.
 
+
 # monitoring_grafana_expose_lb = true
 
 # Command to select cluster:
@@ -472,6 +524,13 @@ bamboo_dataset_url = "https://centaurus-datasets.s3.amazonaws.com/bamboo/dcapt-b
 # Command to get grafana ulr: kubectl get svc -n kube-monitoring | grep grafana
 # Default grafana creds: admin/prom-operator
 
+# Command to select cluster:
+# export ENVIRONMENT_NAME=your_environment_name
+# aws eks update-kubeconfig --region us-east-2 --name atlas-$ENVIRONMENT_NAME-cluster
+
+# Command to get grafana ulr: kubectl get svc -n kube-monitoring | grep grafana
+# Default grafana creds: admin/prom-operator
+
 # Prometheus Persistent Volume Claim size. Defaults to 10Gi.
 # Out of the box EKS cluster is created with gp2 storage class which does not allow volume expansion,
 # i.e. if you expect a high volume of metrics or metrics with high cardinality it is recommended

requirements.txt

@@ -11,3 +11,6 @@ prettytable==3.9.0
 bzt==1.16.27
 boto3==1.34.14
 retry==0.9.2
+bzt==1.16.27
+boto3==1.34.14
+retry==0.9.2