Add base_url_gap for Grafana #1141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
This reverts commit d43ddf4.
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
Tofel
reviewed
Sep 18, 2024
lib/config/logging.go
Outdated
| @@ -91,6 +91,7 @@ func (l *LokiConfig) Validate() error { | |||
|
|
|||
| type GrafanaConfig struct { | |||
| BaseUrl *string `toml:"base_url"` | |||
| BaseUrlCI *string `toml:"base_url_github_ci"` // Base URL for the dashboard via GAP proxy used on CI | |||
There was a problem hiding this comment.
// Base URL for the dashboard via GAP proxy used on CI -> // URL of GAP proxy used on CI for Grafana
Tofel
reviewed
Sep 18, 2024
lib/logstream/logstream_handlers.go
Outdated
| h.grafanaUrl = shortUrl | ||
| } else { | ||
| if h.loggingConfig.Grafana == nil || h.loggingConfig.Grafana.BaseUrl == nil { | ||
| return "", errors.New("grafana base URL is not set in logging config") |
There was a problem hiding this comment.
I don't think we need to return error. Why not display what we can? which is the part of url without hostname? in that way if you forget to set it in the config you will still have an usable url like: /dashboard-ulr&var=1... so you can just manually paste it after Grafana URL and get a working link
There was a problem hiding this comment.
@Tofel yeah, we can. I'll do it
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
had a problem deploying
to
integration
GitHub Actions
Error
lukaszcl
had a problem deploying
to
integration
GitHub Actions
Error
Tofel
approved these changes
Sep 18, 2024
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
|
lukaszcl
temporarily deployed
to
integration
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related PR in core: smartcontractkit/chainlink#14475
Below is a summarization created by an LLM (gpt-4-0125-preview). Be mindful of hallucinations and verify accuracy.
Why
The changes enhance Grafana logging configuration and log stream handling, particularly for CI environments. By introducing a new configuration parameter for Grafana to specify a base URL for dashboard access through a GAP proxy, it simplifies accessing dashboards from CI pipelines. Furthermore, the adjustment in log stream handlers to utilize this new URL for generating dashboard links ensures that the links are correctly generated for environments where direct access to Grafana might be restricted.
What
BaseUrlGapfield toGrafanaConfigstruct. This addition allows specifying a base URL for the Grafana dashboard through a GAP proxy, primarily used in CI environments.GetLogLocationmethod to useBaseUrlGapfromGrafanaConfigif available. This change ensures that the generated Grafana dashboard URL is accessible in environments where a GAP proxy is needed for dashboard access.