From efcac0b181f4676948fbc2c6017e4207011cb442 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 19 Jul 2019 14:09:51 -0400 Subject: [PATCH 1/4] Fix nodesensors -n with csv --- confluent_client/bin/nodesensors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_client/bin/nodesensors b/confluent_client/bin/nodesensors index c86e1256..ccf8b917 100755 --- a/confluent_client/bin/nodesensors +++ b/confluent_client/bin/nodesensors @@ -158,7 +158,7 @@ def sensorpass(showout=True, appendtime=False): def format_csv(csvwriter, orderedsensors, resdata, showtime=True): for nodekey in resdata: if showtime: - if showtime.is_integer(): + if isinstance(showtime, int): rowdata = [time.strftime('%Y-%m-%dT%H:%M:%S'), nodekey] else: rowdata = [time.strftime('%Y-%m-%dT%H:%M:%S.') + @@ -199,7 +199,7 @@ def main(): orderedsensors.append(name) orderedsensors.sort() for name in orderedsensors: - headernames.append(sensorheaders[name]) + headernames.append(sensorheaders[name].encode('utf-8')) if options.csv: linebyline = False csvwriter = csv.writer(sys.stdout) From da82fef0cb99cce1b7f98fe292c2ff657beaa21c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 19 Jul 2019 14:22:19 -0400 Subject: [PATCH 2/4] Have nodelist use nodeattrib completion Since nodelist may also show attribute values, use same completion function. --- confluent_client/confluent_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_client/confluent_env.sh b/confluent_client/confluent_env.sh index 2815f11a..2cb8b6be 100644 --- a/confluent_client/confluent_env.sh +++ b/confluent_client/confluent_env.sh @@ -277,7 +277,7 @@ complete -F _confluent_ng_completion nodegroupremove complete -F _confluent_nr_completion nodehealth complete -F _confluent_nodeidentify_completion nodeidentify complete -F _confluent_nr_completion nodeinventory -complete -F _confluent_nr_completion nodelist +complete -F _confluent_nodeattrib_completion nodelist complete -F _confluent_nodemedia_completion nodemedia complete -F _confluent_nodepower_completion nodepower complete -F _confluent_nr_completion noderemove From 44929e7975a4f2c24f32cf3fed40c6043bfb3101 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 19 Jul 2019 15:36:43 -0400 Subject: [PATCH 3/4] Fix printing of unicode to pipe nodesensors would have a unicode error on pipe output. --- confluent_client/bin/nodesensors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_client/bin/nodesensors b/confluent_client/bin/nodesensors index ccf8b917..6c13cc74 100755 --- a/confluent_client/bin/nodesensors +++ b/confluent_client/bin/nodesensors @@ -150,7 +150,7 @@ def sensorpass(showout=True, appendtime=False): showval += ' @' + time.strftime( '%Y-%m-%dT%H:%M:%S') print(u'{0}: {1}:{2}'.format( - node, sensedata['name'], showval)) + node, sensedata['name'], showval).encode('utf8')) sys.stdout.flush() return resultdata From 00ce48b046bffa62d38f9973ae60db300f05253e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 22 Jul 2019 09:27:31 -0400 Subject: [PATCH 4/4] Fix behavior for bad nodelicense arguments Correctly show help and exit if unrecognized parameter. --- confluent_client/bin/nodelicense | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/confluent_client/bin/nodelicense b/confluent_client/bin/nodelicense index 96af0d52..5c6e1d41 100755 --- a/confluent_client/bin/nodelicense +++ b/confluent_client/bin/nodelicense @@ -51,7 +51,8 @@ try: elif args[1] == 'delete': delete = args[2] else: - components = ['all'] + argparser.print_help() + sys.exit(1) except IndexError: argparser.print_help() sys.exit(1)