Merge pull request grafana#3681 from byronmwong/master

torkelo · torkelo · commit 908b2d151f2c · 2016-01-11T16:29:46.000+01:00
Fix elasticsearch hourly indexes
diff --git a/public/app/plugins/datasource/elasticsearch/index_pattern.js b/public/app/plugins/datasource/elasticsearch/index_pattern.js
@@ -11,7 +11,7 @@ function (_, moment) {
   }
 
   IndexPattern.intervalMap = {
-    "Hours":   { startOf: 'hour',     amount: 'hours'},
+    "Hourly":   { startOf: 'hour',     amount: 'hours'},
     "Daily":   { startOf: 'day',      amount: 'days'},
     "Weekly":  { startOf: 'isoWeek',  amount: 'weeks'},
     "Monthly": { startOf: 'month',    amount: 'months'},

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function (_, moment) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`IndexPattern.intervalMap = {`
`14`		`- "Hours": { startOf: 'hour', amount: 'hours'},`
	`14`	`+ "Hourly": { startOf: 'hour', amount: 'hours'},`
`15`	`15`	`"Daily": { startOf: 'day', amount: 'days'},`
`16`	`16`	`"Weekly": { startOf: 'isoWeek', amount: 'weeks'},`
`17`	`17`	`"Monthly": { startOf: 'month', amount: 'months'},`