collectd: set intel_pmu events path and OVS socket path

switch from hardcoded path to dynamic path
based on bin_path

also enable proxy for install_collectd

add barometer settings for virt and ovs_stats

Change-Id: Id138aef548332a3e3fcb3963b746e7c9f10c0948
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

2 files changed, 62 insertions, 42 deletions

diff --git a/ansible/roles/download_pmu_tools/files/event_download_local.py b/ansible/roles/download_pmu_tools/files/event_download_local.py
index 882fc5046..8eda2cd0d 100755
--- a/ansible/roles/download_pmu_tools/files/event_download_local.py
+++ b/ansible/roles/download_pmu_tools/files/event_download_local.py
@@ -16,35 +16,46 @@
 # event_download.py         download for current cpu
 # event_download.py -a      download all
 # event_download.py cpustr...  Download for specific CPU
+from __future__ import absolute_import
+from __future__ import print_function
 import sys
+
 import re
-from urllib2 import urlopen, URLError
 import os
 import string
 from fnmatch import fnmatch
 from shutil import copyfile
 
+try:
+    from urllib2 import URLError
+except ImportError:
+    # python 3
+    from urllib.error import URLError
+
+
 urlpath = 'https://download.01.org/perfmon'
-localpath = 'download.01.org/perfmon'
+localpath = 'pmu_local_mirror/download.01.org/perfmon'
 mapfile = 'mapfile.csv'
 modelpath = localpath + "/" + mapfile
-NSB_JSON = '/opt/nsb_bin/pmu_event.json'
+NSB_JSON = os.environ.get("PMU_EVENTS_PATH", "/tmp/pmu_event.json")
+
 
 def get_cpustr():
-    f = open('/proc/cpuinfo', 'r')
-    cpu = [None, None, None]
-    for j in f:
-        n = j.split()
-        if n[0] == 'vendor_id':
-            cpu[0] = n[2]
-        elif n[0] == 'model' and n[1] == ':':
-            cpu[2] = int(n[2])
-        elif n[0] == 'cpu' and n[1] == 'family':
-            cpu[1] = int(n[3])
-        if all(cpu):
-            break
+    with open('/proc/cpuinfo', 'r') as f:
+        cpu = [None, None, None]
+        for j in f:
+            n = j.split()
+            if n[0] == 'vendor_id':
+                cpu[0] = n[2]
+            elif n[0] == 'model' and n[1] == ':':
+                cpu[2] = int(n[2])
+            elif n[0] == 'cpu' and n[1] == 'family':
+                cpu[1] = int(n[3])
+            if all(cpu):
+                break
     return "%s-%d-%X" % (cpu[0], cpu[1], cpu[2])
 
+
 def sanitize(s, a):
     o = ""
     for j in s:
@@ -52,13 +63,14 @@ def sanitize(s, a):
             o += j
     return o
 
+
 def getdir():
     try:
         d = os.getenv("XDG_CACHE_HOME")
         xd = d
         if not d:
             home = os.getenv("HOME")
-            d = "%s/.cache" % (home)
+            d = "%s/.cache" % home
         d += "/pmu-events"
         if not os.path.isdir(d):
             # try to handle the sudo case
@@ -73,11 +85,13 @@ def getdir():
     except OSError:
         raise Exception('Cannot access ' + d)
 
+
 NUM_TRIES = 3
 
+
 def getfile(url, dir, fn):
     tries = 0
-    print "Downloading", url, "to", fn
+    print("Downloading", url, "to", fn)
     while True:
         try:
             f = open(url)
@@ -86,15 +100,17 @@ def getfile(url, dir, fn):
             tries += 1
             if tries >= NUM_TRIES:
                 raise
-            print "retrying download"
+            print("retrying download")
             continue
         break
-    o = open(os.path.join(dir, fn), "w")
-    o.write(data)
-    o.close()
+    with open(os.path.join(dir, fn), "w") as o:
+        o.write(data)
     f.close()
 
+
 allowed_chars = string.ascii_letters + '_-.' + string.digits
+
+
 def download(match, key=None, link=True):
     found = 0
     dir = getdir()
@@ -105,14 +121,14 @@ def download(match, key=None, link=True):
             n = j.rstrip().split(",")
             if len(n) < 4:
                 if len(n) > 0:
-                    print "Cannot parse", n
+                    print("Cannot parse", n)
                 continue
             cpu, version, name, type = n
             if not fnmatch(cpu, match) or (key is not None and type not in key) or type.startswith("EventType"):
                 continue
             cpu = sanitize(cpu, allowed_chars)
             url = localpath + name
-	    fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars))
+            fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars))
             try:
                 os.remove(os.path.join(dir, fn))
             except OSError:
@@ -128,34 +144,37 @@ def download(match, key=None, link=True):
                 try:
                     os.symlink(fn, os.path.join(dir, lname))
                 except OSError as e:
-                    print >>sys.stderr, "Cannot link %s to %s:" % (name, lname), e
+                    print("Cannot link %s to %s:" % (name, lname), e, file=sys.stderr)
             found += 1
         models.close()
         getfile(localpath + "/readme.txt", dir, "readme.txt")
     except URLError as e:
-        print >>sys.stderr, "Cannot access event server:", e
-        print >>sys.stderr, "If you need a proxy to access the internet please set it with:"
-        print >>sys.stderr, "\texport https_proxy=http://proxyname..."
-        print >>sys.stderr, "If you are not connected to the internet please run this on a connected system:"
-        print >>sys.stderr, "\tevent_download.py '%s'" % (match)
-        print >>sys.stderr, "and then copy ~/.cache/pmu-events to the system under test"
-        print >>sys.stderr, "To get events for all possible CPUs use:"
-        print >>sys.stderr, "\tevent_download.py -a"
+        print("Cannot access event server:", e, file=sys.stderr)
+        print("If you need a proxy to access the internet please set it with:", file=sys.stderr)
+        print("\texport https_proxy=http://proxyname...", file=sys.stderr)
+        print("If you are not connected to the internet please run this on a connected system:", file=sys.stderr)
+        print("\tevent_download.py '%s'" % match, file=sys.stderr)
+        print("and then copy ~/.cache/pmu-events to the system under test", file=sys.stderr)
+        print("To get events for all possible CPUs use:", file=sys.stderr)
+        print("\tevent_download.py -a", file=sys.stderr)
     except OSError as e:
-        print >>sys.stderr, "Cannot write events file:", e
+        print("Cannot write events file:", e, file=sys.stderr)
     return found
 
+
 def download_current(link=False):
     """Download JSON event list for current cpu.
        Returns >0 when a event list is found"""
     return download(get_cpustr(), link=link)
 
+
 def eventlist_name(name=None, key="core"):
     if not name:
         name = get_cpustr()
     cache = getdir()
     return "%s/%s-%s.json" % (cache, name, key)
 
+
 if __name__ == '__main__':
     # only import argparse when actually called from command line
     # this makes ocperf work on older python versions without it.
@@ -164,18 +183,19 @@ if __name__ == '__main__':
     p.add_argument('--all', '-a', help='Download all available event files', action='store_true')
     p.add_argument('--verbose', '-v', help='Be verbose', action='store_true')
     p.add_argument('--mine', help='Print name of current CPU', action='store_true')
-    p.add_argument('--link', help='Create links with the original event file name', action='store_true', default=True)
+    p.add_argument('--link', help='Create links with the original event file name',
+                   action='store_true', default=True)
     p.add_argument('cpus', help='CPU identifiers to download', nargs='*')
     args = p.parse_args()
 
     cpustr = get_cpustr()
     if args.verbose or args.mine:
-        print "My CPU", cpustr
+        print("My CPU", cpustr)
     if args.mine:
         sys.exit(0)
     d = getdir()
     if args.all:
-	found = download('*', link=args.link)
+        found = download('*', link=args.link)
     elif len(args.cpus) == 0:
         found = download_current(link=args.link)
     else:
@@ -184,10 +204,10 @@ if __name__ == '__main__':
             found += download(j, link=args.link)
 
     if found == 0:
-        print >>sys.stderr, "Nothing found"
+        print("Nothing found", file=sys.stderr)
 
     el = eventlist_name()
     if os.path.exists(el):
-        print "my event list", el 
-        copyfile(el,NSB_JSON)
-        print "File copied to ", NSB_JSON
+        print("my event list", el)
+        copyfile(el, NSB_JSON)
+        print("File copied to ", NSB_JSON)
diff --git a/ansible/roles/download_pmu_tools/tasks/main.yml b/ansible/roles/download_pmu_tools/tasks/main.yml
index e78cc72d6..3ef412217 100644
--- a/ansible/roles/download_pmu_tools/tasks/main.yml
+++ b/ansible/roles/download_pmu_tools/tasks/main.yml
@@ -29,13 +29,13 @@
     pmu_tools_path: "{{ pmu_tools_dest }}"
 
 - name: Create perfmon local mirror
-  command: "wget -mkEpnp {{ perfmon_url }} -P {{ pmu_tools_dest }}"
+  command: "wget -mkEpnp {{ perfmon_url }} -P {{ INSTALL_BIN_PATH }}/pmu_local_mirror"
   ignore_errors: yes
 
 - name: Copy local event download file
   copy:
     src: event_download_local.py
-    dest: "{{ pmu_tools_dest }}"
+    dest: "{{ INSTALL_BIN_PATH }}/event_download_local.py"
     owner: root
     group: root
     mode: 0755