From f9dc1a4373e5e067aa65d950e4a3efa9621c5e14 Mon Sep 17 00:00:00 2001 From: Matthew Fala Date: Sat, 4 Nov 2023 11:15:40 +0000 Subject: [PATCH 1/2] stability: rename file logging feature flag variables Signed-off-by: Matthew Fala --- .../default-config.json | 4 ++-- .../firelens-datajet.json | 2 +- .../fluent-bit.conf | 2 +- .../task-definition.json | 6 +++--- .../templates/s3-fargate-v04-05-2023/default-config.json | 4 ++-- .../templates/s3-fargate-v04-05-2023/task-definition.json | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/default-config.json b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/default-config.json index e1f9212..f9c44d4 100644 --- a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/default-config.json +++ b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/default-config.json @@ -17,7 +17,7 @@ "ServiceName": "golden-onepod-low-throughput", "debugS3Bucket": "{{managed.s3OutputBucket}}", "debugS3KeyPrefix": "{{managed.s3OutputExecutionPath}}/{{managed.caseNameUnique}}", - "is_datajet_tail_enable": true, - "is_fluent_bit_tail_enable": true + "is_datajet_tail_enabled": true, + "is_fluent_bit_tail_enabled": true } } \ No newline at end of file diff --git a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/firelens-datajet.json b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/firelens-datajet.json index 91ad273..43440e4 100644 --- a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/firelens-datajet.json +++ b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/firelens-datajet.json @@ -33,7 +33,7 @@ "batchRate": {{definitions.kbps_throughput_forward}} } }, - {{#if definitions.is_datajet_tail_enable}} + {{#if definitions.is_datajet_tail_enabled}} { "comment": "service log to tail", "generator": { diff --git a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/fluent-bit.conf b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/fluent-bit.conf index 23d9313..5868875 100644 --- a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/fluent-bit.conf +++ b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/fluent-bit.conf @@ -72,7 +72,7 @@ # 64MB = 512MB / 2 / (4 INPUT sections) Mem_Buf_Limit 64MB -{{#if definitions.is_fluent_bit_tail_enable}} +{{#if definitions.is_fluent_bit_tail_enabled}} [INPUT] Name tail Tag ServiceMetrics diff --git a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/task-definition.json b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/task-definition.json index 2086270..f4e781b 100644 --- a/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/task-definition.json +++ b/apps/firelens-stability/templates/golden-path-mountebank-fargate-v01-11-2023/task-definition.json @@ -132,7 +132,7 @@ "awslogs-stream-prefix": "{{managed.caseNameUnique}}-fluent-bit" } }, - {{#if definitions.is_fluent_bit_tail_enable}} + {{#if definitions.is_fluent_bit_tail_enabled}} "mountPoints": [ { "sourceVolume": "my-shared-volume", @@ -177,7 +177,7 @@ "awslogs-stream-prefix": "{{managed.caseNameUnique}}-datajet" } }, - {{#if definitions.is_fluent_bit_tail_enable}} + {{#if definitions.is_fluent_bit_tail_enabled}} "mountPoints": [ { "sourceVolume": "my-shared-volume", @@ -245,7 +245,7 @@ } ], "memory": "4096", - "cpu": "1024"{{#if definitions.is_fluent_bit_tail_enable}}, + "cpu": "1024"{{#if definitions.is_fluent_bit_tail_enabled}}, "volumes": [ { "name": "my-shared-volume" diff --git a/apps/firelens-stability/templates/s3-fargate-v04-05-2023/default-config.json b/apps/firelens-stability/templates/s3-fargate-v04-05-2023/default-config.json index 8b8bd26..853af71 100644 --- a/apps/firelens-stability/templates/s3-fargate-v04-05-2023/default-config.json +++ b/apps/firelens-stability/templates/s3-fargate-v04-05-2023/default-config.json @@ -20,7 +20,7 @@ "5172", "5173" ], - "is_datajet_tail_enable": true, - "is_fluent_bit_tail_enable": true + "is_datajet_tail_enabled": true, + "is_fluent_bit_tail_enabled": true } } diff --git a/apps/firelens-stability/templates/s3-fargate-v04-05-2023/task-definition.json b/apps/firelens-stability/templates/s3-fargate-v04-05-2023/task-definition.json index 08a8e20..3726ae8 100644 --- a/apps/firelens-stability/templates/s3-fargate-v04-05-2023/task-definition.json +++ b/apps/firelens-stability/templates/s3-fargate-v04-05-2023/task-definition.json @@ -56,7 +56,7 @@ "awslogs-create-group": "true", "awslogs-stream-prefix": "{{managed.caseNameUnique}}-fluent-bit" } - }{{#if definitions.is_fluent_bit_tail_enable}}, + }{{#if definitions.is_fluent_bit_tail_enabled}}, "mountPoints": [ { "sourceVolume": "my-shared-volume", @@ -94,7 +94,7 @@ "awslogs-stream-prefix": "{{managed.caseNameUnique}}-datajet" } }, - {{#if definitions.is_fluent_bit_tail_enable}} + {{#if definitions.is_fluent_bit_tail_enabled}} "mountPoints": [ { "sourceVolume": "my-shared-volume", @@ -131,7 +131,7 @@ } ], "memory": "4096", - "cpu": "1024"{{#if definitions.is_fluent_bit_tail_enable}}, + "cpu": "1024"{{#if definitions.is_fluent_bit_tail_enabled}}, "volumes": [ { "name": "my-shared-volume" From 3348f8e9f441284177ce65bf959e65ed0129f4cc Mon Sep 17 00:00:00 2001 From: Matthew Fala Date: Sat, 4 Nov 2023 11:49:17 +0000 Subject: [PATCH 2/2] stability: upgrade to arena private subnet with 32763 ip addresses and various fixes Signed-off-by: Matthew Fala --- .../suite-config.json | 4 ++-- .../config/collection-config.json | 5 ++--- .../lib/helpers/start-execution-stages.ts | 17 ++++++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/firelens-stability/collections/ecs-firelens-stability-tests/suite-config.json b/apps/firelens-stability/collections/ecs-firelens-stability-tests/suite-config.json index e586f25..058183f 100644 --- a/apps/firelens-stability/collections/ecs-firelens-stability-tests/suite-config.json +++ b/apps/firelens-stability/collections/ecs-firelens-stability-tests/suite-config.json @@ -11,7 +11,7 @@ "dashboard": "{{definitions.collectionUniqueName}}", "lists.dashboardWidgets": [ { - "name": "{{config.collectionUniqueName}}", + "name": "title-{{config.collectionUniqueName}}", "section": "0_{{config.collectionUniqueName}}", "config": { "type": "text", @@ -20,7 +20,7 @@ "width": 24, "height": 6, "properties": { - "markdown": "# Stability Test {{managed.executionName}}-{{managed.executionId}} \nThis dashboard is autogenerated by the FireLens stability test framework.\n## Test details\n**Cluster**: {{definitions.clusterName}}\n\n**Dashboard**: A link to this dashboard: [{{definitions.collectionUniqueName}}](#dashboards:name={{definitions.collectionUniqueName}}). \n " + "markdown": "# Stability Test {{managed.executionName}}-{{managed.executionId}} \nThis dashboard is autogenerated by the FireLens stability test framework.\n## Test details\n**Cluster**: [{{definitions.clusterName}}](https://us-west-2.console.aws.amazon.com/ecs/v2/clusters/{{definitions.clusterName}}/tasks?region=us-west-2)\n\n**Dashboard**: A link to this dashboard: [{{definitions.collectionUniqueName}}](#dashboards:name={{definitions.collectionUniqueName}}). \n " } } }, diff --git a/apps/firelens-stability/config/collection-config.json b/apps/firelens-stability/config/collection-config.json index 62cd8a5..61f6fe6 100644 --- a/apps/firelens-stability/config/collection-config.json +++ b/apps/firelens-stability/config/collection-config.json @@ -11,11 +11,10 @@ "config": { "region": "us-west-2", "taskVpcSubnets": [ - "subnet-078f461abe5af0a04", - "subnet-0cac11db3d721bddb" + "subnet-04b8799d6b53585fa" ], "taskVpcSecurityGroups": [ - "sg-087206043d26db005" + "sg-008bce72f5d6251be" ] } } \ No newline at end of file diff --git a/apps/firelens-stability/lib/helpers/start-execution-stages.ts b/apps/firelens-stability/lib/helpers/start-execution-stages.ts index 90caf93..78a1a11 100644 --- a/apps/firelens-stability/lib/helpers/start-execution-stages.ts +++ b/apps/firelens-stability/lib/helpers/start-execution-stages.ts @@ -176,21 +176,24 @@ export async function hydrateTestCaseSeed(testCaseSeed: ITestCaseSeed): }; const layer2Config = cascadeConfigurationStringAsExtension(testCaseSeed.collectionConfigSeed, baseConfig); - const layer3Config = cascadeConfigurationStringAsExtension(testCaseSeed.suiteConfigSeed, layer2Config); - const layer4Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseConfigSeed, layer3Config); - const layer5Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseSeed, layer4Config); + const layer2ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer2Config); + const layer3Config = cascadeConfigurationStringAsExtension(testCaseSeed.suiteConfigSeed, layer2ExecutionOverride); + const layer3ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer3Config); + const layer4Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseConfigSeed, layer3ExecutionOverride); + const layer4ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer4Config); + const layer5Config = cascadeConfigurationStringAsExtension(testCaseSeed.caseSeed, layer4ExecutionOverride); /* Apply execution config before and after template to ensure overrides are set - allow set template */ - const layer6Config = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer5Config); + const layer5ExecutionOverride = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer5Config); /* Get template */ - const templateName = layer6Config.config.template; + const templateName = layer5ExecutionOverride.config.template; if (!templateName) { - validateTestConfig(layer6Config); + validateTestConfig(layer5ExecutionOverride); } const templateConfigPath = Path.join(Constants.paths.templates, templateName, Constants.fileNames.templateDefaultConfig); const templateConfig = await getStringFromFile(templateConfigPath); - const layer7Config = cascadeConfigurationStringAsDefault(templateConfig, layer6Config); + const layer7Config = cascadeConfigurationStringAsDefault(templateConfig, layer5ExecutionOverride); /* Final layer of configuration from execution seed. These function as overrides. */ const config = cascadeConfigurationStringAsExtension(testCaseSeed.executionConfigSeed, layer7Config);