diff --git a/lemur/destinations/service.py b/lemur/destinations/service.py
index f27a138c..ed860614 100644
--- a/lemur/destinations/service.py
+++ b/lemur/destinations/service.py
@@ -8,6 +8,7 @@
from sqlalchemy import func
from lemur import database
+from lemur.models import certificate_destination_associations
from lemur.destinations.models import Destination
from lemur.certificates.models import Certificate
@@ -117,10 +118,9 @@ def stats(**kwargs):
:param kwargs:
:return:
"""
- attr = getattr(Destination, kwargs.get('metric'))
- query = database.db.session.query(attr, func.count(attr))
-
- items = query.group_by(attr).all()
+ items = database.db.session.query(Destination.label, func.count(certificate_destination_associations.c.certificate_id))\
+ .join(certificate_destination_associations)\
+ .group_by(Destination.label).all()
keys = []
values = []
diff --git a/lemur/static/app/angular/dashboard/dashboard.js b/lemur/static/app/angular/dashboard/dashboard.js
index 71f0f557..a9a05ce7 100644
--- a/lemur/static/app/angular/dashboard/dashboard.js
+++ b/lemur/static/app/angular/dashboard/dashboard.js
@@ -84,8 +84,8 @@ angular.module('lemur')
$scope.expiring = {labels: data.items.labels, values: [data.items.values]};
});
- LemurRestangular.all('destinations').customGET('stats', {metric: 'certificates'})
+ LemurRestangular.all('destinations').customGET('stats', {metric: 'certificate'})
.then(function (data) {
- $scope.destinations = {labels: data.items.labels, values: [data.items.values]};
+ $scope.destinations = data.items;
});
});
diff --git a/lemur/static/app/angular/dashboard/dashboard.tpl.html b/lemur/static/app/angular/dashboard/dashboard.tpl.html
index c8d2c6a6..22baec24 100644
--- a/lemur/static/app/angular/dashboard/dashboard.tpl.html
+++ b/lemur/static/app/angular/dashboard/dashboard.tpl.html
@@ -10,43 +10,45 @@
Expiring Certificates
-
+
-
-
-
-
Issuers
-
-
-
-
+
+
-
-
-
-
Bit Strength
-
-
-
-
+
+
+
+
+
+
+
+
+
Bit Strength
+
+
+
+
+
+
+
+
+
-
-
-
-
-
Destinations
-
-
-
-
-
-
-