From 7b5f02b4c8fdaa66a01d528ea338a76fe1b9f974 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Sat, 9 Feb 2019 23:22:22 +0000 Subject: Added Kadira packages and env settings in Docker Compose --- .meteor/packages | 1 + docker-compose.yml | 73 ++++++++++++++++++++++++++++++++++++++++-------------- server/kadira.js | 5 ++++ 3 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 server/kadira.js diff --git a/.meteor/packages b/.meteor/packages index 88a0cae6..228427e4 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -90,3 +90,4 @@ wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar +meteorhacks:kadira diff --git a/docker-compose.yml b/docker-compose.yml index abcaa48b..951c705e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: #------------------------------------------------------------------------------------- container_name: wekan-db restart: always - command: mongod --smallfiles --oplogSize 128 + command: mongod --smallfiles --replSet kadira --oplogSize 128 networks: - wekan-tier expose: @@ -129,26 +129,26 @@ services: #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== # ==== and use commands: docker-compose up -d --build - #build: - # context: . - # dockerfile: Dockerfile - # args: - # - NODE_VERSION=${NODE_VERSION} - # - METEOR_RELEASE=${METEOR_RELEASE} - # - NPM_VERSION=${NPM_VERSION} - # - ARCHITECTURE=${ARCHITECTURE} - # - SRC_PATH=${SRC_PATH} - # - METEOR_EDGE=${METEOR_EDGE} - # - USE_EDGE=${USE_EDGE} + build: + context: . + dockerfile: Dockerfile + args: + - NODE_VERSION=${NODE_VERSION} + - METEOR_RELEASE=${METEOR_RELEASE} + - NPM_VERSION=${NPM_VERSION} + - ARCHITECTURE=${ARCHITECTURE} + - SRC_PATH=${SRC_PATH} + - METEOR_EDGE=${METEOR_EDGE} + - USE_EDGE=${USE_EDGE} #------------------------------------------------------------------------------------- ports: # Docker outsideport:insideport. Do not add anything extra here. # For example, if you want to have wekan on port 3001, # use 3001:8080 . Do not add any extra address etc here, that way it does not work. # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - - 80:8080 + - 3000:8080 environment: - - MONGO_URL=mongodb://wekandb:27017/wekan + - MONGO_URL=mongodb://wekandb:27017/wekan?replicaSet=kadira #--------------------------------------------------------------- # ==== ROOT_URL SETTING ==== # Change ROOT_URL to your real Wekan URL, for example: @@ -161,7 +161,7 @@ services: # - http://example.com # - http://boards.example.com # - http://192.168.1.100 <=== using at local LAN - - ROOT_URL=http://localhost # <=== using only at same laptop/desktop where Wekan is installed + - ROOT_URL=http://frigg:3000 # <=== using only at same laptop/desktop where Wekan is installed #--------------------------------------------------------------- # ==== EMAIL SETTINGS ==== # Email settings are required in both MAIL_URL and Admin Panel, @@ -169,8 +169,8 @@ services: # For SSL in email, change smtp:// to smtps:// # NOTE: Special characters need to be url-encoded in MAIL_URL. # You can encode those characters for example at: https://www.urlencoder.org - - MAIL_URL=smtp://user:pass@mailserver.example.com:25/ - - MAIL_FROM='Example Wekan Support ' + #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ + #- MAIL_FROM='Example Wekan Support ' #--------------------------------------------------------------- # ==== OPTIONAL: MONGO OPLOG SETTINGS ===== # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587 @@ -193,7 +193,9 @@ services: # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== # https://github.com/smeijer/kadira # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011 + - KADIRA_OPTIONS_ENDPOINT=http://kadira-engine:11011 + - KADIRA_APP_ID=iYpPgq6rXRrZJty4A + - KADIRA_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs @@ -510,6 +512,41 @@ services: # - ./nginx/nginx.conf:/etc/nginx/nginx.conf + kadira-engine: + ## This is the endpoint where Meteor app sends performance data + image: vladgolubev/kadira-engine + ports: + - "11011:11011" + environment: + - PORT=11011 + - MONGO_URL=mongodb://wekandb:27017/kadira?replicaSet=kadira + - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira?replicaSet=kadira + networks: + - wekan-tier + restart: always + + kadira-rma: + ## This computes statistics databases every minute. + image: vladgolubev/kadira-rma + environment: + - MONGO_URL=mongodb://wekandb:27017/kadira + networks: + - wekan-tier + restart: always + + kadira-ui: + ## Meteor app that presents the Kadira user interface. + image: vladgolubev/kadira-ui + ports: + #- "80:4000" + - "4000:4000" + environment: + - MONGO_URL=mongodb://wekandb:27017/kadira + - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira + networks: + - wekan-tier + restart: always + volumes: wekan-db: driver: local diff --git a/server/kadira.js b/server/kadira.js new file mode 100644 index 00000000..8b43102d --- /dev/null +++ b/server/kadira.js @@ -0,0 +1,5 @@ +Meteor.startup(() => { + const appId = process.env.KADIRA_APP_ID; + const appSecret = process.env.KADIRA_APP_SECRET; + Kadira.connect(appId, appSecret); +}); -- cgit v1.2.3-1-g7c22 From 8996df5c0909e2090e749f45ee88e7d5bc977e7e Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Sat, 9 Feb 2019 23:37:01 +0000 Subject: Added Kadira using meteor add method --- .meteor/versions | 1 + 1 file changed, 1 insertion(+) diff --git a/.meteor/versions b/.meteor/versions index b8b8e4fd..320ba7a6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -90,6 +90,7 @@ meteor-base@1.2.0 meteor-platform@1.2.6 meteorhacks:aggregate@1.3.0 meteorhacks:collection-utils@1.2.0 +meteorhacks:kadira@2.30.4 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 -- cgit v1.2.3-1-g7c22 From 905c45f225809769268e1aaa64d30c1d44254f15 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Mon, 11 Feb 2019 16:43:52 +0000 Subject: Replaced Kadira by meteor-apm-agent --- .meteor/packages | 2 +- docker-compose.yml | 10 +++++----- server/kadira.js | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 server/kadira.js diff --git a/.meteor/packages b/.meteor/packages index 228427e4..274a8d0d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -90,4 +90,4 @@ wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar -meteorhacks:kadira +mdg:meteor-apm-agent diff --git a/docker-compose.yml b/docker-compose.yml index 951c705e..ddd293a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -123,7 +123,7 @@ services: # image: wekanteam/wekan:v1.95 #------------------------------------------------------------------------------------- container_name: wekan-app - restart: always + restart: "no" networks: - wekan-tier #------------------------------------------------------------------------------------- @@ -148,7 +148,7 @@ services: # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - 3000:8080 environment: - - MONGO_URL=mongodb://wekandb:27017/wekan?replicaSet=kadira + - MONGO_URL=mongodb://wekandb:27017/wekan #--------------------------------------------------------------- # ==== ROOT_URL SETTING ==== # Change ROOT_URL to your real Wekan URL, for example: @@ -193,9 +193,9 @@ services: # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== # https://github.com/smeijer/kadira # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - - KADIRA_OPTIONS_ENDPOINT=http://kadira-engine:11011 - - KADIRA_APP_ID=iYpPgq6rXRrZJty4A - - KADIRA_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 + - APM_OPTIONS_ENDPOINT=http://kadira-engine:11011 + - APM_APP_ID=iYpPgq6rXRrZJty4A + - APM_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs diff --git a/server/kadira.js b/server/kadira.js deleted file mode 100644 index 8b43102d..00000000 --- a/server/kadira.js +++ /dev/null @@ -1,5 +0,0 @@ -Meteor.startup(() => { - const appId = process.env.KADIRA_APP_ID; - const appSecret = process.env.KADIRA_APP_SECRET; - Kadira.connect(appId, appSecret); -}); -- cgit v1.2.3-1-g7c22 From d3abb0756ebe198f495d0fc6d4e1a737b8dc8f32 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Mon, 11 Feb 2019 20:12:53 +0000 Subject: Pulled Wekan-LDAP locally for debug --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff6243d5..aed3ecdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -247,7 +247,7 @@ RUN \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ + #gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ -- cgit v1.2.3-1-g7c22 From 5c083d99e2bd0041cc07a5ef86a0279900a3ce83 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Mon, 11 Feb 2019 23:16:37 +0000 Subject: Moved to meteor-apm-agent and removed Wekan LDAP to test if working --- .meteor/packages | 1 - .meteor/versions | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 274a8d0d..2553cf94 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -86,7 +86,6 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache -wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar diff --git a/.meteor/versions b/.meteor/versions index 5477519e..2df52582 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -84,13 +84,13 @@ localstorage@1.2.0 logging@1.1.19 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 +mdg:meteor-apm-agent@3.1.2 mdg:validation-error@0.5.1 meteor@1.8.2 meteor-base@1.2.0 meteor-platform@1.2.6 meteorhacks:aggregate@1.3.0 meteorhacks:collection-utils@1.2.0 -meteorhacks:kadira@2.30.4 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 @@ -182,6 +182,4 @@ webapp@1.4.0 webapp-hashing@1.0.9 wekan-scrollbar@3.1.3 wekan:accounts-cas@0.1.0 -wekan:wekan-ldap@0.0.2 -yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 -- cgit v1.2.3-1-g7c22 From 227772bc332228a779c8e85dd690474d6ea92bfa Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Tue, 12 Feb 2019 23:50:22 +0000 Subject: Added back wekan-ldap after it's fixed in a separate change --- .meteor/packages | 1 + .meteor/versions | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.meteor/packages b/.meteor/packages index 2553cf94..274a8d0d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -86,6 +86,7 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache +wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar diff --git a/.meteor/versions b/.meteor/versions index 2df52582..6734f378 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -182,4 +182,6 @@ webapp@1.4.0 webapp-hashing@1.0.9 wekan-scrollbar@3.1.3 wekan:accounts-cas@0.1.0 +wekan:wekan-ldap@0.0.2 +yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 -- cgit v1.2.3-1-g7c22 From 595a2d2baa0bb99154d19a5dc324029481f864b0 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Wed, 13 Feb 2019 00:00:34 +0000 Subject: Cleaning up docker-compose for merge --- docker-compose.yml | 78 +++++++++++++++--------------------------------------- 1 file changed, 22 insertions(+), 56 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5d39cb07..03b578b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: #------------------------------------------------------------------------------------- container_name: wekan-db restart: always - command: mongod --smallfiles --replSet kadira --oplogSize 128 + command: mongod --smallfiles --oplogSize 128 networks: - wekan-tier expose: @@ -123,30 +123,30 @@ services: # image: wekanteam/wekan:v1.95 #------------------------------------------------------------------------------------- container_name: wekan-app - restart: "no" + restart: always networks: - wekan-tier #------------------------------------------------------------------------------------- # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ==== # ==== and use commands: docker-compose up -d --build - build: - context: . - dockerfile: Dockerfile - args: - - NODE_VERSION=${NODE_VERSION} - - METEOR_RELEASE=${METEOR_RELEASE} - - NPM_VERSION=${NPM_VERSION} - - ARCHITECTURE=${ARCHITECTURE} - - SRC_PATH=${SRC_PATH} - - METEOR_EDGE=${METEOR_EDGE} - - USE_EDGE=${USE_EDGE} + #build: + # context: . + # dockerfile: Dockerfile + # args: + # - NODE_VERSION=${NODE_VERSION} + # - METEOR_RELEASE=${METEOR_RELEASE} + # - NPM_VERSION=${NPM_VERSION} + # - ARCHITECTURE=${ARCHITECTURE} + # - SRC_PATH=${SRC_PATH} + # - METEOR_EDGE=${METEOR_EDGE} + # - USE_EDGE=${USE_EDGE} #------------------------------------------------------------------------------------- ports: # Docker outsideport:insideport. Do not add anything extra here. # For example, if you want to have wekan on port 3001, # use 3001:8080 . Do not add any extra address etc here, that way it does not work. # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network - - 3000:8080 + - 80:8080 environment: - MONGO_URL=mongodb://wekandb:27017/wekan #--------------------------------------------------------------- @@ -161,7 +161,7 @@ services: # - http://example.com # - http://boards.example.com # - http://192.168.1.100 <=== using at local LAN - - ROOT_URL=http://frigg:3000 # <=== using only at same laptop/desktop where Wekan is installed + - ROOT_URL=http://localhost # <=== using only at same laptop/desktop where Wekan is installed #--------------------------------------------------------------- # ==== EMAIL SETTINGS ==== # Email settings are required in both MAIL_URL and Admin Panel, @@ -169,8 +169,8 @@ services: # For SSL in email, change smtp:// to smtps:// # NOTE: Special characters need to be url-encoded in MAIL_URL. # You can encode those characters for example at: https://www.urlencoder.org - #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/ - #- MAIL_FROM='Example Wekan Support ' + - MAIL_URL=smtp://user:pass@mailserver.example.com:25/ + - MAIL_FROM='Example Wekan Support ' #--------------------------------------------------------------- # ==== OPTIONAL: MONGO OPLOG SETTINGS ===== # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587 @@ -191,11 +191,12 @@ services: # - MONGO_OPLOG_URL=mongodb://:@/local?authSource=admin&replicaSet=rsWekan #--------------------------------------------------------------- # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ==== - # https://github.com/smeijer/kadira + # https://github.com/edemaine/kadira-compose + # https://github.com/meteor/meteor-apm-agent # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f - - APM_OPTIONS_ENDPOINT=http://kadira-engine:11011 - - APM_APP_ID=iYpPgq6rXRrZJty4A - - APM_APP_SECRET=9de2728b-320d-46c1-9352-0084435411f0 + #- APM_OPTIONS_ENDPOINT=http://:11011 + #- APM_APP_ID= + #- APM_APP_SECRET= #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs @@ -515,41 +516,6 @@ services: # - ./nginx/nginx.conf:/etc/nginx/nginx.conf - kadira-engine: - ## This is the endpoint where Meteor app sends performance data - image: vladgolubev/kadira-engine - ports: - - "11011:11011" - environment: - - PORT=11011 - - MONGO_URL=mongodb://wekandb:27017/kadira?replicaSet=kadira - - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira?replicaSet=kadira - networks: - - wekan-tier - restart: always - - kadira-rma: - ## This computes statistics databases every minute. - image: vladgolubev/kadira-rma - environment: - - MONGO_URL=mongodb://wekandb:27017/kadira - networks: - - wekan-tier - restart: always - - kadira-ui: - ## Meteor app that presents the Kadira user interface. - image: vladgolubev/kadira-ui - ports: - #- "80:4000" - - "4000:4000" - environment: - - MONGO_URL=mongodb://wekandb:27017/kadira - - MONGO_SHARD_URL_one=mongodb://wekandb:27017/kadira - networks: - - wekan-tier - restart: always - volumes: wekan-db: driver: local -- cgit v1.2.3-1-g7c22 From 8e95871534d654e006982938fabd98a7357392e3 Mon Sep 17 00:00:00 2001 From: Gavin Lilly Date: Wed, 13 Feb 2019 00:01:47 +0000 Subject: Adding wekan-ldap back in to build in the Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aed3ecdf..ff6243d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -247,7 +247,7 @@ RUN \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \ - #gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ -- cgit v1.2.3-1-g7c22