Merge branch 'master' into check-revoke-revised
This commit is contained in:
commit
c669cd23f0
|
@ -15,6 +15,7 @@ from lemur.sources.models import Source
|
||||||
from lemur.certificates.models import Certificate
|
from lemur.certificates.models import Certificate
|
||||||
from lemur.certificates import service as certificate_service
|
from lemur.certificates import service as certificate_service
|
||||||
from lemur.endpoints import service as endpoint_service
|
from lemur.endpoints import service as endpoint_service
|
||||||
|
from lemur.extensions import metrics
|
||||||
from lemur.destinations import service as destination_service
|
from lemur.destinations import service as destination_service
|
||||||
|
|
||||||
from lemur.certificates.schemas import CertificateUploadInputSchema
|
from lemur.certificates.schemas import CertificateUploadInputSchema
|
||||||
|
@ -94,6 +95,9 @@ def sync_endpoints(source):
|
||||||
certificate_name, endpoint["name"]
|
certificate_name, endpoint["name"]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
metrics.send("endpoint.certificate.not.found",
|
||||||
|
"counter", 1,
|
||||||
|
metric_tags={"cert": certificate_name, "endpoint": endpoint["name"], "acct": s.get_option("accountNumber", source.options)})
|
||||||
continue
|
continue
|
||||||
|
|
||||||
policy = endpoint.pop("policy")
|
policy = endpoint.pop("policy")
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
<button ng-repeat="count in params.settings().counts" type="button" ng-class="{'active':params.count()==count}" ng-click="params.count(count)" class="btn btn-default">
|
<button ng-repeat="count in params.settings().counts" type="button" ng-class="{'active':params.count()==count}" ng-click="params.count(count)" class="btn btn-default">
|
||||||
<span ng-bind="count"></span>
|
<span ng-bind="count"></span>
|
||||||
</button>
|
</button>
|
||||||
|
<div class="centered-cell">
|
||||||
|
<span ng-bind="params.data.total"></span> Found
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="btn-group pull-right">
|
<div class="btn-group pull-right">
|
||||||
<span ng-repeat="page in pages" ng-switch="page.type" ng-class="{'disabled': !page.active && !page.current, 'active': page.current}">
|
<span ng-repeat="page in pages" ng-switch="page.type" ng-class="{'disabled': !page.active && !page.current, 'active': page.current}">
|
||||||
|
|
Loading…
Reference in New Issue