diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index d54b18561d..a1388b3927 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -67,7 +67,7 @@ - datagrepper - role: collectd/web-service site: datagrepper - url: localhost/datagrepper/raw + url: "http://localhost/datagrepper/raw" interval: 15 handlers: diff --git a/roles/collectd/web-service/templates/web-service-collectd.py b/roles/collectd/web-service/templates/web-service-collectd.py index 2f0b46d9de..798a711723 100644 --- a/roles/collectd/web-service/templates/web-service-collectd.py +++ b/roles/collectd/web-service/templates/web-service-collectd.py @@ -2,6 +2,7 @@ """ monitor website request times for collectd """ import time +import socket import urllib @@ -20,10 +21,11 @@ if __name__ == '__main__': interval = int("{{ interval }}") try: - loadtime = get_loadtime(url) - timestamp = int(time.time()) - print "PUTVAL %s/%s/delay-%s interval=%i %i:%i" % ( - hostname, 'web', site, interval, timestamp, loadtime) - time.sleep(interval) + while True: + loadtime = get_loadtime(url) + timestamp = int(time.time()) + print "PUTVAL %s/%s/delay-%s interval=%i %i:%f" % ( + hostname, 'web', site, interval, timestamp, loadtime) + time.sleep(interval) except KeyboardInterrupt: pass