This repository has been archived by the owner on Aug 24, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
PMM-9993 Add support to set web.listen-address #381
Draft
cezmunsta
wants to merge
3
commits into
main
Choose a base branch
from
PMM-9993-set-web.listen-address
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,6 +35,16 @@ import ( | |
|
||
const pathBaseDefault = "/usr/local/percona/pmm2" | ||
|
||
// ExporterAddress stores listen address values for exporters | ||
cezmunsta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
type ExporterAddress struct { | ||
Default string `yaml:"default"` | ||
} | ||
|
||
// ListenAddress returns the exporter listen-address | ||
cezmunsta marked this conversation as resolved.
Show resolved
Hide resolved
|
||
func (e *ExporterAddress) ListenAddress() string { | ||
return e.Default | ||
} | ||
|
||
// Server represents PMM Server configuration. | ||
type Server struct { | ||
Address string `yaml:"address"` | ||
|
@@ -143,6 +153,8 @@ type Config struct { | |
ListenAddress string `yaml:"listen-address"` | ||
ListenPort uint16 `yaml:"listen-port"` | ||
|
||
ExporterListenAddress ExporterAddress `yaml:"exporter-listen-address"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🚫 [golangci-lint] reported by reviewdog 🐶 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Following the pattern of the struct |
||
|
||
Server Server `yaml:"server"` | ||
Paths Paths `yaml:"paths"` | ||
Ports Ports `yaml:"ports"` | ||
|
@@ -324,6 +336,8 @@ func Application(cfg *Config) (*kingpin.Application, *string) { | |
Envar("PMM_AGENT_LISTEN_ADDRESS").StringVar(&cfg.ListenAddress) | ||
app.Flag("listen-port", "Agent local API port [PMM_AGENT_LISTEN_PORT]"). | ||
Envar("PMM_AGENT_LISTEN_PORT").Uint16Var(&cfg.ListenPort) | ||
app.Flag("exporter-listen-address", "Exporter web interface address [PMM_AGENT_EXPORTER_LISTEN_ADDRESS]"). | ||
Envar("PMM_AGENT_EXPORTER_LISTEN_ADDRESS").StringVar(&cfg.ExporterListenAddress.Default) | ||
|
||
app.Flag("server-address", "PMM Server address [PMM_AGENT_SERVER_ADDRESS]"). | ||
Envar("PMM_AGENT_SERVER_ADDRESS").PlaceHolder("<host:port>").StringVar(&cfg.Server.Address) | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [golangci-lint] reported by reviewdog 🐶
found a struct that contains a context.Context field (containedctx)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already exists