Fix Grafana bootstrap issues

Makefile

@@ -167,6 +167,7 @@ influxdb/bin/influxd:
 	cd influxdb && make
 influxdb/meta/meta.db:
+	printf ',s/^#influxdb/influxdb/\nwq\n' | ed -s Procfile
 	support/bootstrap-influxdb 8086
 influxdb/influxdb.conf:
@@ -187,12 +188,11 @@ grafana/gdk-pg-created:
 	touch $@
 grafana/gdk-data-source-created:
+	printf ',s/^#grafana/grafana/\nwq\n' | ed -s Procfile
 	support/bootstrap-grafana
 	touch $@
 	
-performance-metrics-setup:	influxdb-setup grafana-setup Procfile
-	printf ',s/^#influxdb/influxdb/\nwq\n' | ed -s Procfile
-	printf ',s/^#grafana/grafana/\nwq\n' | ed -s Procfile
+performance-metrics-setup:	Procfile influxdb-setup grafana-setup
 clean-config:
 	rm -f \

support/bootstrap-grafana

@@ -23,7 +23,7 @@ begin
     end
   end
-  abort "#$0: could not connect to InfluxDB at #{host}:#{port}" unless socket_ready
+  abort "#$0: could not connect to Grafana at #{host}:#{port}" unless socket_ready
   http = Net::HTTP.new(host, port)
   request = Net::HTTP::Post.new('/api/datasources')