7 Commits (28f22b4d80aed4e7cafcc4f42c086521479b6def)

Author	SHA1	Message	Date
Jan Fajerski	00315ce15e	Merge branch 'main' into 3.0-main-sync-24-08-30 ... using -Xours Signed-off-by: Jan Fajerski <jfajersk@redhat.com>	3 months ago
ouyang1204@gmail.com	89dee48cc8	fix the issue of failing to match the first network when the container is reconnected to a new network ... Signed-off-by: ouyang1204@gmail.com <ouyang1204@gmail.com>	3 months ago
Julien Pivotto	7711cd5ab5	Remove deprecated storage.tsdb.retention flag ... Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu> Signed-off-by: Julien <roidelapluie@o11y.eu>	3 months ago
unknown	0d25931049	rebase main and adjust the configuration ... Signed-off-by: ouyang1204@gmail.com <ouyang1204@gmail.com>	5 months ago
Julien Pivotto	5f3a02f1e2	Update go dependencies ... Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Levi Harrison	89f154d643	Added tests ... Signed-off-by: Levi Harrison <git@leviharrison.dev>	3 years ago
Julien Pivotto	5bce801a09	Rename discovery/dockerswarm to discovery/moby (#8691) ... This makes it clear that the dockerswarm package does more than docker swarm, but does also docker. I have picked moby as it is the upstream name: https://mobyproject.org/ There is no user-facing change, except in the case of a bad configuration. Previously, a user who would have a bad docker sd config would see an error like: > field xx not found in type dockerswarm.plain Now that error would be turned into: > field xx not found in type moby.plain While not perfect, it should at not be confusing between docker and dockerswarm. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago