-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #58 from qclaogui:add-option-to-collect-metrics
Add option to collect metrics
- Loading branch information
Showing
28 changed files
with
186 additions
and
355 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
|
||
services: | ||
agent: | ||
agent-all-in-one: | ||
labels: | ||
logs.agent.grafana.com/log-format: logfmt | ||
app: grafana-agent | ||
|
5 changes: 3 additions & 2 deletions
5
docker-compose/common/compose-include/agent-collect-logs.yaml
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
5 changes: 4 additions & 1 deletion
5
docker-compose/common/compose-include/agent-collect-metrics.yaml
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
5 changes: 4 additions & 1 deletion
5
docker-compose/common/compose-include/agent-collect-profiles.yaml
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
5 changes: 4 additions & 1 deletion
5
docker-compose/common/compose-include/agent-collect-traces.yaml
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
17 changes: 0 additions & 17 deletions
17
docker-compose/common/compose-include/load-mimir-rule.yaml
This file was deleted.
Oops, something went wrong.
21 changes: 21 additions & 0 deletions
21
docker-compose/common/compose-include/load-rules-to-mimir.yaml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
services: | ||
load-rules-to-mimir: | ||
depends_on: | ||
gateway: | ||
condition: service_healthy | ||
image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:latest} | ||
volumes: | ||
- ../../../monitoring-mixins/agent-flow-mixin/deploy/agent-flow-mixin-alerts.yaml:/agent-flow-mixin-alerts.yaml | ||
- ../../../monitoring-mixins/loki-mixin/deploy/loki-mixin-rules.yaml:/loki-mixin-rules.yaml | ||
- ../../../monitoring-mixins/loki-mixin/deploy/loki-mixin-alerts.yaml:/loki-mixin-alerts.yaml | ||
- ../../../monitoring-mixins/memcached-mixin/deploy/memcached-mixin-alerts.yaml:/memcached-mixin-alerts.yaml | ||
- ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/mimir-mixin-rules.yaml | ||
- ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/mimir-mixin-alerts.yaml | ||
- ../../../monitoring-mixins/pyroscope-mixin/deploy/pyroscope-mixin-rules.yaml:/pyroscope-mixin-rules.yaml | ||
# - ../../../monitoring-mixins/tempo-mixin/deploy/tempo-mixin-rules.yaml:/tempo-mixin-rules.yaml | ||
# - ../../../monitoring-mixins/tempo-mixin/deploy/tempo-mixin-alerts.yaml:/tempo-mixin-alerts.yaml | ||
environment: | ||
- MIMIR_ADDRESS=http://gateway:8080 | ||
- MIMIR_TENANT_ID=anonymous | ||
command: >- | ||
rules load agent-flow-mixin-alerts.yaml /loki-mixin-rules.yaml /loki-mixin-alerts.yaml /memcached-mixin-alerts.yaml /mimir-mixin-rules.yaml /mimir-mixin-alerts.yaml /pyroscope-mixin-rules.yaml |
15 changes: 0 additions & 15 deletions
15
docker-compose/common/compose-include/load-tempo-rule.yaml
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
docker-compose/common/compose-include/option-to-collect-metrics.yaml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
|
||
# Note: | ||
# include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. | ||
include: | ||
- path: agent-collect-metrics.yaml | ||
- path: load-rules-to-mimir.yaml | ||
|
||
services: | ||
mimir: | ||
depends_on: | ||
minio: | ||
condition: service_healthy | ||
image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:latest} | ||
volumes: | ||
- ../config/mimir:/etc/mimir | ||
command: | ||
- -config.file=/etc/mimir/monolithic-mode-metrics.yaml | ||
- -target=all | ||
- -config.expand-env=true | ||
healthcheck: | ||
test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ready || exit 1" ] | ||
interval: 10s | ||
timeout: 5s | ||
retries: 5 | ||
# expose 38080 port so we can directly access mimir inside container | ||
ports: | ||
- "38080:8080" | ||
networks: | ||
default: | ||
aliases: | ||
- mimir-memberlist |
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
1 change: 1 addition & 0 deletions
1
docker-compose/common/config/grafana/provisioning/datasources/.gitignore
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
* | ||
!.gitignore | ||
!datasources.yaml |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.