Michael-GMH
85777e8f96
merge with upstream
2021-05-25 21:08:00 +08:00
Slavi Pantaleev
adcecaffaf
Fix connectivity between prometheus and prometheus-node-exporter
...
Expected to have regressed after https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1008
This patch comes with its own downsides (as described in the comments
for matrix_prometheus_node_exporter_container_http_host_bind_port),
but at least there's:
- no security issue
- metrics remain readable from matrix-prometheus (even if the network metrics are inaccurate)
A better patch is certainly welcome.
2021-04-19 18:29:03 +03:00
Dan Arnfield
f04614a993
Fix prometheus network for ansible < 2.8
2021-04-17 20:15:26 -05:00
Slavi Pantaleev
badd81e0ec
Revert "Attempt to fix docker_network result discrepancy between Ansible versions"
...
This reverts commit 68ca81c8c2
2021-04-17 19:31:20 +03:00
Slavi Pantaleev
68ca81c8c2
Attempt to fix docker_network result discrepancy between Ansible versions
...
Supposedly fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/907
2021-04-17 11:42:06 +03:00
Dan Arnfield
8a550ce67c
Update prometheus (2.24.1->2.26.0)
2021-04-16 09:25:45 -05:00
Ahmad Haghighi
e335f3fc77
rename matrix_global_registry to matrix_container_global_registry_prefix related to #990
...
Signed-off-by: Ahmad Haghighi <haghighi@fedoraproject.org>
2021-04-12 17:23:55 +04:30
Ahmad Haghighi
f52a8b6484
use custom docker registry
2021-04-12 17:23:55 +04:30
Slavi Pantaleev
0585a3ed9f
Merge pull request #896 from rakshazi/add_version_to_each_role
...
added "matrix_%SERVICE%_version" variable to all roles
2021-02-21 12:26:17 +02:00
Slavi Pantaleev
77ab0d3e98
Do not delete Prometheus/Grafana Docker images
...
Same reasoning as in 1cd251ed78
2021-02-21 11:14:40 +02:00
rakshazi
2f887f292c
added "matrix_%SERVICE%_version" variable to all roles, use it in "matrix_%SERVICE%_docker_image" var (preserving backward-compatibility)
2021-02-20 19:08:28 +02:00
Slavi Pantaleev
66d5b0e5b9
Do not fail on unrelated validation tasks when Prometheus not enabled
...
These validation tasks should only run when Prometheus is enabled.
2021-02-12 15:41:15 +02:00
Slavi Pantaleev
c8ab200cb1
Break dependency between matrix-prometheus and (matrix-prometheus-node-exporter, matrix-synapse)
2021-02-12 11:59:24 +02:00
Slavi Pantaleev
6842102e00
Split install/uninstall tasks in matrix-prometheus
2021-02-12 11:59:24 +02:00
Slavi Pantaleev
18e31526a8
Rename some variables
2021-02-12 11:59:24 +02:00
Slavi Pantaleev
85a260daaf
Make --tags=setup-prometheus not break, relying on matrix-base facts
2021-02-12 11:59:24 +02:00
Slavi Pantaleev
df3dd1c824
Use --read-only FS for metrics-related containers
...
It seems like it doesn't cause any issues for any of these services.
2021-02-12 11:59:24 +02:00
Peetz0r
144a5e6198
Register docker network info and use it for prometheus-node-exporter
...
Using the hardcoded IP did break while I was
messing with IPv6 stuff on the other branch
2021-02-10 22:54:42 +01:00
Peetz0r
76d7e84be5
Make prometheus-node-exporter a bit more capable
...
By running it in a more privileged container with access to the host network stack and such
2021-02-10 22:54:14 +01:00
Peetz0r
e525970b39
Prometheus Node Exporter
...
Basic system stats, to show stuff the synapse metrics
can't show such as resource usage by bridges, etc
Seems to work fine as well.
This too has only been tested on debian amd64 so far
2021-02-10 22:54:14 +01:00
Peetz0r
13ef9e85cf
Prometheus
...
Initial attempt. Seems to work fine.
Only tested on debian amd64 so far
2021-02-10 22:54:14 +01:00
