[release 2.54] [BUGFIX] Docker SD: fix the issue of failing to match the first network when the container is reconnected to a new network #14654
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
|
cc @bboreham |
DrAuYueng
force-pushed
the
docker-network-mode-match
branch
3 times, most recently
from
8a57a14
to
197adfc
Compare
|
Should this be against release-2.54 branch? |
DrAuYueng
commented
Aug 13, 2024
discovery/moby/docker.go
Outdated
| // 3. Reconnect network with user defined networks. | ||
| var first string | ||
| firstNetworkMode = string(containerNetworkMode) | ||
| firstNetwork = networks[firstNetworkMode] |
There was a problem hiding this comment.
I'm thinking about whether this step is still necessary because the next step sorts all non-nil networks in ascending order and gets the first one from the sorted list of networks, which I think is more consistent.
There was a problem hiding this comment.
If someone wants to use a specific network, they can use the following configuration:
scrape_configs:
- job_name: 'docker-containers'
docker_sd_configs:
- host: unix:///var/run/docker.sock
match_first_network: false
relabel_configs:
# Select containers whose name is prefixed by `exporter__`.
- source_labels: [__meta_docker_container_name]
regex: /exporter__. # For some reason, container names begin with a '/' character.
action: keep
# Create new label named 'container' with the value from the meta container name label.
- source_labels: [__meta_docker_container_name]
target_label: container
regex: /(. )
- source_labels: [__meta_docker_network_name]
regex: mysql_net1
action: keep
Yep. |
DrAuYueng
force-pushed
the
docker-network-mode-match
branch
from
197adfc
to
6c95821
Compare
|
@bboreham Ready for review. |
bboreham
requested review from
dgl,
roidelapluie,
jesusvazquez,
aknuds1,
cstyan,
bwplotka,
tomwilkie,
juliusv and
Nexucis
as code owners
bboreham
force-pushed
the
docker-network-mode-match
branch
from
6c95821
to
90d260d
Compare
Agree, make sense. |
DrAuYueng
force-pushed
the
docker-network-mode-match
branch
6 times, most recently
from
0d2c7e9
to
c23f097
Compare
|
Updated. |
DrAuYueng
changed the title
bboreham
reviewed
Aug 19, 2024
…r is reconnected to a new network Signed-off-by: [email protected] <[email protected]>
DrAuYueng
force-pushed
the
docker-network-mode-match
branch
from
c23f097
to
89dee48
Compare
Done. |
5 tasks
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.
In the scenario where the container is connected to multiple networks, if the container is reconnected to a new network, the network mode will not change which will causes the issue of failing to match the first network.
Follows #10490.
Fixes #14647.