[aggConfig] restore use of @timestamp

spalger · spalger · commit e71b0f26c79c · 2016-10-24T17:04:13.000-07:00
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -51,7 +51,7 @@ describe('ResponseWriter class', function () {
 
     it('collects the aggConfigs from each column in aggStack', function () {
       let aggs = [
-        { type: 'date_histogram', schema: 'segment', params: { field: 'time' } },
+        { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
         { type: 'terms', schema: 'segment', params: { field: 'extension' } },
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } }
       ];
diff --git a/src/ui/public/vis/__tests__/_agg_config.js b/src/ui/public/vis/__tests__/_agg_config.js
@@ -197,7 +197,7 @@ describe('AggConfig', function () {
         {
           type: 'count',
           schema: 'metric',
-          params: {field: 'time'}
+          params: {field: '@timestamp'}
         }
       ]
     }, {
@@ -295,7 +295,7 @@ describe('AggConfig', function () {
           {
             type: 'count',
             schema: 'metric',
-            params: {field: 'time'}
+            params: {field: '@timestamp'}
           }
         ]
       },
@@ -305,7 +305,7 @@ describe('AggConfig', function () {
           {
             type: 'count',
             schema: 'metric',
-            params: {field: 'time'}
+            params: {field: '@timestamp'}
           },
           {
             type: 'date_histogram',
@@ -421,7 +421,7 @@ describe('AggConfig', function () {
           {
             type: 'date_histogram',
             schema: 'segment',
-            params: { field: 'time' }
+            params: { field: '@timestamp' }
           }
         ]
       });
@@ -433,7 +433,7 @@ describe('AggConfig', function () {
           {
             type: 'count',
             schema: 'metric',
-            params: { field: 'time' }
+            params: { field: '@timestamp' }
           }
         ]
       });
@@ -447,7 +447,7 @@ describe('AggConfig', function () {
           {
             type: 'date_histogram',
             schema: 'segment',
-            params: { field: 'time' }
+            params: { field: '@timestamp' }
           }
         ]
       });
@@ -464,7 +464,7 @@ describe('AggConfig', function () {
           {
             type: 'date_histogram',
             schema: 'segment',
-            params: { field: 'time' }
+            params: { field: '@timestamp' }
           }
         ]
       });

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ describe('AggConfig', function () {`
`197`	`197`	`{`
`198`	`198`	`type: 'count',`
`199`	`199`	`schema: 'metric',`
`200`		`- params: {field: 'time'}`
	`200`	`+ params: {field: '@timestamp'}`
`201`	`201`	`}`
`202`	`202`	`]`
`203`	`203`	`}, {`
`@@ -295,7 +295,7 @@ describe('AggConfig', function () {`
`295`	`295`	`{`
`296`	`296`	`type: 'count',`
`297`	`297`	`schema: 'metric',`
`298`		`- params: {field: 'time'}`
	`298`	`+ params: {field: '@timestamp'}`
`299`	`299`	`}`
`300`	`300`	`]`
`301`	`301`	`},`
`@@ -305,7 +305,7 @@ describe('AggConfig', function () {`
`305`	`305`	`{`
`306`	`306`	`type: 'count',`
`307`	`307`	`schema: 'metric',`
`308`		`- params: {field: 'time'}`
	`308`	`+ params: {field: '@timestamp'}`
`309`	`309`	`},`
`310`	`310`	`{`
`311`	`311`	`type: 'date_histogram',`
`@@ -421,7 +421,7 @@ describe('AggConfig', function () {`
`421`	`421`	`{`
`422`	`422`	`type: 'date_histogram',`
`423`	`423`	`schema: 'segment',`
`424`		`- params: { field: 'time' }`
	`424`	`+ params: { field: '@timestamp' }`
`425`	`425`	`}`
`426`	`426`	`]`
`427`	`427`	`});`
`@@ -433,7 +433,7 @@ describe('AggConfig', function () {`
`433`	`433`	`{`
`434`	`434`	`type: 'count',`
`435`	`435`	`schema: 'metric',`
`436`		`- params: { field: 'time' }`
	`436`	`+ params: { field: '@timestamp' }`
`437`	`437`	`}`
`438`	`438`	`]`
`439`	`439`	`});`
`@@ -447,7 +447,7 @@ describe('AggConfig', function () {`
`447`	`447`	`{`
`448`	`448`	`type: 'date_histogram',`
`449`	`449`	`schema: 'segment',`
`450`		`- params: { field: 'time' }`
	`450`	`+ params: { field: '@timestamp' }`
`451`	`451`	`}`
`452`	`452`	`]`
`453`	`453`	`});`
`@@ -464,7 +464,7 @@ describe('AggConfig', function () {`
`464`	`464`	`{`
`465`	`465`	`type: 'date_histogram',`
`466`	`466`	`schema: 'segment',`
`467`		`- params: { field: 'time' }`
	`467`	`+ params: { field: '@timestamp' }`
`468`	`468`	`}`
`469`	`469`	`]`
`470`	`470`	`});`