summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Lilly <gavtherav@gmail.com>2019-02-11 16:43:52 +0000
committerGavin Lilly <gavtherav@gmail.com>2019-02-11 16:43:52 +0000
commit905c45f225809769268e1aaa64d30c1d44254f15 (patch)
treef2646dd80236c1aca49f96ce96243cae1a03c8b5
parent8996df5c0909e2090e749f45ee88e7d5bc977e7e (diff)
downloadwekan-905c45f225809769268e1aaa64d30c1d44254f15.tar.gz
wekan-905c45f225809769268e1aaa64d30c1d44254f15.tar.bz2
wekan-905c45f225809769268e1aaa64d30c1d44254f15.zip
Replaced Kadira by meteor-apm-agent
-rw-r--r--.meteor/packages2
-rw-r--r--docker-compose.yml10
-rw-r--r--server/kadira.js5
3 files changed, 6 insertions, 11 deletions
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);
-});