Additional checks for variables (#85)

* fix: only try and get token if password set

Signed-off-by: Ricky Moorhouse <[email protected]>

* fix: additional graphite reference

#72
Signed-off-by: Ricky Moorhouse <[email protected]>

---------

Signed-off-by: Ricky Moorhouse <[email protected]>

Author: rickymoorhouse

manager_net.py

@@ -235,9 +235,10 @@ def fish(self):
             logger.debug("Disabled because a fatal error already occurred")
             return
 
-        # Allow 10 seconds to run
-        if self.cm_token_expires - 10 < time.time():
-            self.get_token(self.hostname, cloud_manager=True)
+        # Only attempt to get distinct token with cm credentials if password is set
+        if self.cm_password != "":
+            if self.cm_token_expires - 10 < time.time():
+                self.get_token(self.hostname, cloud_manager=True)
 
         # Allow 10 seconds to run
         if self.token_expires - 10 < time.time():

trawler.py

@@ -123,12 +123,13 @@ def set_gauge(self, component, target_name, value, pod_name=None, labels=None):
                         self.gauges[prometheus_target].set(value)
                 except ValueError as value_exception:
                     self.logger.exception(value_exception)
-            if self.config['graphite']['enabled']:
-                if pod_name:
-                    metric_name = "{}.{}.{}".format(component, pod_name, target_name)
-                else:
-                    metric_name = "{}.{}".format(component, target_name)
-                self.graphite.stage(metric_name, value)
+            if 'graphite' in self.config:
+                if self.config['graphite']['enabled']:
+                    if pod_name:
+                        metric_name = "{}.{}.{}".format(component, pod_name, target_name)
+                    else:
+                        metric_name = "{}.{}".format(component, target_name)
+                    self.graphite.stage(metric_name, value)
 
     def inc_counter(self, component, target_name, value, pod_name=None, labels=None):
         """ Set or increase prometheus counter """