X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Fenvironment.yaml;h=c08ec2c41da31baabf214b4210c1282463f51453;hp=0e946046b4f510c98a194e1b8017527d86f940d7;hb=cab67f5de29b46776a689423188c121f997cc321;hpb=c10980893443b59c464deb6cd0d66d5be972593f diff --git a/resources/tools/presentation/specifications/report/environment.yaml b/resources/tools/presentation/specifications/report/environment.yaml index 0e946046b4..c08ec2c41d 100644 --- a/resources/tools/presentation/specifications/report/environment.yaml +++ b/resources/tools/presentation/specifications/report/environment.yaml @@ -117,13 +117,6 @@ # Data sources are used in this order: data-sources: - # JSON from S3 - - type: "json" - url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" - path: "{job}/{build}/{filename}" - file-name: "output.json.gz" - file-format: ".gz" - enabled: False # XML - type: "xml" url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" @@ -139,32 +132,38 @@ enabled: True - type: "xml" url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1" - path: "{job}/{build}/archives/{filename}" + path: "{job}/{build}/{filename}" file-name: "output_info.xml.gz" file-format: ".gz" enabled: True - type: "xml" url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1" path: "{job}/{build}/archives/{filename}" - file-name: "output.xml.gz" + file-name: "output_info.xml.gz" file-format: ".gz" enabled: True - type: "xml" - url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" + url: "https://s3-logs.fd.io/logs/production/vex-yul-rot-jenkins-1" + path: "{job}/{build}/{filename}" + file-name: "output_info.xml.gz" + file-format: ".gz" + enabled: True + - type: "xml" + url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1" path: "{job}/{build}/archives/{filename}" file-name: "output.xml.gz" file-format: ".gz" enabled: True - type: "xml" url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" - path: "{job}/{build}/{filename}" + path: "{job}/{build}/archives/{filename}" file-name: "output.xml.gz" file-format: ".gz" enabled: True - type: "xml" - url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1" + url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" path: "{job}/{build}/{filename}" - file-name: "output_info.xml.gz" + file-name: "output.xml.gz" file-format: ".gz" enabled: True - type: "xml" @@ -192,8 +191,15 @@ file-name: "robot-plugin.zip" file-format: ".zip" enabled: True + # JSON from S3 + - type: "json" + url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1" + path: "{job}/{build}/{filename}" + file-name: "output.json.gz" + file-format: ".gz" + enabled: False - archive-inputs: True + archive-inputs: False mapping-file: "" @@ -224,7 +230,6 @@ reverse-input: False # Needed for trending, not important for the report - # TODO: Change in code needed, it was in type: "configuration" limits: nic: x520: 24460000 @@ -258,7 +263,7 @@ ################################################################################ - type: "output" - arch-file-format: # moved from input, TODO: change it in the code + arch-file-format: - ".gz" - ".zip" output: "report"