From 871bf96c9b231b5c2281a021599959c4f164b479 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 20 Jun 2017 08:50:31 +0000 Subject: Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740 --- app/assets/javascripts/monitoring/monitoring_bundle.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts/monitoring/monitoring_bundle.js') diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js index b3ce9310417..5d5cb56af72 100644 --- a/app/assets/javascripts/monitoring/monitoring_bundle.js +++ b/app/assets/javascripts/monitoring/monitoring_bundle.js @@ -1,6 +1,10 @@ -import PrometheusGraph from './prometheus_graph'; +import Vue from 'vue'; +import Monitoring from './components/monitoring.vue'; -document.addEventListener('DOMContentLoaded', function onLoad() { - document.removeEventListener('DOMContentLoaded', onLoad, false); - return new PrometheusGraph(); -}, false); +document.addEventListener('DOMContentLoaded', () => new Vue({ + el: '#prometheus-graphs', + components: { + 'monitoring-dashboard': Monitoring, + }, + render: createElement => createElement('monitoring-dashboard'), +})); -- cgit v1.2.3