diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 12:07:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 12:07:27 +0000 |
| commit | 3e68d3848770b492d314f8e2967c37f7fdd5d143 (patch) | |
| tree | 01bd69a759c55ddf4ea1e5549a253cb0fd564854 /qa | |
| parent | 52192e0f19ca790dc9f44bc45730434100f83d90 (diff) | |
| download | gitlab-ce-3e68d3848770b492d314f8e2967c37f7fdd5d143.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/support/loglinking.rb | 2 | ||||
| -rw-r--r-- | qa/spec/resource/api_fabricator_spec.rb | 2 | ||||
| -rw-r--r-- | qa/spec/support/loglinking_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/support/loglinking.rb b/qa/qa/support/loglinking.rb index 89519e9537c..ab38faeb887 100644 --- a/qa/qa/support/loglinking.rb +++ b/qa/qa/support/loglinking.rb @@ -30,7 +30,7 @@ module QA errors = ["Correlation Id: #{correlation_id}"] errors << "Sentry Url: #{sentry_uri}&query=correlation_id%3A%22#{correlation_id}%22" if sentry_uri - errors << "Kibana Url: #{kibana_uri}app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20#{correlation_id}'))" if kibana_uri + errors << "Kibana Url: #{kibana_uri}app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20#{correlation_id}'))&_g=(time:(from:now-24h%2Fh,to:now))" if kibana_uri errors.join("\n") end diff --git a/qa/spec/resource/api_fabricator_spec.rb b/qa/spec/resource/api_fabricator_spec.rb index ec9907916eb..581236e5ac5 100644 --- a/qa/spec/resource/api_fabricator_spec.rb +++ b/qa/spec/resource/api_fabricator_spec.rb @@ -156,7 +156,7 @@ RSpec.describe QA::Resource::ApiFabricator do Fabrication of FooBarResource using the API failed (400) with `#{raw_post}`. Correlation Id: foobar Sentry Url: https://sentry.gitlab.net/gitlab/staginggitlabcom/?environment=gstg-cny&query=correlation_id%3A%22foobar%22 - Kibana Url: https://nonprod-log.gitlab.net/app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20foobar')) + Kibana Url: https://nonprod-log.gitlab.net/app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20foobar'))&_g=(time:(from:now-24h%2Fh,to:now)) ERROR end end diff --git a/qa/spec/support/loglinking_spec.rb b/qa/spec/support/loglinking_spec.rb index cba8a139767..3a112ef36d7 100644 --- a/qa/spec/support/loglinking_spec.rb +++ b/qa/spec/support/loglinking_spec.rb @@ -28,7 +28,7 @@ RSpec.describe QA::Support::Loglinking do expect(QA::Support::Loglinking.failure_metadata('foo123')).to eql(<<~ERROR.chomp) Correlation Id: foo123 - Kibana Url: https://kibana.address/app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20foo123')) + Kibana Url: https://kibana.address/app/discover#/?_a=(query:(language:kuery,query:'json.correlation_id%20:%20foo123'))&_g=(time:(from:now-24h%2Fh,to:now)) ERROR end end |