commit 2b3a93c0d017245bf4573417f92a50c60273ab2f
author Allen Li <ayatane@chromium.org> Tue Nov 01 12:27:21 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Nov 09 16:23:57 2016 -0800
tree dc0650891a0e6d1eb05ed8218c6faf12cd02eb36
parent 63babff1e114d284c9fd7e20e3a01ddee5951df3

[sysmon] Fix wrong type for Puppet config version metric

BUG=chromium:661263
TEST=Run on test drone

Change-Id: Iab9a5c5b3416ed9bcdffdf64fbb1ce8493b088fd
Reviewed-on: https://chromium-review.googlesource.com/405697
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>

scripts/sysmon/puppet_metrics.py

diff --git a/scripts/sysmon/puppet_metrics.py b/scripts/sysmon/puppet_metrics.py
index 163d408..47bfc74 100644
--- a/scripts/sysmon/puppet_metrics.py
+++ b/scripts/sysmon/puppet_metrics.py
@@ -55,13 +55,13 @@
 
   @property
   def config_version(self):
-    """Return config version as int or None."""
-    return self.versions.get('config', None)
+    """Return config version as int."""
+    return self.versions.get('config', -1)
 
   @property
   def puppet_version(self):
-    """Return Puppet version as string or None."""
-    return self.versions.get('puppet', None)
+    """Return Puppet version as string."""
+    return self.versions.get('puppet', '')
 
   @property
   def events(self):
@@ -91,7 +91,7 @@
   except Exception as e:
     logging.warning('Error loading Puppet run summary: %s', e)
   else:
-    _config_version_metric.set(str(summary.config_version))
+    _config_version_metric.set(summary.config_version)
     _puppet_version_metric.set(str(summary.puppet_version))
 
     for key, value in summary.events.iteritems():