Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide Docker target and discovery in Promtail. #4911

Merged
merged 53 commits into from
Jan 25, 2022
Merged

Provide Docker target and discovery in Promtail. #4911

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
c74a42c
Provide Docker target and discovery in Promtail.
jeschkies Dec 9, 2021
0ca5f1c
Add Docker service discovery.
jeschkies Dec 9, 2021
003b95a
Add Docker service discovery.
jeschkies Dec 10, 2021
5d2c8c8
Use stderr writer.
jeschkies Dec 14, 2021
05a3581
Rename target manager name in error message.
jeschkies Dec 23, 2021
d5d7166
Persist position.
jeschkies Dec 23, 2021
ce8767e
Run discovery manager.
jeschkies Jan 4, 2022
e19393c
Add target.
jeschkies Jan 5, 2022
d6acba3
Split out target creation into syncer.
jeschkies Jan 5, 2022
2fbfd7d
Add targets.
jeschkies Jan 6, 2022
b90d0b3
Document Docker target and service discovery.
jeschkies Jan 7, 2022
e874238
Rename syncer to target_group and make it threadsafe.
jeschkies Jan 7, 2022
165d07f
Format code.
jeschkies Jan 7, 2022
7f149bb
Test target manager.
jeschkies Jan 7, 2022
15d8121
Test target manager.
jeschkies Jan 7, 2022
ef4b805
Make linter happy.
jeschkies Jan 7, 2022
564a62e
Add changelog entry.
jeschkies Jan 7, 2022
01eea28
Merge remote-tracking branch 'grafana/main' into karsten/docker-sd
jeschkies Jan 7, 2022
43aa65d
Correct spelling.
jeschkies Jan 10, 2022
d3970be
Format code.
jeschkies Jan 10, 2022
71e8fe0
Fix docker config.
jeschkies Jan 10, 2022
f45aea8
Reset vendor.
jeschkies Jan 10, 2022
f9ebe64
Merge remote-tracking branch 'grafana/main' into karsten/docker-sd
jeschkies Jan 10, 2022
5ddc140
Address Michel's comments.
jeschkies Jan 10, 2022
eb63e79
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 11, 2022
7997660
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 11, 2022
80c0ab4
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 11, 2022
b6dc0d7
Address typos.
jeschkies Jan 11, 2022
676f05a
Stop target when container is stopped.
jeschkies Jan 11, 2022
4a820c3
Merge remote-tracking branch 'grafana/main' into karsten/docker-sd
jeschkies Jan 11, 2022
5f11eed
Use io.Pipe instead of channel.
jeschkies Jan 12, 2022
975cd7c
Document log stream label.
jeschkies Jan 12, 2022
1a2413b
Remove unused port.
jeschkies Jan 12, 2022
f608abf
Update docs/sources/clients/docker-driver/_index.md
jeschkies Jan 12, 2022
f63b4e2
Clean up.
jeschkies Jan 13, 2022
3e37bb1
Merge remote-tracking branch 'refs/remotes/origin/karsten/docker-sd' …
jeschkies Jan 13, 2022
45f6f46
Merge remote-tracking branch 'grafana/main' into karsten/docker-sd
jeschkies Jan 13, 2022
9d4ca1c
Remoe configuration of specific containers.
jeschkies Jan 14, 2022
46a72e4
Close entry handler for target groups.
jeschkies Jan 14, 2022
06cdf84
Relabel discovered labels.
jeschkies Jan 14, 2022
5403bcc
Document relabelling.
jeschkies Jan 14, 2022
2403cde
Merge branch 'main' into karsten/docker-sd
jeschkies Jan 14, 2022
6101736
Fix test.
jeschkies Jan 14, 2022
bbab1c0
Merge branch 'main' into karsten/docker-sd
jeschkies Jan 18, 2022
fddab7d
Update docs/sources/clients/docker-driver/_index.md
jeschkies Jan 19, 2022
baff77d
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 19, 2022
783ee02
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 19, 2022
cd730ef
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 19, 2022
fa94653
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 19, 2022
4971fcd
Update docs/sources/clients/promtail/configuration.md
jeschkies Jan 19, 2022
acd6673
Merge branch 'main' into karsten/docker-sd
jeschkies Jan 19, 2022
1db6d4f
Clarify authentication.
jeschkies Jan 19, 2022
9efe689
Merge branch 'main' into karsten/docker-sd
jeschkies Jan 21, 2022
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
Prev Previous commit
Next Next commit
Update docs/sources/clients/promtail/configuration.md 
Co-authored-by: Karen Miller <84039272+KMiller-Grafana@users.noreply.github.com>
  • Loading branch information
@jeschkies @KMiller-Grafana
jeschkies and KMiller-Grafana authored Jan 19, 2022
commit baff77d93656c76d149e79cfa41e8f5d04c54df0
3 changes: 2 additions & 1 deletion docs/sources/clients/promtail/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ consul_sd_configs:
consulagent_sd_configs:
[ - <consulagent_sd_config> ... ]

# Describes how to use the Docker daemon API to discover containers running on the same host as Promtail.
# Describes how to use the Docker daemon API to discover containers running on
# the same host as Promtail.
docker_sd_configs:
[ - <docker_sd_config> ... ]
```
Expand Down