Skip to content
This repository was archived by the owner on Jun 21, 2022. It is now read-only.

PMM-5967 Bind-IP for agent listeners #394

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

PMM-5967 Bind-IP for agent listeners #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
05df62c
PMM-5967 Bind-IP for agent listeners
May 19, 2020
f3b2248
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi May 20, 2020
ce131a3
PMM-5967 Bind-IP for agent listeners
May 20, 2020
2b985f7
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi May 26, 2020
b42204f
Merge branch 'PMM-2.0' of https://github.com/percona/pmm-managed into…
Aug 25, 2020
e82c7b4
PMM-5967 Bind-IP for agent listeners
Aug 25, 2020
d2e8426
Merge branch 'PMM-2.0' into PMM-2.0
Aug 27, 2020
daea288
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Oct 7, 2020
18ac8dc
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Nov 24, 2020
c8b818e
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Nov 28, 2020
458a74b
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Dec 9, 2020
8f2277b
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Dec 16, 2020
c96ca61
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Dec 20, 2020
5ed96e5
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Dec 21, 2020
8b1032d
Merge branch 'PMM-2.0' into PMM-2.0
AlekSi Dec 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion services/agents/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ func nodeExporterConfig(node *models.Node, exporter *models.Agent) *agentpb.SetS

"--web.disable-exporter-metrics", // we enable them as a part of HR metrics

"--web.listen-address=:" + tdp.left + " .listen_port " + tdp.right,
"--web.listen-address=" +
tdp.left + " with .listen_address " + tdp.right + tdp.left + " . " + tdp.right + tdp.left + " end " + tdp.right +
":" + tdp.left + " .listen_port " + tdp.right,
}

// do not tweak collectors on macOS as many (but not) of them are Linux-specific
Expand Down
4 changes: 2 additions & 2 deletions services/agents/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestNodeExporterConfig(t *testing.T) {
"--no-collector.xfs",
"--no-collector.zfs",
"--web.disable-exporter-metrics",
"--web.listen-address=:{{ .listen_port }}",
"--web.listen-address={{ with .listen_address }}{{ . }}{{ end }}:{{ .listen_port }}",
},
Env: []string{
"HTTP_AUTH=pmm:agent-id",
Expand Down Expand Up @@ -130,7 +130,7 @@ func TestNodeExporterConfig(t *testing.T) {
"--collector.textfile.directory.lr=/usr/local/percona/pmm2/collectors/textfile-collector/low-resolution",
"--collector.textfile.directory.mr=/usr/local/percona/pmm2/collectors/textfile-collector/medium-resolution",
"--web.disable-exporter-metrics",
"--web.listen-address=:{{ .listen_port }}",
"--web.listen-address={{ with .listen_address }}{{ . }}{{ end }}:{{ .listen_port }}",
},
Env: []string{
"HTTP_AUTH=pmm:agent-id",
Expand Down