Trending: Use s3 as primary source

Change-Id: Ibf68155fa06b8ee0783df83af3e03d351a615294
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 89f01fb4a805db23f7daa318baa83a3839efb5e1)

diff --git a/resources/tools/presentation/specifications/trending/environment.yaml b/resources/tools/presentation/specifications/trending/environment.yaml
index 16261fa..5868fd9 100644 (file)
--- a/resources/tools/presentation/specifications/trending/environment.yaml
+++ b/resources/tools/presentation/specifications/trending/environment.yaml
@@ -68,6 +68,12 @@
   # Data sources are used in this order:
   data-sources:
     # XML
+    - type: "xml"
+      url: "https://s3-logs.fd.io/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.nginx.service.consul/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
@@ -80,48 +86,44 @@
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
+    # To be deprecated soon:
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
       file-name: "output_info.xml.gz"
       file-format: ".gz"
       enabled: True
+    # Deprecated:
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/archives/{filename}"
       file-name: "output_info.xml.gz"
       file-format: ".gz"
-      enabled: True
-    - type: "xml"
-      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
+      enabled: False
     - type: "xml"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/archives/{filename}"
       file-name: "output.xml.gz"
       file-format: ".gz"
-      enabled: True
+      enabled: False
     - type: "xml"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
       file-name: "output.xml.gz"
       file-format: ".gz"
-      enabled: True
+      enabled: False
     - 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
+      enabled: False
     - type: "xml"
       url: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
       path: "{job}/{build}/{filename}"
       file-name: "output.xml.gz"
       file-format: ".gz"
-      enabled: True
+      enabled: False
     # JSON from S3
     - type: "json"
       url: "https://logs.nginx.service.consul/vex-yul-rot-jenkins-1"