From 7c9be8e7a3a2462137e5e01f07bfdfa99d4361fd Mon Sep 17 00:00:00 2001 From: "Marlon (Esolitos) Saglia" Date: Thu, 22 Aug 2024 14:18:31 +0200 Subject: [PATCH 1/2] chore: replace deprecated endpoints for vespa feeding and documentation --- _config.yml | 15 ++++++++----- _paragraphs_config.yml | 21 ++++++++++++------- _suggestions_config.yml | 21 ++++++++++++------- .../google-cloud/cloud-functions/README.md | 8 +++---- .../google-cloud/cloud-functions/go/visit.go | 2 +- 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/_config.yml b/_config.yml index a6e856de3..57b3fa8a4 100644 --- a/_config.yml +++ b/_config.yml @@ -24,18 +24,23 @@ search: do_feed : true do_index_removal_before_feed: false feed_endpoints: - - url: https://vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + # vespacloud-docsearch // aws // us-east-1c + - url: https://b671e1db.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - - url: https://vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + # vespacloud-docsearch // gcp // us-central1-f + - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - - url: https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud/ + # vespacloud-docsearch // aws // us-west-1a + - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + # vespacloud-docsearch // aws (enclave) // us-west-1a + - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + # vespacloud-docsearch // gcp (enclave) // us-central1-f + - url: https://ac5f3559.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json diff --git a/_paragraphs_config.yml b/_paragraphs_config.yml index 090b72c5d..2eead1483 100644 --- a/_paragraphs_config.yml +++ b/_paragraphs_config.yml @@ -6,18 +6,23 @@ search: do_feed : true do_index_removal_before_feed: false feed_endpoints: - - url: https://vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + # vespacloud-docsearch // aws // us-east-1c + - url: https://b671e1db.b68a8c0d.z.vespa-app.cloud/ indexes: - - paragraph_index.json - - url: https://vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + - paragraph_index.json + # vespacloud-docsearch // gcp // us-central1-f + - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - - paragraph_index.json - - url: https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud/ + - paragraph_index.json + # vespacloud-docsearch // aws // us-west-1a + - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - - paragraph_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + - paragraph_index.json + # vespacloud-docsearch // aws (enclave) // us-west-1a + - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - paragraph_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + # vespacloud-docsearch // gcp (enclave) // us-central1-f + - url: https://ac5f3559.b68a8c0d.z.vespa-app.cloud/ indexes: - paragraph_index.json diff --git a/_suggestions_config.yml b/_suggestions_config.yml index 53cb07500..4d37ad161 100644 --- a/_suggestions_config.yml +++ b/_suggestions_config.yml @@ -6,18 +6,23 @@ search: do_feed : true do_index_removal_before_feed: false feed_endpoints: - - url: https://vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + # vespacloud-docsearch // aws // us-east-1c + - url: https://b671e1db.b68a8c0d.z.vespa-app.cloud/ indexes: - - suggestions_index.json - - url: https://vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + - suggestions_index.json + # vespacloud-docsearch // gcp // us-central1-f + - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - - suggestions_index.json - - url: https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud/ + - suggestions_index.json + # vespacloud-docsearch // aws // us-west-1a + - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - - suggestions_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/ + - suggestions_index.json + # vespacloud-docsearch // aws (enclave) // us-west-1a + - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - suggestions_index.json - - url: https://enclave.vespacloud-docsearch.vespa-team.gcp-us-central1-f.z.vespa-app.cloud/ + # vespacloud-docsearch // gcp (enclave) // us-central1-f + - url: https://ac5f3559.b68a8c0d.z.vespa-app.cloud/ indexes: - suggestions_index.json diff --git a/examples/google-cloud/cloud-functions/README.md b/examples/google-cloud/cloud-functions/README.md index 0d55bf071..91eba1035 100644 --- a/examples/google-cloud/cloud-functions/README.md +++ b/examples/google-cloud/cloud-functions/README.md @@ -54,11 +54,11 @@ $ gcloud functions deploy get-page-tls \ ``` Test using: ``` -$ curl --data '{"url":"https://vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/document/v1/open/doc/docid"}' \ +$ curl --data '{"url":"https://c360c4e6.b68a8c0d.g.vespa-app.cloud//document/v1/open/doc/docid"}' \ https://get-page-tls-abc5tvbrvq-ew.a.run.app $ curl -v --data '{ - "url":"https://vespacloud-docsearch.vespa-team.aws-us-east-1c.z.vespa-app.cloud/document/v1/open/doc/docid", + "url":"https://c360c4e6.b68a8c0d.g.vespa-app.cloud//document/v1/open/doc/docid", "bucket":"my_bucket", "object":"my_docs"}' \ https://store-page-abc5tvbrvq-ew.a.run.app @@ -67,7 +67,7 @@ $ curl --max-time 60 --data '{ "contentCluster":"documentation", "chunkCount":100, "selection":"doc", - "endpoint":"https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud"}' \ + "endpoint":"https://c360c4e6.b68a8c0d.g.vespa-app.cloud/"}' \ https://visit-abc5tvbrvq-ew.a.run.app ``` To install - in same directory: @@ -90,7 +90,7 @@ $ curl --max-time 60 --data '{ "contentCluster":"documentation", "chunkCount":100, "selection":"doc", - "endpoint":"https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud"}' \ + "endpoint":"https://c360c4e6.b68a8c0d.g.vespa-app.cloud/"}' \ https://backup-abc5tvbrvq-ew.a.run.app ``` diff --git a/examples/google-cloud/cloud-functions/go/visit.go b/examples/google-cloud/cloud-functions/go/visit.go index 6cd807e03..a037685fe 100644 --- a/examples/google-cloud/cloud-functions/go/visit.go +++ b/examples/google-cloud/cloud-functions/go/visit.go @@ -141,7 +141,7 @@ func visit(w http.ResponseWriter, r *http.Request) { } var service Service - service.BaseURL = d.Endpoint //"https://vespacloud-docsearch.vespa-team.aws-eu-west-1a.z.vespa-app.cloud" + service.BaseURL = d.Endpoint //"https://c360c4e6.b68a8c0d.g.vespa-app.cloud/" service.Cert = cert res := visitClusters(vArgs, &service) From 1429976f00d436a1e5f172805a204c959097ef13 Mon Sep 17 00:00:00 2001 From: "Marlon (Esolitos) Saglia" Date: Thu, 22 Aug 2024 14:37:03 +0200 Subject: [PATCH 2/2] chore: replace deprecated endpoints for vespa search feeding --- _config.yml | 4 ++-- _paragraphs_config.yml | 4 ++-- _suggestions_config.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_config.yml b/_config.yml index 57b3fa8a4..404707e23 100644 --- a/_config.yml +++ b/_config.yml @@ -32,11 +32,11 @@ search: - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - # vespacloud-docsearch // aws // us-west-1a + # vespacloud-docsearch // aws // eu-west-1a - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json - # vespacloud-docsearch // aws (enclave) // us-west-1a + # vespacloud-docsearch // aws (enclave) // us-west-1c - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - vespaapps_index.json diff --git a/_paragraphs_config.yml b/_paragraphs_config.yml index 2eead1483..7cd041304 100644 --- a/_paragraphs_config.yml +++ b/_paragraphs_config.yml @@ -14,11 +14,11 @@ search: - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - paragraph_index.json - # vespacloud-docsearch // aws // us-west-1a + # vespacloud-docsearch // aws // eu-west-1a - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - paragraph_index.json - # vespacloud-docsearch // aws (enclave) // us-west-1a + # vespacloud-docsearch // aws (enclave) // us-west-1c - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - paragraph_index.json diff --git a/_suggestions_config.yml b/_suggestions_config.yml index 4d37ad161..2e730c992 100644 --- a/_suggestions_config.yml +++ b/_suggestions_config.yml @@ -14,11 +14,11 @@ search: - url: https://a341952a.b68a8c0d.z.vespa-app.cloud/ indexes: - suggestions_index.json - # vespacloud-docsearch // aws // us-west-1a + # vespacloud-docsearch // aws // eu-west-1a - url: https://ed053d52.b68a8c0d.z.vespa-app.cloud/ indexes: - suggestions_index.json - # vespacloud-docsearch // aws (enclave) // us-west-1a + # vespacloud-docsearch // aws (enclave) // us-west-1c - url: https://f10d3607.b68a8c0d.z.vespa-app.cloud/ indexes: - suggestions_index.json