Merge branch 'release/20181030-02'

johnsusek · Oct 30, 2018 · ee50d26 · ee50d26
2 parents 7d5ecb4 + d14ae0b
commit ee50d26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/ESChart.vue b/src/components/ESChart.vue
@@ -267,8 +267,8 @@ export default {
       let gte;
 
       if (this.timeType === 'iso') {
-        lte = Math.trunc(+new Date());
-        gte = moment().subtract(Object.values(this.timespan)[0], Object.keys(this.timespan)[0]).valueOf();
+        gte = `now-${intervalFromTimeframe(this.timespan)}`;
+        lte = 'now';
       } else if (this.timeType === 'unix_ms') {
         lte = Math.trunc(+new Date());
         gte = moment().subtract(Object.values(this.timespan)[0], Object.keys(this.timespan)[0]).valueOf();

diff --git a/src/components/EventTable.vue b/src/components/EventTable.vue
@@ -168,7 +168,7 @@ export default {
       let to;
 
       if (this.timeType === 'iso') {
-        to = intervalFromTimeframe(this.timeframe);
+        to = `${this.from}||+${intervalFromTimeframe(this.timeframe)}`;
       } else if (this.timeType === 'unix_ms') {
         to = this.from + msFromTimeframe(this.timeframe);
       } else {