diff --git a/puppetboard/app.py b/puppetboard/app.py
index 14dfd61..0fbf684 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -196,3 +196,15 @@ def query():
                 query='[{0}]'.format(form.query.data))
         return render_template('query.html', form=form, result=result)
     return render_template('query.html', form=form)
+
+@app.route('/metrics')
+def metrics():
+  metrics = puppetdb._query('metrics', path='mbeans')
+  for key,value in metrics.iteritems():
+    metrics[key]=value.split('/')[3]
+  return render_template('metrics.html', metrics=metrics)
+
+@app.route('/metric/<metric>')
+def metric(metric):
+  metric = puppetdb.metric(metric)
+  return render_template('metric.html', metric=metric)
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index abad3af..423b17f 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -25,6 +25,7 @@
               ('nodes', 'Nodes'),
               ('facts', 'Facts'),
               ('reports', 'Reports'),
+              ('metrics', 'Metrics'),
               ('query', 'Query'),
                 ] %}
                   <li{% if endpoint == request.endpoint %} class=active{% endif
diff --git a/puppetboard/templates/metric.html b/puppetboard/templates/metric.html
new file mode 100644
index 0000000..8e2aba6
--- /dev/null
+++ b/puppetboard/templates/metric.html
@@ -0,0 +1,14 @@
+{% extends 'layout.html' %}
+{% block content %}
+<h1>Metric</h1>
+<table class="table table-striped">
+  <tbody>
+    {% for key,value in metric.iteritems() %}
+    <tr>
+      <td>{{key}}</td>
+      <td>{{value}}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endblock content %}
diff --git a/puppetboard/templates/metrics.html b/puppetboard/templates/metrics.html
new file mode 100644
index 0000000..8f84658
--- /dev/null
+++ b/puppetboard/templates/metrics.html
@@ -0,0 +1,9 @@
+{% extends 'layout.html' %}
+{% block content %}
+<h1>Metrics</h1>
+<ul>
+  {% for key,value in metrics.iteritems() %}
+  <li><a href="{{url_for('metric', metric=value)}}">{{key}}</li>
+  {% endfor %}
+</ul>
+{% endblock content %}