From 7bfe2500359c24c6e364f8b35e9089b84c06b1b5 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 23 Jul 2020 15:42:17 +0300 Subject: [PATCH 1/3] Add Graphite (#265) --- .travis.yml | 3 +++ README.md | 4 ++++ run-document-server.sh | 18 ++++++++++++++++++ tests/graphite.yml | 32 ++++++++++++++++++++++++++++++++ tests/graphite/statsd/config.js | 7 +++++++ 5 files changed, 64 insertions(+) create mode 100644 tests/graphite.yml create mode 100644 tests/graphite/statsd/config.js diff --git a/.travis.yml b/.travis.yml index 94a1ff0..4371198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,9 @@ env: # redis - config: redis.yml + # graphite + - config: graphite.yml + services: - docker diff --git a/README.md b/README.md index e11f94c..cdf7c42 100644 --- a/README.md +++ b/README.md @@ -181,6 +181,10 @@ Below is the complete list of parameters that can be set using environment varia - **JWT_HEADER**: Defines the http header that will be used to send the JSON Web Token. Defaults to `Authorization`. - **JWT_IN_BODY**: Specifies the enabling the token validation in the request body to the ONLYOFFICE Document Server. Defaults to `false`. - **USE_UNAUTHORIZED_STORAGE**: Set to `true`if using selfsigned certificates for your storage server e.g. Nextcloud. Defaults to `false` +- **METRICS_ENABLED**: Specifies the enabling StatsD for ONLYOFFICE Document Server. Defaults to `false`. +- **METRICS_HOST**: Defines StatsD listening host. Defaults to `localhost`. +- **METRICS_PORT**: Defines StatsD listening port. Defaults to `8125`. +- **METRICS_PREFIX**: Defines StatsD metrics prefix for backend services. Defaults to `ds.`. ## Installing ONLYOFFICE Document Server integrated with Community and Mail Servers diff --git a/run-document-server.sh b/run-document-server.sh index b040372..21ddea3 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -78,6 +78,11 @@ read_setting(){ deprecated_var AMQP_SERVER_URL AMQP_URI deprecated_var AMQP_SERVER_TYPE AMQP_TYPE + METRICS_ENABLED="${METRICS_ENABLED:-false}" + METRICS_HOST="${METRICS_HOST:-localhost}" + METRICS_PORT="${METRICS_PORT:-8125}" + METRICS_PREFIX="${METRICS_PREFIX:-.ds}" + DB_HOST=${DB_HOST:-${POSTGRESQL_SERVER_HOST:-$(${JSON} services.CoAuthoring.sql.dbHost)}} case $DB_TYPE in "postgres") @@ -179,6 +184,15 @@ waiting_for_redis(){ waiting_for_datacontainer(){ waiting_for_connection ${ONLYOFFICE_DATA_CONTAINER_HOST} ${ONLYOFFICE_DATA_CONTAINER_PORT} } + +update_statsd_settings(){ + ${JSON} -I -e "if(this.statsd===undefined)this.statsd={};" + ${JSON} -I -e "this.statsd.useMetrics = '${METRICS_ENABLED}'" + ${JSON} -I -e "this.statsd.host = '${METRICS_HOST}'" + ${JSON} -I -e "this.statsd.port = '${METRICS_PORT}'" + ${JSON} -I -e "this.statsd.prefix = '${METRICS_PREFIX}'" +} + update_db_settings(){ ${JSON} -I -e "this.services.CoAuthoring.sql.type = '${DB_TYPE}'" ${JSON} -I -e "this.services.CoAuthoring.sql.dbHost = '${DB_HOST}'" @@ -420,6 +434,10 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then read_setting + if [ $METRICS_ENABLED = "true" ]; then + update_statsd_settings + fi + update_welcome_page update_log_settings diff --git a/tests/graphite.yml b/tests/graphite.yml new file mode 100644 index 0000000..2bc4694 --- /dev/null +++ b/tests/graphite.yml @@ -0,0 +1,32 @@ +version: '2.1' +services: + onlyoffice-documentserver: + container_name: onlyoffice-documentserver + build: + context: ../. + depends_on: + - onlyoffice-graphite + environment: + - METRICS_ENABLED=${METRICS_ENABLED:-true} + - METRICS_HOST=${METRICS_HOST:-localhost} + - METRICS_PORT=${METRICS_PORT:-8125} + - METRICS_PREFIX=${METRICS_PREFIX:-ds.} + stdin_open: true + restart: always + expose: + - '2003' + ports: + - '80:80' + volumes: + - ./graphite/statsd:/var/www/onlyoffice/documentserver/server/Metrics/config + + onlyoffice-graphite: + container_name: onlyoffice-graphite + image: graphiteapp/graphite-statsd + environment: + - GRAPHITE_STATSD_HOST=${GRAPHITE_STATSD_HOST:-onlyoffice-documentserver} + - GRAPHITE_TIME_ZONE=${GRAPHITE_TIME_ZONE:-Etc/UTC} + ports: + - '8888:80' + stdin_open: true + restart: always diff --git a/tests/graphite/statsd/config.js b/tests/graphite/statsd/config.js new file mode 100644 index 0000000..2ebffe6 --- /dev/null +++ b/tests/graphite/statsd/config.js @@ -0,0 +1,7 @@ +{ + "graphiteHost": "onlyoffice-graphite", + "graphitePort": 2003, + "port": 8125, + "flushInterval": 60000, + "backends": [ "./backends/graphite.js" ] +} From c47a31068330ae67b352e539223327cff99ccd8a Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 30 Jul 2020 11:54:46 +0300 Subject: [PATCH 2/3] Fix unary operator expected (Bug 45985) (#270) --- run-document-server.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/run-document-server.sh b/run-document-server.sh index 86e8c09..9f57747 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -483,14 +483,16 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then rm -rf /var/run/rabbitmq fi - if [ ${REDIS_SERVER_HOST} != "localhost" ]; then - update_redis_settings - elif [ ${REDIS_ENABLED} = "true" ]; then - # change rights for redis directory - chown -R redis:redis ${REDIS_DATA} - chmod -R 750 ${REDIS_DATA} + if [ ${REDIS_ENABLED} = "true" ]; then + if [ ${REDIS_SERVER_HOST} != "localhost" ]; then + update_redis_settings + else + # change rights for redis directory + chown -R redis:redis ${REDIS_DATA} + chmod -R 750 ${REDIS_DATA} - LOCAL_SERVICES+=("redis-server") + LOCAL_SERVICES+=("redis-server") + fi fi else # no need to update settings just wait for remote data From ecb77ddb56665b9ff3dbb46b5568aea3df5a50bd Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Thu, 10 Sep 2020 16:57:21 +0300 Subject: [PATCH 3/3] Add more travis tests (#289) * Add version variable for travis tests * Fix typo * Fix activemq variable * Add travis tests * Remove mysql latest * Fixes & refactoring * Add more travis tests * Remove mysql 8 test * Remove mysql 8 test [2] * Add mysql 8 comment * Fix mysql 8 auth plugin Co-authored-by: Alexey Golubev --- .travis.yml | 69 ++++++++++++++++++++++++++++++++++++++++------ tests/activemq.yml | 2 +- tests/mariadb.yml | 2 +- tests/mysql.yml | 3 +- tests/postgres.yml | 2 +- tests/rabbitmq.yml | 2 +- tests/redis.yml | 2 +- 7 files changed, 67 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37749d6..084cddc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - config: standalone.yml PRODUCT_NAME: documentserver-ie + # certificates (default tls if onlyoffice not exists) - config: certs.yml ssl: true @@ -30,10 +31,27 @@ env: SSL_CERTIFICATE_PATH: /var/www/onlyoffice/Data/certs/mycert.crt SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key - # postgresql + + # postgresql 12 + - config: postgres.yml + POSTGRES_VERSION: 12 + + # postgresql 11 + - config: postgres.yml + POSTGRES_VERSION: 11 + + # postgresql 10 + - config: postgres.yml + POSTGRES_VERSION: 10 + + # postgresql 9 + - config: postgres.yml + POSTGRES_VERSION: 9 + + # postgresql 9.5 - config: postgres.yml - # custom values + # postgresql custom values - config: postgres.yml DB_NAME: mydb DB_USER: myuser @@ -41,31 +59,64 @@ env: POSTGRES_DB: mydb POSTGRES_USER: myuser - # deprecated variables + # postgresql deprecated variables - config: postgres-old.yml - # mysql + + # mysql 8 + - config: mysql.yml + MYSQL_VERSION: 8 + + # mysql 5 + - config: mysql.yml + MYSQL_VERSION: 5 + + # mysql 5.7 - config: mysql.yml - # mariadb + + # mariadb 10 + - config: mariadb.yml + MARIADB_VERSION: 10 + + # mariadb 10.5 - config: mariadb.yml - # activemq + + - config: activemq.yml + ACTIVEMQ_VERSION: latest + + # activemq 5.14.3 - config: activemq.yml - # rabbitmq + + # rabbitmq latest - config: rabbitmq.yml + # rabbitmq 3 + - config: rabbitmq.yml + RABBITMQ_VERSION: 3 + # rabbitmq old variables - config: rabbitmq-old.yml - # redis with community edition + + # redis latest with community edition - config: redis.yml - # redis with integraion edition + # redis latest with integraion edition - config: redis.yml PRODUCT_NAME: documentserver-ie + # redis 6 + - config: redis.yml + REDIS_VERSION: 6 + + # redis 5 + - config: redis.yml + REDIS_VERSION: 5 + + # graphite - config: graphite.yml diff --git a/tests/activemq.yml b/tests/activemq.yml index 6c3aad7..5781c64 100644 --- a/tests/activemq.yml +++ b/tests/activemq.yml @@ -17,7 +17,7 @@ services: onlyoffice-activemq: container_name: onlyoffice-activemq - image: webcenter/activemq:5.14.3 + image: webcenter/activemq:${ACTIVEMQ_VERSION:-5.14.3} environment: - ACTIVEMQ_USERS_guest=${ACTIVEMQ_USERS_guest:-guest} - ACTIVEMQ_GROUPS_owners=${ACTIVEMQ_GROUPS_owners:-guest} diff --git a/tests/mariadb.yml b/tests/mariadb.yml index 91131e2..4bb8de5 100644 --- a/tests/mariadb.yml +++ b/tests/mariadb.yml @@ -20,7 +20,7 @@ services: onlyoffice-mariadb: container_name: onlyoffice-mariadb - image: mariadb:10.5 + image: mariadb:${MARIADB_VERSION:-10.5} environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice} diff --git a/tests/mysql.yml b/tests/mysql.yml index 1389a89..20fcd70 100644 --- a/tests/mysql.yml +++ b/tests/mysql.yml @@ -20,7 +20,8 @@ services: onlyoffice-mysql: container_name: onlyoffice-mysql - image: mysql:5.7 + image: mysql:${MYSQL_VERSION:-5.7} + command: --default-authentication-plugin=mysql_native_password environment: - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice} diff --git a/tests/postgres.yml b/tests/postgres.yml index 6ddf134..8333b10 100644 --- a/tests/postgres.yml +++ b/tests/postgres.yml @@ -20,7 +20,7 @@ services: onlyoffice-postgresql: container_name: onlyoffice-postgresql - image: postgres:9.5 + image: postgres:${POSTGRES_VERSION:-9.5} environment: - POSTGRES_DB=${POSTGRES_DB:-onlyoffice} - POSTGRES_USER=${POSTGRES_USER:-onlyoffice} diff --git a/tests/rabbitmq.yml b/tests/rabbitmq.yml index f73501f..293045c 100644 --- a/tests/rabbitmq.yml +++ b/tests/rabbitmq.yml @@ -17,7 +17,7 @@ services: onlyoffice-rabbitmq: container_name: onlyoffice-rabbitmq - image: rabbitmq + image: rabbitmq:${RABBITMQ_VERSION:-latest} restart: always networks: - onlyoffice diff --git a/tests/redis.yml b/tests/redis.yml index 5f759ad..849be16 100644 --- a/tests/redis.yml +++ b/tests/redis.yml @@ -19,7 +19,7 @@ services: onlyoffice-redis: container_name: onlyoffice-redis - image: redis + image: redis:${REDIS_VERSION:-latest} restart: always networks: - onlyoffice