the timestamp field is called 'time'

trehn · trehn · commit f02967766a3f · 2015-06-24T22:48:47.000+02:00
diff --git a/influxdb/line_protocol.py b/influxdb/line_protocol.py
@@ -94,9 +94,9 @@ def make_lines(data):
         lines = lines[:-1]  # strip the trailing comma
 
         # add timestamp
-        if 'timestamp' in point:
+        if 'time' in point:
             lines += " " + _force_text(str(int(
-                _convert_timestamp(point['timestamp'])
+                _convert_timestamp(point['time'])
             )))
 
         lines += "\n"
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}}]}
             )
 
@@ -206,18 +206,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,
