Skip to content

Commit a87b2cc

Browse files
author
Aman Brar
authored
Add soaking and perf to prometheus static (#150)
* added environment variables to EC2 AOC deployment * make env vars only on amazon linux * remove unneeded changes * made env vars command modular and added windows env vars * remove cortex instance endpoint var for backwards compatibility * ec2 working with windows * get soaking and performance test working for prometheus_mock * increase memory for prometheus sample app in soaking/perf tests * put pull mode soaking compose in defaults * change var names * set env vars in ec2 setup amis * get soaking and performance test working for prometheus_mock * added prometheus static perf and soaking test logic * remove static prometheus logging exporter * remove duplicate vars * fixed issues in rebase * remove soaking compose from prometheus mock
1 parent ac9a5cb commit a87b2cc

File tree

11 files changed

+18
-23
lines changed

11 files changed

+18
-23
lines changed

terraform/common.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,8 @@ variable "soaking_data_mode" {
5858
variable "sample_app_mode" {
5959
default = "push"
6060
}
61+
62+
variable "cortex_instance_endpoint" {
63+
# change to your cortex endpoint
64+
default = "https://aps-workspaces-gamma.us-west-2.amazonaws.com/workspaces/AWS_TEST_ACCOUNT_WORKSPACE"
65+
}

terraform/ec2/variables.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,3 @@ variable "testing_type" {
9898
variable "canary" {
9999
default = false
100100
}
101-
102-
variable "cortex_instance_endpoint" {
103-
default = ""
104-
}

terraform/ec2_setup/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ module "ec2_setup" {
4646
soaking_data_rate = var.soaking_data_rate
4747
soaking_data_type = var.soaking_data_type
4848

49+
cortex_instance_endpoint = var.cortex_instance_endpoint
50+
4951
# negative soaking
5052
mock_endpoint = var.negative_soaking ? "http://127.0.0.2" : "mocked-server/put-data"
5153

terraform/ec2_setup/variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,3 @@ variable "install_package_source" {
6767
variable "install_package_local_path" {
6868
default = "../../../aws-otel-collector/build/packages/linux/amd64/aws-otel-collector.rpm"
6969
}
70-

terraform/ecs/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,3 @@ variable "ecs_launch_type" {
2020
variable "sample_app_callable" {
2121
default = true
2222
}
23-
24-
variable "cortex_instance_endpoint" {
25-
# change to your cortex endpoint
26-
default = ""
27-
}

terraform/eks/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,3 @@
1616
variable "eks_cluster_name" {
1717
default = "aws-otel-testing-framework-eks"
1818
}
19-
20-
variable "cortex_instance_endpoint" {
21-
# change to your cortex endpoint
22-
default = ""
23-
}

terraform/performance/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ module "ec2_setup" {
3131
soaking_data_type = var.data_type
3232
soaking_data_mode = var.soaking_data_mode
3333

34+
cortex_instance_endpoint = var.cortex_instance_endpoint
35+
3436
install_package_source = var.install_package_source
3537
install_package_local_path = var.install_package_local_path
3638

terraform/soaking/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ module "ec2_setup" {
3030
soaking_data_rate = var.soaking_data_rate
3131
soaking_data_type = var.soaking_data_type
3232

33+
cortex_instance_endpoint = var.cortex_instance_endpoint
34+
3335
install_package_source = var.install_package_source
3436
install_package_local_path = var.install_package_local_path
3537

terraform/testcases/prometheus_sd/parameters.tfvars

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,4 @@ validation_config="prometheus-sd-validation.yml"
33

44
sample_app="prometheus"
55

6-
# change to your cortex endpoint
7-
cortex_instance_endpoint=""
8-
9-
sample_app_mode="pull"
6+
sample_app_mode="pull"

terraform/testcases/prometheus_static/otconfig.tpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ exporters:
1313
aws_auth:
1414
region: ${region}
1515
service: "aps"
16-
timeout: 10s
17-
logging:
18-
loglevel: debug
16+
timeout: 15s
1917
service:
2018
pipelines:
2119
metrics:
2220
receivers: [prometheus]
23-
exporters: [awsprometheusremotewrite, logging]
21+
exporters: [awsprometheusremotewrite]

0 commit comments

Comments
 (0)