Merge branch 'master' of github.com:thingsboard/thingsboard into feature/external-js-eval

@@ -83,7 +83,7 @@ public class AlarmController extends BaseController {
             Alarm savedAlarm = checkNotNull(alarmService.createOrUpdateAlarm(alarm));
             logEntityAction(savedAlarm.getId(), savedAlarm,
                     getCurrentUser().getCustomerId(),
-                    savedAlarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
+                    alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
             return savedAlarm;
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.ALARM), alarm,

@@ -209,7 +209,7 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge {
                     this.elementValueClone.renderedValue = this._value;
                 }
                 if (angular.isUndefined(this.elementValueClone.renderedValue)) {
-                    this.elementValueClone.renderedValue = options.minValue;
+                    this.elementValueClone.renderedValue = this.value;
                 }
                 let context = this.contextValueClone;
                 // clear the cache