Merge branch 'master' into master

lemur/certificates/service.py

@@ -393,6 +393,9 @@ def render(args):
                     Certificate.cn.ilike(term),
                 )
             )
+        elif "fixedName" in terms:
+            # only what matches the fixed name directly if a fixedname is provided
+            query = query.filter(Certificate.name == terms[1])
         else:
             query = database.filter(query, Certificate, terms)
 

lemur/plugins/lemur_atlas_redis/__init__.py

@@ -0,0 +1,4 @@
+try:
+    VERSION = __import__("pkg_resources").get_distribution(__name__).version
+except Exception as e:
+    VERSION = "unknown"

lemur/plugins/lemur_atlas_redis/plugin.py

@@ -0,0 +1,97 @@
+"""
+.. module: lemur.plugins.lemur_atlas_redis.plugin
+    :platform: Unix
+    :copyright: (c) 2018 by Netflix Inc., see AUTHORS for more
+    :license: Apache, see LICENSE for more details.
+
+.. moduleauthor:: Jay Zarfoss
+"""
+
+from redis import Redis
+import json
+from datetime import datetime
+
+from flask import current_app
+from lemur.plugins import lemur_atlas as atlas
+from lemur.plugins.bases.metric import MetricPlugin
+
+
+def millis_since_epoch():
+    """
+    current time since epoch in milliseconds
+    """
+    epoch = datetime.utcfromtimestamp(0)
+    delta = datetime.now() - epoch
+    return int(delta.total_seconds() * 1000.0)
+
+
+class AtlasMetricRedisPlugin(MetricPlugin):
+    title = "AtlasRedis"
+    slug = "atlas-metric-redis"
+    description = "Adds support for sending key metrics to Atlas via local Redis"
+    version = atlas.VERSION
+
+    author = "Jay Zarfoss"
+    author_url = "https://github.com/netflix/lemur"
+
+    options = [
+        {
+            "name": "redis_host",
+            "type": "str",
+            "required": False,
+            "help_message": "If no host is provided localhost is assumed",
+            "default": "localhost",
+        },
+        {"name": "redis_port", "type": "int", "required": False, "default": 28527},
+    ]
+
+    metric_data = {}
+    redis_host = None
+    redis_port = None
+
+    def submit(
+        self, metric_name, metric_type, metric_value, metric_tags=None, options=None
+    ):
+        if not options:
+            options = self.options
+
+        valid_types = ["COUNTER", "GAUGE", "TIMER"]
+        if metric_type.upper() not in valid_types:
+            raise Exception(
+                "Invalid Metric Type for Atlas: '{metric}' choose from: {options}".format(
+                    metric=metric_type, options=",".join(valid_types)
+                )
+            )
+
+        if metric_tags:
+            if not isinstance(metric_tags, dict):
+                raise Exception(
+                    "Invalid Metric Tags for Atlas: Tags must be in dict format"
+                )
+
+        self.metric_data["timestamp"] = millis_since_epoch()
+        self.metric_data["type"] = metric_type.upper()
+        self.metric_data["name"] = str(metric_name)
+        self.metric_data["tags"] = metric_tags
+
+        if (
+            metric_value == "NaN"
+            or isinstance(metric_value, int)
+            or isinstance(metric_value, float)
+        ):
+            self.metric_data["value"] = metric_value
+        else:
+            raise Exception("Invalid Metric Value for Atlas: Metric must be a number")
+
+        self.redis_host = self.get_option("redis_host", options)
+        self.redis_port = self.get_option("redis_port", options)
+
+        try:
+            r = Redis(host=self.redis_host, port=self.redis_port, socket_timeout=0.1)
+            r.rpush('atlas-agent', json.dumps(self.metric_data))
+        except Exception as e:
+            current_app.logger.warning(
+                "AtlasMetricsRedis: exception [{exception}] could not post atlas metrics to AtlasRedis [{host}:{port}], metric [{metricdata}]".format(
+                    exception=e, host=self.redis_host, port=self.redis_port, metricdata=json.dumps(self.metric_data)
+                )
+            )

lemur/sources/service.py

@@ -78,7 +78,7 @@ def sync_endpoints(source):
                 source.label
             )
         )
-        return new, updated
+        return new, updated, updated_by_hash
 
     for endpoint in endpoints:
         exists = endpoint_service.get_by_dnsname_and_port(

lemur/static/app/angular/certificates/view/view.js

@@ -11,7 +11,7 @@ angular.module('lemur')
         controller: 'CertificatesViewController'
       })
       .state('certificate', {
-        url: '/certificates/:name',
+        url: '/certificates/:fixedName', // use "fixedName" if in URL to indicate 'like' query can be avoided
         templateUrl: '/angular/certificates/view/view.tpl.html',
         controller: 'CertificatesViewController'
       });

lemur/static/app/angular/certificates/view/view.tpl.html

@@ -52,7 +52,7 @@
             </td>
             <td data-title="''" style="text-align: center; vertical-align: middle;">
                 <div class="btn-group pull-right" role="group" aria-label="...">
-                  <a class="btn btn-sm btn-primary" ui-sref="certificate({name: certificate.name})">Permalink</a>
+                  <a class="btn btn-sm btn-primary" ui-sref="certificate({fixedName: certificate.name})">Permalink</a>
                   <button ng-model="certificate.toggle" class="btn btn-sm btn-info" uib-btn-checkbox btn-checkbox-true="1"
                             btn-checkbox-false="0">More
                   </button>