From 2750d083527037fe776c72f57fc78013ab7261cc Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 12:56:02 +0100 Subject: [PATCH 1/8] Get InfluxDB 1.1.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20a6d8cc..1dd2c78d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: - pip install tox - pip install coveralls - mkdir influxdb_install - - wget https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb + - wget https://dl.influxdata.com/influxdb/releases/influxdb_1.1.0_amd64.deb - dpkg -x influxdb*.deb influxdb_install script: - export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/usr/bin/influxd From 7c3d204d07d3757fc42ea1aa7b97e58a20a9b70f Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 13:12:56 +0100 Subject: [PATCH 2/8] Default retetion policy name and duration unit have changed in InfluxDB --- .../server_tests/client_test_with_server.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py index 86faf204..9b273eb4 100644 --- a/influxdb/tests/server_tests/client_test_with_server.py +++ b/influxdb/tests/server_tests/client_test_with_server.py @@ -431,8 +431,8 @@ def test_default_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'name': 'default', - 'duration': '0', + {'name': 'autogen', + 'duration': '0s', 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', 'default': True} @@ -447,11 +447,11 @@ def test_create_retention_policy_default(self): self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': False, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '24h0m0s', 'default': True, 'replicaN': 1, @@ -471,11 +471,11 @@ def test_create_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': True, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '24h0m0s', 'default': False, 'replicaN': 1, @@ -494,11 +494,11 @@ def test_alter_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': True, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '96h0m0s', 'default': False, 'replicaN': 1, From cb295197d9c85d06857bef7d03f5964bb3a35f3a Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 13:23:11 +0100 Subject: [PATCH 3/8] Default retention name and policy duration, again --- .../server_tests/client_test_with_server.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py index 9b273eb4..01bd345b 100644 --- a/influxdb/tests/server_tests/client_test_with_server.py +++ b/influxdb/tests/server_tests/client_test_with_server.py @@ -514,11 +514,11 @@ def test_alter_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': True, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '96h0m0s', 'default': False, 'replicaN': 4, @@ -534,11 +534,11 @@ def test_alter_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': False, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '96h0m0s', 'default': True, 'replicaN': 4, @@ -558,11 +558,11 @@ def test_alter_retention_policy_invalid(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': True, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'}, + 'name': 'autogen'}, {'duration': '24h0m0s', 'default': False, 'replicaN': 1, @@ -580,11 +580,11 @@ def test_drop_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( [ - {'duration': '0', + {'duration': '0s', 'default': True, 'replicaN': 1, 'shardGroupDuration': u'168h0m0s', - 'name': 'default'} + 'name': 'autogen'} ], rsp ) From 6c921a977bd88007bca2c1871d4015307ee40613 Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 15:44:36 +0100 Subject: [PATCH 4/8] Altering retention policy doesn't change shard group duration --- .../tests/server_tests/client_test_with_server.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py index 01bd345b..ae9e86fa 100644 --- a/influxdb/tests/server_tests/client_test_with_server.py +++ b/influxdb/tests/server_tests/client_test_with_server.py @@ -468,6 +468,9 @@ def test_create_retention_policy_default(self): def test_create_retention_policy(self): self.cli.create_retention_policy('somename', '1d', 1) + # NB: creating a retention policy without specifying shard group duration + # leads to a shard group duration of 1 hour + # See https://docs.influxdata.com/influxdb/v1.1/query_language/database_management/#retention-policy-management rsp = self.cli.get_list_retention_policies() self.assertEqual( [ @@ -491,6 +494,7 @@ def test_alter_retention_policy(self): # Test alter duration self.cli.alter_retention_policy('somename', 'db', duration='4d') + # NB: altering retention policy doesn't change shard group duration rsp = self.cli.get_list_retention_policies() self.assertEqual( [ @@ -502,7 +506,7 @@ def test_alter_retention_policy(self): {'duration': '96h0m0s', 'default': False, 'replicaN': 1, - 'shardGroupDuration': u'24h0m0s', + 'shardGroupDuration': u'1h0m0s', 'name': 'somename'} ], rsp @@ -511,6 +515,7 @@ def test_alter_retention_policy(self): # Test alter replication self.cli.alter_retention_policy('somename', 'db', replication=4) + # NB: altering retention policy doesn't change shard group duration rsp = self.cli.get_list_retention_policies() self.assertEqual( [ @@ -522,7 +527,7 @@ def test_alter_retention_policy(self): {'duration': '96h0m0s', 'default': False, 'replicaN': 4, - 'shardGroupDuration': u'24h0m0s', + 'shardGroupDuration': u'1h0m0s', 'name': 'somename'} ], rsp @@ -531,6 +536,7 @@ def test_alter_retention_policy(self): # Test alter default self.cli.alter_retention_policy('somename', 'db', default=True) + # NB: altering retention policy doesn't change shard group duration rsp = self.cli.get_list_retention_policies() self.assertEqual( [ @@ -542,7 +548,7 @@ def test_alter_retention_policy(self): {'duration': '96h0m0s', 'default': True, 'replicaN': 4, - 'shardGroupDuration': u'24h0m0s', + 'shardGroupDuration': u'1h0m0s', 'name': 'somename'} ], rsp From 103899e15916a9e58615fc25d0f795823c0df6a3 Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 15:49:47 +0100 Subject: [PATCH 5/8] Fix styling --- influxdb/tests/server_tests/client_test_with_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py index ae9e86fa..d81054c9 100644 --- a/influxdb/tests/server_tests/client_test_with_server.py +++ b/influxdb/tests/server_tests/client_test_with_server.py @@ -468,9 +468,9 @@ def test_create_retention_policy_default(self): def test_create_retention_policy(self): self.cli.create_retention_policy('somename', '1d', 1) - # NB: creating a retention policy without specifying shard group duration + # NB: creating a retention policy without specifying + # shard group duration # leads to a shard group duration of 1 hour - # See https://docs.influxdata.com/influxdb/v1.1/query_language/database_management/#retention-policy-management rsp = self.cli.get_list_retention_policies() self.assertEqual( [ From 56a7326c434ef36ec9a44820dfab878a13a21471 Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 16:03:37 +0100 Subject: [PATCH 6/8] Fix coverage link in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d3a8d775..08349c53 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ InfluxDB-Python is a client for interacting with InfluxDB_. Maintained by @aviau :alt: Documentation Status .. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg - :target: https://coveralls.io/r/influxdata/influxdb-python + :target: https://coveralls.io/github/gansanay/influxdb-python :alt: Coverage .. _readme-about: From 11c01666b5172f602f7a82f25fc151f5c323845d Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 16:04:20 +0100 Subject: [PATCH 7/8] Put initial coverage link back --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 08349c53..d3a8d775 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ InfluxDB-Python is a client for interacting with InfluxDB_. Maintained by @aviau :alt: Documentation Status .. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg - :target: https://coveralls.io/github/gansanay/influxdb-python + :target: https://coveralls.io/r/influxdata/influxdb-python :alt: Coverage .. _readme-about: From 3370b8468da6a322061f04212b5f3e9d6387f7af Mon Sep 17 00:00:00 2001 From: gansanay Date: Tue, 29 Nov 2016 16:09:48 +0100 Subject: [PATCH 8/8] Update README: v1.1.0 is the recommended version of InfluxDB --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index d3a8d775..a88ce0f2 100644 --- a/README.rst +++ b/README.rst @@ -22,10 +22,10 @@ InfluxDB is an open-source distributed time series database, find more about Inf .. _installation: -InfluxDB v0.8.X users -===================== +InfluxDB pre v1.1.0 users +========================= -InfluxDB 0.9 was released and it is the new recommended version. However, InfluxDB 0.8.x users may still use the legacy client by using ``from influxdb.influxdb08 import InfluxDBClient`` instead. +InfluxDB 1.1.0 was released and it is the new recommended version. InfluxDB 0.8.x users may still use the legacy client by using ``from influxdb.influxdb08 import InfluxDBClient`` instead. Installation ============