Merge pull request influxdata#205 from jmoses/master

aviau · aviau · commit 881a8c33191e · 2015-06-17T19:30:07.000-04:00
Replace instances of `timestamp` with `time` for v0.9 release
diff --git a/README.rst b/README.rst
@@ -103,7 +103,7 @@ Here's a basic example (for more see the examples directory)::
                 "host": "server01",
                 "region": "us-west"
             },
-            "timestamp": "2009-11-10T23:00:00Z",
+            "time": "2009-11-10T23:00:00Z",
             "fields": {
                 "value": 0.64
             }
diff --git a/examples/tutorial.py b/examples/tutorial.py
@@ -17,7 +17,7 @@ def main(host='localhost', port=8086):
                 "host": "server01",
                 "region": "us-west"
             },
-            "timestamp": "2009-11-10T23:00:00Z",
+            "time": "2009-11-10T23:00:00Z",
             "fields": {
                 "value": 0.64
             }
diff --git a/examples/tutorial_server_data.py b/examples/tutorial_server_data.py
@@ -28,7 +28,7 @@ def main(host='localhost', port=8086, nb_day=15):
         hostName = "server-%d" % random.randint(1, 5)
         # pointValues = [int(past_date.strftime('%s')), value, hostName]
         pointValues = {
-                "timestamp": int(past_date.strftime('%s')),
+                "time": int(past_date.strftime('%s')),
                 "measurement": metric,
                 'fields':  {
                     'value': value,
diff --git a/examples/tutorial_sine_wave.py b/examples/tutorial_sine_wave.py
@@ -23,7 +23,7 @@ def main(host='localhost', port=8086):
 
         point = {
             "measurement": 'foobar',
-            "timestamp": int(now.strftime('%s')) + angle,
+            "time": int(now.strftime('%s')) + angle,
             "fields": {
                 "value": y
             }
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -88,7 +88,7 @@ def setUp(self):
                     "host": "server01",
                     "region": "us-west"
                 },
-                "timestamp": "2009-11-10T23:00:00Z",
+                "time": "2009-11-10T23:00:00Z",
                 "fields": {
                     "value": 0.64
                 }
@@ -149,7 +149,7 @@ def test_write(self):
                  "points": [{"measurement": "cpu_load_short",
                              "tags": {"host": "server01",
                                       "region": "us-west"},
-                             "timestamp": "2009-11-10T23:00:00Z",
+                             "time": "2009-11-10T23:00:00Z",
                              "fields": {"value": 0.64}}]}
             )
 
@@ -160,7 +160,7 @@ def test_write(self):
                  "points": [{"measurement": "cpu_load_short",
                              "tags": {"host": "server01",
                                       "region": "us-west"},
-                             "timestamp": "2009-11-10T23:00:00Z",
+                             "time": "2009-11-10T23:00:00Z",
                              "fields": {"value": 0.64}}]}
             )
 
@@ -212,18 +212,18 @@ def test_write_points_toplevel_attributes(self):
     def test_write_points_batch(self):
         dummy_points = [
             {"measurement": "cpu_usage", "tags": {"unit": "percent"},
-             "timestamp": "2009-11-10T23:00:00Z", "fields": {"value": 12.34}},
+             "time": "2009-11-10T23:00:00Z", "fields": {"value": 12.34}},
             {"measurement": "network", "tags": {"direction": "in"},
-             "timestamp": "2009-11-10T23:00:00Z", "fields": {"value": 123.00}},
+             "time": "2009-11-10T23:00:00Z", "fields": {"value": 123.00}},
             {"measurement": "network", "tags": {"direction": "out"},
-             "timestamp": "2009-11-10T23:00:00Z", "fields": {"value": 12.00}}
+             "time": "2009-11-10T23:00:00Z", "fields": {"value": 12.00}}
         ]
         expected_last_body = {"tags": {"host": "server01",
                                        "region": "us-west"},
                               "database": "db",
                               "points": [{"measurement": "network",
                                           "tags": {"direction": "out"},
-                                          "timestamp": "2009-11-10T23:00:00Z",
+                                          "time": "2009-11-10T23:00:00Z",
                                           "fields": {"value": 12.00}}]}
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ Here's a basic example (for more see the examples directory)::`
`103`	`103`	`"host": "server01",`
`104`	`104`	`"region": "us-west"`
`105`	`105`	`},`
`106`		`- "timestamp": "2009-11-10T23:00:00Z",`
	`106`	`+ "time": "2009-11-10T23:00:00Z",`
`107`	`107`	`"fields": {`
`108`	`108`	`"value": 0.64`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def main(host='localhost', port=8086):`
`17`	`17`	`"host": "server01",`
`18`	`18`	`"region": "us-west"`
`19`	`19`	`},`
`20`		`- "timestamp": "2009-11-10T23:00:00Z",`
	`20`	`+ "time": "2009-11-10T23:00:00Z",`
`21`	`21`	`"fields": {`
`22`	`22`	`"value": 0.64`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def main(host='localhost', port=8086):`
`23`	`23`
`24`	`24`	`point = {`
`25`	`25`	`"measurement": 'foobar',`
`26`		`- "timestamp": int(now.strftime('%s')) + angle,`
	`26`	`+ "time": int(now.strftime('%s')) + angle,`
`27`	`27`	`"fields": {`
`28`	`28`	`"value": y`
`29`	`29`	`}`