From b113fb3e9cf88144e8a1854c2a7766c46437f26f Mon Sep 17 00:00:00 2001 From: Xiuming Chen Date: Tue, 23 Jun 2015 22:32:49 -0700 Subject: [PATCH 1/2] Accept time resolution param for _cat/nodes. --- elasticsearch/client/cat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch/client/cat.py b/elasticsearch/client/cat.py index ceb42777..65b6b19a 100644 --- a/elasticsearch/client/cat.py +++ b/elasticsearch/client/cat.py @@ -134,7 +134,7 @@ class CatClient(NamespacedClient): params=params) return data - @query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'v') + @query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'time', 'v') def nodes(self, params=None): """ The nodes command shows the cluster topology. @@ -146,6 +146,7 @@ class CatClient(NamespacedClient): master node (default: false) :arg master_timeout: Explicit operation timeout for connection to master node + :arg time: The unit in which to display time values :arg v: Verbose mode. Display column headers, default False """ _, data = self.transport.perform_request('GET', '/_cat/nodes', From ceffee3b8bc5ad70c701635a6078824e1a58c074 Mon Sep 17 00:00:00 2001 From: Xiuming Chen Date: Tue, 23 Jun 2015 22:35:53 -0700 Subject: [PATCH 2/2] Comments for bytes. --- elasticsearch/client/cat.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/elasticsearch/client/cat.py b/elasticsearch/client/cat.py index 65b6b19a..f79ba54f 100644 --- a/elasticsearch/client/cat.py +++ b/elasticsearch/client/cat.py @@ -140,6 +140,7 @@ class CatClient(NamespacedClient): The nodes command shows the cluster topology. ``_ + :arg bytes: The unit in which to display byte values :arg h: Comma-separated list of column names to display :arg help: Return help information, default False :arg local: Return local information, do not retrieve the state from @@ -182,6 +183,7 @@ class CatClient(NamespacedClient): :arg index: A comma-separated list of index names to limit the returned information + :arg bytes: The unit in which to display byte values :arg h: Comma-separated list of column names to display :arg help: Return help information, default False :arg local: Return local information, do not retrieve the state from @@ -202,6 +204,7 @@ class CatClient(NamespacedClient): :arg index: A comma-separated list of index names to limit the returned information + :arg bytes: The unit in which to display byte values :arg h: Comma-separated list of column names to display :arg help: Return help information, default False :arg local: Return local information, do not retrieve the state from