[perf] Make android-master-ingest.skia.org redirect to android-metric-ingest.skia.org.
Change-Id: I1f9438dbba116032b0dffbad29dc80ae8a2ff714
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/324511
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
diff --git a/android_ingest/PROD.md b/android_ingest/PROD.md
index d1c5e71..1ca416f 100644
--- a/android_ingest/PROD.md
+++ b/android_ingest/PROD.md
@@ -28,7 +28,7 @@
## bad_files
-Visit [android-master-ingest.skia.org](https://android-master-ingest.skia.org/)
+Visit [android-metric-ingest.skia.org](https://android-metric-ingest.skia.org/)
and look at the "Recent Bad Requests" section and see why they are failing. A
previous issue has been bad serializing of the data that is POSTed to the server
where all the data was actually just encoded as one long string. If bad data is
diff --git a/android_ingest/replay-log.sh b/android_ingest/replay-log.sh
index 4546b4f..2abb0de 100755
--- a/android_ingest/replay-log.sh
+++ b/android_ingest/replay-log.sh
@@ -10,6 +10,6 @@
for FILENAME in $(gsutil ls "gs://skia-perf/android-master-ingest/tx_log/2018/09/14/20/**")
do
echo $FILENAME
- curl --data-binary @<(gsutil cat $FILENAME) -H "Content-Type: application/json" -X POST https://android-master-ingest.skia.org/upload
+ curl --data-binary @<(gsutil cat $FILENAME) -H "Content-Type: application/json" -X POST https://android-metric-ingest.skia.org/upload
done
diff --git a/perf/probersk.json5 b/perf/probersk.json5
index d0c7cb7..6770241 100644
--- a/perf/probersk.json5
+++ b/perf/probersk.json5
@@ -1,48 +1,53 @@
{
- "skiaperf": {
- "urls": [
- "https://perf.skia.org/e/",
- "https://androidx-perf.skia.org/e/",
- "https://flutter-engine-perf.skia.org/e/",
- "https://flutter-flutter-perf.skia.org/e/",
- ],
- "method": "GET",
- "expected": [200],
- "body": "",
- "mimetype": ""
- },
- "skiaperf_protected": {
- "urls": [
- "https://android-master-perf.skia.org/e/",
- "https://ct-perf.skia.org/e/",
- ],
- "method": "GET",
- "expected": [307],
- "body": "",
- "mimetype": ""
- },
- "android_ingest": {
- "urls": [
- "https://android-master-ingest.skia.org",
- "https://android-metric-ingest.skia.org",
- ],
- "method": "GET",
- "expected": [307],
- "body": "",
- "mimetype": "",
- "responsetest": ""
- },
- "skiaperf_untriaged": {
- "urls": [
- "https://perf.skia.org/_/reg/count",
- "https://android-master-perf.skia.org/_/reg/count",
- "https://ct-perf.skia.org/_/reg/count",
- "https://androidx-perf.skia.org/_/reg/count",
- ],
- "method": "GET",
- "expected": [200],
- "body": "",
- "mimetype": "",
- "responsetest": "validJSON",
- },
+ skiaperf: {
+ urls: [
+ 'https://perf.skia.org/e/',
+ 'https://androidx-perf.skia.org/e/',
+ 'https://flutter-engine-perf.skia.org/e/',
+ 'https://flutter-flutter-perf.skia.org/e/',
+ ],
+ method: 'GET',
+ expected: [200],
+ body: '',
+ mimetype: '',
+ },
+ skiaperf_protected: {
+ urls: [
+ 'https://android-master-perf.skia.org/e/',
+ 'https://ct-perf.skia.org/e/',
+ ],
+ method: 'GET',
+ expected: [307],
+ body: '',
+ mimetype: '',
+ },
+ android_ingest: {
+ urls: ['https://android-metric-ingest.skia.org'],
+ method: 'GET',
+ expected: [307],
+ body: '',
+ mimetype: '',
+ responsetest: '',
+ },
+ android_ingest_redirect: {
+ urls: ['https://android-master-ingest.skia.org'],
+ method: 'GET',
+ expected: [301],
+ body: '',
+ mimetype: '',
+ responsetest: '',
+ },
+ skiaperf_untriaged: {
+ urls: [
+ 'https://perf.skia.org/_/reg/count',
+ 'https://android-master-perf.skia.org/_/reg/count',
+ 'https://ct-perf.skia.org/_/reg/count',
+ 'https://androidx-perf.skia.org/_/reg/count',
+ ],
+ method: 'GET',
+ expected: [200],
+ body: '',
+ mimetype: '',
+ responsetest: 'validJSON',
+ },
}
diff --git a/skfe/computed.json b/skfe/computed.json
index a5b81b0..697764d 100644
--- a/skfe/computed.json
+++ b/skfe/computed.json
@@ -1945,11 +1945,9 @@
"match": {
"prefix": "/"
},
- "route": {
- "cluster": "androidingest",
- "timeout": {
- "seconds": 600
- }
+ "redirect": {
+ "host_redirect": "android-metric-ingest.skia.org",
+ "https_redirect": true
}
}
]
diff --git a/skfe/envoy-starter.json b/skfe/envoy-starter.json
index 0ed3080..d3821ce 100644
--- a/skfe/envoy-starter.json
+++ b/skfe/envoy-starter.json
@@ -882,11 +882,9 @@
"match": {
"prefix": "/"
},
- "route": {
- "cluster": "androidingest",
- "timeout": {
- "seconds": 600
- }
+ "redirect": {
+ "host_redirect": "android-metric-ingest.skia.org",
+ "https_redirect": true
}
}
]
@@ -1514,7 +1512,6 @@
}
]
},
-
{
"domains": "android-perf.skia.org",
"name": "android-perf.skia.org",
@@ -2269,4 +2266,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/skfe/probersk.json5 b/skfe/probersk.json5
index d5ef466..929194d 100644
--- a/skfe/probersk.json5
+++ b/skfe/probersk.json5
@@ -6,6 +6,7 @@
"method": "GET",
"urls": [
"https://afdo-chromium-roll.skia.org",
+ "https://android-master-ingest.skia.org",
"https://android-master-roll.skia.org",
"https://android-next-roll.skia.org",
"https://android-o-roll.skia.org",
