Update config with the new telemetry group option

Signed-off-by: Naga Ravi Chaitanya Elluri <[email protected]>

config.yaml.template

@@ -44,6 +44,7 @@ telemetry:
     backup_threads: $TELEMTRY_BACKUP_THREADS                   # number of telemetry download/upload threads
     archive_path: $TELEMETRY_ARCHIVE_PATH                      # local path where the archive files will be temporarly stored
     max_retries: $TELEMETRY_MAX_RETRIES                        # maximum number of upload retries (if 0 will retry forever)
+    telemetry_group: $TELEMETRY_GROUP                          # if set will archive the telemetry in the S3 bucket on a folder named after the value, otherwise will use "default"
     run_tag: $TELEMETRY_RUN_TAG                                # if set, this will be appended to the run folder in the bucket (useful to group the runs)
     archive_size: $TELEMETRY_ARCHIVE_SIZE                       # the size of the prometheus data archive size in KB. The lower the size of archive is
     logs_backup: $TELEMETRY_LOGS_BACKUP
@@ -53,4 +54,4 @@ telemetry:
 
 elastic: 
     elastic_url: $ELASTIC_SERVER
-    elastic_index: $ELASTIC_INDEX
+    elastic_index: $ELASTIC_INDEX

docs/all_scenarios_env.md

@@ -36,6 +36,7 @@ TELEMETRY_BACKUP_THREADS | number of telemetry download/upload threads | 5 |
 TELEMETRY_ARCHIVE_PATH | local path where the archive files will be temporarly stored | /tmp |
 TELEMETRY_MAX_RETRIES | maximum number of upload retries (if 0 will retry forever)  | 0 |
 TELEMETRY_RUN_TAG | if set, this will be appended to the run folder in the bucket (useful to group the runs | chaos |
+TELEMETRY_GROUP | if set will archive the telemetry in the S3 bucket on a folder named after the value | default |
 TELEMETRY_ARCHIVE_SIZE | the size of the prometheus data archive size in KB. The lower the size of archive is | 1000 |
 TELEMETRY_LOGS_BACKUP  | Logs backup to s3 | False |
 TELEMETRY_FILTER_PATTER | Filter logs based on certain time stamp patterns |["(\\w{3}\\s\\d{1,2}\\s\\d{2}:\\d{2}:\\d{2}\\.\\d+).+","kinit (\\d+/\\d+/\\d+\\s\\d{2}:\\d{2}:\\d{2})\\s+","(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+Z).+"]  | 

env.sh

@@ -29,6 +29,7 @@ export TELEMETRY_BACKUP_THREADS=${TELEMETRY_BACKUP_THREADS:=5}
 export TELEMETRY_ARCHIVE_PATH=${TELEMETRY_ARCHIVE_PATH:=/tmp}
 export TELEMETRY_MAX_RETRIES=${TELEMETRY_MAX_RETRIES:=0}
 export TELEMETRY_RUN_TAG=${TELEMETRY_RUN_TAG:=chaos}
+export TELEMETRY_GROUP=${TELEMETRY_GROUP:=default}
 export TELEMETRY_ARCHIVE_SIZE=${TELEMETRY_ARCHIVE_SIZE:=1000}
 export TELEMETRY_LOGS_BACKUP=${TELEMETRY_LOGS_BACKUP:=False}
 export TELEMETRY_FILTER_PATTERN=${TELEMETRY_FILTER_PATTERN:='["(\\w{3}\\s\\d{1,2}\\s\\d{2}:\\d{2}:\\d{2}\\.\\d+).+","kinit (\\d+/\\d+/\\d+\\s\\d{2}:\\d{2}:\\d{2})\\s+","(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d+Z).+"]'}