@@ -81,6 +81,7 @@ def fish(self):
81
81
# Use default port of 5554 if not annotated
82
82
port = i .metadata .annotations .get ('restPort' , 5554 )
83
83
version = i .metadata .annotations .get ('productVersion' , '0' )
84
+ logger .info ("Version is %s" , version )
84
85
if self .use_kubeconfig :
85
86
ip = '127.0.0.1'
86
87
else :
@@ -101,15 +102,14 @@ def fish(self):
101
102
trawler = self .trawler ,
102
103
api_tests = self .api_tests ,
103
104
version = version
104
- )
105
+ )
105
106
self .items [dp_key ].gather_metrics ()
106
107
logger .info ("DataPowers in list: {}" .format (len (pods )))
107
108
except client .rest .ApiException as exception :
108
109
logger .error ("Error calling kubernetes API" )
109
110
logger .debug (exception )
110
111
111
112
112
-
113
113
class DataPower ():
114
114
""" Object representing each datapower pod """
115
115
domain = 'apiconnect'
@@ -265,7 +265,7 @@ def object_counts(self):
265
265
""" Count objects within datapower domain """
266
266
if self .version > '10.5.0.0' :
267
267
# Supports ObjectInstanceCounts - much quicker...
268
- logger .info ("Processing status provider ObjectInstanceCounts" )
268
+ logger .info ("Processing status provider ObjectInstanceCounts (DP version in %s)" , self . version )
269
269
try :
270
270
url = "https://{}:{}/mgmt/status/{}/ObjectInstanceCounts" .format (
271
271
self .ip ,
@@ -283,7 +283,7 @@ def object_counts(self):
283
283
except requests .exceptions .RequestException as e :
284
284
logger .info ("Failed to get object instance count: {} (Check rest-mgmt is enabled and you have network connectivity)" .format (e .strerror ))
285
285
else :
286
- logger .info ("Processing status provider ObjectStatus" )
286
+ logger .info ("Processing status provider ObjectStatus (DP version is %s)" , self . version )
287
287
try :
288
288
url = "https://{}:{}/mgmt/status/{}/ObjectStatus" .format (
289
289
self .ip ,
0 commit comments