IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech(lodash): upraded lodash to 4.15.0, closes #6021

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-14 09:17:10 +02:00
parent 0fa0066cd9
commit 649d9f9177
158 changed files with 5531 additions and 128629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/cloudwatch/annotation_query.js
View File

@@ -47,7 +47,7 @@ function (_) {
var start = self.datasource.convertToCloudWatchTime(from, false);
var end = self.datasource.convertToCloudWatchTime(to, true);
_.chain(alarms)
.pluck('MetricAlarms')
.map('MetricAlarms')
.flatten()
.each(function(alarm) {
if (!alarm) {
@@ -70,7 +70,8 @@ function (_) {
d.resolve(eventList);
});
});
})
.value();
});
return d.promise;
@@ -91,7 +92,7 @@ function (_) {
if (!_.isEmpty(dimensions) && !isSameDimensions) {
return false;
}
if (!_.isEmpty(statistics) && !_.contains(statistics, alarm.Statistic)) {
if (!_.isEmpty(statistics) && !_.includes(statistics, alarm.Statistic)) {
return false;
}
if (!_.isNaN(period) && alarm.Period !== period) {