diff --git a/muranodashboard/static/muranodashboard/js/horizon.muranotopology.js b/muranodashboard/static/muranodashboard/js/horizon.muranotopology.js index 33f402b6f..764d5fe0c 100644 --- a/muranodashboard/static/muranodashboard/js/horizon.muranotopology.js +++ b/muranodashboard/static/muranodashboard/js/horizon.muranotopology.js @@ -127,7 +127,6 @@ function remove_nodes(old_nodes, new_nodes){ } function build_links(){ - debugger; for (var i=0;i + {% for env in stats %} + {% with parent=grp_id env=env t="stats/_billing_stats.html" %} + {% include t %} + {% endwith %} + {% endfor %} + diff --git a/muranodashboard/templates/stats/_billing_entry.html b/muranodashboard/templates/stats/_billing_entry.html new file mode 100644 index 000000000..a7a309ab5 --- /dev/null +++ b/muranodashboard/templates/stats/_billing_entry.html @@ -0,0 +1,15 @@ + + + {{ instance.service }} + + + {{ instance.service_type }} + + + {{ instance.duration }} sec. + + + {{ instance.active }} + + + diff --git a/muranodashboard/templates/stats/_billing_stats.html b/muranodashboard/templates/stats/_billing_stats.html new file mode 100644 index 000000000..297884576 --- /dev/null +++ b/muranodashboard/templates/stats/_billing_stats.html @@ -0,0 +1,28 @@ +
+ +
+
+ + + + + + + + + + {% for entry in env.instances %} + {% with instance=entry t="stats/_billing_entry.html" %} + {% include t %} + {% endwith %} + {% endfor %} +
Component Name Component Type Duration Active
+
+
+
diff --git a/muranodashboard/templates/stats/index.html b/muranodashboard/templates/stats/index.html index e10531078..c15132fd2 100644 --- a/muranodashboard/templates/stats/index.html +++ b/muranodashboard/templates/stats/index.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Murano Stats" %}{% endblock %} +{% block title %}{% trans "Murano Statistics" %}{% endblock %} {% block page_header %} {% include "stats/_page_header.html" with title=_("Murano Server Stats") %}