You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/11/24 12:11:20 UTC
ambari git commit: AMBARI-14035. $.timeago for alert instance and
alert definitions should use not converted with timezone timestamps
(onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 21333ef0f -> 09826ec04
AMBARI-14035. $.timeago for alert instance and alert definitions should use not converted with timezone timestamps (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09826ec0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09826ec0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09826ec0
Branch: refs/heads/branch-2.1
Commit: 09826ec0454d79136beb7f148f816f0d06676d32
Parents: 21333ef
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Nov 24 13:07:27 2015 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue Nov 24 13:07:27 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mappers/alert_definition_summary_mapper.js | 3 ++-
ambari-web/app/mappers/alert_definitions_mapper.js | 1 +
ambari-web/app/mappers/alert_instances_mapper.js | 1 +
ambari-web/app/models/alerts/alert_definition.js | 9 +++++----
ambari-web/app/models/alerts/alert_instance.js | 5 +++--
ambari-web/test/models/alerts/alert_definition_test.js | 4 ++--
6 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/app/mappers/alert_definition_summary_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/alert_definition_summary_mapper.js b/ambari-web/app/mappers/alert_definition_summary_mapper.js
index b795638..0cfc775 100644
--- a/ambari-web/app/mappers/alert_definition_summary_mapper.js
+++ b/ambari-web/app/mappers/alert_definition_summary_mapper.js
@@ -51,7 +51,8 @@ App.alertDefinitionSummaryMapper = App.QuickDataMapper.create({
});
summaryMap[alertDefinitionSummary.definition_id] = {
summary: summary,
- lastTriggered: App.dateTimeWithTimeZone(parseInt(timestamp))
+ lastTriggered: App.dateTimeWithTimeZone(parseInt(timestamp)),
+ lastTriggeredRaw: timestamp
};
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/app/mappers/alert_definitions_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/alert_definitions_mapper.js b/ambari-web/app/mappers/alert_definitions_mapper.js
index 80d175e..a3ab513 100644
--- a/ambari-web/app/mappers/alert_definitions_mapper.js
+++ b/ambari-web/app/mappers/alert_definitions_mapper.js
@@ -126,6 +126,7 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({
// new values will be parsed in the another mapper, so for now just use old values
alertDefinition.summary = oldAlertDefinition.get('summary');
alertDefinition.last_triggered = oldAlertDefinition.get('lastTriggered');
+ alertDefinition.last_triggered_raw = oldAlertDefinition.get('lastTriggeredRaw');
}
alertDefinitionsToDelete = alertDefinitionsToDelete.without(alertDefinition.id);
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/app/mappers/alert_instances_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/alert_instances_mapper.js b/ambari-web/app/mappers/alert_instances_mapper.js
index 45a4760..349d94d 100644
--- a/ambari-web/app/mappers/alert_instances_mapper.js
+++ b/ambari-web/app/mappers/alert_instances_mapper.js
@@ -35,6 +35,7 @@ App.alertInstanceMapper = App.QuickDataMapper.create({
host_name: 'Alert.host_name',
scope: 'Alert.scope',
original_timestamp: 'Alert.original_timestamp',
+ original_raw_timestamp: 'Alert.original_timestamp',
latest_timestamp: 'Alert.latest_timestamp',
maintenance_state: 'Alert.maintenance_state',
instance: 'Alert.instance',
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/app/models/alerts/alert_definition.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alerts/alert_definition.js b/ambari-web/app/models/alerts/alert_definition.js
index e33324b..79286fe 100644
--- a/ambari-web/app/models/alerts/alert_definition.js
+++ b/ambari-web/app/models/alerts/alert_definition.js
@@ -34,6 +34,7 @@ App.AlertDefinition = DS.Model.extend({
groups: DS.hasMany('App.AlertGroup'),
reporting: DS.hasMany('App.AlertReportDefinition'),
lastTriggered: DS.attr('number'),
+ lastTriggeredRaw: DS.attr('number'),
//relates only to SCRIPT-type alert definition
location: DS.attr('string'),
@@ -95,9 +96,9 @@ App.AlertDefinition = DS.Model.extend({
* @type {string}
*/
lastTriggeredAgoFormatted: function () {
- var lastTriggered = this.get('lastTriggered');
+ var lastTriggered = this.get('lastTriggeredRaw');
return lastTriggered ? $.timeago(new Date(lastTriggered)) : '';
- }.property('lastTriggered'),
+ }.property('lastTriggeredRaw'),
lastTriggeredVerboseDisplay: function () {
var lastTriggered = this.get('lastTriggered');
@@ -109,7 +110,7 @@ App.AlertDefinition = DS.Model.extend({
* @type {string}
*/
lastTriggeredForFormatted: function () {
- var lastTriggered = this.get('lastTriggered');
+ var lastTriggered = this.get('lastTriggeredRaw');
var previousSuffixAgo = $.timeago.settings.strings.suffixAgo;
var previousPrefixAgo = $.timeago.settings.strings.prefixAgo;
$.timeago.settings.strings.suffixAgo = null;
@@ -118,7 +119,7 @@ App.AlertDefinition = DS.Model.extend({
$.timeago.settings.strings.suffixAgo = previousSuffixAgo;
$.timeago.settings.strings.prefixAgo = previousPrefixAgo;
return triggeredFor;
- }.property('lastTriggered'),
+ }.property('lastTriggeredRaw'),
/**
* Formatted displayName for <code>componentName</code>
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/app/models/alerts/alert_instance.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alerts/alert_instance.js b/ambari-web/app/models/alerts/alert_instance.js
index 60a2723..92dc59e 100644
--- a/ambari-web/app/models/alerts/alert_instance.js
+++ b/ambari-web/app/models/alerts/alert_instance.js
@@ -31,6 +31,7 @@ App.AlertInstance = DS.Model.extend({
hostName: DS.attr('string'),
scope: DS.attr('string'),
originalTimestamp: DS.attr('number'),
+ originalRawTimestamp: DS.attr('number'),
latestTimestamp: DS.attr('number'),
maintenanceState: DS.attr('string'),
instance: DS.attr('string'),
@@ -89,7 +90,7 @@ App.AlertInstance = DS.Model.extend({
* @type {string}
*/
lastTriggeredAgoFormatted: function () {
- var lastTriggered = this.get('originalTimestamp');
+ var lastTriggered = this.get('originalRawTimestamp');
return lastTriggered ? $.timeago(new Date(lastTriggered)) : '';
}.property('originalTimestamp'),
@@ -106,7 +107,7 @@ App.AlertInstance = DS.Model.extend({
* @type {string}
*/
lastTriggeredForFormatted: function () {
- var lastTriggered = this.get('originalTimestamp');
+ var lastTriggered = this.get('originalRawTimestamp');
var previousSuffixAgo = $.timeago.settings.strings.suffixAgo;
var previousPrefixAgo = $.timeago.settings.strings.prefixAgo;
$.timeago.settings.strings.suffixAgo = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/09826ec0/ambari-web/test/models/alerts/alert_definition_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/models/alerts/alert_definition_test.js b/ambari-web/test/models/alerts/alert_definition_test.js
index 0e8cc79..9aac2a4 100644
--- a/ambari-web/test/models/alerts/alert_definition_test.js
+++ b/ambari-web/test/models/alerts/alert_definition_test.js
@@ -128,12 +128,12 @@ describe('App.AlertDefinition', function () {
describe('#lastTriggeredAgoFormatted', function () {
it('should be empty', function () {
- model.set('lastTriggered', 0);
+ model.set('lastTriggeredRaw', 0);
expect(model.get('lastTriggeredAgoFormatted')).to.equal('');
});
it('should not be empty', function () {
- model.set('lastTriggered', new Date().getTime() - 61000);
+ model.set('lastTriggeredRaw', new Date().getTime() - 61000);
expect(model.get('lastTriggeredAgoFormatted')).to.equal('about a minute ago');
});