Merge pull request #2 from Countly/master

mrg

Author: frknbasaran

.travis.yml

@@ -11,7 +11,7 @@ branches:
 before_install:
 - sudo apt-get remove -y mongodb-org mongodb-org-mongos mongodb-org-server mongodb-org-shell mongodb-org-tools
 - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz
-- tar -xvf /tmp/mongodb.tgz
+- tar -xf /tmp/mongodb.tgz
 - mkdir /tmp/data
 - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --logpath ${PWD}/mongod.log &> /dev/null &
 - until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done

CHANGELOG.md

@@ -1,3 +1,90 @@
+## Version 20.04.1
+
+**Fixes**
+* [api] make sure location is string
+* [api] skip empty bulk requests
+* [cmd] fix logging of upgrade commands
+* [configuration] plugin settings in app managament treat number like number
+* [crashes] log bulk error on crash users upsert
+* [dbviewer] fixed projection problem
+* [enterpriseinfo] more space to login area
+* [frontend] fix empty template load in application management
+* [frontend] fixed admins accessing applications section
+* [frontend] fixed error when checking user_of rights
+* [frontend] period parsing fixes
+* [members] maintain backwards compatability for api key validation
+* [plugin-upload] fix file type check
+* [populator] allow providing single digit values as custom user properties in templates
+* [push] fixing unhandled rejection on delete of notification with invalid id
+* [reportmanager] delete long tasks on app delete
+* [server-stats] punchcard comply with rights access
+* [star-rating] fix dialog to work with checksum enabled apps
+* [star-rating] fixed integration popup problem
+* [star-ratings] fixed comments tab sorting problem
+* [systemlogs] fix exports script for new driver version
+* [views] correct localization based on app type
+* [views] fixed incorrect result when searching for specific views
+
+**Enterprise fixes**
+* [ab-testing] fixed user merging logic for ab testing experiments
+* [ab-testing] shallow copy bug fix
+* [attribution] correctly calculating campaign level aggregated data
+* [cohorts] do not crash if cohort does not exist for widget
+* [cohorts] moved back to master process for usage in push campaigns
+* [concurrent_users] handling metric labels overflow
+* [dashboards] fixed double zoom on drill widget period switch
+* [drill] correctly check query type for api parameter
+* [drill] fixed date processing error in some cases
+* [drill] fixed duration formatting for BY queryes and dashboard widgets
+* [drill] fixed recording orientation key
+* [drill] limit line count in graph based on settings color count for BY queries
+* [drill] proper event key escaping/unescaping processing
+* [drill] use BY limit from configuration correctly
+* [flows] use view display name in flow diagram
+* [formulas] correctly regenerate formulas data in report manager
+* [formulas] fixed NaN/no data issue for weekly buckets
+* [funnels] fixed calculating funnel data for past periods
+* [loyalty] fix segmentation filter
+* [performance-monitoring] apm tables sorting fixes
+* [performance-monitoring] fix drill query period
+* [performance-monitoring] tabs navigation bug fix
+* [performance-monitoring] unknown value fix
+* [star-rating] drill icon will only appear on ratings tab
+
+**Improvements**
+* [compare] increased app/event compare limit to 20
+* [db] support for mongodb DNS seed list connection string
+* [frontend] add links to events in event overview
+* [frontend] remove password field when creating users from Global admin
+* [ip_store] store ip address as custom user property (disabled by default)
+* [logger] allow searching for request contents in search field
+* [logger] register data for tokens on top level
+* [logger] register requests with ms precision
+* [performance-monitoring] network response latency overall percentages and breakdown by country
+* [populator] add more template based views with heatmap data for web app type
+* [remote-config] add support for does not contain
+* [reportmanager] display errors in the report manager table 
+
+**Enterprise Improvements**
+* [block] do not require segmentation for blocking events
+* [funnels] display readable stepnames for custom dashboards widgets
+* [users] display search input if any value is provided in it
+* [users] make segments and segment values searchable and exportable in event timeline
+
+**Development related**
+* [api] provide a way to bypass checksum check for programmatic request
+* [cmd] add new plugin creation command
+* [docker] Invalid A/B testing model location for debian
+* [docker] Removing unnecessary plugins
+* [docker] fixed disappearing timzeone
+* [docs] comment fixes and documentation generation stucture
+* [frontend] allow skipping columns from export
+* [plugins] ensure events propagate to all plugins on single plugin failure
+* [scripts] single mongodb installation script (that can be used standalone)
+* [shellcheck] fixes and CI checks
+* [tests] increased timeouts and removed ambigiousness
+
+
 ## Version 20.04
 
 **Fixes**

Dockerfile-api

@@ -13,6 +13,7 @@ USER root
 ## Tini
 ENV COUNTLY_CONTAINER="api" \
 	COUNTLY_DEFAULT_PLUGINS="${COUNTLY_PLUGINS}" \
+	COUNTLY_CONFIG_API_API_WORKERS="1" \
 	COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
 	TINI_VERSION="0.18.0"
 

Dockerfile-centos-api

@@ -13,6 +13,7 @@ USER root
 ## Tini
 ENV COUNTLY_CONTAINER="api" \
 	COUNTLY_DEFAULT_PLUGINS="${COUNTLY_PLUGINS}" \
+	COUNTLY_CONFIG_API_API_WORKERS="1" \
 	COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
 	TINI_VERSION="0.18.0" \
 	PATH="/opt/rh/rh-nodejs10/root/usr/bin:${PATH}"

api/lib/countly.common.js

@@ -105,7 +105,7 @@ function getPeriodObject() {
         }
         catch (SyntaxError) {
             console.log("period JSON parse failed");
-            _period = "month";
+            _period = "30days";
         }
     }
 
@@ -1865,7 +1865,7 @@ countlyCommon.decode = function(str) {
 * @param {(string|string[]|number[])} defaultPeriod - default period value in case it's not supplied in the params
 * @returns {module:api/lib/countly.common.periodObj} period object
 */
-countlyCommon.getPeriodObj = function(params, defaultPeriod = "month") {
+countlyCommon.getPeriodObj = function(params, defaultPeriod = "30days") {
     let appTimezone = params.appTimezone || (params.app && params.app.timezone);
 
     params.qstring.period = params.qstring.period || defaultPeriod;

api/parts/data/usage.js

@@ -230,7 +230,7 @@ usage.processLocation = function(params) {
 
         if ('location' in params.qstring) {
             if (params.qstring.location) {
-                var coords = params.qstring.location.split(',');
+                var coords = (params.qstring.location + "").split(',');
                 if (coords.length === 2) {
                     var lat = parseFloat(coords[0]),
                         lon = parseFloat(coords[1]);

api/parts/jobs/manager.js

@@ -353,11 +353,13 @@ class Manager {
     **/
     schedule(job) {
         if (job.scheduleObj) {
-            var schedule = typeof job.scheduleObj === 'string' ? later.parse.text(job.scheduleObj) : job.scheduleObj,
-                nextFrom = new Date(job.next);
-            var next = later.schedule(schedule).next(2, nextFrom);
+            var strict = job.strict !== null && job.strict !== undefined,
+                schedule = typeof job.scheduleObj === 'string' ? later.parse.text(job.scheduleObj) : job.scheduleObj,
+                nextFrom = strict ? new Date(job.next) : new Date(),
+                next = later.schedule(schedule).next(2, nextFrom);
+
             if (next && next.length > 1) {
-                if (job.strict !== null && job.strict !== undefined) {
+                if (strict) {
                     // for strict jobs we're going to repeat all missed tasks up to current date after restart
                     // for non-strict ones, we want to start from current date
                     while (next[1].getTime() < Date.now()) {
@@ -595,7 +597,7 @@ class Manager {
             n = (this.running[job.name] || []).length,
             can = c === 0 || (n + count) <= c;
         if (!can) {
-            log.i('Hit concurrency limit on %j: %d is running out of limit %d, requested to run %d', job._id, n, c, count);
+            log.i('Hit concurrency limit on %j: %d is running out of limit %d, requested to run %d, running %j', job._id, n, c, count, this.running[job.name]);
         }
         return can;
     }

api/parts/mgmt/app_users.js

@@ -15,6 +15,14 @@ var spawn = cp.spawn; //for calling comannd line
 const fse = require('fs-extra');
 var crypto = require('crypto');
 
+var cohorts;
+try {
+    cohorts = require("../../../plugins/cohorts/api/parts/cohorts.js");
+}
+catch (ex) {
+    cohorts = null;
+}
+
 /**
 * Create new app_user document. Creates uid if one is not provided
 * @param {string} app_id - _id of the app
@@ -1026,6 +1034,11 @@ usersApi.loyalty = function(params) {
         }
     }
 
+    if (cohorts) {
+        var cohortQuery = cohorts.preprocessQuery(query);
+        query = Object.assign(query, cohortQuery);
+    }
+
     // Time
     const ts = (new Date()).getTime();
     const sevenDays = 7 * 24 * 60 * 60 * 1000;

api/parts/mgmt/apps.js

@@ -462,7 +462,13 @@ appsApi.updateAppPlugins = function(params) {
                             reject(err2);
                         }
                         else if (changes) {
-                            resolve({[k]: changes});
+                            let err = changes.filter(c => c.status === 'rejected')[0];
+                            if (err) {
+                                reject(err.reason);
+                            }
+                            else {
+                                resolve({[k]: changes.map(c => c.value)});
+                            }
                         }
                         else {
                             log.d('Updating %s plugin config for app %s in db: %j', k, params.qstring.app_id, params.qstring.args[k]);

api/parts/mgmt/mail.js

@@ -56,6 +56,7 @@ else {
 * @param {function} callback - function to call when its done
 **/
 mail.sendMail = function(message, callback) {
+    message.from = config.mail && config.mail.strings && config.mail.strings.from || message.from || "Countly";
     mail.smtpTransport.sendMail(message, function(error) {
         if (error) {
             console.log('Error sending email');
@@ -241,4 +242,4 @@ mail.lookup = function(callback) {
 };
 
 plugins.extendModule("mail", mail);
-module.exports = mail;
+module.exports = mail;