Skip to content

Commit

Permalink
Merge branch 'doc/fixci_builddoc' into 'develop'
Browse files Browse the repository at this point in the history
Merge branch 'rn/23.04.14-fix' into 'release-24.04'

See merge request canopsis/canopsis-pro!4321
build_doc
  • Loading branch information
mmourcia committed Nov 4, 2024
2 parents d09a447 + f8c410b commit 4b2bc8d
Show file tree
Hide file tree
Showing 8 changed files with 449 additions and 4 deletions.
4 changes: 2 additions & 2 deletions community/deployment/canopsis/docker/.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ MONGO_TAG=7.0.14-jammy
RABBITMQ_TAG=3.12.13-management
REDIS_TAG=6.2.14-bookworm
TIMESCALEDB_TAG=2.15.1-pg15
CANOPSIS_IMAGE_TAG=24.10.0-preview1
CANOPSIS_IMAGE_TAG=24.10.0
PROMETHEUS_TAG=v2.53.0
GRAFANA_TAG=10.0.10

DOCKER_REPOSITORY=docker.canopsis.net/docker/develop-
DOCKER_REPOSITORY=docker.canopsis.net/docker/
4 changes: 2 additions & 2 deletions community/deployment/canopsis/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ x-service_base: &service_base
- canopsis.env
- ${CPS_EDITION:?CPS_EDITION not set}.env

x-inital_config_base: &inital_config_base
x-initial_config_base: &initial_config_base
<<: *service_base
restart: "no"
depends_on:
Expand Down Expand Up @@ -157,7 +157,7 @@ services:
#

reconfigure:
<<: *inital_config_base
<<: *initial_config_base
image: ${DOCKER_REPOSITORY}community/canopsis-reconfigure:${CANOPSIS_IMAGE_TAG}
command: /canopsis-reconfigure -migrate-postgres=true -migrate-mongo=true -migrate-tech-postgres -edition ${CPS_EDITION} -conf /canopsis-${CPS_EDITION}.toml
volumes:
Expand Down
3 changes: 3 additions & 0 deletions community/sources/docs/fr/guide-de-depannage/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Il comporte les sections suivantes :
- [amqp2tty : Analyse temps réel des flux AMQP](amqp2tty/index.md)
- [Vérification d'envoi d'un événement](troubleshooting-evenement/index.md)

## Aide au support

- [Outil de support](outil-de-support/index.md)

## Métriques techniques

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4b2bc8d

Please sign in to comment.