diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-02-13 02:13:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 02:13:46 +0200 |
| commit | f53e8fbd2111b7ce2e3377b1aea85a5a76bfb6d6 (patch) | |
| tree | 03c7eccee2144f36d7ed1b8a9943854d3ca3601e | |
| parent | d22964bcfd46ea4fd4860528b0c5e6f5d90812b6 (diff) | |
| parent | 8e95871534d654e006982938fabd98a7357392e3 (diff) | |
| download | wekan-f53e8fbd2111b7ce2e3377b1aea85a5a76bfb6d6.tar.gz wekan-f53e8fbd2111b7ce2e3377b1aea85a5a76bfb6d6.tar.bz2 wekan-f53e8fbd2111b7ce2e3377b1aea85a5a76bfb6d6.zip | |
Merge pull request #2187 from GavinLilly/kadira-integration
Kadira integration
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 1 | ||||
| -rw-r--r-- | docker-compose.yml | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.meteor/packages b/.meteor/packages index 88a0cae6..274a8d0d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -90,3 +90,4 @@ wekan:wekan-ldap wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar +mdg:meteor-apm-agent diff --git a/.meteor/versions b/.meteor/versions index 15e2f8b9..e91115a2 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -84,6 +84,7 @@ 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 diff --git a/docker-compose.yml b/docker-compose.yml index 869415a8..7a1f7b87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -191,9 +191,12 @@ services: # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/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 - # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011 + #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011 + #- APM_APP_ID= + #- APM_APP_SECRET= #--------------------------------------------------------------- # ==== OPTIONAL: LOGS AND STATS ==== # https://github.com/wekan/wekan/wiki/Logs |