diff --git a/CHANGES b/CHANGES index ab5c1cc1d..81fa056cd 100644 --- a/CHANGES +++ b/CHANGES @@ -2242,4 +2242,5 @@ * sftp: fix rebuild condition * app mailbox is now optional * Fix display of user management/dashboard visiblity for email apps +* graphite: disable tagdb and reduce log noise diff --git a/setup/start.sh b/setup/start.sh index 7ff218d74..23d4e33d0 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -45,7 +45,8 @@ mkdir -p "${APPS_DATA_DIR}" # keep these in sync with paths.js log "Ensuring directories" -mkdir -p "${PLATFORM_DATA_DIR}/graphite" +# clear out graphite, since old installations are having some db migration issue +rm -rf "${PLATFORM_DATA_DIR}/graphite" && mkdir -p "${PLATFORM_DATA_DIR}/graphite" mkdir -p "${PLATFORM_DATA_DIR}/mysql" mkdir -p "${PLATFORM_DATA_DIR}/postgresql" mkdir -p "${PLATFORM_DATA_DIR}/mongodb" diff --git a/src/graphite.js b/src/graphite.js index fa57723ab..08add8c53 100644 --- a/src/graphite.js +++ b/src/graphite.js @@ -19,7 +19,6 @@ function start(existingInfra, serviceConfig, callback) { assert.strictEqual(typeof callback, 'function'); const tag = infra.images.graphite.tag; - const dataDir = paths.PLATFORM_DATA_DIR; const memoryLimit = serviceConfig.memoryLimit || exports.DEFAULT_MEMORY_LIMIT; const memory = system.getMemoryAllocation(memoryLimit); @@ -38,7 +37,7 @@ function start(existingInfra, serviceConfig, callback) { -p 127.0.0.1:2003:2003 \ -p 127.0.0.1:2004:2004 \ -p 127.0.0.1:8417:8000 \ - -v "${dataDir}/graphite:/var/lib/graphite" \ + -v "${paths.PLATFORM_DATA_DIR}/graphite:/var/lib/graphite" \ --label isCloudronManaged=true \ --read-only -v /tmp -v /run "${tag}"`; diff --git a/src/infra_version.js b/src/infra_version.js index 56badd31d..86bc667b7 100644 --- a/src/infra_version.js +++ b/src/infra_version.js @@ -21,7 +21,7 @@ exports = module.exports = { 'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.2@sha256:9df297ccc3370f38c54f8d614e214e082b363777cd1c6c9522e29663cc8f5362' }, 'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.3@sha256:37e5222e01ae89bc5a742ce12030631de25a127b5deec8a0e992c68df0fdec10' }, 'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.3.0@sha256:d0b9724e9fb4cb1da52e032481d39de96d3d1f9cc99b2296500276dda703f20d' }, - 'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.4.0@sha256:953bbd8b72a9108a8526d2c0bdbba67e1e1563ff59d0a117f0884dba1576f3dd' }, + 'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.4.1@sha256:b00b64b8df4032985d7a1ddd548a2713b6d7d88a54ebe9b7d324cece2bd6829e' }, 'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.2.0@sha256:61e8247ded1e07cf882ca478dab180960357c614472e80b938f1f690a46788c2' } } };