Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MB-13798: Add default ssl argument

Change-Id: Ib511d2c83866fc0bbed863d7a790ef9b6d1ceb2a
  • Loading branch information...
commit a43acce50fe273772205270f41a6f2a13ea6a7b5 1 parent fe28bc7
@bcui6611 bcui6611 authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 collector.py
View
10 collector.py
@@ -116,7 +116,7 @@ def retrieve_node_stats(self, nodeInfo, nodeStats):
def get_hostlist(self, server, port, user, password, opts):
try:
opts.append(("-o", "return"))
- nodes = listservers.ListServers().runCmd('host-list', server, port, user, password, opts)
+ nodes = listservers.ListServers().runCmd('host-list', server, port, user, password, False, opts)
for node in nodes:
(node_server, node_port) = util.hostport(node['hostname'])
node_stats = {"host" : node_server,
@@ -125,7 +125,7 @@ def get_hostlist(self, server, port, user, password, opts):
"master" : server}
stats_buffer.nodes[node['hostname']] = node_stats
if node['status'] == 'healthy':
- node_info = info.Info().runCmd('get-server-info', node_server, node_port, user, password, opts)
+ node_info = info.Info().runCmd('get-server-info', node_server, node_port, user, password, False, opts)
self.retrieve_node_stats(node_info, node_stats)
else:
self.log.error("Unhealthy node: %s:%s" %(node_server, node['status']))
@@ -136,7 +136,7 @@ def get_hostlist(self, server, port, user, password, opts):
def get_bucketlist(self, server, port, user, password, bucketname, opts):
try:
- bucketlist = buckets.Buckets().runCmd('bucket-get', server, port, user, password, opts)
+ bucketlist = buckets.Buckets().runCmd('bucket-get', server, port, user, password, False, opts)
for bucket in bucketlist:
bucket_name = bucket['name']
if bucketname == 'all' or bucket_name == bucketname:
@@ -172,7 +172,7 @@ def number_bucketddocs(self, server, port, user, password, bucketname, buckettyp
try:
opts_tmp = opts
opts_tmp.append(('-b', bucketname))
- docs = buckets.Buckets().runCmd('bucket-ddocs', server, port, user, password, opts_tmp)
+ docs = buckets.Buckets().runCmd('bucket-ddocs', server, port, user, password, False, opts_tmp)
total_ddocs = 0
total_view = 0
if docs:
@@ -293,7 +293,7 @@ def get_ns_stats(self, bucketlist, server, port, user, password, bucketname, sca
sys.stderr.write('.')
self.log.debug("retrieve: %s" % stat)
c = buckets.BucketNodeStats(bucket_name, stat, scale)
- json = c.runCmd('bucket-node-stats', server, port, user, password, opts)
+ json = c.runCmd('bucket-node-stats', server, port, user, password, False, opts)
for node, vals in json["nodeStats"].iteritems():
for i, val in enumerate(vals):
if isinstance(val, basestring):
Please sign in to comment.
Something went wrong with that request. Please try again.